From: <var...@us...> - 2012-11-14 11:15:00
|
Revision: 8425 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8425&view=rev Author: vargenau Date: 2012-11-14 11:14:49 +0000 (Wed, 14 Nov 2012) Log Message: ----------- Use list instead of tables for menu Modified Paths: -------------- trunk/themes/fusionforge/templates/actionbar.tmpl Modified: trunk/themes/fusionforge/templates/actionbar.tmpl =================================================================== --- trunk/themes/fusionforge/templates/actionbar.tmpl 2012-11-14 10:11:31 UTC (rev 8424) +++ trunk/themes/fusionforge/templates/actionbar.tmpl 2012-11-14 11:14:49 UTC (rev 8425) @@ -7,47 +7,43 @@ $isBrowse = $request->getArg('action') == 'browse'; ?> - <div id="actionbuttons"> - <table cellpadding="0" cellspacing="0"> - <tr> - + <menu id="actionbuttons"> + <div> + <ul> <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?> <?php $talk = new WikiPageName('Talk:'.$pagename); ?> - <td class="bold"> + <li class="bold"> <?php echo Button(array(), $isActionPage ? _("Action Page") : _("Page"), $talk->getParent(), array('title' => "Page")) ?> - </td> - <td class="spacer"> </td> + </li> <?php if (!$isActionPage) { ?> <?php if ($dbh->isWikiPage($talk->getName())) { ?> - <td> + <li> <?php echo Button(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?> - </td> + </li> <?php } else { ?> - <td> + <li> <?php echo Button(array('action'=>'create', 'template'=>_("Template/Talk")), _("Discussion"), $talk->getName()) ?> - </td> + </li> <?php } ?> <?php } ?> <?php } else { $talk = new WikiPageName($pagename); ?> - <td> + <li> <?php echo Button(array(),$isActionPage ? _("Action Page") : _("Page"), $talk->getParent(), array('title' => "View the page")) ?> - </td> - <td class="spacer"> </td> - <td class="bold"> + </li> + <li class="bold"> <?php echo Button(array(),_("Discussion"), $talk->getName()) ?> - </td> + </li> <?php } ?> + </ul> - <td class="spacer"> </td> - <td class="spacer"> </td> - + <ul> <?php if ($user->isAdmin() or (!($page->get('locked')) and (mayAccessPage('edit', $page->getName())))) { ?> - <td class="bold"> + <li class="bold"> <?php if (! $dbh->isWikiPage($page->getName())) { ?> <?php echo Button("edit", _("Create Page")) ?> <?php } else if ($revision && (($revision->isCurrent()) || ($revision->hasDefaultContents()))) { ?> @@ -55,80 +51,68 @@ <?php } else { ?> <?php echo Button("edit", _("Edit Old Revision")) ?> <?php } ?> - </td> + </li> <?php } else if ($dbh->isWikiPage($page->getName())) { ?> - <td><?php echo Button("viewsource", _("View Source")) ?></td> + <li><?php echo Button("viewsource", _("View Source")) ?></li> <?php } ?> <?php if ($dbh->isWikiPage($page->getName())) { ?> - <td class="spacer"> </td> - <td><?php echo Button("PageHistory", _("History")) ?></td> + <li><?php echo Button(_("PageHistory"), _("History")) ?></li> <?php if ($curuserprefs->get('diffMenuItem')) { ?> - <td class="spacer"> </td> - <td><?php echo Button("diff", _("Last Difference")) ?> </td> + <li><?php echo Button("diff", _("Last Difference")) ?> </li> <?php } ?> - <?php if ($curuserprefs->get('revertMenuItem')) { ?> - <td class="spacer"> </td> - <td><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></td> + <?php if ($revision && $curuserprefs->get('revertMenuItem')) { ?> + <li><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li> <?php } ?> - <td class="spacer"> </td> - <td><?php echo Button("PageInfo", _("Page Info")) ?></td> + <li><?php echo Button(_("PageInfo"), _("Page Info")) ?></li> - <td class="spacer"> </td> - <td><?php echo Button(array('action'=>_("BackLinks")), _("Back Links"),$page->getName()) ?></td> + <li><?php echo Button(array('action'=>_("BackLinks")), _("Back Links"),$page->getName()) ?></li> <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> <?php if ($curuserprefs->get('pdfMenuItem')) { ?> - <td class="spacer"> </td> - <td><?php echo Button("pdf") ?></td> + <li><?php echo Button("pdf") ?></li> <?php } ?> <?php } ?> + </ul> - <td class="spacer"> </td> - <td class="spacer"> </td> - + <ul> <?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?> <?php if ($curuserprefs->get('lockMenuItem')) { ?> <?php if ($page->get('locked')) { ?> - <td><?php echo Button('unlock', _("Unlock")) ?></td> + <li><?php echo Button('unlock', _("Unlock")) ?></li> <?php } else { ?> - <td><?php echo Button('lock', _("Lock")) ?></td> + <li><?php echo Button('lock', _("Lock")) ?></li> <?php } ?> - <td class="spacer"> </td> <?php } ?> <?php if (ENABLE_PAGEPERM and mayAccessPage('change', $page->getName())) { ?> <?php if ($curuserprefs->get('chownMenuItem')) { ?> - <td><?php echo Button('chown', _("Change Owner")) ?></td> - <td class="spacer"> </td> + <li><?php echo Button('chown', _("Change Owner")) ?></li> <?php } ?> <?php if ($curuserprefs->get('setaclMenuItem')) { ?> - <td><?php echo Button('setaclsimple', _("Access Rights")) ?></td> - <td class="spacer"> </td> + <li><?php echo Button('setaclsimple', _("Access Rights")) ?></li> <?php } ?> <?php } ?> <?php } ?> <?php if (($user->isAdmin() or mayAccessPage('rename', $page->getName())) && $revision) { ?> - <td><?php echo Button('rename', _("Rename")) ?></td> - <td class="spacer"> </td> + <li><?php echo Button('rename', _("Rename")) ?></li> <?php } ?> <?php if (($user->isAdmin() or mayAccessPage('purge', $page->getName())) && $revision) { ?> - <td><?php echo Button('purge', _("Purge")) ?></td> - <td class="spacer"> </td> + <li><?php echo Button('purge', _("Purge")) ?></li> <?php } ?> <?php } ?> + </ul> - <td class="spacer"> </td> - <td><?php echo Button(_("WatchPage"), _("Watch Page")) ?></td> - - </tr> - </table> + <ul> + <li><?php echo Button(_("WatchPage"), _("Watch Page")) ?></li> + </ul> </div> + </menu> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |