aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2016-06-30 22:18:45 +0200
committerfilip <filip.komar@gmail.com>2016-06-30 22:18:45 +0200
commit435d9d0f5e1e25edf579071703d458375a975ef9 (patch)
tree16d88b5435ffc167b1e2ec351997ee0fff95afe9
parentb95ca1348944895976c63ee0502e3eec3e709407 (diff)
downloadwww-435d9d0f5e1e25edf579071703d458375a975ef9.tar
www-435d9d0f5e1e25edf579071703d458375a975ef9.tar.gz
www-435d9d0f5e1e25edf579071703d458375a975ef9.tar.bz2
www-435d9d0f5e1e25edf579071703d458375a975ef9.tar.xz
www-435d9d0f5e1e25edf579071703d458375a975ef9.zip
common footer added to last two active pages +
+ small fix for local locale parse error
-rw-r--r--404.php8
-rwxr-xr-xen/4/download_index.php6
2 files changed, 9 insertions, 5 deletions
diff --git a/404.php b/404.php
index 4ae1d9f8a..1e71d814d 100644
--- a/404.php
+++ b/404.php
@@ -2,10 +2,10 @@
define('HLANG', true);
define('ALIGNMENT', 'Center');
require 'langs.php'; // needs absolute path in some form to be link depth independent
-$dictionary = read_translation_file($locale, '404');
+$locale = ($locale == '404.php' ? 'en' : $locale);
+$dictionary = read_translation_file($locale, array('404', 'common_footer'));
header('HTTP/1.0 404 Not Found');
header('Status: 404 Not Found');
-$locale = ($locale == '404' ? 'en' : $locale);
?><!DOCTYPE html>
<html dir="ltr" lang="<?php echo $locale; ?>">
<head>
@@ -15,12 +15,13 @@ $locale = ($locale == '404' ? 'en' : $locale);
<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 include 'analytics.php'; ?>
</head>
<body>
<?php echo $hsnav; ?>
<h1 id="mgnavt"><?php _g('Sorry, we could not find this page.')?></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">
@@ -32,5 +33,6 @@ $locale = ($locale == '404' ? 'en' : $locale);
</div>
</div>
</div>
+<?php echo common_footer($locale); ?>
</body>
</html>
diff --git a/en/4/download_index.php b/en/4/download_index.php
index 4bf250006..f5335621d 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -4,7 +4,7 @@ define('HLANG', true);
define('ALIGNMENT', 'Center');
require '../../langs.php';
-$dictionary = read_translation_file($locale, '4');
+$dictionary = read_translation_file($locale, array('4', 'common_footer'));
require '../downloads/get/lib.php';
function get_mageia_image_file_name($variant = null, $arch, $medium, $ext)
@@ -51,13 +51,14 @@ 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 include '../../analytics.php'; ?>
</head>
<body class="release downloads">
<?php echo $hsnav; ?>
<h1 id="mgnavt"><?php echo sprintf(_r('Download') . ' <strong>Mageia 4.1</strong>')?></h1>
<?php include '../4/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">
@@ -261,5 +262,6 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
</div>
</div>
</div>
+<?php echo common_footer($locale); ?>
</body>
</html>