aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2016-06-28 18:33:45 +0200
committerfilip <filip.komar@gmail.com>2016-06-28 18:33:45 +0200
commit919bbda416c2add0463b2ae2fcf5b802f4efd59a (patch)
tree7a91b14f81972daff62cfd9a817f3f91218e6f4d /en
parent80c9f1c7aef4eb6500d7f3f907357cb878df5812 (diff)
downloadwww-919bbda416c2add0463b2ae2fcf5b802f4efd59a.tar
www-919bbda416c2add0463b2ae2fcf5b802f4efd59a.tar.gz
www-919bbda416c2add0463b2ae2fcf5b802f4efd59a.tar.bz2
www-919bbda416c2add0463b2ae2fcf5b802f4efd59a.tar.xz
www-919bbda416c2add0463b2ae2fcf5b802f4efd59a.zip
start with the common footer on some pages
+ separate function for it + separate css for it + expanding i18n function for that purpose (to accept more than one gettext file)
Diffstat (limited to 'en')
-rwxr-xr-xen/5/download_index.php6
-rw-r--r--en/about/index.php6
-rw-r--r--en/doc/archive.php9
-rw-r--r--en/doc/index.php9
-rw-r--r--en/index.php29
-rw-r--r--en/map/index.php4
-rw-r--r--en/support/index.php6
7 files changed, 24 insertions, 45 deletions
diff --git a/en/5/download_index.php b/en/5/download_index.php
index 058653ddd..1b01b5e98 100755
--- a/en/5/download_index.php
+++ b/en/5/download_index.php
@@ -13,7 +13,7 @@ define('HLANG', true);
define('ALIGNMENT', 'Center');
require '../../langs.php';
-$dictionary = read_translation_file($locale, "5");
+$dictionary = read_translation_file($locale, array('5', 'common_footer'));
function get_mageia($name, $version, $release)
{
@@ -133,6 +133,7 @@ input[type="radio"], input[type="submit"] {
border-radius: 6px;
}
</style>
+<link rel="stylesheet" type="text/css" href="/g/style/common_footer.css">
</head>
<body class="release downloads">
<?php echo $hsnav; ?>
@@ -140,7 +141,7 @@ input[type="radio"], input[type="submit"] {
<h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1>
<?php include '../5/nav.php'; ?>
- <div id="doc4" class="yui-t7">
+ <div id="doc4" class="yui-t7" style="margin-bottom: 0px;">
<div id="bd" role="main">
<div class="yui-ge bb1">
<div class="yui-u first rb1">
@@ -626,5 +627,6 @@ $('img.lazy').each(function(){
});
</script>
+<?php echo common_footer($locale); ?>
</body>
</html>
diff --git a/en/about/index.php b/en/about/index.php
index 62043c885..4eadd7490 100644
--- a/en/about/index.php
+++ b/en/about/index.php
@@ -3,7 +3,7 @@ define('HLANG', true);
define('ALIGNMENT', 'Center');
require '../../langs.php';
-$dictionary = read_translation_file($locale, "about");
+$dictionary = read_translation_file($locale, array('about', 'common_footer'));
?><!DOCTYPE html>
<html dir="ltr" lang="<?php echo $locale ?>">
@@ -22,11 +22,12 @@ $dictionary = read_translation_file($locale, "about");
width: 500px;
}
</style>
+ <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css">
</head>
<body class="about">
<?php echo $hsnav; ?>
<h1 id="mgnavtitle"><?php _g('About Mageia')?></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" style="padding-top: 2em;">
<img src="/g/media/logo/mageia-2013.svg" id="abtlg" alt="Mageia">
@@ -92,5 +93,6 @@ $dictionary = read_translation_file($locale, "about");
</div></div>
</div>
</div>
+<?php echo common_footer($locale); ?>
</body>
</html>
diff --git a/en/doc/archive.php b/en/doc/archive.php
index f67c870eb..a873f946c 100644
--- a/en/doc/archive.php
+++ b/en/doc/archive.php
@@ -2,7 +2,7 @@
define('HLANG', true);
define('ALIGNMENT', 'Center');
require '../../langs.php';
-$dictionary = read_translation_file($locale, 'documentation');
+$dictionary = read_translation_file($locale, array('documentation', 'common_footer'));
require 'doc.php';
?><!DOCTYPE html>
@@ -13,6 +13,7 @@ require 'doc.php';
<meta name="description" content="<?php _g('Documentation for previous releases of Mageia distribution and its tools.')?>">
<meta name="keywords" content="<?php _g('doc,documentation,help,guide,installer,installation,mageia,linux')?>">
<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="doc">
@@ -58,10 +59,6 @@ require 'doc.php';
</div>
</div>
</div>
- <div style="margin-left: 2em;">
- <hr>
- <p><a href="/<?php echo $locale; ?>/map/"><?php _g('Mageia sitemap')?></a>
- | <a href="/<?php echo $locale; ?>/support/"><?php _g('Support')?></a></p>
- </div>
+<?php echo common_footer($locale); ?>
</body>
</html>
diff --git a/en/doc/index.php b/en/doc/index.php
index 880b2549d..12027bfb5 100644
--- a/en/doc/index.php
+++ b/en/doc/index.php
@@ -2,7 +2,7 @@
define('HLANG', true);
define('ALIGNMENT', 'Center');
require '../../langs.php';
-$dictionary = read_translation_file($locale, 'documentation');
+$dictionary = read_translation_file($locale, array('documentation', 'common_footer'));
require 'doc.php';
@@ -15,6 +15,7 @@ require 'doc.php';
<meta name="description" content="<?php _g('Documentation for Mageia distribution and its tools.')?>">
<meta name="keywords" content="<?php _g('doc,documentation,help,guide,installer,installation,mageia,linux')?>">
<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="doc">
@@ -41,10 +42,6 @@ require 'doc.php';
</div>
</div>
</div>
- <div style="margin-left: 2em;">
- <hr>
- <p><a href="/<?php echo $locale; ?>/map/"><?php _g('Mageia sitemap')?></a>
- | <a href="/<?php echo $locale; ?>/support/"><?php _g('Support')?></a></p>
- </div>
+<?php echo common_footer($locale); ?>
</body>
</html>
diff --git a/en/index.php b/en/index.php
index 7ee7499eb..a72dd5339 100644
--- a/en/index.php
+++ b/en/index.php
@@ -4,15 +4,7 @@
define('HLANG', true);
define('ALIGNMENT', 'Center');
require '../langs.php';
-$dictionary_1 = read_translation_file($locale, 'index');
-$dictionary_2 = read_translation_file($locale, 'news');
-$dictionary = array_merge($dictionary_1, $dictionary_2);
-
-$nav = array(
- 'nav-support' => array('support/', _r('Support')),
- 'nav-community' => array('community/', _r('Community')),
- 'nav-about' => array('about/', _r('About&nbsp;Mageia.Org'))
-);
+$dictionary = read_translation_file($locale, array('index', 'news', 'common_footer'));
?><!DOCTYPE html>
<html dir="ltr" lang="<?php echo $locale; ?>">
@@ -141,7 +133,7 @@ $nav = array(
font: 60%/1.2 Verdana,Arial,sans-serif;
color: #f0f0f0;
}
- #fnotes a { color: #ccc; text-decoration: none; }
+ #fnotes a { color: #aaa; text-decoration: none; }
.free-dl { color: green; font-weight: bold; }
/* Landscape phones and down */
@@ -285,22 +277,7 @@ $nav = array(
</div>
</div>
</div>
-<hr>
-<div id="down">
- <div class="container">
- <ul id="navb"><?php foreach ($nav as $k => $v)
- echo sprintf(
- '<li><a class="%s" href="%s">%s</a></li>',
- $k, $v[0], $v[1]
- );
- ?></ul>
- <hr>
- <p id="fnotes">
- <a href="/<?php echo $locale ?>/map/"><?php _g('Sitemap')?></a>
- | <a href="/<?php echo $locale ?>/about/policies/privacy/"><?php _g('Privacy policy')?></a>
- </p>
- </div>
-</div>
+<?php echo common_footer($locale); ?>
</body>
</html>
diff --git a/en/map/index.php b/en/map/index.php
index af3c263af..3fe54c3a9 100644
--- a/en/map/index.php
+++ b/en/map/index.php
@@ -2,7 +2,7 @@
define('HLANG', true);
define('ALIGNMENT', 'Center');
require '../../langs.php';
-$dictionary = read_translation_file($locale, 'map');
+$dictionary = read_translation_file($locale, array('map', 'common_footer'));
$map = array(
'about' => array(
@@ -126,6 +126,7 @@ $sMap .= '</ul>';
<meta name="robots" content="noindex,nofollow,nosnippet">
<link rel="canonical" href="/<?php echo $locale; ?>/map/">
<link rel="stylesheet" href="map.css">
+ <link rel="stylesheet" type="text/css" href="/g/style/common_footer.css">
<?php include '../../analytics.php'; ?>
</head>
<body class="map">
@@ -141,5 +142,6 @@ $sMap .= '</ul>';
<p><form><input type="search"><input type="submit"></form></p>
-->
</div>
+<?php echo common_footer($locale); ?>
</body>
</html>
diff --git a/en/support/index.php b/en/support/index.php
index 9d41238cb..fd298062c 100644
--- a/en/support/index.php
+++ b/en/support/index.php
@@ -2,7 +2,7 @@
define('HLANG', true);
define('ALIGNMENT', 'Center');
require '../../langs.php';
-$dictionary = read_translation_file($locale, 'support');
+$dictionary = read_translation_file($locale, array('support', 'common_footer'));
?><!DOCTYPE html>
<html dir="ltr" lang="<?php echo $locale; ?>">
@@ -13,6 +13,7 @@ $dictionary = read_translation_file($locale, 'support');
<meta name="keywords" content="<?php _g('mageia, linux, support, help, hardware, qa, test')?>">
<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="support">
@@ -29,7 +30,7 @@ $dictionary = read_translation_file($locale, 'support');
<li><a href="//bugs.mageia.org/"><?php _g('Bugs Reports')?></a></li>
</ul>
</header>
- <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;">
@@ -103,5 +104,6 @@ $dictionary = read_translation_file($locale, 'support');
</div>
</div>
</div>
+<?php echo common_footer($locale); ?>
</body>
</html>
generated by cgit v1.2.1 (git 2.21.0) at 2024-05-10 10:12:53 +0000