common footer added to some more pages

author: filip <filip.komar@gmail.com> 2016-06-28 23:25:17 +0200
committer: filip <filip.komar@gmail.com> 2016-06-28 23:25:17 +0200
commit: 4942a149658d442ec06d68afbcbbdc42d6a4eefd (patch)
tree: 6f3ec8bbdbeb85a5549d58efe8c91775917cc6fa
parent: 05db764b04c1de4d458b1687dd1174468f40fc07 (diff)
download: www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar
www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar.gz
www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar.bz2
www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar.xz
www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.zip
11 files changed, 48 insertions, 26 deletions
diff --git a/en/about/code-of-conduct/index.php b/en/about/code-of-conduct/index.php
index d95a88f79..45eb14a09 100644
--- a/en/about/code-of-conduct/index.php
+++ b/en/about/code-of-conduct/index.php
@@ -2,7 +2,7 @@
 define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../../langs.php';
-$dictionary = read_translation_file($locale, 'about/code-of-conduct');
+$dictionary = read_translation_file($locale, array('documentation', 'common_footer'));
 ?><!DOCTYPE html>
 <html dir="ltr" lang="<?php echo $locale; ?>">
 
@@ -13,12 +13,13 @@ $dictionary = read_translation_file($locale, 'about/code-of-conduct');
     <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 include '../../../analytics.php'; ?>
 </head>
 <body class="about">
     <?php echo $hsnav; ?>
     <h1 id="mgnavt"><?php _g('Code of Conduct')?></h1>
-    <div id="doc" class="yui-t7">
+    <div id="doc" class="yui-t7" style="margin-bottom: 0px;">>
         <div id="bd" role="main">
             <div class="yui-g">
                 <div class="para codeofconduct">
@@ -104,5 +105,6 @@ $dictionary = read_translation_file($locale, 'about/code-of-conduct');
             </div>
         </div>
     </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
 \ No newline at end of file
diff --git a/en/about/constitution/index.php b/en/about/constitution/index.php
index 320c502b1..fff6423d3 100644
--- a/en/about/constitution/index.php
+++ b/en/about/constitution/index.php
@@ -3,7 +3,7 @@ define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../../langs.php';
 
-$dictionary = read_translation_file($locale, "about/constitution");
+$dictionary = read_translation_file($locale, array('about/constitution', 'common_footer'));
 
 // Note to translators: _r('Note to translators! PLEASE READ THIS LINE! YOU DON\'T NEED TO TRANSLATE IT! Please translate constitution in file "mageia.org_statutes_fr.md" or "mageia.org_statutes_en.md" as a fallback first. Check wiki for details.')
 
@@ -16,12 +16,13 @@ $dictionary = read_translation_file($locale, "about/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'; ?>
 </head>
 <body class="about constitution">
     <?php echo $hsnav; ?>
     <h1 id="mgnavt"><?php _g('Mageia.Org constitution')?></h1>
-    <div id="doc4" class="yui-t7">
+    <div id="doc4" class="yui-t7" style="margin-bottom: 0px;">
         <div id="bd" role="main">
             <div class="yui-g">
                 <div class="para preambule">
@@ -44,5 +45,6 @@ $dictionary = read_translation_file($locale, "about/constitution");
             </div>
         </div>
     </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
diff --git a/en/about/license/index.php b/en/about/license/index.php
index 9f70aa158..9047ebddf 100644
--- a/en/about/license/index.php
+++ b/en/about/license/index.php
@@ -3,7 +3,7 @@ define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../../langs.php';
 
-$dictionary = read_translation_file($locale, 'about/license');
+$dictionary = read_translation_file($locale, array('about/license', 'common_footer'));
 
 require('license.php');
 $prepared_license_strings = read_license_from_vcs($locale);
@@ -16,6 +16,7 @@ $prepared_license_strings = read_license_from_vcs($locale);
     <meta charset="utf-8">
     <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; }
@@ -25,7 +26,7 @@ $prepared_license_strings = read_license_from_vcs($locale);
 <body class="about">
     <?php echo $hsnav; ?>
     <h1 id="mgnavtitle"><?php _g('Mageia license')?></h1>
-    <div id="doc" class="yui-t7">
+    <div id="doc" class="yui-t7" style="margin-bottom: 0px;">
 	<div id="bd" role="main" class="para">
         <section>
             <?php
@@ -51,5 +52,6 @@ $prepared_license_strings = read_license_from_vcs($locale);
         </section>
     </div>
     </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
diff --git a/en/about/media/index.php b/en/about/media/index.php
index 3998a29df..c02c428f1 100644
--- a/en/about/media/index.php
+++ b/en/about/media/index.php
@@ -3,7 +3,7 @@ define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../../langs.php';
 
-$dictionary = read_translation_file($locale, "about/media");
+$dictionary = read_translation_file($locale, array('about/media', 'common_footer'));
 
 ?><!DOCTYPE html>
 <html dir="ltr" lang="<?php echo $locale ?>">
@@ -14,12 +14,13 @@ $dictionary = read_translation_file($locale, "about/media");
     <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 include '../../../analytics.php'; ?>
 </head>
 <body class="about">
     <?php echo $hsnav; ?>
     <h1 id="mgnavtitle"><?php _g('Media files')?></h1>
-    <div id="doc" class="yui-t7">
+    <div id="doc" class="yui-t7" style="margin-bottom: 0px;">
         <div id="bd" role="main">
             <div class="yui-g"><div class="para">
                 <h2><?php _g('Official Logo')?></h2>
@@ -41,7 +42,7 @@ $dictionary = read_translation_file($locale, "about/media");
 			<td><?php echo sprintf(_r('%sPNG</a> or %sSVG</a>'), '<a href="/g/media/logo/mageia-2013-alpha.png">', '<a href="/g/media/logo/mageia-2013-alpha.svg">') ?></td>
 		</tr>
 		</table>
-		
+
 		<br>
 		<?php 
 			_g('The font used for the logo can be downloaded <a href="%s">here</a>.',array('http://openfontlibrary.org/en/font/nicoduv'),'p' )
@@ -79,13 +80,14 @@ $dictionary = read_translation_file($locale, "about/media");
                     <a href="/g/media/covers/print-2.png"><img src="/g/media/covers/t-print-2.png" alt="<?php _g('Mageia 1 CD/DVD')?>" title="<?php _g('Mageia 1 CD/DVD')?>"></a>
                     <a href="/g/media/covers/print-3.png"><img src="/g/media/covers/t-print-3.png" alt="<?php _g('Mageia 1 CD/DVD')?>" title="<?php _g('Mageia 1 CD/DVD')?>"></a></p>
                 <p><?php _g('Licensed under CC-By-SA by Julie Guennegues.')?></p>
-                    
+
                 <hr>
-                
+
                 <p><?php _g('Please consult <a href="https://wiki.mageia.org/en/Atelier_team">atelier team</a> if you have questions/concerns about using these files.')?></p>
-                
+
             </div></div>
         </div>
     </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
diff --git a/en/about/policies/privacy/index.php b/en/about/policies/privacy/index.php
index 61bcb779c..8d23f04cd 100644
--- a/en/about/policies/privacy/index.php
+++ b/en/about/policies/privacy/index.php
@@ -3,7 +3,7 @@ define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../../../langs.php';
 
-$dictionary = read_translation_file($locale, "about/policies/privacy");
+$dictionary = read_translation_file($locale, array('about/policies/privacy', 'common_footer'));
 
 ?><!DOCTYPE html>
 <html lang="<?php echo $locale; ?>" dir="ltr">
@@ -12,12 +12,13 @@ $dictionary = read_translation_file($locale, "about/policies/privacy");
     <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'; ?>
 </head>
 <body class="about">
     <?php echo $hsnav; ?>
     <h1 id="mgnavt"><?php _g('Policies')?></h1>
-    <div id="doc" class="yui-t7">
+    <div id="doc" class="yui-t7" style="margin-bottom: 0px;">
         <div id="bd" role="main">
             <div class="yui-g">
                 <div class="para donate" style="padding-top: 2em;">
@@ -44,5 +45,6 @@ _r('https://wiki.mageia.org/en/Privacy_policy'), 'p');
             </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 c3c33826d..c61cc7d7c 100644
--- a/en/about/reports/index.php
+++ b/en/about/reports/index.php
@@ -2,7 +2,7 @@
 define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../../langs.php';
-$dictionary = read_translation_file($locale, 'about/reports');
+$dictionary = read_translation_file($locale, array('about/reports', 'common_footer'));
 ?><!DOCTYPE html>
 <html dir="ltr" lang="<?php echo $locale; ?>">
 <head>
@@ -12,12 +12,13 @@ $dictionary = read_translation_file($locale, 'about/reports');
     <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'; ?>
 </head>
 <body class="about">
     <?php echo $hsnav; ?>
     <h1 id="mgnavt"><?php _g('Activity Reports')?></h1>
-    <div id="doc" class="yui-t7">
+    <div id="doc" class="yui-t7" style="margin-bottom: 0px;">
         <div id="bd" role="main">
             <div class="yui-g">
                 <div class="para values">
@@ -35,5 +36,6 @@ $dictionary = read_translation_file($locale, 'about/reports');
             </div>
         </div>
     </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
diff --git a/en/about/values/index.php b/en/about/values/index.php
index 9791768f9..018fc1704 100644
--- a/en/about/values/index.php
+++ b/en/about/values/index.php
@@ -2,7 +2,7 @@
 define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../../langs.php';
-$dictionary = read_translation_file($locale, 'about/values');
+$dictionary = read_translation_file($locale, array('about/values', 'common_footer'));
 ?><!DOCTYPE html>
 <html dir="ltr" lang="<?php echo $locale; ?>">
 <head>
@@ -12,12 +12,13 @@ $dictionary = read_translation_file($locale, 'about/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'; ?>
 </head>
 <body class="about">
     <?php echo $hsnav; ?>
     <h1 id="mgnavt"><?php _g('Values')?></h1>
-    <div id="doc" class="yui-t7">
+    <div id="doc" class="yui-t7" style="margin-bottom: 0px;">
         <div id="bd" role="main">
             <div class="yui-g">
                 <div class="para values">
@@ -72,5 +73,6 @@ $dictionary = read_translation_file($locale, 'about/values');
             </div>
         </div>
     </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
diff --git a/en/contact/index.php b/en/contact/index.php
index bc54451ef..8a81d87eb 100644
--- a/en/contact/index.php
+++ b/en/contact/index.php
@@ -2,7 +2,7 @@
 define('HLANG', true);
 define('ALIGNMENT', 'Center'); 
 require '../../langs.php';
-$dictionary = read_translation_file($locale, 'contact');
+$dictionary = read_translation_file($locale, array('contact', 'common_footer'));
 ?><!DOCTYPE html>
 <html lang="<?php echo $locale; ?>">
 <head>
@@ -12,6 +12,7 @@ $dictionary = read_translation_file($locale, 'contact');
     <meta name="keywords" content="<?php _g('mageia, contact, mail, press, people, board, council, mailing lists')?>">
     <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">
     <link rel="canonical" href="/<?php echo $locale; ?>/contact/">
     <style> .para { text-align: left; float: left; width: 250px; display: block; border-right: 1px solid #eef; border-bottom: 1px solid #eef; }</style>
     <?php include '../../analytics.php'; ?>
@@ -19,7 +20,7 @@ $dictionary = read_translation_file($locale, 'contact');
 <body class="contact">
     <?php echo $hsnav; ?>
     <h1 id="mgnavtitle"><?php _g('Contact Us')?></h1>
-<div style="margin:auto;display: table;margin: 1em auto 2em;border-radius: 10px;box-shadow: 0px 0px 6px #555;overflow: hidden;background: none repeat scroll 0% 0% #FFF;">
+<div style="display: table;margin: 1em auto 0;border-radius: 10px;box-shadow: 0px 0px 6px #555;overflow: hidden;background: none repeat scroll 0% 0% #FFF;">
       <div class="para" style="width: 300px;">
             <?php
             _g('You are looking for support', null, 'h2');
@@ -77,5 +78,6 @@ $dictionary = read_translation_file($locale, 'contact');
             <hr>
         </div>
 </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
diff --git a/en/contribute/index.php b/en/contribute/index.php
index 9f43fdef7..35b52fbea 100644
--- a/en/contribute/index.php
+++ b/en/contribute/index.php
@@ -3,7 +3,7 @@
 define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../langs.php';
-$dictionary = read_translation_file($locale, 'contribute');
+$dictionary = read_translation_file($locale, array('contribute', 'common_footer'));
 
 ?><!DOCTYPE html>
 <html lang="<?php echo $locale; ?>">
@@ -14,6 +14,7 @@ $dictionary = read_translation_file($locale, 'contribute');
     <meta name="keywords" content="<?php _g('mageia, contribute, howto, operating system')?>">
     <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">
     <link rel="canonical" href="/<?php echo $locale; ?>/contribute/">
     <?php include '../../analytics.php'; ?>
     <style> .para {text-align:justify;}</style>
@@ -21,7 +22,7 @@ $dictionary = read_translation_file($locale, 'contribute');
 <body id="top" class="contribute">
     <?php echo $hsnav; ?>
     <h1 id="mgnavtitle"><?php _g('Contribute to Mageia')?></h1>
-    <div id="doc5" class="yui-t7">
+    <div id="doc5" class="yui-t7" style="margin-bottom: 0px;">
     <div class="yui-ge">
         <div class="para bb1" style="padding-top: 2em;">
             <p><?php _g('Many people from all over the world gather to build Mageia &ndash; a Linux-based operating system <em>and</em> a <a href="../about/code-of-conduct/">lively, fun community</a> for <a href="../about/values/">building Free Software projects</a>.')?></p>
@@ -121,5 +122,6 @@ $dictionary = read_translation_file($locale, 'contribute');
     </div>
 </div>
 </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
diff --git a/en/donate/index.php b/en/donate/index.php
index 014d5a056..03dba11b2 100644
--- a/en/donate/index.php
+++ b/en/donate/index.php
@@ -2,7 +2,7 @@
 define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../langs.php';
-$dictionary = read_translation_file($locale, 'donate');
+$dictionary = read_translation_file($locale, array('donate', 'common_footer'));
 ?><!DOCTYPE html>
 <html dir="ltr" lang="<?php echo $locale; ?>">
 <head>
@@ -12,6 +12,7 @@ $dictionary = read_translation_file($locale, 'donate');
     <meta name="keywords" content="<?php _g('mageia, donate, donation, donors, help'); ?>">
     <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">
     <link rel="canonical" href="/<?php echo $locale; ?>/donate/">
     <?php include '../../analytics.php'; ?>
     <style>
@@ -25,7 +26,7 @@ $dictionary = read_translation_file($locale, 'donate');
 <body class="donate">
     <?php echo $hsnav; ?>
     <h1 id="mgnavt"><?php _g('Donate to Mageia')?></h1>
-    <div id="doc2" class="yui-t7">
+    <div id="doc2" class="yui-t7" style="margin-bottom: 0px;">
     <div class="yui-ge">
        <div class="yui-u first" style="width:50%"> 
         <div class="para">
@@ -108,5 +109,6 @@ People can choose how to distribute their donation among those:
     </div>
 </div>
 </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
diff --git a/en/downloads/get/index.php b/en/downloads/get/index.php
index 34826e7b9..3a394dbbb 100644
--- a/en/downloads/get/index.php
+++ b/en/downloads/get/index.php
@@ -53,7 +53,7 @@ if (is_null($product)) {
 define('HLANG', true);
 define('ALIGNMENT', 'Center');
 require '../../../langs.php';
-$dictionary = read_translation_file($locale, "downloads/get");
+$dictionary = read_translation_file($locale, array('downloads/get', 'common_footer'));
 
 session_start();
 
@@ -208,6 +208,7 @@ if ($debug)
     <title><?php echo $title; ?> | <?php _g('Mageia Downloads') ?></title>
     <meta name="robots" content="noindex,nofollow,nosnippet">
     <link rel="stylesheet" type="text/css" href="/g/style/all.css">
+    <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css">
     <?php
 if (!isset($_SERVER['APP_MODE']) || $_SERVER['APP_MODE'] == 'prod') {
     include '../../../analytics.php';
@@ -218,7 +219,7 @@ if (!isset($_SERVER['APP_MODE']) || $_SERVER['APP_MODE'] == 'prod') {
 <body class="downloads">
     <?php echo $hsnav; ?>
     <h1 id="mgnavt"><?php echo sprintf(_r('Download %s'), '<em class="tag">' . $title . '</em>')?></h1>
-    <div id="doc4" class="yui-t7">
+    <div id="doc4" class="yui-t7" style="margin-bottom: 0px;">
         <div id="bd" role="main">
             <?php if (!is_null($download)): ?>
                 <div class="yui-g"><div class="para" style="padding-top: 2em;">
@@ -353,5 +354,6 @@ document.getElementById("other_mirrors_btn").onclick = function () {
   {lang: '<?php echo $locale; ?>'}
 </script>
 </div>
+<?php echo common_footer($locale); ?>
 </body>
 </html>
author	filip <filip.komar@gmail.com>	2016-06-28 23:25:17 +0200
committer	filip <filip.komar@gmail.com>	2016-06-28 23:25:17 +0200
commit	4942a149658d442ec06d68afbcbbdc42d6a4eefd (patch)
tree	6f3ec8bbdbeb85a5549d58efe8c91775917cc6fa
parent	05db764b04c1de4d458b1687dd1174468f40fc07 (diff)
download	www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar.gz www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar.bz2 www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar.xz www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.zip