<?php echo $_t['page

From 0d0e606eefa347a100cf276b1bc43b832cc48200 Mon Sep 17 00:00:00 2001 From: Romain d'Alverny Date: Tue, 22 May 2012 19:47:02 +0000 Subject: new home page and new navigation for Mageia 2 --- en/index.php | 348 ++++++++++++++++++++++++++++++++++++--------------- en/index_locales.php | 75 +++++++---- langs.inc.php | 3 +- langs.php | 15 +-- lib/news.php | 67 ++++++++-- 5 files changed, 359 insertions(+), 149 deletions(-) diff --git a/en/index.php b/en/index.php index f83bc4769..7eedbf402 100644 --- a/en/index.php +++ b/en/index.php @@ -6,116 +6,262 @@ include 'index_locales.php'; $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); -?> - +$nav = array( + 'nav-for-pc' => array('for-pc/', _t('For PC')), + 'nav-for-server' => array('for-server/', _t('For server')), + 'nav-support' => array('support/', _t('Support')), + 'nav-community' => array('community/', _t('Community')), + 'nav-about' => array('about/', _t('About Mageia.Org')) +); + +?> - <?php echo $_t['page_title']; ?> - - - + + <?php _e('page_title'); ?> + + - + $name) + if ($l != $locale) + echo sprintf('', $l, $l); + ?> + - - - -

- - -

- -

- %s', blog_link($locale), $_t['news']); - echo html_news($locale); - ?> -

- Follow @mageia_org -

- -

Mailing-lists
IRC (Freenode network)
Mageia Wiki
Contact the founders team: -
- mageia-contact@mageia.org
- press@mageia.org
- expect an answer within 2 days

- - - - - -

- */ ?> + } + @media (min-width: 1200px) {} + + + + + +

+ +

%s', $ci); + ?> + +

+ Mageia 2 + + + + +
+ , + errata. +
+
+ + +
+

- +

+ + | +

- + \ No newline at end of file diff --git a/en/index_locales.php b/en/index_locales.php index 12d3c11c2..a774680b1 100644 --- a/en/index_locales.php +++ b/en/index_locales.php @@ -1,52 +1,77 @@ array( - 'page_title' => 'A New Linux Distribution: Mageia', - 'page_desc' => 'Mageia is new community-based Linux distribution.', - 'page_kw' => 'linux, mageia, mandriva, mandrake, free software, operating system, computer, laptop, desktop, server, device, mobile', - 'page_h1' => 'A New Linux Distribution', + 'page_title' => 'Home of the Mageia project', + 'page_desc' => 'Mageia is a community-based Linux distribution, for desktop & server.', + 'page_kw' => 'linux, mageia, free software, operating system, computer, laptop, desktop, server, headless, device, mobile, mandriva, mandrake', + 'page_h1' => 'Mageia, a free, community-based Linux distribution for desktop & server.', 'alternate_title' => 'Mageia Blog (English)', 'alternate_href' => 'http://blog.mageia.org/en/?feed=rss', 'about' => array( - 'Mageia is a fork of Mandriva Linux, - supported by a not-for-profit organisation of - recognized and elected contributors.', - 'Further than just delivering a free, secure, stable and sustainable operating system, - the goal is to set up a stable and trustable governance to direct collaborative projects - (check original announcement).' + ' Mageia

is a Free Software, Linux-based operating system.', + 'is a volunteer-based project, gathering individuals and organizations.', + 'has governance bodies elected by contributors.', + 'is supported by a nonprofit organisation owned and elected by contributors.', + 'forked from Mandriva Linux in 2010.' ), 'mageia-is-here' => 'Mageia 1 is here', - 'mageia-is-coming' => 'Mageia 2 is coming', - 'dl-next-mageia' => 'Try Mageia 2 Release Candidate', + 'mageia-2-coming' => 'Mageia 2 is coming soon', 'join-us' => 'Join Us!', 'right-now' => 'Happening right now', 'news' => 'News', + + 'change' => 'Change your perspective', + 'change-items' => array( + 'Stable, secure operating system for desktop & server', + 'Free Software, coproduced by hundreds of people', + 'Elected governance, nonprofit organization', + 'You can be part of it', + ), + 'dl-free-act' => 'Free Download', + 'dl-version' => 'version 2 (May \'12)', + 'dl-rel-notes' => 'Release notes', + 'dl-mga-1' => 'Download older Mageia 1 (June \'11)', + 'dl-contribute' => 'Get involved in the next version', ), 'fr' => array( 'page_title' => 'Une nouvelle distribution Linux communautaire : Mageia', 'page_desc' => 'Mageia est une nouvelle distribution Linux communautaire.', 'page_kw' => 'linux, mageia, mandriva, logiciel libre, système d\'exploitation, ordinateur, portable, serveur', - 'page_h1' => 'Une Distribution Linux', + 'page_h1' => 'Mageia, une distribution Linux communautaire, pour poste personnel et serveur.', 'alternate_title' => 'Le blog de Mageia (français)', 'alternate_href' => 'http://blog.mageia.org/fr/?feed=rss', 'about' => array( - 'Mageia est un fork de Mandriva Linux, - reposant sur une association de type 1901 composée de - contributeurs reconnus et élus pour leur travail.', - 'Au delà d’un système d’exploitation libre, - sécurisé, stable et pérenne, l’objectif est d’établir - une gouvernance stable et légitime autour d’un modèle - collaboratif (voir l’annonce originale).' + ' Mageia

est un système d’exploitation libre, basé sur Linux.', + 'est un projet encadré par une association dirigée par des contributeurs élus.', + 'a pris son essor et dérivé de Mandriva Linux en 2010.', ), 'mageia-is-here' => 'Mageia 1 est arrivée', - 'mageia-is-coming' => 'Mageia 2 arrive', - 'dl-next-mageia' => 'Essayez Mageia 2 Release Candidate', 'join-us' => 'Rejoignez-nous !', 'right-now' => 'En ce moment', - 'news' => 'Actualités' - + 'news' => 'Actualités', + + 'change' => 'Changez de point de vue', + 'change-items' => array( + 'Système d’exploitation libre pour PC et serveur', + 'Stable, sécurisé et flexible', + 'Gouvernance élue, association à but non lucratif', + 'Vous pouvez le coproduire' + ), + 'dl-free-act' => 'Téléchargement gratuit', + 'dl-version' => 'version 2 (mai 2012)', + 'dl-rel-notes' => 'Notes de publication', + 'dl-mga-1' => 'Télécharger Mageia 1 (juin \'11)', + 'dl-contribute' => 'Participer à la prochaine version', + 'For you' => 'Pour vous', + 'For PC' => 'Pour ordinateur personnel', + 'For server' => 'Pour serveur', + 'News' => 'Actualités', + 'Community' => 'Communauté', + 'About Mageia.Org' => 'À propos', + 'Privacy policy' => 'Respect de la vie privée', + 'Legal' => 'Mentions légales', + 'Support' => 'Assistance' ), 'de' => array( 'page_title' => 'Mageia - Eine neue Linux Distribution', diff --git a/langs.inc.php b/langs.inc.php index ad1f34862..f81e000ba 100644 --- a/langs.inc.php +++ b/langs.inc.php @@ -155,7 +155,8 @@ function _t($s = null, $opt = null) { else { global $_t; } - return ($s == '' ? '-EMPTY-STRING-' : (array_key_exists($s, $_t) ? $_t[$s] : $s)); + + return ($s == '' ? '---' : (array_key_exists($s, $_t) ? $_t[$s] : $s)); } function _e($s = null) { diff --git a/langs.php b/langs.php index 18060ebfc..4a96b3002 100644 --- a/langs.php +++ b/langs.php @@ -250,16 +250,11 @@ $langsForm = << 0) { - include ('_nav/lib.php'); - $hsnav = _mgnav_style() . _mgnav_html(true, $locale, $langsForm); - $hsfoot = ''; -} +// use new nav now. +// TODO(rda) cleanup above code about old nav structure. +include ('_nav/lib.php'); +$hsnav = _mgnav_style() . _mgnav_html(true, $locale, $langsForm, '//mageia:8888'); +$hsfoot = ''; if (!defined('HLANG')) echo $hsnav; diff --git a/lib/news.php b/lib/news.php index f2d9b2cb3..3a9f7bd86 100644 --- a/lib/news.php +++ b/lib/news.php @@ -8,11 +8,11 @@ * * @return array */ -function html_news($locale = 'en') +function html_news($locale = 'en', $count = 5) { - $news = get_news($locale); + $news = get_news($locale, $count); $html = '

%s %s
%3$s %1$s

%s

%s %s