From: <var...@us...> - 2021-12-16 17:24:42
|
Revision: 10799 http://sourceforge.net/p/phpwiki/code/10799 Author: vargenau Date: 2021-12-16 17:24:40 +0000 (Thu, 16 Dec 2021) Log Message: ----------- templates/body.tmpl: formatting Modified Paths: -------------- trunk/themes/Crao/templates/body.tmpl trunk/themes/MonoBook/templates/body.tmpl trunk/themes/Portland/templates/body.tmpl trunk/themes/Sidebar/templates/body.tmpl trunk/themes/Wordpress/templates/body.tmpl trunk/themes/blog/templates/body.tmpl trunk/themes/default/templates/body.tmpl trunk/themes/wikilens/templates/body.tmpl Modified: trunk/themes/Crao/templates/body.tmpl =================================================================== --- trunk/themes/Crao/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/Crao/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,23 +1,22 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > -<header role="banner"> -<div id="header"><?php // for top toolbars style sheet ?> - <?php echo Template('top') ?> -</div> -</header> -<div class="toolbar"><?php echo Template('navbar') ?></div> -<?php // Page content ?> -<div id="content"> -<?php if (isset($HEADER)) { ?> -<?php // Page title ?> -<h1><?php echo $HEADER ?></h1> -<?php } ?> -<main role="main"> -<?php echo $CONTENT ?> -</main> -<?php echo Template('bottom') ?> -</div> -<?php if (isset($revision)) { ?> -<?php // Actionbar ?> -<?php echo Template('actionbar') ?> -<?php } ?> + <header role="banner"> + <div id="header"> + <?php echo Template('top') ?> + </div> + </header> + <div class="toolbar"> + <?php echo Template('navbar') ?> + </div> + <div id="content"> + <?php if (isset($HEADER)) { ?> + <h1><?php echo $HEADER ?></h1> + <?php } ?> + <main role="main"> + <?php echo $CONTENT ?> + </main> + <?php echo Template('bottom') ?> + </div> + <?php if (isset($revision)) { ?> + <?php echo Template('actionbar') ?> + <?php } ?> </body> Modified: trunk/themes/MonoBook/templates/body.tmpl =================================================================== --- trunk/themes/MonoBook/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/MonoBook/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -8,8 +8,6 @@ <main role="main"> <div id="bodyContent"> <?php echo $CONTENT ?> - - <?php // end content ?> <div class="clear-floats"></div> </div> </main> Modified: trunk/themes/Portland/templates/body.tmpl =================================================================== --- trunk/themes/Portland/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/Portland/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,19 +1,15 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > -<header role="banner"> -<?php // Page title and logo ?> -<h1><a class="wikilink" + <header role="banner"> + <h1><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>" ><img src="<?php echo $WikiTheme->getImageURL('logo')?>" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" - class="bottom" /></a> <?php echo $HEADER?></h1> -</header> -<main role="main"> -<?php echo $CONTENT ?> -</main> -<?php echo Template('navbar') ?> -<?php // RELATEDPAGES were here. ?> - -<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> - -<?php echo Template('bottom') ?> + class="bottom" /></a> <?php echo $HEADER ?></h1> + </header> + <main role="main"> + <?php echo $CONTENT ?> + </main> + <?php echo Template('navbar') ?> + <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> + <?php echo Template('bottom') ?> </body> Modified: trunk/themes/Sidebar/templates/body.tmpl =================================================================== --- trunk/themes/Sidebar/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/Sidebar/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,14 +1,14 @@ - <body <?php echo $WikiTheme->getMoreAttr('body') ?> > +<body <?php echo $WikiTheme->getMoreAttr('body') ?> > <div id="global-wrapper"> <div id="column-content"> <div id="content"> - <main role="main"> + <main role="main"> <?php echo Template('top') ?> <div id="bodyContent"> <?php echo $CONTENT ?> <div class="clear-floats"></div> </div> - </main> + </main> </div> <?php if (!$WikiTheme->DUMP_MODE) { ?> <?php echo Template('logo') ?> @@ -32,4 +32,4 @@ </div> <?php } // !DUMP_MODE ?> </div> - </body> +</body> Modified: trunk/themes/Wordpress/templates/body.tmpl =================================================================== --- trunk/themes/Wordpress/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/Wordpress/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,18 +1,11 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > - -<header role="banner"> -<?php // Page title ?> -<h1 id="header"><?php echo $HEADER ?></h1> -</header> -<main role="main"> -<?php // Page title and logo ?> -<?php echo $CONTENT ?> -</main> -<?php echo Template('navbar') ?> -<?php // RELATEDPAGES were here. ?> - -<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> - -<?php echo Template('bottom') ?> - + <header role="banner"> + <h1 id="header"><?php echo $HEADER ?></h1> + </header> + <main role="main"> + <?php echo $CONTENT ?> + </main> + <?php echo Template('navbar') ?> + <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> + <?php echo Template('bottom') ?> </body> Modified: trunk/themes/blog/templates/body.tmpl =================================================================== --- trunk/themes/blog/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/blog/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,22 +1,18 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > -<div id="page"> -<?php echo Template('top') ?> - -<?php // $CONTENT includes browse.tmpl ?> -<div id="pagetitle"> -<h1 id="pagetitleText"><?php echo $HEADER ?></h1></div> -<main role="main"> -<div id="bodyContent"> -<?php echo $CONTENT?> -</div> -</main> - -<div id="bottom"> -<?php echo Template('bottom') ?> -</div> -<div id="footer"> -<?php echo Template('browse-footer') ?> -</div> - -</div> + <div id="page"> + <?php echo Template('top') ?> + <div id="pagetitle"> + <h1 id="pagetitleText"><?php echo $HEADER ?></h1></div> + <main role="main"> + <div id="bodyContent"> + <?php echo $CONTENT ?> + </div> + </main> + <div id="bottom"> + <?php echo Template('bottom') ?> + </div> + <div id="footer"> + <?php echo Template('browse-footer') ?> + </div> + </div> </body> Modified: trunk/themes/default/templates/body.tmpl =================================================================== --- trunk/themes/default/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/default/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,13 +1,13 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > -<header role="banner"> -<div id="header"> - <?php echo Template('top') ?> -</div> -</header> -<main role="main"> -<div id="content"> -<?php echo $CONTENT ?> -</div> -</main> -<?php echo Template('bottom') ?> + <header role="banner"> + <div id="header"> + <?php echo Template('top') ?> + </div> + </header> + <main role="main"> + <div id="content"> + <?php echo $CONTENT ?> + </div> + </main> + <?php echo Template('bottom') ?> </body> Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/wikilens/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,40 +1,38 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > - -<table> -<tr> -<td colspan="2" class="header"> -<header role="banner"> -<div id="header"> - <?php echo Template('top') ?> -</div> -</header> + <table> + <tr> + <td colspan="2" class="header"> + <header role="banner"> + <div id="header"> + <?php echo Template('top') ?> + </div> + </header> + </td> + </tr> + <tr class="top"> + <td class="leftnav" style="width:120px"> + <nav role="navigation" aria-label="<?php echo _("Main Menu") ?>"> + <div class="toolbar"> + <?php echo Template('navbar') ?> + </div> + <hr /> + <<IncludePage page="LeftbarContent" quiet="true" >> + </nav> + </td> + <td class="content"> + <main role="main"> + <h1><?php echo $HEADER ?> + <?php if (!empty($user) && $user->isSignedIn()) { + $loader = new WikiPluginLoader(); + printXML(HTML::raw(" ")); + printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); + } ?> </h1> + <div id="content"> + <?php echo $CONTENT ?> + </div> + </main> + <?php echo Template('bottom') ?> </td> </tr> -<tr class="top"> -<td class="leftnav" style="width:120px"> -<nav role="navigation" aria-label="<?php echo _("Main Menu") ?>"> -<div class="toolbar"> - <?php echo Template('navbar') ?> -</div> -<hr /> -<<IncludePage page="LeftbarContent" quiet="true" >> -</nav> -</td> -<td class="content"> -<main role="main"> -<?php // Page title ?> -<h1><?php echo $HEADER ?> -<?php if (!empty($user) && $user->isSignedIn()) { - $loader = new WikiPluginLoader(); - printXML(HTML::raw(" ")); - printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); -} ?> </h1> -<div id="content"> -<?php echo $CONTENT ?> -</div> -</main> -<?php echo Template('bottom') ?> -</td> -</tr> </table> </body> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |