aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2011-05-24 07:52:25 +0000
committerRomain d'Alverny <rda@mageia.org>2011-05-24 07:52:25 +0000
commitffe9d841fbfee004236cffcb0e73a66bc7852497 (patch)
treee8317791c88e524d233e45f1e9a228c33e90e150
parentbbcc276ec44ccf7c1ab86d819a0af741b1293b86 (diff)
downloadwww-ffe9d841fbfee004236cffcb0e73a66bc7852497.tar
www-ffe9d841fbfee004236cffcb0e73a66bc7852497.tar.gz
www-ffe9d841fbfee004236cffcb0e73a66bc7852497.tar.bz2
www-ffe9d841fbfee004236cffcb0e73a66bc7852497.tar.xz
www-ffe9d841fbfee004236cffcb0e73a66bc7852497.zip
small HTML adjustments
-rw-r--r--contribute/contribute.php20
-rw-r--r--contribute/index.php3
2 files changed, 12 insertions, 11 deletions
diff --git a/contribute/contribute.php b/contribute/contribute.php
index 47ba4bc6f..da844e19d 100644
--- a/contribute/contribute.php
+++ b/contribute/contribute.php
@@ -3,16 +3,14 @@
$locale = explode('/', $_SERVER['REQUEST_URI']);
$locale = $locale[1];
-include 'contribute_locales.php';
+require 'contribute_locales.php';
if (!array_key_exists($locale, $_t)) {
- $locale = 'en';
+ $locale = 'en';
}
$_t = $_t[$locale];
-include '../../langs.php';
?>
-
<!DOCTYPE html>
<html lang="<?php echo $locale; ?>">
<head>
@@ -22,10 +20,12 @@ include '../../langs.php';
<meta name="keywords" content="<?php echo $_t['page_kw']; ?>">
<meta name="author" content="Mageia">
<link rel="stylesheet" type="text/css" href="/g/style/all.css">
- <?php # include '../../analytics.php'; ?>
+ <link rel="canonical" href="/<?php echo $locale; ?>/contribute/">
+ <?php include '../../analytics.php'; ?>
</head>
<body id="top">
- <div id="doc" class="yui-t7">
+ <?php include '../../langs.php'; ?>
+ <div id="doc" class="yui-t7">
<div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1></div>
<div id="bd" role="main">
<div class="yui-g">
@@ -49,7 +49,8 @@ include '../../langs.php';
<li id=""><a href="#by-time">Browse by time</a></li>
</ul>
- <h2 id="by-role">Roles</h2>
+ <div id="by-role">
+ <h2>Roles</h2>
<ul id="contrib-roles" class="contrib-list">
<li id="support">
<h3>Helping users &amp; advocating the project</h3>
@@ -154,7 +155,9 @@ include '../../langs.php';
</li>
</ul>
<hr>
- <h2 id="by-time">Time</h2>
+ </div>
+ <div id="by-time">
+ <h2>Time</h2>
<p>How much free time do you have? and how much of it do you want to commit to Mageia?
See what you can do:</p>
<ul id="contrib-time" class="contrib-list">
@@ -190,6 +193,7 @@ include '../../langs.php';
</li>
</ul>
<hr>
+ </div>
</div>
</div>
</div>
diff --git a/contribute/index.php b/contribute/index.php
index aeaa7e3e1..faf557c76 100644
--- a/contribute/index.php
+++ b/contribute/index.php
@@ -1,7 +1,4 @@
<?php
require_once '../langs.inc.php';
-
relocate($langs, 'contribute/');
-
-?>