From: <var...@us...> - 2022-04-19 14:43:38
|
Revision: 11024 http://sourceforge.net/p/phpwiki/code/11024 Author: vargenau Date: 2022-04-19 14:43:35 +0000 (Tue, 19 Apr 2022) Log Message: ----------- Whitespace, braces Modified Paths: -------------- trunk/themes/Crao/templates/actionbar.tmpl trunk/themes/MonoBook/templates/actionbar.tmpl trunk/themes/Portland/templates/actionbar.tmpl trunk/themes/Sidebar/templates/actionbar.tmpl trunk/themes/Wordpress/templates/actionbar.tmpl trunk/themes/blog/templates/actionbar.tmpl trunk/themes/fusionforge/templates/actionbar.tmpl trunk/themes/shamino_com/templates/actionbar.tmpl Modified: trunk/themes/Crao/templates/actionbar.tmpl =================================================================== --- trunk/themes/Crao/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023) +++ trunk/themes/Crao/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024) @@ -16,7 +16,7 @@ <?php echo $SEP?><?php echo Button('chown') ?> <?php echo $SEP?><?php echo Button('setacl') ?> <?php }} ?> -<?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?> +<?php if ($user->isAdmin() or mayAccessPage('remove', $page->getName())) { ?> <?php echo $SEP?><?php echo Button('remove') ?> <?php } ?> <?php echo $SEP?><?php echo Button(__("PageHistory"), _("Page History")) ?> Modified: trunk/themes/MonoBook/templates/actionbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023) +++ trunk/themes/MonoBook/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024) @@ -24,7 +24,7 @@ <?php } ?> <?php } else { $talk = new WikiPageName($pagename); ?> - <?php echo ActionButton(array(),$isActionPage ? _("Action Page") : _("Article"), $talk->getParent(), array('title' => "View the page")) ?> + <?php echo ActionButton(array(), $isActionPage ? _("Action Page") : _("Article"), $talk->getParent(), array('title' => "View the page")) ?> <?php echo ActionButton(array(), _("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?> <?php } ?> <?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?> @@ -67,7 +67,7 @@ <?php echo ActionButton('setacl') ?> <?php }} ?> <?php if (!empty($revision) and ($isAdmin or mayAccessPage('remove', $pagename))) { ?> - <?php echo ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?> + <?php echo ActionButton('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?> <?php echo ActionButton('remove') ?> <?php } ?> <?php } ?> Modified: trunk/themes/Portland/templates/actionbar.tmpl =================================================================== --- trunk/themes/Portland/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023) +++ trunk/themes/Portland/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024) @@ -16,7 +16,7 @@ ?> <?php echo $EditB ?> <?php echo $SEP?> -<a href="<?php echo WikiURL($revision,array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a> +<a href="<?php echo WikiURL($revision, array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a> <?php echo $SEP?> <?php echo Button(__("PageHistory"), _("Page History")) ?> <?php echo $SEP?> Modified: trunk/themes/Sidebar/templates/actionbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023) +++ trunk/themes/Sidebar/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024) @@ -48,7 +48,7 @@ <?php if (!empty($revision) and ($isAdmin or mayAccessPage('remove', $pagename))) { ?> <?php echo ActionButton('remove') ?> <?php echo ActionButton('purge') ?> - <?php echo ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?> + <?php echo ActionButton('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?> <?php } ?> <?php if ($isAdmin or $mayChange) { ?> <?php echo ActionButton($page->get('locked') ? 'unlock' : 'lock') ?> Modified: trunk/themes/Wordpress/templates/actionbar.tmpl =================================================================== --- trunk/themes/Wordpress/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023) +++ trunk/themes/Wordpress/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024) @@ -62,7 +62,7 @@ <li><?php echo _("Information") ?> <ul> <li> - <a href="<?php echo WikiURL($revision,array('action'=>'diff')) ?>"> + <a href="<?php echo WikiURL($revision, array('action'=>'diff')) ?>"> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a> </li> <li> Modified: trunk/themes/blog/templates/actionbar.tmpl =================================================================== --- trunk/themes/blog/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023) +++ trunk/themes/blog/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024) @@ -2,7 +2,7 @@ <tr class="baseline"> <td> <div class="actionbuttons"> - <?php echo WikiLink(HOME_PAGE, "known",_("Home")) ?> + <?php echo WikiLink(HOME_PAGE, "known", _("Home")) ?> <?php echo $SEP?><?php echo WikiLink(__("About")) ?> <?php echo $SEP?><?php echo WikiLink(__("BlogArchives"), '', _("Archives")) ?> <?php echo $SEP?><?php echo WikiLink(__("PhotoAlbum")) ?> @@ -11,10 +11,11 @@ <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Info")) ?> <?php if ($user->isAuthenticated()) { - if (mayAccessPage('edit', $page->getName())) + if (mayAccessPage('edit', $page->getName())) { $EditB = Button("edit", _("Edit"), false, array('id'=>'btn-edit')); - else + } else { $EditB = Button("viewsource", _("View Source")); + } ?> <?php echo $SEP?><?php echo $EditB ?> <?php } ?> Modified: trunk/themes/fusionforge/templates/actionbar.tmpl =================================================================== --- trunk/themes/fusionforge/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023) +++ trunk/themes/fusionforge/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024) @@ -43,13 +43,13 @@ <li class="bold"> <?php if (! $dbh->isWikiPage($page->getName())) { ?> <?php echo Button("edit", _("Create Page")) ?> - <?php } else if ($revision && (($revision->isCurrent()) || ($revision->hasDefaultContents()))) { ?> + <?php } elseif ($revision && (($revision->isCurrent()) || ($revision->hasDefaultContents()))) { ?> <?php echo Button("edit", _("Edit")) ?> <?php } else { ?> <?php echo Button("edit", _("Edit Old Version")) ?> <?php } ?> </li> - <?php } else if ($dbh->isWikiPage($page->getName())) { ?> + <?php } elseif ($dbh->isWikiPage($page->getName())) { ?> <li><?php echo Button("viewsource", _("View Source")) ?></li> <?php } ?> @@ -62,7 +62,7 @@ <?php } ?> <?php if ($revision && $curuserprefs->get('revertMenuItem')) { ?> - <li><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li> + <li><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li> <?php } ?> <li><?php echo Button(__("PageInfo"), _("Page Info")) ?></li> Modified: trunk/themes/shamino_com/templates/actionbar.tmpl =================================================================== --- trunk/themes/shamino_com/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023) +++ trunk/themes/shamino_com/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024) @@ -1,10 +1,12 @@ <nav role="navigation" aria-label="<?php echo _("Actions Menu") ?>"> <?php -if (empty($revision)) $revision = $page->getCurrentRevision(false); +if (empty($revision)) { + $revision = $page->getCurrentRevision(false); +} ?> -<?php echo Button(array('action'=>__('PageInfo')), _("Page Info"),$page->getName()) ?> +<?php echo Button(array('action'=>__('PageInfo')), _("Page Info"), $page->getName()) ?> <?php echo $SEP?><?php echo Button("edit", ($revision->isCurrent() || $revision->hasDefaultContents()) ? _("Edit") : _("Edit Old Version")) ?> -<?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?> +<?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?> <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?> <?php if (ENABLE_PAGEPERM) { ?> <?php echo $SEP?><?php echo Button('chown') ?> @@ -11,7 +13,7 @@ <?php echo $SEP?><?php echo Button('setacl') ?> <?php } ?> <?php } ?> -<?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?> +<?php if ($user->isAdmin() or mayAccessPage('remove', $page->getName())) { ?> <?php echo $SEP?><?php echo Button('remove') ?> <?php } ?> <?php if (!empty($user) && $user->isAdmin()) { ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |