changeset dafa8cc9d737 in /home/hg/repos/gajim-website
author: Yann Leboulanger asterix@lagaule.org details:http://hg.gajim.org/gajim-website?cmd=changeset;node=dafa8cc9d737 description: Merge new_download_page branch diffstat:
Design.php | 35 +-- css/main.css | 39 +- dev.php | 22 +- docs.php | 15 +- downloads.php | 384 ++++++++++++++++++----------- imgs/agilialinux.png | Bin imgs/archlinux.png | Bin imgs/debian.png | Bin imgs/fedora.png | Bin imgs/freebsd.png | Bin imgs/gentoo.png | Bin imgs/mandriva.png | Bin imgs/opensuse.png | Bin imgs/pld.png | Bin imgs/slackware.png | Bin imgs/source.png | Bin imgs/sourcemage.png | Bin imgs/ubuntu.png | Bin imgs/windows.png | Bin imgs/zenwalk.png | Bin locale/ar_AE/LC_MESSAGES/msg.po | 490 ++++++++++++++++++------------------- locale/bg_BG/LC_MESSAGES/msg.po | 489 ++++++++++++++++++-------------------- locale/de_DE/LC_MESSAGES/msg.po | 490 ++++++++++++++++++------------------- locale/eo/LC_MESSAGES/msg.po | 486 ++++++++++++++++++-------------------- locale/es_ES/LC_MESSAGES/msg.po | 427 +++++++++++++-------------------- locale/fr_FR/LC_MESSAGES/msg.po | 489 ++++++++++++++++++-------------------- locale/he_IL/LC_MESSAGES/msg.po | 508 +++++++++++++++++++-------------------- locale/hu_HU/LC_MESSAGES/msg.po | 491 ++++++++++++++++++------------------- locale/it_IT/LC_MESSAGES/msg.po | 493 ++++++++++++++++++------------------- locale/pl_PL/LC_MESSAGES/msg.po | 492 ++++++++++++++++++-------------------- locale/pt_BR/LC_MESSAGES/msg.po | 495 ++++++++++++++++++-------------------- locale/ru_RU/LC_MESSAGES/msg.po | 498 +++++++++++++++++++-------------------- msg.pot | 401 +++++++++++-------------------- 33 files changed, 3232 insertions(+), 3512 deletions(-)
diffs (truncated from 11744 to 300 lines):
diff -r e51cf683a910 -r dafa8cc9d737 Design.php --- a/Design.php Wed Jul 02 23:26:53 2014 +0200 +++ b/Design.php Sun Aug 31 21:36:34 2014 +0200 @@ -69,6 +69,7 @@
function Entete ($titre, $texte, $p="") { + header('Content-Type: application/xhtml+xml'); session_start(); // print_r($_SERVER); $language = get_language(); @@ -89,28 +90,6 @@ _("Wiki") => "http://trac.gajim.org/wiki", _("Development") => "dev.php");
- if (strpos($_SERVER['SCRIPT_NAME'], 'downloads.php')) - $menu2 = array( - _("Debian") => "downloads.php?lang=$language#debian", - _("Slackware") => "downloads.php?lang=$language#slackware", - _("Ubuntu") => "downloads.php?lang=$language#ubuntu", - _("Fedora") => "downloads.php?lang=$language#fedora", - _("Gentoo") => "downloads.php?lang=$language#gentoo", - _("Archlinux") => "downloads.php?lang=$language#archlinux", - _("SuSE") => "downloads.php?lang=$language#suse", - _("PLD") => "downloads.php?lang=$language#pld", - _("Sourcemage") => "downloads.php?lang=$language#sourcemage", - _("Mandriva") => "downloads.php?lang=$language#mandriva", - _("Zenwalk") => "downloads.php?lang=$language#zenwalk", - _("AgiliaLinux") => "downloads.php?lang=$language#agilialinux", - _("FreeBSD") => "downloads.php?lang=$language#freebsd", - _("Autopackage") => "downloads.php?lang=$language#autopackage", - _("Windows installer") => "downloads.php?lang=$language#windows", - _("Source") => "downloads.php?lang=$language#tarball", - _("Mercurial") => "downloads.php?lang=$language#mercurial", - _("Daily snapshots") => "downloads.php?lang=$language#snaps", - _("Old releases") => "downloads.php?lang=$language#old"); - if (strpos($_SERVER['SCRIPT_NAME'], 'docs.php')) $menu2 = array( _("Installation") => "docs.php?lang=$language#install", @@ -119,13 +98,13 @@ $page = $_SERVER["SCRIPT_NAME"]; $p = explode("/", $page); $page = $p[count($p)-1]; + echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"; echo "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"; echo "<html xmlns='http://www.w3.org/1999/xhtml'>\n <head>\n"; echo " <meta name="Author" content="Le Boulanger Yann (asterix)"/>"; echo " <meta name="description" content="Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is to provide a full featured and easy to use xmpp client for the GTK+ users. Gajim does not require GNOME to run, eventhough it exists with it nicely. Gajim is released under the GNU General Public License"/>\n"; echo " <meta name="keywords" content="gajim client jabber python gtk xmpp chat linux gnu instant messaging messenger pygtk contact transport file transfer hig chatstate bookmark avatars srv wikipedia"/>\n"; - echo " <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n"; echo " <title>\n $titre\n </title>\n"; echo " <link rel="stylesheet" href="css/main.css" type="text/css" />\n"; if ($language == "he" or $language == "ar") @@ -163,7 +142,7 @@ echo " <a href = "$page?lang=hu"><img src="imgs/hu_flag.png" alt="hu_flag" title="Weboldal magyarul" /></a>\n"; echo " <a href = "$page?lang=he"><img src="imgs/he_flag.png" alt="he_flag" title="אתר הרשת בעברית" /></a>\n"; echo " <a href = "$page?lang=ar"><img src="imgs/ar_flag.png" alt="ar_flag" title="الموقع باللغة العربية" /></a>\n"; - echo " </div> <!-- translator -->\n</div>\n"; + echo " </div> <!-- translator -->\n</div> <!-- logo -->\n"; echo "<div class="menu">\n"; while ( list ($libelle, $ancre) = each ($menu)){ echo " <span>\n "; @@ -186,7 +165,7 @@ echo Ancre ($ancre2, $libelle2, "submenu_a"); echo "\n </li>\n"; } - echo " </ul></div><div id="main_content">\n"; + echo " </ul></div> <!-- submenu -->\n"; } } @@ -194,11 +173,11 @@
function PiedDePage () { - echo " </div><div id="footer">\n "; + echo " <div id="footer">\n "; echo _(" Site optimized for W3C Standards and realized with vim editor under GNU/Linux by Asterix (Jabber ID: asterix@jabber.lagaule.org)\n"); echo " </div> <!-- footer -->\n"; - echo " </div> <!-- content -->\n"; - echo " <!-- inner -->\n"; + echo " </div> <!-- main -->\n"; + echo " </div> <!-- inner -->\n";
echo " </body>\n</html>\n"; diff -r e51cf683a910 -r dafa8cc9d737 css/main.css --- a/css/main.css Wed Jul 02 23:26:53 2014 +0200 +++ b/css/main.css Sun Aug 31 21:36:34 2014 +0200 @@ -31,14 +31,6 @@
}
-/* -#end_menu -{ - background-image: url(../bar.png); - background-repeat:no-repeat; - float:left; - width:144px; -}*/ #translator { position: absolute; top : 20px; @@ -71,9 +63,6 @@ } .menu a:hover { -/* background-color: #84C1D7; - border: none; -*/ color: gray; } .main { @@ -86,10 +75,6 @@ border: 2px dashed #26667E; margin-right:20px; } -/*#main_content -{ - -}*/ .submenu ul { clear: both; @@ -149,3 +134,27 @@ .translation-status td.trans-img img { vertical-align:middle; } + +#os-logos { + margin:25px auto; +} + +#os-logos > tr > td { + min-width:100px; + max-width:100px; + text-align:center; + vertical-align:bottom; +} + +.os-logo { + max-width:75px; + max-height:75px; + margin:0px auto; +} + +#os-details div { + border:1px solid #bbbbbb; + border-radius:5px; + margin:10px; + padding:5px; +} diff -r e51cf683a910 -r dafa8cc9d737 dev.php --- a/dev.php Wed Jul 02 23:26:53 2014 +0200 +++ b/dev.php Sun Aug 31 21:36:34 2014 +0200 @@ -5,14 +5,12 @@ Entete (_("Gajim, a Jabber client"), "GAJIM");
-print (" <p>"); print (" <h1>"); print _(" Our Room"); print (" </h1>"); print _(" Our room is")." <a href="xmpp:gajim@conference.gajim.org?join">gajim@conference.gajim.org</a> "._("You are welcome to join and communicate with us."); print (" <br/>");
-print (" <p>"); print (" <h1>"); print _(" Mailing List"); print (" </h1>"); @@ -26,7 +24,7 @@ print (" </h1>"); print _("To checkout hg do")." <em>hg clone http://hg.gajim.org/gajim gajim</em>"; print (" <br/>"); -print _(" You can also")." <a href="http://trac.gajim.org/browser/%5C%22%3E%22._(%22browse SVN repository")."</a>."; +print _(" You can also")." <a href="http://trac.gajim.org/browser/%5C%22%3E%22._(%22browse Mercurial repository")."</a>."; print (" <br/>");
@@ -49,10 +47,12 @@ print (" <li>\n"); print _(" Donating: ")."\n"; print ('<form action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <input type="hidden" name="cmd" value="_s-xclick"> - <input type="hidden" name="hosted_button_id" value="ASTY4K884QP26"> - <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> - <img alt="" border="0" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" width="1" height="1"> + <fieldset style="border:0;"> + <input type="hidden" name="cmd" value="_s-xclick"/> + <input type="hidden" name="hosted_button_id" value="ASTY4K884QP26"/> + <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" style="border:0;" name="submit" alt="PayPal - The safer, easier way to pay online!"/> + <img alt="" style="border:0;" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" width="1" height="1"/> + </fieldset> </form>'); print ('<a class="FlattrButton" style="display:none;" href="http://gajim.org"></a>'); print (" </li>\n"); @@ -68,10 +68,9 @@ $f3 = fopen("stats_po_svn", 'r'); print ("<table class="translation-status">"); print ("<tr><th>Language</th><th colspan="2">0.14.4 Version</th><th colspan="2">0.15.1 Version</th><th colspan="2">HG version</th></tr>"); -while (!feof($f_lang)) -{ +$data = fgets($f_lang); +do { print ("<tr>"); - $data = fgets($f_lang); print ($data); $data = fgets($f1); print ($data); @@ -80,7 +79,8 @@ $data = fgets($f3); print ($data); print ("</tr>"); -} + $data = fgets($f_lang); +} while (!feof($f_lang)); print ("</table>"); fclose($f_lang); fclose($f1); diff -r e51cf683a910 -r dafa8cc9d737 docs.php --- a/docs.php Wed Jul 02 23:26:53 2014 +0200 +++ b/docs.php Sun Aug 31 21:36:34 2014 +0200 @@ -5,14 +5,13 @@ Entete ("Gajim, a Jabber client", "GAJIM");
-print (" <p>\n"); -print ("<a name="install"></a>"); +print ("<a name="install"/>"); print (" <h1>\n"); print _(" Installation\n"); -print (" </h1></a>\n"); +print (" </h1>\n");
-print ("<a name="tarball"></a>\n"); -print ("<a name="mercurial"></a>\n"); +print ("<a name="tarball"/>\n"); +print ("<a name="mercurial"/>\n"); print (" <h2>\n"); print _(" Tarball and Mercurial\n"); print (" </h2>\n"); @@ -30,15 +29,14 @@ print (" </h3>\n"); $link = "<a href="http://trac.gajim.org/wiki/Win32Env%5C%22%3E%22._(%22this page")."</a>"; printf(_("See %s to install development version under windows."), $link); -print (" <p>\n");
-print ("<a name="jabber"></a>"); +print ("<a name="jabber"/>"); print (" <h1>\n"); print (" Jabber/XMPP\n"); print (" </h1>\n"); print _(" Please read")." <a href="http://trac.gajim.org/wiki/GajimHelp#help_quickstart_guides%5C%22%3E%22._(%2...")."</a>.\n";
-print ("<a name="structure"></a>"); +print ("<a name="structure"/>"); print (" <h1>\n"); print _(" Structure\n"); print (" </h1>\n"); @@ -46,7 +44,6 @@ print (" <br/>"); $link = "<a href="http://xmpppy.sourceforge.net/%5C%22%3Exmpppy</a>"; printf(_(" Gajim uses a fork of the %s library to do the interface with Jabber network.\n"), $link); -print (" </p>\n");
PiedDePage(); ?> diff -r e51cf683a910 -r dafa8cc9d737 downloads.php --- a/downloads.php Wed Jul 02 23:26:53 2014 +0200 +++ b/downloads.php Sun Aug 31 21:36:34 2014 +0200 @@ -11,166 +11,223 @@ printf(_(" A %s version is in test"), "<strong>0.16-rc2</strong>"); print ("<br/>\n"); print _("If your distribution doesn't have the latest version "); -print _("you are advised to use the ")."<a href="#autopackage">autopackage</a> "._("or the ")."<a href="#tarball">"._("source tarball")."</a>\n"; +print _("you are advised to use the ")."<a href='#source' id='top-sourcelink'>"._("source tarball")."</a>\n";
-print ("<a name="debian">\n"); -print (" <h2>\n"); -print (" Debian GNU/Linux\n"); -print (" </h2>\n"); -print ("</a>\n"); + +#OS-Table START +print "<table id='os-logos'>\n<tr>\n"; + +$os_table = array( + 0 => array ( + "agilialinux", # href / image + "AgiliaLinux", # Tooltip + "AgiliaLinux (MOPSLinux)", #text + ), + 1 => array ( + "archlinux", + "Archlinux", + "Archlinux", + ),