Skip to content

B
branding-etersoft-ximper
Commit fee0603b authored by Кирилл Уницаев's avatar Кирилл Уницаев
Browse files
Options

Merge branch 'ximper-wiki' into 'sisyphus'

the indexhtml page has been replaced with a link to the wiki See merge request !3
parents 67435e6d f766c68d
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 233 deletions
Makefile.in
View file @ fee0603b
......@@ -94,18 +94,8 @@ boot-grub:
boot: boot-splash boot-grub
INDEXHTML_DIR=$(datadir)/doc/indexhtml
indexhtml:
for i in indexhtml/*.html indexhtml/*.css;do \
install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \
done
install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html
cp -a indexhtml/images $(INDEXHTML_DIR)
cp -a indexhtml/fonts $(INDEXHTML_DIR)
#for i in alt-docs documentation;do \
#ln -s /usr/share/doc/$$i $(INDEXHTML_DIR)/$$i; \
#done
#install -Dpm644 indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
#install -Dpm644 indexhtml/ximper-wiki.desktop $(datadir)/applications/ximper-wiki.desktop
install: browser-qt ahttpd boot indexhtml
# install product icon
......@@ -151,8 +141,3 @@ install: browser-qt ahttpd boot indexhtml
install slideshow/slideshow.conf $(sysconfdir)/alterator/
# Set English slideshow as default
#ln -s slides-en $(datadir)/install2/slideshow/slides
#indexhtml
install -d $(datadir)/doc/indexhtml
cp -a indexhtml/{*.html,images} $(datadir)/doc/indexhtml
#install -Dm755 indexhtml/indexhtml-desktop.desktop $(datadir)/kf5/kio_desktop/DesktopLinks/indexhtml.desktop
#install -Dm755 indexhtml/indexhtml-desktop.desktop $(datadir)/Desktop/indexhtml.desktop
branding.spec
View file @ fee0603b
......@@ -236,21 +236,19 @@ Slideshow for %distro_name installer.
%package indexhtml
BuildArch: noarch
Summary: HTML welcome page for %distro_name
Summary(ru_RU.UTF-8): Стартовая страница для дистрибутива %distro_name_ru
Summary: Wiki for %distro_name
Summary(ru_RU.UTF-8): Wiki для дистрибутива %distro_name_ru
License: distributable
Group: System/Base
Provides: indexhtml indexhtml-%theme = %version indexhtml-Desktop = 1:5.0
Obsoletes: indexhtml-desktop indexhtml-Desktop
%branding_add_conflicts %flavour indexhtml
Requires(post): indexhtml-common
%description indexhtml
%distro_name welcome page.
%distro_name wiki.
%description indexhtml -l ru_RU.UTF-8
В данном пакете содержится стартовая страница для дистрибутива
В данном пакете содержится wiki для дистрибутива
%distro_name_ru.
%package backgrounds
......@@ -321,9 +319,6 @@ shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme/theme.
shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal
shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
#%post indexhtml
#%_sbindir/indexhtml-update
%ifarch %grub_arches
%files bootloader
/boot/grub/themes/%theme
......@@ -395,15 +390,8 @@ fi
/etc/alterator/slideshow.conf
/usr/share/install2/slideshow
%define indexhtmldir %_defaultdocdir/indexhtml
%files indexhtml
%ghost %_defaultdocdir/indexhtml/index.html
%_defaultdocdir/indexhtml/*
#%_desktopdir/*
#%_datadir/kf5/kio_desktop/DesktopLinks/indexhtml.desktop
#%attr(0755,root,root) %_datadir/Desktop/indexhtml.desktop
#_iconsdir/hicolor/*/apps/alt-%theme-desktop.png
%_desktopdir/ximper-wiki.desktop
%changelog
* Mon Sep 23 2024 Kirill Unitsaev <fiersik@altlinux.org> 0.9.2-alt6
......
configure.ac
View file @ fee0603b
......@@ -50,10 +50,6 @@ AC_CONFIG_FILES([
notes/release-notes.all.html
notes/license.ru.html
notes/license.all.html
indexhtml/indexhtml.desktop
indexhtml/indexhtml-desktop.desktop
indexhtml/index-ru.html
indexhtml/index-en.html
systemd/os-release
ahttpd/styles/alterator.css
])
......
indexhtml/index.css deleted 100644 → 0
View file @ 67435e6d
/* CSS file for indexhtml page in ALT Linux distros */
@font-face {
font-family: "montserratmedium";
src: url("fonts/montserrat-medium-webfont.woff2") format("woff2"),
url("fonts/montserrat-medium-webfont.woff") format("woff");
font-weight: normal;
font-style: normal;
}
body {
font-family: "montserratmedium";
font-size: 12px;
background: #f8f8f8;
background-image: url("images/dotted-background.png");
}
#content {
background: white;
border: solid 10px #e6e6e6;
border-radius: 16px;
-webkit-border-radius: 16px;
-moz-border-radius: 16px;
-khtml-border-radius: 16px;
padding: 0;
position: relative;
width: 780px;
margin: 40px auto;
}
div#languages {
text-align: right;
font-size: x-small;
padding: 12px;
}
div#title {
font-weight: normal;
font-size: 18pt;
font-family: "montserratmedium";
text-align: center;
margin-top: 0;
margin-bottom: 12px;
background: #cdcdce;
padding: 6px 0 6px 0;
border-top: solid 1px #cdcdce;
border-bottom: solid 1px #cdcdce;
color: #000;
}
div#main {
padding: 10px 0px 20px 0px;
}
.grid {
display: flex;
align-items: start;
align-self: center;
justify-content: center;
align-items: stretch;
}
.grid-title {
flex: 1;
display: flex;
justify-content: center;
padding-top: 5px;
padding-bottom: 5px;
}
.grid-cell {
flex: 1;
border-top: 2px solid #7b8185;
background: url("images/section.png") no-repeat 112px 0px;
padding: 9px 0 5px 0;
}
.side-pane {
background-color: #e3e0de;
}
.central-pane {
background-color: #cdcdce;
}
#search {
text-align: center;
padding: 12px;
}
input#search_string {
position: relative;
vertical-align: top;
margin-top: 12px;
font-size: 130%;
background: white;
border: solid 1px #aeaeae;
border-radius: 2px;
background-color: white;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
-khtml-border-radius: 2px;
outline: none;
font-family: "montserratmedium";
padding: 3px;
}
input#search_string:focus {
border: solid 1px #7b8185;
box-shadow: 0 0 0 0.15rem rgb(123 129 133 / 25%);
}
input#search_button {
margin-top: 12px;
vertical-align: top;
font-size: 130%;
font-family: "montserratmedium";
padding: 3px;
}
input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none;
display: inline-block;
width: 12px;
height: 12px;
margin-left: 10px;
background: linear-gradient(
45deg,
rgba(123, 129, 133, 0) 0%,
rgba(123, 129, 133, 0) 43%,
#7b8185 45%,
#7b8185 55%,
rgba(0, 0, 0, 0) 57%,
rgba(0, 0, 0, 0) 100%
),
linear-gradient(
135deg,
transparent 0%,
transparent 43%,
#7b8185 45%,
#7b8185 55%,
transparent 57%,
transparent 100%
);
}
ul li {
text-align: left;
list-style-type: square;
color: #7b8185;
line-height: 1.4em;
}
a:link,
a:visited {
text-decoration: none;
color: black;
}
a:hover {
text-decoration: none;
color: #f60;
border-bottom: 1px dotted #f60;
}
footer {
display: flex;
align-items: flex-end;
}
#left_footer,
#right_footer {
font-size: xx-small;
color: #999;
vertical-align: bottom;
padding: 2px 12px 0px 12px;
width: 50%;
}
#right_footer {
text-align: right;
}
indexhtml/indexhtml.desktop.in deleted 100644 → 0
View file @ 67435e6d
[Desktop Entry]
Version=1.0
Type=Application
Exec=xbrowser /usr/share/doc/indexhtml/index.html
StartupNotify=false
Icon=alt-@THEME@
Name=About @PRODUCT_NAME@
Categories=System;Documentation;
# Translations
Name[ru]=О системе «@PRODUCT_NAME_RU@»
indexhtml/indexhtml-desktop.desktop.in → indexhtml/ximper-wiki.desktop
View file @ fee0603b
[Desktop Entry]
Version=1.0
Type=Application
Exec=xbrowser /usr/share/doc/indexhtml/index.html
Exec=xbrowser https://wiki.ximperlinux.ru/
StartupNotify=false
Icon=alt-@THEME@-desktop
Name=About system
Icon=ximperlinux
Name=Guide
Categories=System;Documentation;
# Translations
Name[ru]=О системе
Name[ru]=Руководство
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment