[phpwiki-checkins] SF.net SVN: phpwiki:[10817] trunk/themes/blog/templates

[<var...@us...>]

Revision: 10817
          http://sourceforge.net/p/phpwiki/code/10817
Author:   vargenau
Date:     2022-01-04 14:15:37 +0000 (Tue, 04 Jan 2022)
Log Message:
-----------
blog theme: fix layout of messages

Modified Paths:
--------------
    trunk/themes/blog/templates/body.tmpl
    trunk/themes/blog/templates/browse.tmpl
    trunk/themes/blog/templates/viewsource.tmpl

Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl	2022-01-04 14:13:20 UTC (rev 10816)
+++ trunk/themes/blog/templates/body.tmpl	2022-01-04 14:15:37 UTC (rev 10817)
@@ -4,6 +4,23 @@
       <div id="pagetitle">
       <h1 id="pagetitleText"><?php echo $HEADER ?></h1></div>
       <main role="main">
+<?php
+$action = $request->getArg('action');
+if (empty($revision)) $revision = $page->getCurrentRevision(false);
+if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+  <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+  <?php echo _("This page has been locked and cannot be edited.") ?>
+  </p>
+<?php } ?>
+<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
+  <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+  <?php echo _("You are viewing an old revision of this page.")?>
+  <?php echo Button('browse', _("View the current version."), $page)?>
+  </p>
+<?php } ?>
+<?php if (!empty($redirected)) { ?>
+  <p><?php echo $redirected ?></p>
+<?php } ?>
       <div id="bodyContent">
       <?php echo $CONTENT ?>
       </div>

Modified: trunk/themes/blog/templates/browse.tmpl
===================================================================
--- trunk/themes/blog/templates/browse.tmpl	2022-01-04 14:13:20 UTC (rev 10816)
+++ trunk/themes/blog/templates/browse.tmpl	2022-01-04 14:15:37 UTC (rev 10817)
@@ -1,15 +1,3 @@
-<?php
-$action = $request->getArg('action');
-?>
-<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
-  <p class="warning_msg"><?php echo _("Note:") ?>
-  <?php echo _("You are viewing an old revision of this page.") ?>
-  <?php echo Button('browse', _("View the current version."), $page) ?>
-  </p>
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
-  <p><?php echo $redirected ?></p>
-<?php } ?>
 <div id="content" class="narrowcolumn">
 <?php echo $CONTENT?>
 <div class="comments">

Modified: trunk/themes/blog/templates/viewsource.tmpl
===================================================================
--- trunk/themes/blog/templates/viewsource.tmpl	2022-01-04 14:13:20 UTC (rev 10816)
+++ trunk/themes/blog/templates/viewsource.tmpl	2022-01-04 14:15:37 UTC (rev 10817)
@@ -1,15 +1,3 @@
-<?php
-if (empty($revision)) $revision = $page->getCurrentRevision(false);
-if ($page->get('locked') && !$user->isAdmin()) { ?>
-  <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
-  <?php echo _("This page has been locked and cannot be edited.") ?>
-  </p>
-<?php } ?>
-<?php if (! $revision->isCurrent()) { ?>
-  <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('viewsource', _("View the current version."), $page) ?>
-  </p>
-<?php } ?>
 <br class="clear-floats" />
 <div id="content" class="narrowcolumn">
 <textarea class="wikiedit"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.