diff options
| author | Manuel Hiebel <leuhmanu@mageia.org> | 2017-07-05 09:52:42 +0200 |
|---|---|---|
| committer | Manuel Hiebel <leuhmanu@mageia.org> | 2017-07-05 09:52:42 +0200 |
| commit | a5fa26a9aa722272e293eb5f0d750f76da1bdf42 (patch) | |
| tree | 154744de7e2a02a1019465b01a1b8313d8bdf5d0 | |
| parent | 47d6171b94ad6ba36386869633540f2c8f2d06fe (diff) | |
| download | www-a5fa26a9aa722272e293eb5f0d750f76da1bdf42.tar www-a5fa26a9aa722272e293eb5f0d750f76da1bdf42.tar.gz www-a5fa26a9aa722272e293eb5f0d750f76da1bdf42.tar.bz2 www-a5fa26a9aa722272e293eb5f0d750f76da1bdf42.tar.xz www-a5fa26a9aa722272e293eb5f0d750f76da1bdf42.zip | |
replace custom .css with common header, basic bootstrap adaptation
31 files changed, 96 insertions, 60 deletions
@@ -14,8 +14,7 @@ header('Status: 404 Not Found'); <meta http-equiv="expires" content="0"> <meta name="robots" content="noindex, nofollow"> <meta name="author" content="Mageia"> - <link rel="stylesheet" type="text/css" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> + <?php echo common_header(); ?> <?php include 'analytics.php'; ?> </head> <body> diff --git a/en/1/for-you/index.php b/en/1/for-you/index.php index eed3ded86..f2e92af1d 100644 --- a/en/1/for-you/index.php +++ b/en/1/for-you/index.php @@ -17,6 +17,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <meta name="author" content="Mageia"> <link rel="stylesheet" type="text/css" href="/g/style/all.css"> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="release"> <?php echo $hsnav; ?> @@ -83,5 +84,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); </div> </div> </div> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/1/index.php b/en/1/index.php index ee21002a9..c17c0ec99 100644 --- a/en/1/index.php +++ b/en/1/index.php @@ -18,6 +18,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <link rel="canonical" href="/<?php echo $locale; ?>/1/"> <link rel="stylesheet" href="/g/style/all.css"> <?php include '../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="release"> <?php echo $hsnav; ?> @@ -64,5 +65,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <?php include 'nav.php'; ?> </div> </div> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/1/migrate/index.php b/en/1/migrate/index.php index f24d73d93..59f5d62f2 100644 --- a/en/1/migrate/index.php +++ b/en/1/migrate/index.php @@ -17,6 +17,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <meta name="author" content="Mageia"> <link rel="stylesheet" type="text/css" href="/g/style/all.css"> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="release"> <?php echo $hsnav; ?> @@ -110,5 +111,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); </div> </div> </div> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/1/next/index.php b/en/1/next/index.php index 98696dbb8..c1af04557 100644 --- a/en/1/next/index.php +++ b/en/1/next/index.php @@ -17,6 +17,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <link rel="stylesheet" type="text/css" href="/g/style/all.css"> <link rel="canonical" href="/<?php echo $locale; ?>/1/next/"> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="release"> <?php echo $hsnav; ?> @@ -111,5 +112,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <?php include '../nav.php'; ?> </div> </div> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/1/notes/index.php b/en/1/notes/index.php index 9ee372f95..8fb521ae7 100644 --- a/en/1/notes/index.php +++ b/en/1/notes/index.php @@ -18,6 +18,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <link rel="stylesheet" type="text/css" href="/g/style/all.css"> <link rel="canonical" href="/<?php echo $locale; ?>/1/notes/"> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="release"> <?php echo $hsnav; ?> @@ -211,5 +212,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <?php include '../nav.php'; ?> </div> </div> +<?php echo common_footer($locale); ?> </body> -</html>
\ No newline at end of file +</html> diff --git a/en/2/download_index.php b/en/2/download_index.php index 25524306c..5755650d7 100644 --- a/en/2/download_index.php +++ b/en/2/download_index.php @@ -18,6 +18,7 @@ require '../downloads/get/lib.php'; <link rel="canonical" href="/<?php echo $locale; ?>/2/"> <link rel="stylesheet" href="/g/style/all.css"> <?php include '../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="release downloads"> <?php echo $hsnav; ?> @@ -227,5 +228,6 @@ require '../downloads/get/lib.php'; </div> </div> </div> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/2/for-pc/index.php b/en/2/for-pc/index.php index 5794be6e5..15933427d 100644 --- a/en/2/for-pc/index.php +++ b/en/2/for-pc/index.php @@ -16,12 +16,14 @@ $dictionary = read_translation_file($locale, '2'); hr { margin-top: 2em; } </style> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="downloads"> <?php echo $hsnav; ?> <h1 id="mgnavtitle"><a href="../2/">Mageia 2</a> » <?php _g('for your PC')?></h1> <?php include '../nav.php'; ?> - <div class="para" style="width: 600px;"> + <div class="container row" id="doc"> + <div class="col"> <section> <?php _g('Plenty', null, 'h2'); @@ -46,53 +48,57 @@ $dictionary = read_translation_file($locale, '2'); ?> </section> </div> - <div class="para" style="width: 300px"> + <div class="row"> + <div class="col"> <?php _g('Web', null, 'h3'); _g('Choose your web browser from Firefox ESR 10.0.4, Chromium-browser 180.1025.160, Epiphany 3.4.1 or Opera 11.64 – or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.8.2, Thunderbird ESR 10.0.4, Evolution 3.4.1 or maybe Claws-Mail or Mutt.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Messaging', null, 'h3'); _g('Choose from Kopete, Pidgin, Empathy or Kadu for instant messaging; use Quassel, Konversation, XChat-Gnome or KVIrc for IRC chat; try QuteCom or Ekiga (or even Skype) for VOIP.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Office', null, 'h3'); _g('The two full-featured office suites LibreOffice and Calligra are there, as well as AbiWord, and a host of text editors including Kate; for finance there\'s KMyMoney, Skrooge or the professional-level GnuCash.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Image', null, 'h3'); _g('Use GIMP for powerful image manipulation, or Inkscape for vector drawing; Blender is there for serious animation. DigiKam or Showfoto will take care of your photos, talk to your camera and give you more basic image editing.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Sound', null, 'h3'); _g('For playing audio files, choose from Amarok 2.5.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don\'t infringe local laws.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Video', null, 'h3'); _g('For editing video files, try Avidemux, Kino or OpenShot; for subtitles, there\'s Gaupol or Subtitles Composer; use MythTV, Miro, tvtime, FreetuxTV or Me TV for watching or recording TV programmes.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Plus', null, 'h3'); _g('Then there\'s ZoneMinder, for CCTV Security; VirtualBox or WINE for virtualisation; and a range of development environments such as Anjuta, Eclipse, Netbeans or KDevelop.', null, 'p'); ?> </div> - <div class="para"> + <div class="col"> <?php _g('For more information about these and other packages, check the <a href="%s">Mageia 2 Release notes</a>.', array('https://wiki.mageia.org/en/Mageia_2_Release_Notes'), 'p'); _g('You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.', array('//madb.mageia.org'), 'p'); ?> </div> + </div><!--row apps--> + </div><!--container--> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/2/for-server/index.php b/en/2/for-server/index.php index 2bf840800..5c6f7d635 100644 --- a/en/2/for-server/index.php +++ b/en/2/for-server/index.php @@ -16,12 +16,14 @@ $dictionary = read_translation_file($locale, '2'); hr { margin-top: 2em; } </style> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="downloads"> <?php echo $hsnav; ?> <h1 id="mgnavtitle"><a href="../2/">Mageia 2</a> » <?php _g('for your server')?></h1> <?php include '../nav.php'; ?> - <div class="para" style="width: 600px;"> + <div class="container row" id="doc"> + <div class="col"> <section> <?php _g('Mageia 2 has all the main services and server packages you will need to run your server.', null, 'p'); @@ -45,12 +47,14 @@ $dictionary = read_translation_file($locale, '2'); ?> </section> </div> - <div class="para"> + <div class="col"> <?php _g('For more information about these and other packages, check the <a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes">Mageia 2 Release notes</a>.', null, 'p'); _g('You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.', array('//madb.mageia.org'), 'p'); ?> </div> + </div><!-- container--> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/2/index.php b/en/2/index.php index 2fd8055b5..3df8da1e6 100644 --- a/en/2/index.php +++ b/en/2/index.php @@ -17,12 +17,13 @@ $dictionary = read_translation_file($locale, '2'); hr { margin-top: 2em; } </style> <?php include '../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="downloads"> <?php echo $hsnav; ?> <h1 id="mgnavtitle"><a href="../2/">Mageia 2</a></h1> <?php include '../2/nav.php'; ?> - <div class="para" style="width: 600px;"> + <div class="container" id="doc"> <section> <a href="../download_index.php" title="Mageia 2"><img src="/g/2/images/mageia-2-desktop-550.jpg" alt="Mageia 2" style="width: 550px; display: block; margin: 2em auto 3em auto; box-shadow: 0 0 5px #aaa;"></a> <?php @@ -46,5 +47,6 @@ $dictionary = read_translation_file($locale, '2'); ?> </section> </div> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/3/download_index.php b/en/3/download_index.php index df7b8f84c..dd1c8defa 100755 --- a/en/3/download_index.php +++ b/en/3/download_index.php @@ -18,6 +18,7 @@ require '../downloads/get/lib.php'; <link rel="canonical" href="/<?php echo $locale; ?>/3/"> <link rel="stylesheet" href="/g/style/all.css"> <?php include '../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="release downloads"> @@ -208,5 +209,6 @@ require '../downloads/get/lib.php'; </div> </div> </div> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/3/for-pc/index.php b/en/3/for-pc/index.php index a4de84404..8a4e1c36a 100644 --- a/en/3/for-pc/index.php +++ b/en/3/for-pc/index.php @@ -16,12 +16,14 @@ $dictionary = read_translation_file($locale, '3'); hr { margin-top: 2em; } </style> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="downloads"> <?php echo $hsnav; ?> <h1 id="mgnavtitle"><a href="../3/">Mageia 3</a> » <?php _g('for your PC')?></h1> <?php include '../nav.php'; ?> - <div class="para" style="width: 600px;"> + <div class="container row" id="doc"> + <div class="col"> <section> <?php _g('Plenty', null, 'h2'); @@ -46,53 +48,57 @@ $dictionary = read_translation_file($locale, '3'); ?> </section> </div> - <div class="para" style="width: 300px"> + <div class="row"> + <div class="col"> <?php _g('Web', null, 'h3'); _g('Choose your web browser from Firefox ESR 17.0.6, Chromium-browser 26.0.1410.65, Epiphany 3.6.1 or Opera 12.15 – or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.10.2, Thunderbird ESR 17.0.6, Evolution 3.6.3 or maybe Claws-Mail or Mutt.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Messaging', null, 'h3'); _g('Choose from Kopete, Pidgin, Empathy or Kadu for instant messaging; use Quassel, Konversation, XChat-Gnome or KVIrc for IRC chat; try QuteCom or Ekiga (or even Skype) for VOIP.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Office', null, 'h3'); _g('The two full-featured office suites LibreOffice and Calligra are there, as well as AbiWord, and a host of text editors including Kate; for finance there\'s KMyMoney, Skrooge or the professional-level GnuCash.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Image', null, 'h3'); _g('Use GIMP for powerful image manipulation, or Inkscape for vector drawing; Blender is there for serious animation. DigiKam or Showfoto will take care of your photos, talk to your camera and give you more basic image editing.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Sound', null, 'h3'); _g('For playing audio files, choose from Amarok 2.7.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don\'t infringe local laws.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Video', null, 'h3'); _g('For editing video files, try Avidemux or OpenShot; for subtitles, there\'s Gaupol or Subtitles Composer; use MythTV, Miro, tvtime, FreetuxTV or Me TV for watching or recording TV programmes.', null, 'p'); ?> </div> - <div class="para" style="width: 300px"> + <div class="col"> <?php _g('Plus', null, 'h3'); _g('Then there\'s ZoneMinder, for CCTV Security; VirtualBox or WINE for virtualisation; and a range of development environments such as Anjuta, Eclipse, Netbeans or KDevelop.', null, 'p'); ?> </div> - <div class="para"> + <div class="col"> <?php _g('For more information about these and other packages, check the <a href="%s">Mageia 3 Release notes</a>.', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes'), 'p'); _g('You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.', array('//madb.mageia.org'), 'p'); ?> </div> + </div><!--row apps--> + </div><!--container--> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/3/for-server/index.php b/en/3/for-server/index.php index 8bf254280..35a3f71f7 100644 --- a/en/3/for-server/index.php +++ b/en/3/for-server/index.php @@ -16,12 +16,14 @@ $dictionary = read_translation_file($locale, '3'); hr { margin-top: 2em; } </style> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="downloads"> <?php echo $hsnav; ?> <h1 id="mgnavtitle"><a href="../3/">Mageia 3</a> » <?php _g('for your server')?></h1> <?php include '../nav.php'; ?> - <div class="para" style="width: 600px;"> + <div class="container row" id="doc"> + <div class="col"> <section> <?php _g('Mageia 3 has all the main services and server packages you will need to run your server.', null, 'p'); @@ -43,11 +45,13 @@ $dictionary = read_translation_file($locale, '3'); ?> </section> </div> - <div class="para"> + <div class="col"> <?php _g('For more information about these and other packages, check the <a href="https://wiki.mageia.org/en/Mageia_3_Release_Notes">Mageia 3 Release notes</a>.', null, 'p'); _g('You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.', array('//madb.mageia.org'), 'p'); ?> </div> + </div><!-- container--> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/3/index.php b/en/3/index.php index ec3cc5cdf..96fc93e2e 100644 --- a/en/3/index.php +++ b/en/3/index.php @@ -17,12 +17,13 @@ $dictionary = read_translation_file($locale, '3'); hr { margin-top: 2em; } </style> <?php include '../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="downloads"> <?php echo $hsnav; ?> <h1 id="mgnavtitle"><a href="../3/">Mageia 3</a></h1> <?php include '../3/nav.php'; ?> - <div class="para" style="width: 600px;"> + <div class="container" id="doc"> <section> <a href="../3/download_index.php" title="Mageia 3"><img src="/g/3/mageia-3-desktop-550.png" alt="Mageia 3" style="width: 550px; display: block; margin: 2em auto 3em auto; box-shadow: 0 0 5px #aaa;"></a> <?php @@ -45,5 +46,6 @@ $dictionary = read_translation_file($locale, '3'); ?> </section> </div> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/4/download_index.php b/en/4/download_index.php index f5335621d..f0f1260d0 100755 --- a/en/4/download_index.php +++ b/en/4/download_index.php @@ -51,7 +51,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un <meta name="robots" content="index,nofollow,nosnippet"> <link rel="canonical" href="/<?php echo $locale.'/4';?>/"> <link rel="stylesheet" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> + <?php echo common_header(); ?> <?php include '../../analytics.php'; ?> </head> <body class="release downloads"> diff --git a/en/4/index.php b/en/4/index.php index 6fdd8604c..2b47bb623 100644 --- a/en/4/index.php +++ b/en/4/index.php @@ -11,7 +11,7 @@ $dictionary = read_translation_file($locale, array('4', 'common_footer')); <meta charset="utf-8"> <title><?php _g('Mageia 4')?></title> <link rel="stylesheet" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> + <?php echo common_header(); ?> <meta name="description" content="<?php _g('Mageia 4 is the new, solid, stable Linux distribution from the Mageia project.')?>"> <?php include '../../analytics.php'; ?> <style>.para{text-align: justify;text-align: -webkit-auto;}</style> diff --git a/en/about/code-of-conduct/index.php b/en/about/code-of-conduct/index.php index 96f0bcf7c..2acad4887 100644 --- a/en/about/code-of-conduct/index.php +++ b/en/about/code-of-conduct/index.php @@ -12,17 +12,17 @@ $dictionary = read_translation_file($locale, array('about/code-of-conduct', 'com <meta name="description" content="<?php _g('Mageia project Code of Conduct for contributors and users.')?>"> <meta name="keywords" content="<?php _g('mageia, values, conduct, rules')?>"> <meta name="author" content="Mageia"> - <link rel="stylesheet" type="text/css" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> + <?php echo common_header(); ?> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="about"> <?php echo $hsnav; ?> <h1 id="mgnavt"><?php _g('Code of Conduct')?></h1> - <div id="doc" class="yui-t7" style="margin-bottom: 0px;"> + <div id="doc" class="yui-t7"> <div id="bd" role="main"> <div class="yui-g"> - <div class="para codeofconduct"> + <div class="codeofconduct"> <div id="preamble"> <p><?php _g('The Mageia project is a lively community, open to everyone. We want this community to be a nice place for both newcomers and current members, where everyone feels comfortable and accepted whatever the amount and type of his/her contributions are.')?></p> @@ -34,7 +34,7 @@ $dictionary = read_translation_file($locale, array('about/code-of-conduct', 'com <p><?php _g('This Code of Conduct is shared by all contributors and users who engage with the Mageia project and its community services.')?></p> </div> - <div id="overview"> + <div id="overview" class="mt-4"> <h2 class="be"><?php _g('Overview')?></h2> <p><?php _g('This Code of Conduct presents a summary of the shared values and “common sense” thinking in our community. The basic social imperatives that hold our project together include:')?></p> @@ -107,4 +107,4 @@ $dictionary = read_translation_file($locale, array('about/code-of-conduct', 'com </div> <?php echo common_footer($locale); ?> </body> -</html>
\ No newline at end of file +</html> diff --git a/en/about/constitution/index.php b/en/about/constitution/index.php index fff6423d3..df4533e21 100644 --- a/en/about/constitution/index.php +++ b/en/about/constitution/index.php @@ -15,9 +15,8 @@ $dictionary = read_translation_file($locale, array('about/constitution', 'common <meta name="description" content="<?php _g('Mageia.Org constitution');?>"> <meta name="keywords" content="<?php _g('mageia.org, association, organization, legal, constitution, statuts'); ?>"> <meta name="author" content="Mageia"> - <link rel="stylesheet" type="text/css" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="about constitution"> <?php echo $hsnav; ?> @@ -25,7 +24,7 @@ $dictionary = read_translation_file($locale, array('about/constitution', 'common <div id="doc4" class="yui-t7" style="margin-bottom: 0px;"> <div id="bd" role="main"> <div class="yui-g"> - <div class="para preambule"> + <div class="p-2"> <div id="preamble"> <p><?php echo sprintf(_r('Original and definitive version (in French) is available from %s. These <em>may</em> be improved. Do not hesitate to mail your patches; check how in the %s.'), '<a href="//gitweb.mageia.org/org/constitution/tree/">gitweb.mageia.org/org/constitution</a>', diff --git a/en/about/index.php b/en/about/index.php index 87d969784..b922efe2b 100644 --- a/en/about/index.php +++ b/en/about/index.php @@ -13,8 +13,8 @@ $dictionary = read_translation_file($locale, array('about', 'common_footer')); <meta name="description" content="<?php _g('Mageia is a Free Software, community-led project. Learn more about it.')?>"> <meta name="keywords" content="<?php _g('mageia, mageia.org, about, mission, contacts, governance, values, timeline')?>"> <meta name="author" content="Mageia"> - <link rel="stylesheet" type="text/css" href="/g/style/all.css"> <?php include '../../analytics.php'; ?> + <?php echo common_header(); ?> <style> #abtlg { display: block; @@ -22,7 +22,7 @@ $dictionary = read_translation_file($locale, array('about', 'common_footer')); width: 500px; } </style> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> + <?php echo common_header(); ?> </head> <body class="about"> <?php echo $hsnav; ?> diff --git a/en/about/license/index.php b/en/about/license/index.php index 9047ebddf..a42946ee4 100644 --- a/en/about/license/index.php +++ b/en/about/license/index.php @@ -14,14 +14,13 @@ $prepared_license_strings = read_license_from_vcs($locale); <html lang="<?php echo $locale; ?>"> <head> <meta charset="utf-8"> + <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> <title><?php _g('Mageia license')?></title> - <link rel="stylesheet" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> <style> .para { text-align: left; float: left; display: block; } hr { margin-top: 2em; } </style> - <?php include '../../../analytics.php'; ?> </head> <body class="about"> <?php echo $hsnav; ?> diff --git a/en/about/media/index.php b/en/about/media/index.php index c02c428f1..bd87ce72a 100644 --- a/en/about/media/index.php +++ b/en/about/media/index.php @@ -13,8 +13,7 @@ $dictionary = read_translation_file($locale, array('about/media', 'common_footer <meta name="description" content="Mageia"> <meta name="keywords" content="mageia"> <meta name="author" content="Mageia"> - <link rel="stylesheet" type="text/css" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> + <?php echo common_header(); ?> <?php include '../../../analytics.php'; ?> </head> <body class="about"> @@ -24,7 +23,7 @@ $dictionary = read_translation_file($locale, array('about/media', 'common_footer <div id="bd" role="main"> <div class="yui-g"><div class="para"> <h2><?php _g('Official Logo')?></h2> - <table> + <table class="table-responsive"> <tr> <th><?php _g('Mageia 2013')?></th> <th><?php _g('Mageia 2013 dark')?></th> diff --git a/en/about/policies/privacy/index.php b/en/about/policies/privacy/index.php index 8d23f04cd..21e66f8cc 100644 --- a/en/about/policies/privacy/index.php +++ b/en/about/policies/privacy/index.php @@ -11,17 +11,16 @@ $dictionary = read_translation_file($locale, array('about/policies/privacy', 'co <meta charset="utf-8"> <title><?php _g('Privacy policy')?></title> <meta name="description" content="<?php _g('Privacy policy')?>"> - <link rel="stylesheet" href="/g/style/all.css" type="text/css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> <?php include '../../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="about"> <?php echo $hsnav; ?> <h1 id="mgnavt"><?php _g('Policies')?></h1> - <div id="doc" class="yui-t7" style="margin-bottom: 0px;"> + <div id="doc" class="yui-t7"> <div id="bd" role="main"> <div class="yui-g"> - <div class="para donate" style="padding-top: 2em;"> + <div class="para donate"> <?php _g('Privacy policy', null, 'h2'); diff --git a/en/about/reports/2010/index.php b/en/about/reports/2010/index.php index 752b56b8f..33c2d31cc 100644 --- a/en/about/reports/2010/index.php +++ b/en/about/reports/2010/index.php @@ -9,6 +9,7 @@ <meta name="author" content="Mageia" /> <link rel="stylesheet" type="text/css" href="/g/style/all.css" /> <?php include '../../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="about"> <h1 id="mgnavt"><a href="../">Activity Reports</a> » 2010 Financial Report</h1> @@ -60,5 +61,6 @@ </div> </div> </div> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/about/reports/index.php b/en/about/reports/index.php index cdf5ed313..c0d6c8777 100644 --- a/en/about/reports/index.php +++ b/en/about/reports/index.php @@ -11,9 +11,8 @@ $dictionary = read_translation_file($locale, array('about/reports', 'common_foot <meta name="description" content="<?php _g('Mageia reports, every year.')?>"> <meta name="keywords" content="<?php _g('mageia, reports, activity, financial')?>"> <meta name="author" content="Mageia"> - <link rel="stylesheet" type="text/css" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="about"> <?php echo $hsnav; ?> diff --git a/en/about/reports/template.php b/en/about/reports/template.php index 1f33b56d0..6cbe0fae5 100644 --- a/en/about/reports/template.php +++ b/en/about/reports/template.php @@ -128,6 +128,7 @@ require '../../../../langs.php'; <meta name="author" content="Mageia.org"> <link rel="stylesheet" type="text/css" href="/g/style/all.css"> <?php include '../../../../analytics.php'; ?> + <?php echo common_header(); ?> <!--Load the AJAX API--> <script type="text/javascript" src="https://www.google.com/jsapi"></script> <script type="text/javascript"> @@ -348,5 +349,6 @@ require '../../../../langs.php'; <li><a href="#expenses">Expenses</a></li> <li><a href="#revenues">Revenues</a></li> </nav> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/about/values/index.php b/en/about/values/index.php index 018fc1704..5d177d370 100644 --- a/en/about/values/index.php +++ b/en/about/values/index.php @@ -11,9 +11,8 @@ $dictionary = read_translation_file($locale, array('about/values', 'common_foote <meta name="description" content="<?php _g('Mageia project values')?>"> <meta name="keywords" content="<?php _g('mageia, values')?>"> <meta name="author" content="Mageia"> - <link rel="stylesheet" type="text/css" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> <?php include '../../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="about"> <?php echo $hsnav; ?> diff --git a/en/calendar/index.php b/en/calendar/index.php index 57752e273..09a572f92 100644 --- a/en/calendar/index.php +++ b/en/calendar/index.php @@ -62,7 +62,7 @@ foreach ($calendars as $c) { <meta name="keywords" content="<?php _g('mageia, linux, calendar, events') ?>"> <meta name="author" content="Mageia"> <link rel="stylesheet" type="text/css" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> + <?php echo common_header(); ?> <?php include '../../analytics.php'; ?> </head> <body class="community"> diff --git a/en/legal/index.php b/en/legal/index.php index 2f098a707..810b49948 100644 --- a/en/legal/index.php +++ b/en/legal/index.php @@ -16,8 +16,8 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <meta name="description" content="<?php _e('page_desc')?>"> <meta name="keywords" content="<?php _e('page_kw')?>"> <meta name="author" content="Mageia"> - <link rel="stylesheet" type="text/css" href="/g/style/all.css"> <?php include '../../analytics.php'; ?> + <?php echo common_header(); ?> </head> <body class="about legal"> <?php echo $hsnav; ?> @@ -29,5 +29,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); </div></div> </div> </div> +<?php echo common_footer($locale); ?> </body> </html> diff --git a/en/support/report-a-bug/index.php b/en/support/report-a-bug/index.php index f8b64964e..46c13846c 100644 --- a/en/support/report-a-bug/index.php +++ b/en/support/report-a-bug/index.php @@ -1,3 +1,4 @@ +<?php include '../../../langs.php'; ?> <!DOCTYPE html> <html dir="ltr" lang="en"> <head> @@ -7,10 +8,10 @@ <meta name="keywords" content="mageia, linux, bug, report, procedure, support, help"> <meta name="author" content="Mageia"> <link rel="stylesheet" type="text/css" href="/g/style/all.css" > + <?php echo common_header(); ?> <?php include '../../../analytics.php'; ?> </head> <body class="support report-a-bug"> - <?php include '../../../langs.php'; ?> <h1 id="mgnavt"><a href="../">Support</a> » How to Report a Bug</h1> <div id="doc" class="yui-t7"> <div id="bd" role="main"> diff --git a/en/thank-you/index.php b/en/thank-you/index.php index 53ebcc3ea..0ebf88a32 100644 --- a/en/thank-you/index.php +++ b/en/thank-you/index.php @@ -16,7 +16,7 @@ include '../../donators.inc.php'; <meta name="keywords" content="<?php _g('mageia, donate, donation, thanks, partners, help, mirrors, hosting'); ?>"> <meta name="author" content="Mageia"> <link rel="stylesheet" type="text/css" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> + <?php echo common_header(); ?> <?php include '../../analytics.php'; ?> <script src="//static.mageia.org/g/js/jquery-1.10.1.min.js"></script> <script src="//static.mageia.org/g/js/treasurer.js"></script> diff --git a/en/timeline/index.php b/en/timeline/index.php index 213158317..d1cdd250c 100644 --- a/en/timeline/index.php +++ b/en/timeline/index.php @@ -81,8 +81,7 @@ $events = array( <head> <meta charset="utf-8"> <title><?php _g('Mageia Timeline')?></title> - <link rel="stylesheet" href="/g/style/all.css"> - <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css"> + <?php echo common_header(); ?> <style> .para {padding-top: 2em;} hr { margin-top: 2em; } |