website rev 1299
Add Blog to top menu - fix rss feeds and dl in website/cache
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Sat Mar 25 00:32:07 2017 +0100 (2017-03-25) |
| parents | f89b3d0e4b11 |
| children | 7d0c505926c6 |
| files | .hgignore lib/get-feeds.sh lib/html/header.bs.html lib/html/header.da.html lib/html/header.de.html lib/html/header.fr.html lib/html/header.html lib/html/header.pt.html lib/html/header.ru.html slitaz.css |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/.hgignore Sat Mar 25 00:32:07 2017 +0100 1.3 @@ -0,0 +1,1 @@ 1.4 +cache/
2.1 --- a/lib/get-feeds.sh Fri Mar 24 23:15:18 2017 +0100 2.2 +++ b/lib/get-feeds.sh Sat Mar 25 00:32:07 2017 +0100 2.3 @@ -1,25 +1,23 @@ 2.4 #!/bin/sh 2.5 # 2.6 -# Get latest commits and feeds to display on the website main page. 2.7 +# Get latest commits and feeds to display on the website main pages. 2.8 # On the server, this script is executed by cron each hour. 2.9 # 2.10 - 2.11 -CACHE="/var/cache/slitaz/website" 2.12 +PWD=$(dirname $0) 2.13 +CACHE="$(dirname $PWD)/cache" 2.14 2.15 # Feeds URL http://scn.slitaz.org/activity/feed/ 2.16 -SCN_FEED='http://scn.slitaz.org/activity/feed/' 2.17 -BLOG_FEED='http://scn.slitaz.org/category/news/feed/' 2.18 +BLOG_FEED='http://scn.slitaz.org/?blog=rss' 2.19 WOK_FEED='http://hg.slitaz.org/wok/rss-log' 2.20 FORUM_FEED='http://forum.slitaz.org/rss' 2.21 ROLLING_DATE='http://mirror1.slitaz.org/rolling-date.sh' 2.22 2.23 # Clean cache 2.24 -mkdir -p $CACHE && cd $CACHE 2.25 +mkdir -p ${CACHE} && cd ${CACHE} 2.26 rm -f *.xml 2.27 2.28 # Cache all feeds to save bandwidth (updated by cron) 2.29 echo -n "Getting latest rss feeds... " 2.30 -wget -O scn.xml $SCN_FEED 2>/dev/null 2.31 wget -O wok.xml $WOK_FEED 2>/dev/null 2.32 wget -O blog.xml $BLOG_FEED 2>/dev/null 2.33 wget -O forum.xml $FORUM_FEED 2>/dev/null
3.1 --- a/lib/html/header.bs.html Fri Mar 24 23:15:18 2017 +0100 3.2 +++ b/lib/html/header.bs.html Sat Mar 25 00:32:07 2017 +0100 3.3 @@ -3,9 +3,10 @@ 3.4 <div id="logo"></div> 3.5 <div id="network"> 3.6 <span>Home</span> 3.7 - <a href="http://scn.slitaz.org/">Zajednica</a> 3.8 + <a href="http://scn.slitaz.org/?blog">Blog</a> 3.9 <a href="http://doc.slitaz.org/">Doc</a> 3.10 <a href="http://forum.slitaz.org/">Forum</a> 3.11 + <a href="http://scn.slitaz.org/">Zajednica</a> 3.12 <a href="http://irc.slitaz.org/">IRC</a> 3.13 <a href="http://pro.slitaz.org/">Pro</a> 3.14 <a href="http://shop.slitaz.org/">Prodavaonica</a>
4.1 --- a/lib/html/header.da.html Fri Mar 24 23:15:18 2017 +0100 4.2 +++ b/lib/html/header.da.html Sat Mar 25 00:32:07 2017 +0100 4.3 @@ -3,9 +3,10 @@ 4.4 <div id="logo"></div> 4.5 <div id="network"> 4.6 <span>Home</span> 4.7 - <a href="http://scn.slitaz.org/">Samfund</a> 4.8 + <a href="http://scn.slitaz.org/?blog">Blog</a> 4.9 <a href="http://doc.slitaz.org/">Vejledning</a> 4.10 <a href="http://forum.slitaz.org/">Forum</a> 4.11 + <a href="http://scn.slitaz.org/">Samfund</a> 4.12 <a href="http://irc.slitaz.org/">IRC</a> 4.13 <a href="http://pro.slitaz.org/">Pro</a> 4.14 <a href="http://shop.slitaz.org/">Shop</a>
5.1 --- a/lib/html/header.de.html Fri Mar 24 23:15:18 2017 +0100 5.2 +++ b/lib/html/header.de.html Sat Mar 25 00:32:07 2017 +0100 5.3 @@ -2,10 +2,10 @@ 5.4 <div id="header"> 5.5 <div id="network"> 5.6 <span>Home</span> 5.7 - <a href="http://scn.slitaz.org/">Nutzergemeinschaft</a> 5.8 - <!-- Then we link to wiki, ARm codex, relnotes --> 5.9 + <a href="http://scn.slitaz.org/?blog">Blog</a> 5.10 <a href="/de/doc">Doc</a> 5.11 <a href="http://forum.slitaz.org/">Forum</a> 5.12 + <a href="http://scn.slitaz.org/">Nutzergemeinschaft</a> 5.13 <a href="http://irc.slitaz.org/">IRC</a> 5.14 <a href="http://pro.slitaz.org/">Pro</a> 5.15 <a href="http://shop.slitaz.org/">Shop</a>
6.1 --- a/lib/html/header.fr.html Fri Mar 24 23:15:18 2017 +0100 6.2 +++ b/lib/html/header.fr.html Sat Mar 25 00:32:07 2017 +0100 6.3 @@ -2,10 +2,10 @@ 6.4 <div id="header"> 6.5 <div id="network"> 6.6 <span>Home</span> 6.7 - <a href="http://scn.slitaz.org/">Communauté</a> 6.8 - <!-- Then we link to wiki, ARm codex, relnotes --> 6.9 + <a href="http://scn.slitaz.org/?blog">Blog</a> 6.10 <a href="/fr/doc">Doc</a> 6.11 <a href="http://forum.slitaz.org/">Forum</a> 6.12 + <a href="http://scn.slitaz.org/">Communauté</a> 6.13 <a href="http://irc.slitaz.org/">IRC</a> 6.14 <a href="http://pro.slitaz.org/">Pro</a> 6.15 <a href="http://shop.slitaz.org/">Shop</a>
7.1 --- a/lib/html/header.html Fri Mar 24 23:15:18 2017 +0100 7.2 +++ b/lib/html/header.html Sat Mar 25 00:32:07 2017 +0100 7.3 @@ -2,10 +2,10 @@ 7.4 <div id="header"> 7.5 <div id="network"> 7.6 <span>Home</span> 7.7 - <a href="http://scn.slitaz.org/">Community</a> 7.8 - <!-- Then we link to wiki, ARm codex, relnotes --> 7.9 + <a href="http://scn.slitaz.org/?blog">Blog</a> 7.10 <a href="/en/doc">Doc</a> 7.11 <a href="http://forum.slitaz.org/">Forum</a> 7.12 + <a href="http://scn.slitaz.org/">Community</a> 7.13 <a href="http://irc.slitaz.org/">IRC</a> 7.14 <a href="http://pro.slitaz.org/">Pro</a> 7.15 <a href="http://shop.slitaz.org/">Shop</a>
8.1 --- a/lib/html/header.pt.html Fri Mar 24 23:15:18 2017 +0100 8.2 +++ b/lib/html/header.pt.html Sat Mar 25 00:32:07 2017 +0100 8.3 @@ -2,10 +2,10 @@ 8.4 <div id="header"> 8.5 <div id="network"> 8.6 <span>Home</span> 8.7 - <a href="http://scn.slitaz.org/">Comunidade</a> 8.8 - <!-- Then we link to wiki, ARm codex, relnotes --> 8.9 + <a href="http://scn.slitaz.org/">Blog</a> 8.10 <a href="http://doc.slitaz.org/">Doc</a> 8.11 <a href="http://forum.slitaz.org/">Fórum</a> 8.12 + <a href="http://scn.slitaz.org/">Comunidade</a> 8.13 <a href="http://irc.slitaz.org/">IRC</a> 8.14 <a href="http://pro.slitaz.org/">Pro</a> 8.15 <a href="http://shop.slitaz.org/">Shop</a>
9.1 --- a/lib/html/header.ru.html Fri Mar 24 23:15:18 2017 +0100 9.2 +++ b/lib/html/header.ru.html Sat Mar 25 00:32:07 2017 +0100 9.3 @@ -2,10 +2,10 @@ 9.4 <div id="header"> 9.5 <div id="network"> 9.6 <span>Home</span> 9.7 - <a href="http://scn.slitaz.org/">Сообщество</a> 9.8 - <!-- Then we link to wiki, ARm codex, relnotes --> 9.9 + <a href="http://scn.slitaz.org/?blog">Blog</a> 9.10 <a href="/ru/doc/">Документация</a> 9.11 <a href="http://forum.slitaz.org/">Форум</a> 9.12 + <a href="http://scn.slitaz.org/">Сообщество</a> 9.13 <a href="http://irc.slitaz.org/">IRC</a> 9.14 <a href="http://pro.slitaz.org/">PRO</a> 9.15 <a href="http://shop.slitaz.org/">Магазин</a>
10.1 --- a/slitaz.css Fri Mar 24 23:15:18 2017 +0100 10.2 +++ b/slitaz.css Sat Mar 25 00:32:07 2017 +0100 10.3 @@ -18,7 +18,7 @@ 10.4 a { text-decoration: underline; color: #215090; } 10.5 a:hover { text-decoration: none; } 10.6 img { border: 0pt none; vertical-align: middle; } 10.7 -h2 { color: #444; font-size: 180%; } 10.8 +h2 { color: #444; } 10.9 h3 { color: #666; font-size: 140%; } 10.10 h4 { color: #888; font-size: 120%; } 10.11 h2, h3 { border-bottom: 1px dashed #afafaf; padding-bottom: 5px; } 10.12 @@ -158,7 +158,6 @@ 10.13 * */ 10.14 10.15 nav { 10.16 - font-size: 96%; 10.17 min-height: 100px; 10.18 background: #ddd; 10.19 padding: 56px 6% 0; 10.20 @@ -183,7 +182,7 @@ 10.21 -webkit-transition: background-color 0.6s; 10.22 transition: background-color 0.5s; 10.23 } 10.24 -nav p { padding: 8px; color: #333; font-size: 92%; } 10.25 +nav p { padding: 8px; color: #333; font-size: 90%; } 10.26 10.27 .nav1 { background-color: #333; } 10.28 .nav1:hover { background-color: #128da9; }