# HG changeset patch # User Christophe Lincoln # Date 1332766024 -7200 # Node ID 05bb87925527254280cc767e9c88c60d91a7333c # Parent 41980f21c33e69a9788f7727fd12ab44d5da7bf3 Add Gravatar support to main page, put activity at the bottom, smaller content width diff -r 41980f21c33e -r 05bb87925527 po/fr.po --- a/po/fr.po Mon Mar 26 13:08:58 2012 +0200 +++ b/po/fr.po Mon Mar 26 14:47:04 2012 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: SliTaz Pizza\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-22 12:45+0100\n" -"PO-Revision-Date: 2012-03-22 12:50+0100\n" +"POT-Creation-Date: 2012-03-26 14:23+0200\n" +"PO-Revision-Date: 2012-03-26 14:37+0100\n" "Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" "Language: fr\n" @@ -23,9 +23,9 @@ #: web/pizza.cgi:69 msgid "" -"Chosse your distribution name and the one you want to use as\n" -"\tbase. We need our mail to notify you when your SliTaz Flavor is built \n" -"\tand if any things goes wrong." +"Choose your distribution name and the one you want to use as\n" +"\tbase. We need your mail to notify you when your SliTaz Flavor is built \n" +"\tand if anything goes wrong." msgstr "" "Veuillez choisir le nom de votre distribution et la version sur laquelle\n" "\tvous voulez vous baser. Nous avons besoin de votre adresse email pour vous\n" @@ -89,11 +89,11 @@ #: web/pizza.cgi:209 msgid "Your ISO will be built on next Pizza Bot run" -msgstr "" +msgstr "Votre ISO sera construite à la prochaine exécution du Bot Pizza" #: web/pizza.cgi:211 #, sh-format -msgid "Ther is $inqueue flavors in queue" +msgid "There is $inqueue flavors in queue" msgstr "Il y a $inqueue saveurs dans la queu" #: web/pizza.cgi:219 @@ -128,17 +128,26 @@ msgid "Help" msgstr "Aide" -#: web/pizza.cgi:327 +#: web/pizza.cgi:320 +#: web/pizza.cgi:369 +msgid "Activity" +msgstr "Activité" + +#: web/pizza.cgi:337 msgid "Welcome" msgstr "Bienvenue" -#: web/pizza.cgi:341 +#: web/pizza.cgi:350 msgid "Create a new flavor" msgstr "Créer une nouvelle saveur" -#: web/pizza.cgi:351 +#: web/pizza.cgi:354 msgid "Latest builds" -msgstr "" +msgstr "Dernière cuissons" + +#: web/pizza.cgi:373 +msgid "More activity" +msgstr "Plus d'activité" #~ msgid "Short desc" #~ msgstr "Petite desc" diff -r 41980f21c33e -r 05bb87925527 po/pizza.pot --- a/po/pizza.pot Mon Mar 26 13:08:58 2012 +0200 +++ b/po/pizza.pot Mon Mar 26 14:47:04 2012 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Pizza\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-22 12:45+0100\n" +"POT-Creation-Date: 2012-03-26 14:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,9 +23,9 @@ #: web/pizza.cgi:69 msgid "" -"Chosse your distribution name and the one you want to use as\n" -"\tbase. We need our mail to notify you when your SliTaz Flavor is built \n" -"\tand if any things goes wrong." +"Choose your distribution name and the one you want to use as\n" +"\tbase. We need your mail to notify you when your SliTaz Flavor is built \n" +"\tand if anything goes wrong." msgstr "" #: web/pizza.cgi:77 @@ -90,7 +90,7 @@ #: web/pizza.cgi:211 #, sh-format -msgid "Ther is $inqueue flavors in queue" +msgid "There is $inqueue flavors in queue" msgstr "" #: web/pizza.cgi:219 @@ -125,14 +125,22 @@ msgid "Help" msgstr "" -#: web/pizza.cgi:327 +#: web/pizza.cgi:320 web/pizza.cgi:369 +msgid "Activity" +msgstr "" + +#: web/pizza.cgi:337 msgid "Welcome" msgstr "" -#: web/pizza.cgi:341 +#: web/pizza.cgi:350 msgid "Create a new flavor" msgstr "" -#: web/pizza.cgi:351 +#: web/pizza.cgi:354 msgid "Latest builds" msgstr "" + +#: web/pizza.cgi:373 +msgid "More activity" +msgstr "" diff -r 41980f21c33e -r 05bb87925527 web/pizza.cgi --- a/web/pizza.cgi Mon Mar 26 13:08:58 2012 +0200 +++ b/web/pizza.cgi Mon Mar 26 14:47:04 2012 +0200 @@ -315,6 +315,16 @@ echo -n "Public size : " && du -sh public | awk '{print $1}' echo -n "Tmp size : " && du -sh $tmpdir | awk '{print $1}' echo '' ;; + *\ activity\ *) + cat << EOT +

$(gettext "Activity")

+ +
+$(tac $activity | highlighter activity)
+
+ +EOT + ;; *) # # Main page @@ -325,6 +335,7 @@ [ "$builds" ] || builds=0 cat << EOT

$(gettext "Welcome")

+

SliTaz Pizza lets you create your own SliTaz ISO flavor online. The ISO image can be burnt on a cdrom or installed on USB media. @@ -336,31 +347,33 @@

- - - - +
-

Activity

-
-$(tac $activity | head -n 12 | highlighter activity)
-
- EOT echo "

$(gettext "Latest builds")

" echo '
'
-		for flavor in $(ls -1t public | head -n 12)
+		for flavor in $(ls -1t public | head -n 10)
 		do
 			if [ -f "public/$flavor/receipt" ]; then
 				. ./public/$flavor/receipt
 				[ -f "public/$flavor/$FLAVOR.iso" ] && \
 					cat << EOT
-$VERSION : $FLAVOR.iso ($ISO_SIZE)
+$(get_gravatar $MAINTAINER 24) $ID : \
+$FLAVOR.iso ($ISO_SIZE)
 EOT
 			fi
 		done 
-		echo '
' ;; + echo '' + cat << EOT +

$(gettext "Activity")

+
+$(tac $activity | head -n 12 | highlighter activity)
+
+ + +EOT + ;; esac # HTML footer. diff -r 41980f21c33e -r 05bb87925527 web/pkgs.cgi --- a/web/pkgs.cgi Mon Mar 26 13:08:58 2012 +0200 +++ b/web/pkgs.cgi Mon Mar 26 14:47:04 2012 +0200 @@ -118,7 +118,7 @@
- +
diff -r 41980f21c33e -r 05bb87925527 web/style.css --- a/web/style.css Mon Mar 26 13:08:58 2012 +0200 +++ b/web/style.css Mon Mar 26 14:47:04 2012 +0200 @@ -101,7 +101,7 @@ #content { margin: 40px auto; text-align: justify; - width: 780px; + width: 720px; } .note {