diff options
author | Romain d'Alverny <rda@mageia.org> | 2010-11-06 16:34:51 +0000 |
---|---|---|
committer | Romain d'Alverny <rda@mageia.org> | 2010-11-06 16:34:51 +0000 |
commit | ae4009c1052d9e6163a24c2668dd4d9e039bf3fc (patch) | |
tree | ea45fc747fa4a747ad4952ee10a6b5b639c79627 /root/template | |
parent | ac10cc90fe99a465aaba747a32f469237bcd723e (diff) | |
download | identity-ae4009c1052d9e6163a24c2668dd4d9e039bf3fc.tar identity-ae4009c1052d9e6163a24c2668dd4d9e039bf3fc.tar.gz identity-ae4009c1052d9e6163a24c2668dd4d9e039bf3fc.tar.bz2 identity-ae4009c1052d9e6163a24c2668dd4d9e039bf3fc.tar.xz identity-ae4009c1052d9e6163a24c2668dd4d9e039bf3fc.zip |
more HTML cleanup, doc structure/style broken for now
Diffstat (limited to 'root/template')
-rw-r--r-- | root/template/header | 6 | ||||
-rw-r--r-- | root/template/html | 2 | ||||
-rw-r--r-- | root/template/layout | 51 |
3 files changed, 22 insertions, 37 deletions
diff --git a/root/template/header b/root/template/header index 4812ea7..84b795d 100644 --- a/root/template/header +++ b/root/template/header @@ -1,8 +1,6 @@ -<div class="masthead"> - <h1>[% c.config.apptitle %]</h1> -</div> +<p>[% template.title or site.title or c.config.apptitle %]</p> + <div class="hnav"> - <!--div class="hnav" --> <ul class="hnav"> [% FOREACH page IN pages %] <li><a href="[% c.uri_for(page.page) %]">[% page.title %]</a></li> diff --git a/root/template/html b/root/template/html index d28ca35..93488ef 100644 --- a/root/template/html +++ b/root/template/html @@ -3,7 +3,7 @@ <html lang="en" dir="ltr"> <head> <meta charset="utf-8" /> - <title>[% template.title or site.title %]</title> + <title>[% template.title or site.title or c.config.apptitle %]</title> <meta content="description" value="" /> <meta content="robots" value="index,nofollow" /> <link rel="stylesheet" href="/ttsite.css" /> diff --git a/root/template/layout b/root/template/layout index 3d7bc10..8c80b34 100644 --- a/root/template/layout +++ b/root/template/layout @@ -1,37 +1,24 @@ <div id="header">[% PROCESS template/header %]</div> -<div id="outerColumnContainer"> - <div id="leftColumn"> - <div class="inside"> - <div class="vnav"> - <ul> - [% FOREACH subpage IN subpages %] - <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> - [% END %] - </ul> - </div> - </div> - </div> +<ul id="nav"> +[% FOREACH subpage IN subpages %] + <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> +[% END %] +</ul> - <div id="innerColumnContainer"> - <!-- div id="SOWrap" --> - <div id="middleColumn"> - <div class="inside"> - [% IF errors %] - <span class="error"> - [% FOREACH error IN errors %] - [% error %]<br/> - [% END %] - </span> - [% END %] - <div id="content"> - [% content %] - </div> - </div> - <div class="clear"></div> - </div> - <div class="clear"></div> - </div> +<div class="inside"> +[% IF errors %] + <span class="error"> + [% FOREACH error IN errors %] + [% error %] + <br/> + [% END %] + </span> +[% END %] </div> -<!-- div id="footer">[% PROCESS template/footer %]</div --> +<div id="content"> + [% content %] +</div> + +<div id="footer">[% PROCESS template/footer %]</div> |