# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1301452256 -7200
# Node ID afe0d4f22f9e4f92f64562d404dd9a35cbd8cb00
# Parent  91175a1964f267ea2fb0702be3b00553a3ec7668
Improve main page, rm grid add pretty activity box

diff -r 91175a1964f2 -r afe0d4f22f9e index.php
--- a/index.php	Tue Mar 29 16:39:02 2011 +0100
+++ b/index.php	Wed Mar 30 04:30:56 2011 +0200
@@ -137,30 +137,31 @@
 	</script>
 </div>
 
-<h2>Feed Grid</h2>
+<h2>Project Activity</h2>
 <?php
 	require_once("libs/get-feed.php");
 ?>
-<div class="feed-grid">
-	<div class="right_box">
-		<h3>Community Network</h3>
+
+<div class="activity">
+	<p>
+		<img src="images/users.png" alt="users.png" />
+		Community Activity
 		<?php get_rss_feed("/var/cache/slitaz/website/scn.xml"); ?>
 	</div>
-	<div class="left_box">
-		<h3>Support Forum</h3>
-		<?php #get_forum_rss_feed("/var/cache/slitaz/website/forum.xml"); 
-			echo '<a href="http://forum.slitaz.org/">forum.slitaz.org</a>'; ?>
-	</div>
+	<p class="activity_more">
+		<a href="http://scn.slitaz.org/activity/">More activity</a>
+	</p>
 </div>
-<div class="feed-grid">
-	<div class="right_box">
-		<h3>Latest Commits</h3>
+
+<div class="activity">
+	<p>
+		<img src="images/development.png" alt="development.png" />
+		Latest Commits
 		<?php get_rss_feed("/var/cache/slitaz/website/wok.xml"); ?>
 	</div>
-	<div class="left_box">
-		<h3>Bug Tracker</h3>
-		<?php get_atom_feed("/var/cache/slitaz/website/bugs.xml"); ?>
-	</div>
+	<p class="activity_more">
+		<a href="http://hg.slitaz.org/">More commits</a>
+	</p>
 </div>
 
 <h2>Spread SliTaz</h2>
diff -r 91175a1964f2 -r afe0d4f22f9e libs/get-feed.php
--- a/libs/get-feed.php	Tue Mar 29 16:39:02 2011 +0100
+++ b/libs/get-feed.php	Wed Mar 30 04:30:56 2011 +0200
@@ -7,20 +7,7 @@
 	// We look for last item, channel may not have a PubDate*
 	$up = ($x->channel->item->pubDate);
 	echo "<span>Updated: " . substr("$up", 5, 12) . "</span>\n";
-	echo "<ul>\n";
-	foreach($x->channel->item as $entry) {
-		echo "	<li><a href='$entry->link' title='$entry->title'>" . $entry->title . "</a></li>\n";
-	}
-	echo "</ul>\n";
-}
-
-// Read Forum RSS Feed
-function get_forum_rss_feed($feed_url) {
-	$content = file_get_contents($feed_url);
-	$x = new SimpleXmlElement($content);
-	$up = ($x->channel->pubDate);
-	echo "<span>Updated: " . substr("$up", 5, 6) . (date( ' Y ')) . "</span>\n";
-	echo "<ul>\n";
+	echo "</p>\n<div>\n<ul>\n";
 	foreach($x->channel->item as $entry) {
 		echo "	<li><a href='$entry->link' title='$entry->title'>" . $entry->title . "</a></li>\n";
 	}
@@ -33,7 +20,7 @@
 	$x = new SimpleXmlElement($content);
 	$up = ($x->updated);
 	echo "<span>Updated: " . substr("$up", 0, 10) . "</span>\n";
-	echo "<ul>\n";
+	echo "</p>\n<div>\n<ul>\n";
 	foreach($x->entry as $entry) {
 		echo "	<li><a href='$entry->id' title='$entry->title'>" . $entry->title . "</a></li>\n";
 	}
diff -r 91175a1964f2 -r afe0d4f22f9e libs/get-latest.sh
--- a/libs/get-latest.sh	Tue Mar 29 16:39:02 2011 +0100
+++ b/libs/get-latest.sh	Wed Mar 30 04:30:56 2011 +0200
@@ -22,20 +22,20 @@
 rm *.xml
 
 # Cache all feeds to save bandwidth (updated by cron)
+#wget -O doc.xml $DOC_FEED
+#wget -O forum.xml $FORUM_FEED 
+#wget -O bugs.xml $BUGS_FEED
 wget -O scn.xml $SCN_FEED
-wget -O doc.xml $DOC_FEED
-wget -O forum.xml $FORUM_FEED 
-wget -O bugs.xml $BUGS_FEED
 wget -O wok.xml $WOK_FEED
 
 # Latest cooked packages by the build bot.
-echo -n "Getting latest cooked packages... "
-echo '<ul>' > $OUTPUT
-cd $PKGS && ls -1t *.tazpkg | head -8 | \
-while read file
-do
-	echo -n '	<li>'$(stat -c '%y' $PKGS/$file | \
-	cut -d ' ' -f 1); echo " - $file</li>"
-done >> $OUTPUT
-echo '</ul>' >> $OUTPUT
-echo "Done"
+#echo -n "Getting latest cooked packages... "
+#echo '<ul>' > $OUTPUT
+#cd $PKGS && ls -1t *.tazpkg | head -8 | \
+#while read file
+#do
+	#echo -n '	<li>'$(stat -c '%y' $PKGS/$file | \
+	#cut -d ' ' -f 1); echo " - $file</li>"
+#done >> $OUTPUT
+#echo '</ul>' >> $OUTPUT
+#echo "Done"
diff -r 91175a1964f2 -r afe0d4f22f9e slitaz.css
--- a/slitaz.css	Tue Mar 29 16:39:02 2011 +0100
+++ b/slitaz.css	Wed Mar 30 04:30:56 2011 +0200
@@ -185,15 +185,31 @@
 	border: 1px solid #ddd;
 }
 
-.feed-grid { height: 180px; overflow: hidden; text-align: left; }
-.feed-grid h3 { 
-	margin: 15px 0 0; font-size: 16px; 
-	padding: 0 22px;
-	background: url(images/feed.png) no-repeat left; }
-.feed-grid span { font-size: 10px; color: #888; margin-left: 24px; }
-.feed-grid ul { color: #666; }
-.feed-grid a { color: #666; }
-.feed-grid a:hover { color: blue; }
+/* Activity Box */
+
+.activity { 
+	height: 120px;
+	overflow: hidden;
+	margin: 0 0 20px; 
+	background: #eaeaea; 
+	padding: 5px 2px 25px; 
+	border: 1px solid #ddd; 
+}
+.activity div { height: 75px; overflow: hidden;
+	padding: 0px 10px 10px; background: #fff; margin-top: 5px; }
+.activity p { margin: 0; padding: 5px 10px; font-weight: bold; }
+.activity a { text-decoration: none; }
+.activity ul { list-style-type: none; 
+	margin: 4px 0; padding: 0 4px; line-height: 150%; }
+.activity span { color: #666; font-size: 11px; font-weight: normal; }
+.activity, .activity div { 
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.activity_more { text-align: right;  }
+.activity_more a { font-weight: normal; color: #000; padding: 0 4px; }
+.activity_more a:hover { text-decoration: underline; }
 
 /* Button */