slitaz-pizza rev 16
Add Gravatar support to main page, put activity at the bottom, smaller content width
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Mon Mar 26 14:47:04 2012 +0200 (2012-03-26) |
| parents | 41980f21c33e |
| children | a6b8d65c19a2 |
| files | po/fr.po po/pizza.pot web/pizza.cgi web/pkgs.cgi web/style.css |
line diff
1.1 --- a/po/fr.po Mon Mar 26 13:08:58 2012 +0200 1.2 +++ b/po/fr.po Mon Mar 26 14:47:04 2012 +0200 1.3 @@ -7,8 +7,8 @@ 1.4 msgstr "" 1.5 "Project-Id-Version: SliTaz Pizza\n" 1.6 "Report-Msgid-Bugs-To: \n" 1.7 -"POT-Creation-Date: 2012-03-22 12:45+0100\n" 1.8 -"PO-Revision-Date: 2012-03-22 12:50+0100\n" 1.9 +"POT-Creation-Date: 2012-03-26 14:23+0200\n" 1.10 +"PO-Revision-Date: 2012-03-26 14:37+0100\n" 1.11 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 1.12 "Language-Team: French\n" 1.13 "Language: fr\n" 1.14 @@ -23,9 +23,9 @@ 1.15 1.16 #: web/pizza.cgi:69 1.17 msgid "" 1.18 -"Chosse your distribution name and the one you want to use as\n" 1.19 -"\tbase. We need our mail to notify you when your SliTaz Flavor is built \n" 1.20 -"\tand if any things goes wrong." 1.21 +"Choose your distribution name and the one you want to use as\n" 1.22 +"\tbase. We need your mail to notify you when your SliTaz Flavor is built \n" 1.23 +"\tand if anything goes wrong." 1.24 msgstr "" 1.25 "Veuillez choisir le nom de votre distribution et la version sur laquelle\n" 1.26 "\tvous voulez vous baser. Nous avons besoin de votre adresse email pour vous\n" 1.27 @@ -89,11 +89,11 @@ 1.28 1.29 #: web/pizza.cgi:209 1.30 msgid "Your ISO will be built on next Pizza Bot run" 1.31 -msgstr "" 1.32 +msgstr "Votre ISO sera construite à la prochaine exécution du Bot Pizza" 1.33 1.34 #: web/pizza.cgi:211 1.35 #, sh-format 1.36 -msgid "Ther is $inqueue flavors in queue" 1.37 +msgid "There is $inqueue flavors in queue" 1.38 msgstr "Il y a $inqueue saveurs dans la queu" 1.39 1.40 #: web/pizza.cgi:219 1.41 @@ -128,17 +128,26 @@ 1.42 msgid "Help" 1.43 msgstr "Aide" 1.44 1.45 -#: web/pizza.cgi:327 1.46 +#: web/pizza.cgi:320 1.47 +#: web/pizza.cgi:369 1.48 +msgid "Activity" 1.49 +msgstr "Activité" 1.50 + 1.51 +#: web/pizza.cgi:337 1.52 msgid "Welcome" 1.53 msgstr "Bienvenue" 1.54 1.55 -#: web/pizza.cgi:341 1.56 +#: web/pizza.cgi:350 1.57 msgid "Create a new flavor" 1.58 msgstr "Créer une nouvelle saveur" 1.59 1.60 -#: web/pizza.cgi:351 1.61 +#: web/pizza.cgi:354 1.62 msgid "Latest builds" 1.63 -msgstr "" 1.64 +msgstr "Dernière cuissons" 1.65 + 1.66 +#: web/pizza.cgi:373 1.67 +msgid "More activity" 1.68 +msgstr "Plus d'activité" 1.69 1.70 #~ msgid "Short desc" 1.71 #~ msgstr "Petite desc"
2.1 --- a/po/pizza.pot Mon Mar 26 13:08:58 2012 +0200 2.2 +++ b/po/pizza.pot Mon Mar 26 14:47:04 2012 +0200 2.3 @@ -8,7 +8,7 @@ 2.4 msgstr "" 2.5 "Project-Id-Version: SliTaz Pizza\n" 2.6 "Report-Msgid-Bugs-To: \n" 2.7 -"POT-Creation-Date: 2012-03-22 12:45+0100\n" 2.8 +"POT-Creation-Date: 2012-03-26 14:23+0200\n" 2.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 2.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 2.11 "Language-Team: LANGUAGE <LL@li.org>\n" 2.12 @@ -23,9 +23,9 @@ 2.13 2.14 #: web/pizza.cgi:69 2.15 msgid "" 2.16 -"Chosse your distribution name and the one you want to use as\n" 2.17 -"\tbase. We need our mail to notify you when your SliTaz Flavor is built \n" 2.18 -"\tand if any things goes wrong." 2.19 +"Choose your distribution name and the one you want to use as\n" 2.20 +"\tbase. We need your mail to notify you when your SliTaz Flavor is built \n" 2.21 +"\tand if anything goes wrong." 2.22 msgstr "" 2.23 2.24 #: web/pizza.cgi:77 2.25 @@ -90,7 +90,7 @@ 2.26 2.27 #: web/pizza.cgi:211 2.28 #, sh-format 2.29 -msgid "Ther is $inqueue flavors in queue" 2.30 +msgid "There is $inqueue flavors in queue" 2.31 msgstr "" 2.32 2.33 #: web/pizza.cgi:219 2.34 @@ -125,14 +125,22 @@ 2.35 msgid "Help" 2.36 msgstr "" 2.37 2.38 -#: web/pizza.cgi:327 2.39 +#: web/pizza.cgi:320 web/pizza.cgi:369 2.40 +msgid "Activity" 2.41 +msgstr "" 2.42 + 2.43 +#: web/pizza.cgi:337 2.44 msgid "Welcome" 2.45 msgstr "" 2.46 2.47 -#: web/pizza.cgi:341 2.48 +#: web/pizza.cgi:350 2.49 msgid "Create a new flavor" 2.50 msgstr "" 2.51 2.52 -#: web/pizza.cgi:351 2.53 +#: web/pizza.cgi:354 2.54 msgid "Latest builds" 2.55 msgstr "" 2.56 + 2.57 +#: web/pizza.cgi:373 2.58 +msgid "More activity" 2.59 +msgstr ""
3.1 --- a/web/pizza.cgi Mon Mar 26 13:08:58 2012 +0200 3.2 +++ b/web/pizza.cgi Mon Mar 26 14:47:04 2012 +0200 3.3 @@ -315,6 +315,16 @@ 3.4 echo -n "Public size : " && du -sh public | awk '{print $1}' 3.5 echo -n "Tmp size : " && du -sh $tmpdir | awk '{print $1}' 3.6 echo '</pre>' ;; 3.7 + *\ activity\ *) 3.8 + cat << EOT 3.9 +<h2><img src="images/monitor.png" alt="" />$(gettext "Activity")</h2> 3.10 + 3.11 +<pre> 3.12 +$(tac $activity | highlighter activity) 3.13 +</pre> 3.14 + 3.15 +EOT 3.16 + ;; 3.17 *) 3.18 # 3.19 # Main page 3.20 @@ -325,6 +335,7 @@ 3.21 [ "$builds" ] || builds=0 3.22 cat << EOT 3.23 <h2>$(gettext "Welcome")</h2> 3.24 +<form method="get" action="./"> 3.25 <p> 3.26 SliTaz Pizza lets you create your own SliTaz ISO flavor online. The 3.27 ISO image can be burnt on a cdrom or installed on USB media. 3.28 @@ -336,31 +347,33 @@ 3.29 </pre> 3.30 3.31 <div class="start"> 3.32 - <form method="get" action="./"> 3.33 - <input type="hidden" name="start" value="flavor" /> 3.34 - <input type="submit" value="$(gettext "Create a new flavor")"> 3.35 - </form> 3.36 + <input type="submit" name="start" value="$(gettext "Create a new flavor")"> 3.37 </div> 3.38 3.39 -<h2>Activity</h2> 3.40 -<pre> 3.41 -$(tac $activity | head -n 12 | highlighter activity) 3.42 -</pre> 3.43 - 3.44 EOT 3.45 echo "<h2>$(gettext "Latest builds")</h2>" 3.46 echo '<pre>' 3.47 - for flavor in $(ls -1t public | head -n 12) 3.48 + for flavor in $(ls -1t public | head -n 10) 3.49 do 3.50 if [ -f "public/$flavor/receipt" ]; then 3.51 . ./public/$flavor/receipt 3.52 [ -f "public/$flavor/$FLAVOR.iso" ] && \ 3.53 cat << EOT 3.54 -$VERSION : <a href="public/$flavor/$FLAVOR.iso">$FLAVOR.iso</a> ($ISO_SIZE) 3.55 +$(get_gravatar $MAINTAINER 24) <a href="?id=$ID">$ID</a> : \ 3.56 +<a href="public/$flavor/$FLAVOR.iso">$FLAVOR.iso</a> ($ISO_SIZE) 3.57 EOT 3.58 fi 3.59 done 3.60 - echo '</pre>' ;; 3.61 + echo '</pre>' 3.62 + cat << EOT 3.63 +<h2>$(gettext "Activity")</h2> 3.64 +<pre> 3.65 +$(tac $activity | head -n 12 | highlighter activity) 3.66 +</pre> 3.67 + <input type="submit" name="activity" value="$(gettext "More activity")"> 3.68 +</form> 3.69 +EOT 3.70 + ;; 3.71 esac 3.72 3.73 # HTML footer.
4.1 --- a/web/pkgs.cgi Mon Mar 26 13:08:58 2012 +0200 4.2 +++ b/web/pkgs.cgi Mon Mar 26 14:47:04 2012 +0200 4.3 @@ -118,7 +118,7 @@ 4.4 </form> 4.5 4.6 <form method="get" action="pkgs.cgi" style="float: right;"> 4.7 - <input type="text" name="add" /> 4.8 + <input type="text" name="add" style="width: 400px;" /> 4.9 <input type="hidden" name="id" value="$id" /> 4.10 <input type="submit" name="pkgs" value="$(gettext "Add package(s)")"> 4.11 </form>