aboutsummaryrefslogtreecommitdiffstats
path: root/root
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2012-06-30 12:49:00 +0000
committerRomain d'Alverny <rda@mageia.org>2012-06-30 12:49:00 +0000
commit356df70bd3819e9326115a8908cf9bc4a62dbcb8 (patch)
treefe2af5479cbb4bf2cda7be4991961f9c7a1e2eb4 /root
parent561c4082d19c1d8a529a9d9ec4c67885fdc71a84 (diff)
downloadidentity-356df70bd3819e9326115a8908cf9bc4a62dbcb8.tar
identity-356df70bd3819e9326115a8908cf9bc4a62dbcb8.tar.gz
identity-356df70bd3819e9326115a8908cf9bc4a62dbcb8.tar.bz2
identity-356df70bd3819e9326115a8908cf9bc4a62dbcb8.tar.xz
identity-356df70bd3819e9326115a8908cf9bc4a62dbcb8.zip
reorganize header
Diffstat (limited to 'root')
-rw-r--r--root/template/header24
-rw-r--r--root/template/html5
-rw-r--r--root/template/layout3
3 files changed, 15 insertions, 17 deletions
diff --git a/root/template/header b/root/template/header
index 1a46ea9..d5168fa 100644
--- a/root/template/header
+++ b/root/template/header
@@ -1,13 +1,13 @@
-<h1 id="mgnt">[% template.title or site.title or c.config.apptitle %]</h1>
-
-<div class="hnav">
- <ul class="hnav">
- [% FOREACH page IN pages %]
- <li><a href="[% c.uri_for(page.page) %]">[% page.title %]</a></li>
- [% END %]
- [% IF c.user.username %]
- <li><strong><a href="[% c.uri_for("/user") %]">[% c.user.username %]</a></strong></li>
- <li><a href="/user/logout">[% l('Log out') %]</a></li>
- [% END %]
+<header id="mgnavt">
+ <h1>Your Mageia.Org user account</h1>
+ <ul>
+ [% FOREACH page IN pages %]
+ <li><a href="[% c.uri_for(page.page) %]">[% page.title %]</a></li>
+ [% END %]
+ [% IF c.user.username %]
+ <li><strong><a href="[% c.uri_for("/user") %]">[% c.user.username %]</a></strong></li>
+ <li><a href="/user/logout">[% l('Log out') %]</a></li>
+ [% END %]
+ <li><a href="https://wiki.mageia.org/en/FAQ:Accounts" title="Frequently Asked Questions" hreflang="en">FAQ</a></li>
</ul>
-</div>
+</header>
diff --git a/root/template/html b/root/template/html
index facc555..645c2a7 100644
--- a/root/template/html
+++ b/root/template/html
@@ -3,8 +3,8 @@
<head>
<meta charset="utf-8">
<title>[% template.title or site.title or c.config.apptitle %]</title>
- <meta name="description" content="Mageia.org online user account panel">
- <meta name="keywords" content="mageia, user, account, password">
+ <meta name="description" content="[% template.title or site.title or c.config.apptitle %]">
+ <meta name="keywords" content="mageia, user, account, password, compte, accès, identity, identité, utilisateur, participate, participez, contribute">
<meta name="robots" content="index,nofollow">
<link rel="stylesheet" type="text/css" href="/static/style/yui/reset-fonts-grids.css">
<link rel="stylesheet" type="text/css" href="/static/style/yui/base-min.css">
@@ -12,6 +12,7 @@
<link rel="icon" type="image/png" href="/g/favicon.png">
</head>
<body class="you">
+ [% PROCESS template/header %]
<div id="mgnavdoc">[% content %]</div>
<script src="//nav.mageia.org/js/"></script>
diff --git a/root/template/layout b/root/template/layout
index bd9201a..a03c0a3 100644
--- a/root/template/layout
+++ b/root/template/layout
@@ -1,7 +1,4 @@
<div id="doc" class="yui-t7">
- <div id="hd" role="banner">
- [% PROCESS template/header %]
- </div>
<div id="bd" role="main">
<div class="yui-g">
<ul id="nav">