aboutsummaryrefslogtreecommitdiffstats
path: root/en/about
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2016-06-28 23:25:17 +0200
committerfilip <filip.komar@gmail.com>2016-06-28 23:25:17 +0200
commit4942a149658d442ec06d68afbcbbdc42d6a4eefd (patch)
tree6f3ec8bbdbeb85a5549d58efe8c91775917cc6fa /en/about
parent05db764b04c1de4d458b1687dd1174468f40fc07 (diff)
downloadwww-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar
www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar.gz
www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar.bz2
www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.tar.xz
www-4942a149658d442ec06d68afbcbbdc42d6a4eefd.zip
common footer added to some more pages
Diffstat (limited to 'en/about')
-rw-r--r--en/about/code-of-conduct/index.php6
-rw-r--r--en/about/constitution/index.php6
-rw-r--r--en/about/license/index.php6
-rw-r--r--en/about/media/index.php14
-rw-r--r--en/about/policies/privacy/index.php6
-rw-r--r--en/about/reports/index.php6
-rw-r--r--en/about/values/index.php6
7 files changed, 32 insertions, 18 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>