# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1490398327 -3600
# Node ID f4015a7fe89da8f3f8c6f94c790279e7300fc3ee
# Parent  f89b3d0e4b1103a24e99fac7e68f14439ce546ac
Add Blog to top menu - fix rss feeds and dl in website/cache

diff -r f89b3d0e4b11 -r f4015a7fe89d .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Sat Mar 25 00:32:07 2017 +0100
@@ -0,0 +1,1 @@
+cache/
diff -r f89b3d0e4b11 -r f4015a7fe89d lib/get-feeds.sh
--- a/lib/get-feeds.sh	Fri Mar 24 23:15:18 2017 +0100
+++ b/lib/get-feeds.sh	Sat Mar 25 00:32:07 2017 +0100
@@ -1,25 +1,23 @@
 #!/bin/sh
 #
-# Get latest commits and feeds to display on the website main page.
+# Get latest commits and feeds to display on the website main pages.
 # On the server, this script is executed by cron each hour.
 #
-
-CACHE="/var/cache/slitaz/website"
+PWD=$(dirname $0)
+CACHE="$(dirname $PWD)/cache"
 
 # Feeds URL http://scn.slitaz.org/activity/feed/
-SCN_FEED='http://scn.slitaz.org/activity/feed/'
-BLOG_FEED='http://scn.slitaz.org/category/news/feed/'
+BLOG_FEED='http://scn.slitaz.org/?blog=rss'
 WOK_FEED='http://hg.slitaz.org/wok/rss-log'
 FORUM_FEED='http://forum.slitaz.org/rss'
 ROLLING_DATE='http://mirror1.slitaz.org/rolling-date.sh'
 
 # Clean cache
-mkdir -p $CACHE && cd $CACHE
+mkdir -p ${CACHE} && cd ${CACHE}
 rm -f *.xml
 
 # Cache all feeds to save bandwidth (updated by cron)
 echo -n "Getting latest rss feeds... "
-wget -O scn.xml $SCN_FEED 2>/dev/null
 wget -O wok.xml $WOK_FEED 2>/dev/null
 wget -O blog.xml $BLOG_FEED 2>/dev/null
 wget -O forum.xml $FORUM_FEED 2>/dev/null
diff -r f89b3d0e4b11 -r f4015a7fe89d lib/html/header.bs.html
--- a/lib/html/header.bs.html	Fri Mar 24 23:15:18 2017 +0100
+++ b/lib/html/header.bs.html	Sat Mar 25 00:32:07 2017 +0100
@@ -3,9 +3,10 @@
 	<div id="logo"></div>
 	<div id="network">
 		<span>Home</span>
-		<a href="http://scn.slitaz.org/">Zajednica</a>
+		<a href="http://scn.slitaz.org/?blog">Blog</a>
 		<a href="http://doc.slitaz.org/">Doc</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
+		<a href="http://scn.slitaz.org/">Zajednica</a>
 		<a href="http://irc.slitaz.org/">IRC</a>
 		<a href="http://pro.slitaz.org/">Pro</a>
 		<a href="http://shop.slitaz.org/">Prodavaonica</a>
diff -r f89b3d0e4b11 -r f4015a7fe89d lib/html/header.da.html
--- a/lib/html/header.da.html	Fri Mar 24 23:15:18 2017 +0100
+++ b/lib/html/header.da.html	Sat Mar 25 00:32:07 2017 +0100
@@ -3,9 +3,10 @@
 	<div id="logo"></div>
 	<div id="network">
 		<span>Home</span>
-		<a href="http://scn.slitaz.org/">Samfund</a>
+		<a href="http://scn.slitaz.org/?blog">Blog</a>
 		<a href="http://doc.slitaz.org/">Vejledning</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
+		<a href="http://scn.slitaz.org/">Samfund</a>
 		<a href="http://irc.slitaz.org/">IRC</a>
 		<a href="http://pro.slitaz.org/">Pro</a>
 		<a href="http://shop.slitaz.org/">Shop</a>
diff -r f89b3d0e4b11 -r f4015a7fe89d lib/html/header.de.html
--- a/lib/html/header.de.html	Fri Mar 24 23:15:18 2017 +0100
+++ b/lib/html/header.de.html	Sat Mar 25 00:32:07 2017 +0100
@@ -2,10 +2,10 @@
 <div id="header">
 	<div id="network">
 		<span>Home</span>
-		<a href="http://scn.slitaz.org/">Nutzergemeinschaft</a>
-		<!-- Then we link to wiki, ARm codex, relnotes -->
+		<a href="http://scn.slitaz.org/?blog">Blog</a>
 		<a href="/de/doc">Doc</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
+		<a href="http://scn.slitaz.org/">Nutzergemeinschaft</a>
 		<a href="http://irc.slitaz.org/">IRC</a>
 		<a href="http://pro.slitaz.org/">Pro</a>
 		<a href="http://shop.slitaz.org/">Shop</a>
diff -r f89b3d0e4b11 -r f4015a7fe89d lib/html/header.fr.html
--- a/lib/html/header.fr.html	Fri Mar 24 23:15:18 2017 +0100
+++ b/lib/html/header.fr.html	Sat Mar 25 00:32:07 2017 +0100
@@ -2,10 +2,10 @@
 <div id="header">
 	<div id="network">
 		<span>Home</span>
-		<a href="http://scn.slitaz.org/">Communauté</a>
-		<!-- Then we link to wiki, ARm codex, relnotes -->
+		<a href="http://scn.slitaz.org/?blog">Blog</a>
 		<a href="/fr/doc">Doc</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
+		<a href="http://scn.slitaz.org/">Communauté</a>
 		<a href="http://irc.slitaz.org/">IRC</a>
 		<a href="http://pro.slitaz.org/">Pro</a>
 		<a href="http://shop.slitaz.org/">Shop</a>
diff -r f89b3d0e4b11 -r f4015a7fe89d lib/html/header.html
--- a/lib/html/header.html	Fri Mar 24 23:15:18 2017 +0100
+++ b/lib/html/header.html	Sat Mar 25 00:32:07 2017 +0100
@@ -2,10 +2,10 @@
 <div id="header">
 	<div id="network">
 		<span>Home</span>
-		<a href="http://scn.slitaz.org/">Community</a>
-		<!-- Then we link to wiki, ARm codex, relnotes -->
+		<a href="http://scn.slitaz.org/?blog">Blog</a>
 		<a href="/en/doc">Doc</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
+		<a href="http://scn.slitaz.org/">Community</a>
 		<a href="http://irc.slitaz.org/">IRC</a>
 		<a href="http://pro.slitaz.org/">Pro</a>
 		<a href="http://shop.slitaz.org/">Shop</a>
diff -r f89b3d0e4b11 -r f4015a7fe89d lib/html/header.pt.html
--- a/lib/html/header.pt.html	Fri Mar 24 23:15:18 2017 +0100
+++ b/lib/html/header.pt.html	Sat Mar 25 00:32:07 2017 +0100
@@ -2,10 +2,10 @@
 <div id="header">
 	<div id="network">
 		<span>Home</span>
-		<a href="http://scn.slitaz.org/">Comunidade</a>
-		<!-- Then we link to wiki, ARm codex, relnotes -->
+		<a href="http://scn.slitaz.org/">Blog</a>
 		<a href="http://doc.slitaz.org/">Doc</a>
 		<a href="http://forum.slitaz.org/">Fórum</a>
+		<a href="http://scn.slitaz.org/">Comunidade</a>
 		<a href="http://irc.slitaz.org/">IRC</a>
 		<a href="http://pro.slitaz.org/">Pro</a>
 		<a href="http://shop.slitaz.org/">Shop</a>
diff -r f89b3d0e4b11 -r f4015a7fe89d lib/html/header.ru.html
--- a/lib/html/header.ru.html	Fri Mar 24 23:15:18 2017 +0100
+++ b/lib/html/header.ru.html	Sat Mar 25 00:32:07 2017 +0100
@@ -2,10 +2,10 @@
 <div id="header">
 	<div id="network">
 		<span>Home</span>
-		<a href="http://scn.slitaz.org/">Сообщество</a>
-		<!-- Then we link to wiki, ARm codex, relnotes -->
+		<a href="http://scn.slitaz.org/?blog">Blog</a>
 		<a href="/ru/doc/">Документация</a>
 		<a href="http://forum.slitaz.org/">Форум</a>
+		<a href="http://scn.slitaz.org/">Сообщество</a>
 		<a href="http://irc.slitaz.org/">IRC</a>
 		<a href="http://pro.slitaz.org/">PRO</a>
 		<a href="http://shop.slitaz.org/">Магазин</a>
diff -r f89b3d0e4b11 -r f4015a7fe89d slitaz.css
--- a/slitaz.css	Fri Mar 24 23:15:18 2017 +0100
+++ b/slitaz.css	Sat Mar 25 00:32:07 2017 +0100
@@ -18,7 +18,7 @@
 a { text-decoration: underline; color: #215090; }
 a:hover { text-decoration: none; }
 img { border: 0pt none; vertical-align: middle; }
-h2 { color: #444; font-size: 180%; }
+h2 { color: #444; }
 h3 { color: #666; font-size: 140%; }
 h4 { color: #888; font-size: 120%; }
 h2, h3 { border-bottom: 1px dashed #afafaf; padding-bottom: 5px; }
@@ -158,7 +158,6 @@
  * */
 
 nav {
-	font-size: 96%;
 	min-height: 100px;
 	background: #ddd; 
 	padding: 56px 6% 0;
@@ -183,7 +182,7 @@
 	-webkit-transition: background-color 0.6s;
 	transition: background-color 0.5s;
 }
-nav p { padding: 8px; color: #333; font-size: 92%; }
+nav p { padding: 8px; color: #333; font-size: 90%; }
 
 .nav1 { background-color: #333; }
 .nav1:hover { background-color: #128da9; }