phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[10850] trunk/themes/Wordpress/templates/ actionbar.tmpl

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

Revision: 10850
          http://sourceforge.net/p/phpwiki/code/10850
Author:   vargenau
Date:     2022-01-06 14:51:17 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
themes/Wordpress/templates/actionbar.tmpl: no need for separator

Modified Paths:
--------------
    trunk/themes/Wordpress/templates/actionbar.tmpl

Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl	2022-01-06 11:48:25 UTC (rev 10849)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl	2022-01-06 14:51:17 UTC (rev 10850)
@@ -1,16 +1,18 @@
 <nav role="navigation" aria-label="<?php echo _("Actions Menu") ?>">
 <div id="actionbar">
 <?php
-  if ($revision && (!$page->get('locked') || $user->isAdmin()))
-      $EditB = Button("edit",
-                      $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
-  else
+  if ($revision && (!$page->get('locked') || $user->isAdmin())) {
+      $EditB = Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
+  } else {
       $EditB = Button("viewsource", _("View Source"));
-  if (empty($revision)) $revision = $page->getCurrentRevision(false);
+  }
+  if (empty($revision)) {
+      $revision = $page->getCurrentRevision(false);
+  }
 ?>
 
  <ul>
-   <li><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"><?php echo WIKI_NAME ?></a>
+   <li><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE) ?>"><?php echo WIKI_NAME ?></a>
      <ul>
        <li>
          <?php echo WikiLink(__("HomePage"), "button") ?>
@@ -20,7 +22,7 @@
        </li>
        <?php if (!empty($user) && $user->isAdmin()) { ?>
        <li>
-       <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button") ?>
+       <?php echo WikiLink(__("PhpWikiAdministration"), "button") ?>
        </li>
        <?php } ?>
        <?php if (!empty($user)) { ?>
@@ -32,12 +34,12 @@
           $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
          ?>
          <li>
-         <?php echo $SEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
+         <?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
          </li>
        <?php } ?>
       <?php } ?>
       <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
-        <li><?php echo $SEP?><?php echo Button("pdf") ?></li>
+        <li><?php echo Button("pdf") ?></li>
        <?php } ?>
      </ul>
    </li>
@@ -45,15 +47,15 @@
      <ul>
        <li><?php echo $EditB ?></li>
        <?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?>
-        <li><?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock')?></li>
+        <li><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?></li>
         <?php if (ENABLE_PAGEPERM) { ?>
-          <li><?php echo $SEP?><?php echo Button('chown') ?></li>
-          <li><?php echo $SEP?><?php echo Button('setacl') ?></li>
+          <li><?php echo Button('chown') ?></li>
+          <li><?php echo Button('setacl') ?></li>
         <?php } ?>
        <?php } ?>
        <?php if ($user->isAdmin() or mayAccessPage('remove', $page->getName())) { ?>
-        <li><?php echo $SEP?><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
-        <li><?php echo $SEP?><?php echo Button('remove') ?></li>
+        <li><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
+        <li><?php echo Button('remove') ?></li>
        <?php } ?>
      </ul>
    </li>
@@ -60,19 +62,19 @@
    <li>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>
-         <?php echo $SEP?><?php echo Button(__("PageHistory"), _("Page History")) ?><?php echo $SEP?>
+         <?php echo Button(__("PageHistory"), _("Page History")) ?>
        </li>
        <li> <?php echo Button(__("PageInfo"), _("Page Info")) ?> </li>
          <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?>
          <li>
-           <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
+           <?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
          </li>
          <li>
-           <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
+           <?php echo Button(__("PageDump"), _("Page Dump")) ?>
          </li>
          <?php } ?>
      </ul>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10849] trunk/pgsrc/Help%2FDebugBackendInfoPlugin

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

Revision: 10849
          http://sourceforge.net/p/phpwiki/code/10849
Author:   vargenau
Date:     2022-01-06 11:48:25 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
DebugBackendInfo has arguments

Modified Paths:
--------------
    trunk/pgsrc/Help%2FDebugBackendInfoPlugin

Modified: trunk/pgsrc/Help%2FDebugBackendInfoPlugin
===================================================================
--- trunk/pgsrc/Help%2FDebugBackendInfoPlugin	2022-01-06 11:07:41 UTC (rev 10848)
+++ trunk/pgsrc/Help%2FDebugBackendInfoPlugin	2022-01-06 11:48:25 UTC (rev 10849)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  6 Jan 2022 12:46:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FDebugBackendInfoPlugin;
@@ -16,7 +16,7 @@
 
 == Usage ==
 {{{
-<<DebugBackendInfo>>
+<<DebugBackendInfo arguments>>
 }}}
 
 == Arguments ==

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10848] trunk/locale

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

Revision: 10848
          http://sourceforge.net/p/phpwiki/code/10848
Author:   vargenau
Date:     2022-01-06 11:07:41 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2022-01-06 10:50:44 UTC (rev 10847)
+++ trunk/locale/po/de.po	2022-01-06 11:07:41 UTC (rev 10848)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 18:56+0100\n"
+"POT-Creation-Date: 2022-01-06 12:06+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1576,6 +1576,10 @@
 msgid "Display general and user specific auth information."
 msgstr ""
 
+msgid "You must be an administrator to use this plugin."
+msgstr ""
+"Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen."
+
 msgid "General Auth Settings"
 msgstr "Allgemeine Authentifizierungs-Einstellungen"
 
@@ -3482,16 +3486,15 @@
 msgid "Confirm ownership change"
 msgstr ""
 
-msgid "Are you sure you want to change the owner of the selected pages?"
-msgstr ""
-"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
+msgid "Are you sure you want to change the owner of the following pages?"
+msgstr "Sind Sie sicher, dass Sie die folgenden Seiten wirklich ändern wollen?"
 
+msgid "Change owner to: "
+msgstr "Besitzer ändern zu: "
+
 msgid "Select the pages to change the owner"
 msgstr "Wählen Sie die Seiten zum Ändern"
 
-msgid "Change owner to: "
-msgstr "Besitzer ändern zu: "
-
 msgid "Delete page permissions."
 msgstr "Seite Berechtigungen löschen."
 
@@ -3538,7 +3541,7 @@
 
 msgid "Are you sure you want to permanently purge the following pages?"
 msgstr ""
-"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich entfernen wollen?"
+"Sind Sie sicher, dass Sie die folgenden Seiten wirklich entfernen wollen?"
 
 msgid "Select the pages to purge"
 msgstr "Wählen Sie die Seiten zu entfernen"
@@ -3572,7 +3575,7 @@
 
 msgid "Are you sure you want to remove the following pages?"
 msgstr ""
-"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"
+"Sind Sie sicher, dass Sie die folgenden Seiten wirklich löschen wollen?"
 
 msgid "Select the pages to remove"
 msgstr "Wähle Seiten zum Umbenennen aus"
@@ -3583,9 +3586,9 @@
 msgid "Rename to"
 msgstr "Umbennen zu"
 
-msgid "Are you sure you want to rename the selected pages?"
+msgid "Are you sure you want to rename the following pages?"
 msgstr ""
-"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"
+"Sind Sie sicher, dass Sie die folgenden Seiten wirklich umbenennen wollen?"
 
 msgid "Rename Page"
 msgstr "Seite Umbenennen"
@@ -3651,10 +3654,6 @@
 msgid "Search and replace text in selected wiki pages."
 msgstr "Suche und ersetze Text in den gewählten Seiten."
 
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-"Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen."
-
 msgid "The search string cannot be empty!"
 msgstr "Das Suchwort darf nicht leer sein!"
 
@@ -3664,9 +3663,9 @@
 msgid "Replace"
 msgstr "Ersetze"
 
-msgid "Are you sure you want to replace text in the selected pages?"
+msgid "Are you sure you want to replace text in the following pages?"
 msgstr ""
-"Sind Sie sicher, dass Sie alle Wörter in den angegebenen Seiten ersetzen "
+"Sind Sie sicher, dass Sie alle Wörter in die folgenden Seiten ersetzen "
 "wollen?"
 
 #, php-format
@@ -3728,10 +3727,9 @@
 msgstr "Ungültige ACL"
 
 msgid ""
-"Are you sure you want to permanently change access rights to the selected "
+"Are you sure you want to permanently change access rights to the following "
 "pages?"
-msgstr ""
-"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
+msgstr "Sind Sie sicher, dass Sie die folgenden Seiten wirklich ändern wollen?"
 
 msgid "Change Access Rights"
 msgstr ""

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022-01-06 10:50:44 UTC (rev 10847)
+++ trunk/locale/po/es.po	2022-01-06 11:07:41 UTC (rev 10848)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 18:56+0100\n"
+"POT-Creation-Date: 2022-01-06 12:06+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1549,6 +1549,9 @@
 msgid "Display general and user specific auth information."
 msgstr ""
 
+msgid "You must be an administrator to use this plugin."
+msgstr ""
+
 msgid "General Auth Settings"
 msgstr ""
 
@@ -3403,13 +3406,13 @@
 msgid "Confirm ownership change"
 msgstr ""
 
-msgid "Are you sure you want to change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the following pages?"
 msgstr ""
 
-msgid "Select the pages to change the owner"
+msgid "Change owner to: "
 msgstr ""
 
-msgid "Change owner to: "
+msgid "Select the pages to change the owner"
 msgstr ""
 
 msgid "Delete page permissions."
@@ -3501,7 +3504,7 @@
 msgid "Rename to"
 msgstr ""
 
-msgid "Are you sure you want to rename the selected pages?"
+msgid "Are you sure you want to rename the following pages?"
 msgstr ""
 
 msgid "Rename Page"
@@ -3568,9 +3571,6 @@
 msgid "Search and replace text in selected wiki pages."
 msgstr ""
 
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
 msgid "The search string cannot be empty!"
 msgstr ""
 
@@ -3580,7 +3580,7 @@
 msgid "Replace"
 msgstr "Substituya"
 
-msgid "Are you sure you want to replace text in the selected pages?"
+msgid "Are you sure you want to replace text in the following pages?"
 msgstr ""
 
 #, php-format
@@ -3640,7 +3640,7 @@
 msgstr ""
 
 msgid ""
-"Are you sure you want to permanently change access rights to the selected "
+"Are you sure you want to permanently change access rights to the following "
 "pages?"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022-01-06 10:50:44 UTC (rev 10847)
+++ trunk/locale/po/fr.po	2022-01-06 11:07:41 UTC (rev 10848)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 18:56+0100\n"
+"POT-Creation-Date: 2022-01-06 12:06+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1568,6 +1568,9 @@
 msgid "Display general and user specific auth information."
 msgstr "Afficher les informations générales de l'utilisateur."
 
+msgid "You must be an administrator to use this plugin."
+msgstr "Vous devez être un administrateur pour utiliser ce greffon."
+
 msgid "General Auth Settings"
 msgstr "Préférences générales d'auteur"
 
@@ -3473,17 +3476,16 @@
 msgid "Confirm ownership change"
 msgstr "Confirmer le changement de propriétaire"
 
-msgid "Are you sure you want to change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the following pages?"
 msgstr ""
-"Êtes-vous certain de vouloir changer le propriétaire des pages "
-"sélectionnées ?"
+"Êtes-vous certain de vouloir changer le propriétaire des pages suivantes ?"
 
+msgid "Change owner to: "
+msgstr "Remplacer le propriétaire par : "
+
 msgid "Select the pages to change the owner"
 msgstr "Sélectionnez les pages dont vous voulez changer le propriétaire"
 
-msgid "Change owner to: "
-msgstr "Remplacer le propriétaire par : "
-
 msgid "Delete page permissions."
 msgstr "Supprimer les permissions de page."
 
@@ -3574,8 +3576,8 @@
 msgid "Rename to"
 msgstr "Renommer en"
 
-msgid "Are you sure you want to rename the selected pages?"
-msgstr "Êtes-vous certain de vouloir renommer les pages sélectionnées ?"
+msgid "Are you sure you want to rename the following pages?"
+msgstr "Êtes-vous certain de vouloir renommer les pages suivantes ?"
 
 msgid "Rename Page"
 msgstr "Renommer la page"
@@ -3641,9 +3643,6 @@
 msgid "Search and replace text in selected wiki pages."
 msgstr "Recherche puis remplace le texte dans les pages sélectionnées."
 
-msgid "You must be an administrator to use this plugin."
-msgstr "Vous devez être un administrateur pour utiliser ce greffon."
-
 msgid "The search string cannot be empty!"
 msgstr "vous devez entrez au moins une lettre pour la recherche !"
 
@@ -3653,10 +3652,8 @@
 msgid "Replace"
 msgstr "Remplacer"
 
-msgid "Are you sure you want to replace text in the selected pages?"
-msgstr ""
-"Êtes-vous sur de vouloir rechercher et remplacer dans les pages "
-"sélectionnées ?"
+msgid "Are you sure you want to replace text in the following pages?"
+msgstr "Êtes-vous sur de vouloir remplacer le texte dans les pages suivantes ?"
 
 #, php-format
 msgid "Replace “%s” by “%s”"
@@ -3719,11 +3716,11 @@
 msgstr "ACL invalide"
 
 msgid ""
-"Are you sure you want to permanently change access rights to the selected "
+"Are you sure you want to permanently change access rights to the following "
 "pages?"
 msgstr ""
 "Êtes-vous certain de vouloir définitivement modifier l'accès aux pages "
-"sélectionnées ?"
+"suivantes ?"
 
 msgid "Change Access Rights"
 msgstr "Modifier les droits d'accès"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022-01-06 10:50:44 UTC (rev 10847)
+++ trunk/locale/po/it.po	2022-01-06 11:07:41 UTC (rev 10848)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 18:56+0100\n"
+"POT-Creation-Date: 2022-01-06 12:06+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -1532,6 +1532,9 @@
 msgid "Display general and user specific auth information."
 msgstr ""
 
+msgid "You must be an administrator to use this plugin."
+msgstr ""
+
 msgid "General Auth Settings"
 msgstr ""
 
@@ -3380,13 +3383,13 @@
 msgid "Confirm ownership change"
 msgstr ""
 
-msgid "Are you sure you want to change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the following pages?"
 msgstr ""
 
-msgid "Select the pages to change the owner"
+msgid "Change owner to: "
 msgstr ""
 
-msgid "Change owner to: "
+msgid "Select the pages to change the owner"
 msgstr ""
 
 msgid "Delete page permissions."
@@ -3478,7 +3481,7 @@
 msgid "Rename to"
 msgstr ""
 
-msgid "Are you sure you want to rename the selected pages?"
+msgid "Are you sure you want to rename the following pages?"
 msgstr ""
 
 msgid "Rename Page"
@@ -3545,9 +3548,6 @@
 msgid "Search and replace text in selected wiki pages."
 msgstr ""
 
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
 msgid "The search string cannot be empty!"
 msgstr ""
 
@@ -3557,7 +3557,7 @@
 msgid "Replace"
 msgstr ""
 
-msgid "Are you sure you want to replace text in the selected pages?"
+msgid "Are you sure you want to replace text in the following pages?"
 msgstr ""
 
 #, php-format
@@ -3617,7 +3617,7 @@
 msgstr ""
 
 msgid ""
-"Are you sure you want to permanently change access rights to the selected "
+"Are you sure you want to permanently change access rights to the following "
 "pages?"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022-01-06 10:50:44 UTC (rev 10847)
+++ trunk/locale/po/ja.po	2022-01-06 11:07:41 UTC (rev 10848)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 18:56+0100\n"
+"POT-Creation-Date: 2022-01-06 12:06+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1518,6 +1518,9 @@
 msgid "Display general and user specific auth information."
 msgstr ""
 
+msgid "You must be an administrator to use this plugin."
+msgstr ""
+
 msgid "General Auth Settings"
 msgstr ""
 
@@ -3366,13 +3369,13 @@
 msgid "Confirm ownership change"
 msgstr ""
 
-msgid "Are you sure you want to change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the following pages?"
 msgstr ""
 
-msgid "Select the pages to change the owner"
+msgid "Change owner to: "
 msgstr ""
 
-msgid "Change owner to: "
+msgid "Select the pages to change the owner"
 msgstr ""
 
 msgid "Delete page permissions."
@@ -3464,7 +3467,7 @@
 msgid "Rename to"
 msgstr ""
 
-msgid "Are you sure you want to rename the selected pages?"
+msgid "Are you sure you want to rename the following pages?"
 msgstr ""
 
 msgid "Rename Page"
@@ -3531,9 +3534,6 @@
 msgid "Search and replace text in selected wiki pages."
 msgstr ""
 
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
 msgid "The search string cannot be empty!"
 msgstr ""
 
@@ -3543,7 +3543,7 @@
 msgid "Replace"
 msgstr ""
 
-msgid "Are you sure you want to replace text in the selected pages?"
+msgid "Are you sure you want to replace text in the following pages?"
 msgstr ""
 
 #, php-format
@@ -3603,7 +3603,7 @@
 msgstr ""
 
 msgid ""
-"Are you sure you want to permanently change access rights to the selected "
+"Are you sure you want to permanently change access rights to the following "
 "pages?"
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022-01-06 10:50:44 UTC (rev 10847)
+++ trunk/locale/po/nl.po	2022-01-06 11:07:41 UTC (rev 10848)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 18:56+0100\n"
+"POT-Creation-Date: 2022-01-06 12:06+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1524,6 +1524,9 @@
 msgid "Display general and user specific auth information."
 msgstr ""
 
+msgid "You must be an administrator to use this plugin."
+msgstr ""
+
 msgid "General Auth Settings"
 msgstr ""
 
@@ -3372,13 +3375,13 @@
 msgid "Confirm ownership change"
 msgstr ""
 
-msgid "Are you sure you want to change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the following pages?"
 msgstr ""
 
-msgid "Select the pages to change the owner"
+msgid "Change owner to: "
 msgstr ""
 
-msgid "Change owner to: "
+msgid "Select the pages to change the owner"
 msgstr ""
 
 msgid "Delete page permissions."
@@ -3470,7 +3473,7 @@
 msgid "Rename to"
 msgstr ""
 
-msgid "Are you sure you want to rename the selected pages?"
+msgid "Are you sure you want to rename the following pages?"
 msgstr ""
 
 msgid "Rename Page"
@@ -3537,9 +3540,6 @@
 msgid "Search and replace text in selected wiki pages."
 msgstr ""
 
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
 msgid "The search string cannot be empty!"
 msgstr ""
 
@@ -3549,7 +3549,7 @@
 msgid "Replace"
 msgstr "Vervangt"
 
-msgid "Are you sure you want to replace text in the selected pages?"
+msgid "Are you sure you want to replace text in the following pages?"
 msgstr ""
 
 #, php-format
@@ -3609,7 +3609,7 @@
 msgstr ""
 
 msgid ""
-"Are you sure you want to permanently change access rights to the selected "
+"Are you sure you want to permanently change access rights to the following "
 "pages?"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022-01-06 10:50:44 UTC (rev 10847)
+++ trunk/locale/po/phpwiki.pot	2022-01-06 11:07:41 UTC (rev 10848)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 18:56+0100\n"
+"POT-Creation-Date: 2022-01-06 12:06+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1518,6 +1518,9 @@
 msgid "Display general and user specific auth information."
 msgstr ""
 
+msgid "You must be an administrator to use this plugin."
+msgstr ""
+
 msgid "General Auth Settings"
 msgstr ""
 
@@ -3366,13 +3369,13 @@
 msgid "Confirm ownership change"
 msgstr ""
 
-msgid "Are you sure you want to change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the following pages?"
 msgstr ""
 
-msgid "Select the pages to change the owner"
+msgid "Change owner to: "
 msgstr ""
 
-msgid "Change owner to: "
+msgid "Select the pages to change the owner"
 msgstr ""
 
 msgid "Delete page permissions."
@@ -3464,7 +3467,7 @@
 msgid "Rename to"
 msgstr ""
 
-msgid "Are you sure you want to rename the selected pages?"
+msgid "Are you sure you want to rename the following pages?"
 msgstr ""
 
 msgid "Rename Page"
@@ -3531,9 +3534,6 @@
 msgid "Search and replace text in selected wiki pages."
 msgstr ""
 
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
 msgid "The search string cannot be empty!"
 msgstr ""
 
@@ -3543,7 +3543,7 @@
 msgid "Replace"
 msgstr ""
 
-msgid "Are you sure you want to replace text in the selected pages?"
+msgid "Are you sure you want to replace text in the following pages?"
 msgstr ""
 
 #, php-format
@@ -3603,7 +3603,7 @@
 msgstr ""
 
 msgid ""
-"Are you sure you want to permanently change access rights to the selected "
+"Are you sure you want to permanently change access rights to the following "
 "pages?"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-06 10:50:44 UTC (rev 10847)
+++ trunk/locale/po/sv.po	2022-01-06 11:07:41 UTC (rev 10848)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 18:56+0100\n"
+"POT-Creation-Date: 2022-01-06 12:06+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1519,6 +1519,9 @@
 msgid "Display general and user specific auth information."
 msgstr ""
 
+msgid "You must be an administrator to use this plugin."
+msgstr ""
+
 msgid "General Auth Settings"
 msgstr ""
 
@@ -3367,13 +3370,13 @@
 msgid "Confirm ownership change"
 msgstr ""
 
-msgid "Are you sure you want to change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the following pages?"
 msgstr ""
 
-msgid "Select the pages to change the owner"
+msgid "Change owner to: "
 msgstr ""
 
-msgid "Change owner to: "
+msgid "Select the pages to change the owner"
 msgstr ""
 
 msgid "Delete page permissions."
@@ -3465,7 +3468,7 @@
 msgid "Rename to"
 msgstr ""
 
-msgid "Are you sure you want to rename the selected pages?"
+msgid "Are you sure you want to rename the following pages?"
 msgstr ""
 
 msgid "Rename Page"
@@ -3532,9 +3535,6 @@
 msgid "Search and replace text in selected wiki pages."
 msgstr ""
 
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
 msgid "The search string cannot be empty!"
 msgstr ""
 
@@ -3544,7 +3544,7 @@
 msgid "Replace"
 msgstr ""
 
-msgid "Are you sure you want to replace text in the selected pages?"
+msgid "Are you sure you want to replace text in the following pages?"
 msgstr ""
 
 #, php-format
@@ -3604,7 +3604,7 @@
 msgstr ""
 
 msgid ""
-"Are you sure you want to permanently change access rights to the selected "
+"Are you sure you want to permanently change access rights to the following "
 "pages?"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022-01-06 10:50:44 UTC (rev 10847)
+++ trunk/locale/po/zh.po	2022-01-06 11:07:41 UTC (rev 10848)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 18:56+0100\n"
+"POT-Creation-Date: 2022-01-06 12:06+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1523,6 +1523,9 @@
 msgid "Display general and user specific auth information."
 msgstr "顯示一般與使用者特定認證資訊."
 
+msgid "You must be an administrator to use this plugin."
+msgstr "你必須是管理者才能使用此 plugin."
+
 msgid "General Auth Settings"
 msgstr "一般認證設定"
 
@@ -3377,13 +3380,13 @@
 msgid "Confirm ownership change"
 msgstr ""
 
-msgid "Are you sure you want to change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the following pages?"
 msgstr ""
 
-msgid "Select the pages to change the owner"
+msgid "Change owner to: "
 msgstr ""
 
-msgid "Change owner to: "
+msgid "Select the pages to change the owner"
 msgstr ""
 
 msgid "Delete page permissions."
@@ -3475,7 +3478,7 @@
 msgid "Rename to"
 msgstr "更名為"
 
-msgid "Are you sure you want to rename the selected pages?"
+msgid "Are you sure you want to rename the following pages?"
 msgstr "你確定你想要永久更名選定的檔案?"
 
 msgid "Rename Page"
@@ -3542,9 +3545,6 @@
 msgid "Search and replace text in selected wiki pages."
 msgstr "在選定的頁面中搜尋並更換文字."
 
-msgid "You must be an administrator to use this plugin."
-msgstr "你必須是管理者才能使用此 plugin."
-
 msgid "The search string cannot be empty!"
 msgstr "搜尋字串不能是空白!"
 
@@ -3554,7 +3554,7 @@
 msgid "Replace"
 msgstr "取代"
 
-msgid "Are you sure you want to replace text in the selected pages?"
+msgid "Are you sure you want to replace text in the following pages?"
 msgstr "你確定你想要永久新增並取代選定檔案中的文字?"
 
 #, php-format
@@ -3614,9 +3614,9 @@
 msgstr "錯誤的 acl"
 
 msgid ""
-"Are you sure you want to permanently change access rights to the selected "
+"Are you sure you want to permanently change access rights to the following "
 "pages?"
-msgstr ""
+msgstr "你確定你想要永久新增並取代選定檔案中的文字?"
 
 msgid "Change Access Rights"
 msgstr ""

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10847] trunk/lib/plugin/WikiAdminSetAcl.php

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

Revision: 10847
          http://sourceforge.net/p/phpwiki/code/10847
Author:   vargenau
Date:     2022-01-06 10:50:44 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
lib/plugin/WikiAdminSetAcl.php: selected pages --> following pages

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminSetAcl.php

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2022-01-06 10:43:10 UTC (rev 10846)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2022-01-06 10:50:44 UTC (rev 10847)
@@ -207,7 +207,7 @@
             $header = $this->setaclForm($header, $post_args, $pages);
             $header->pushContent(
                 HTML::p(HTML::strong(
-                    _("Are you sure you want to permanently change access rights to the selected pages?"))));
+                    _("Are you sure you want to permanently change access rights to the following pages?"))));
         } else {
             $button_label = _("Change Access Rights");
             $header = $this->setaclForm($header, $post_args, $pages);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10846] trunk/lib/plugin

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

Revision: 10846
          http://sourceforge.net/p/phpwiki/code/10846
Author:   vargenau
Date:     2022-01-06 10:43:10 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
lib/plugin/WikiAdminPurge.php and lib/plugin/WikiAdminRemove.php: without individual PagePermissions

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2022-01-06 10:41:31 UTC (rev 10845)
+++ trunk/lib/plugin/WikiAdminPurge.php	2022-01-06 10:43:10 UTC (rev 10846)
@@ -117,7 +117,7 @@
         if ($p && $request->isPost() &&
             !empty($post_args['purge']) && empty($post_args['cancel'])
         ) {
-            // check individual PagePermissions
+            // without individual PagePermissions:
             if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
                 $request->_notAuthorized(WIKIAUTH_ADMIN);
                 $this->disabled(_("You must be an administrator to use this plugin."));

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2022-01-06 10:41:31 UTC (rev 10845)
+++ trunk/lib/plugin/WikiAdminRemove.php	2022-01-06 10:43:10 UTC (rev 10846)
@@ -121,7 +121,7 @@
         if ($p && $request->isPost() &&
             !empty($post_args['remove']) && empty($post_args['cancel'])
         ) {
-            // check individual PagePermissions
+            // without individual PagePermissions:
             if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
                 $request->_notAuthorized(WIKIAUTH_ADMIN);
                 $this->disabled(_("You must be an administrator to use this plugin."));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10845] trunk

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

Revision: 10845
          http://sourceforge.net/p/phpwiki/code/10845
Author:   vargenau
Date:     2022-01-06 10:41:31 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
Better link for SetAcl and SetAclSimple

Modified Paths:
--------------
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple
    trunk/pgsrc/PhpWikiAdministration%2FSetAcl
    trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple

Added Paths:
-----------
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzenEinfach

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen	2022-01-06 09:41:57 UTC (rev 10844)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen	2022-01-06 10:41:31 UTC (rev 10845)
@@ -1,4 +1,4 @@
-Date: Wed, 10 Apr 2019 18:35:55 +0000
+Date: Thu,  6 Jan 2022 11:36:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten%2FAclSetzen;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-For simple Access Rights modifications, see **[[phpwiki:?action=setaclsimple|SetAclSimple]]**.
+For simple Access Rights modifications, see **[[PhpWikiSystemverwalten/AclSetzenEinfach|AclSetzenEinfach]]**.
 
 ----
 

Added: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzenEinfach
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzenEinfach	                        (rev 0)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzenEinfach	2022-01-06 10:41:31 UTC (rev 10845)
@@ -0,0 +1,23 @@
+Date: Thu,  6 Jan 2022 11:36:59 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
+Content-Type: application/x-phpwiki;
+  pagename=PhpWikiSystemverwalten%2FAclSetzenEinfach;
+  flags=PAGE_LOCKED;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+{| style="width: 100%; background-color: #e9fbff; border-style: solid; border-color: blue; border-width: 2px;"
+|-
+| {{(on)}} **//Liberal Access Rights//** means **//Everyone can edit//**.
+|-
+| {{(on)}} **//Restrictive Access Rights//** means **//Only logged users can see the page//**.
+|}
+
+For more complex Access Rights modifications, see **[[PhpWikiSystemverwalten/AclSetzen|AclSetzen]]**.
+
+----
+
+<<WikiAdminSetAclSimple>>
+
+----
+[[KategorieAktionSeite]]

Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl	2022-01-06 09:41:57 UTC (rev 10844)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl	2022-01-06 10:41:31 UTC (rev 10845)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:17 +0000
+Date: Thu,  6 Jan 2022 11:36:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki%2FD%C3%A9finirAcl;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Pour des modifications simples d'ACL, voir **[[phpwiki:?action=setaclsimple|DéfinirAclSimple]]**.
+Pour des modifications simples d'ACL, voir **[[AdministrationDePhpWiki/DéfinirAclSimple|DéfinirAclSimple]]**.
 
 ----
 

Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple	2022-01-06 09:41:57 UTC (rev 10844)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple	2022-01-06 10:41:31 UTC (rev 10845)
@@ -1,4 +1,4 @@
-Date: Thu,  4 Apr 2019 17:13:16 +0000
+Date: Thu,  6 Jan 2022 11:36:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki%2FD%C3%A9finirAclSimple;
@@ -13,7 +13,7 @@
 | {{(on)}} **//Droits d'accès restreints//** signifie **//Seuls les utilisateurs connectés peuvent voir la page//**.
 |}
 
-Pour des modification plus complexes des droits d'accès, voir **[[phpwiki:?action=setacl|SetAcl]]**.
+Pour des modification plus complexes des droits d'accès, voir **[[AdministrationDePhpWiki/DéfinirAcl|DéfinirAcl]]**.
 
 ----
 

Modified: trunk/pgsrc/PhpWikiAdministration%2FSetAcl
===================================================================
--- trunk/pgsrc/PhpWikiAdministration%2FSetAcl	2022-01-06 09:41:57 UTC (rev 10844)
+++ trunk/pgsrc/PhpWikiAdministration%2FSetAcl	2022-01-06 10:41:31 UTC (rev 10845)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  6 Jan 2022 11:36:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration%2FSetAcl;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-For simple Access Rights modifications, see **[[phpwiki:?action=setaclsimple|SetAclSimple]]**.
+For simple Access Rights modifications, see **[[PhpWikiAdministration/SetAclSimple|SetAclSimple]]**.
 
 ----
 

Modified: trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple	2022-01-06 09:41:57 UTC (rev 10844)
+++ trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple	2022-01-06 10:41:31 UTC (rev 10845)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  6 Jan 2022 10:36:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration%2FSetAclSimple;
@@ -13,7 +13,7 @@
 | {{(on)}} **//Restrictive Access Rights//** means **//Only logged users can see the page//**.
 |}
 
-For more complex Access Rights modifications, see **[[phpwiki:?action=setacl|SetAcl]]**.
+For more complex Access Rights modifications, see **[[PhpWikiAdministration/SetAcl|SetAcl]]**.
 
 ----
 

Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	2022-01-06 09:41:57 UTC (rev 10844)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	2022-01-06 10:41:31 UTC (rev 10845)
@@ -1,4 +1,4 @@
-Date: Wed,  4 Aug 2021 09:27:34 +0000
+Date: Thu,  6 Jan 2022 11:36:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration%2FSetAclSimple;
@@ -13,7 +13,7 @@
 | {{(on)}} **//Restrictive Access Rights//** means **//Only project members can see the page//**.
 |}
 
-For more complex Access Rights modifications, see **[[phpwiki:?action=setacl|SetAcl]]**.
+For more complex Access Rights modifications, see **[[PhpWikiAdministration/SetAcl|SetAcl]]**.
 
 ----
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10844] trunk/lib/plugin/WikiAdminSearchReplace.php

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

Revision: 10844
          http://sourceforge.net/p/phpwiki/code/10844
Author:   vargenau
Date:     2022-01-06 09:41:57 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
lib/plugin/WikiAdminSearchReplace.php: selected pages --> following pages

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminSearchReplace.php

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2022-01-06 09:35:41 UTC (rev 10843)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2022-01-06 09:41:57 UTC (rev 10844)
@@ -26,7 +26,6 @@
 /**
  * Usage:   <<WikiAdminSearchReplace >> or called via WikiAdminSelect
  * Author:  Reini Urban
- *
  */
 
 require_once 'lib/PageList.php';
@@ -110,7 +109,7 @@
             // List all pages to select from.
             //TODO: check for permissions and list only the allowed
             $pages = $this->collectPages($pages, $dbi, $args['sortby'],
-                $args['limit'], $args['exclude']);
+                                         $args['limit'], $args['exclude']);
         }
 
         $args['info'] = "checkbox,pagename,mtime,author";
@@ -132,7 +131,7 @@
             $button_label = _("Replace");
             $header->pushContent(
                 HTML::p(HTML::strong(
-                    _("Are you sure you want to replace text in the selected pages?"))));
+                    _("Are you sure you want to replace text in the following pages?"))));
         } else {
             $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns);
             $pagelist->addPageList($pages);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10843] trunk/lib/plugin/WikiAdminRename.php

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

Revision: 10843
          http://sourceforge.net/p/phpwiki/code/10843
Author:   vargenau
Date:     2022-01-06 09:35:41 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
lib/plugin/WikiAdminRename.php: selected pages --> following pages

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminRename.php

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2022-01-06 09:31:46 UTC (rev 10842)
+++ trunk/lib/plugin/WikiAdminRename.php	2022-01-06 09:35:41 UTC (rev 10843)
@@ -26,7 +26,6 @@
 /**
  * Usage:   <<WikiAdminRename >> or called via WikiAdminSelect
  * @author:  Reini Urban
- *
  */
 
 require_once 'lib/PageList.php';
@@ -131,7 +130,7 @@
         if ($next_action == 'select' and empty($pages)) {
             // List all pages to select from.
             $pages = $this->collectPages($pages, $dbi, $args['sortby'],
-                $args['limit'], $args['exclude']);
+                                         $args['limit'], $args['exclude']);
         }
         $pagelist = new PageList_Selectable(
             $args['info'], $args['exclude'],
@@ -146,7 +145,7 @@
             $button_label = _("Yes");
             $header->pushContent(
                 HTML::p(HTML::strong(
-                    _("Are you sure you want to rename the selected pages?"))));
+                    _("Are you sure you want to rename the following pages?"))));
             $header = $this->renameForm($header, $post_args, $singlepage, true);
         } else {
             if ($singlepage === true) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10842] trunk/lib/plugin/WikiAdminChown.php

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

Revision: 10842
          http://sourceforge.net/p/phpwiki/code/10842
Author:   vargenau
Date:     2022-01-06 09:31:46 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
lib/plugin/WikiAdminChown.php: make value readonly when confirming

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminChown.php

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2022-01-06 09:18:29 UTC (rev 10841)
+++ trunk/lib/plugin/WikiAdminChown.php	2022-01-06 09:31:46 UTC (rev 10842)
@@ -169,19 +169,23 @@
             $button_label = _("Yes");
             $header->pushContent(HTML::legend(_("Confirm ownership change")));
             $header->pushContent(HTML::p(HTML::strong(
-                    _("Are you sure you want to change the owner of the selected pages?"))));
+                    _("Are you sure you want to change the owner of the following pages?"))));
+            $header->pushContent(_("Change owner to: "));
+            $header->pushContent(HTML::input(array('name' => 'admin_chown[user]',
+                                                   'value' => $post_args['user'],
+                                                   'size' => 40,
+                                                   'readonly' => 'readonly')));
         } else {
             $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $args);
             $pagelist->addPageList($pages);
             $button_label = _("Change owner of selected pages");
             $header->pushContent(HTML::legend(_("Select the pages to change the owner")));
+            $header->pushContent(_("Change owner to: "));
+            $header->pushContent(HTML::input(array('name' => 'admin_chown[user]',
+                                                   'value' => $post_args['user'],
+                                                   'size' => 40)));
         }
 
-        $header->pushContent(_("Change owner to: "));
-        $header->pushContent(HTML::input(array('name' => 'admin_chown[user]',
-            'value' => $post_args['user'],
-            'size' => 40)));
-
         $buttons = HTML::p(Button('submit:admin_chown[chown]', $button_label, 'wikiadmin'),
                            HTML::raw("  "),
                            Button('submit:admin_chown[cancel]', _("Cancel"), 'button'));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10841] trunk/lib/plugin/WikiAdminRemove.php

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

Revision: 10841
          http://sourceforge.net/p/phpwiki/code/10841
Author:   vargenau
Date:     2022-01-06 09:18:29 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
lib/plugin/WikiAdminRemove.php: do not display checkbox when confirming

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminRemove.php

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2022-01-06 09:18:03 UTC (rev 10840)
+++ trunk/lib/plugin/WikiAdminRemove.php	2022-01-06 09:18:29 UTC (rev 10841)
@@ -112,9 +112,10 @@
         $this->preSelectS($args, $request);
 
         $p = $request->getArg('p');
-        if (!$p) $p = $this->_list;
+        if (!$p) {
+            $p = $this->_list;
+        }
         $post_args = $request->getArg('admin_remove');
-
         $next_action = 'select';
         $pages = array();
         if ($p && $request->isPost() &&
@@ -150,17 +151,22 @@
         }
 
         $header = HTML::fieldset();
-        $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
-            array('types' =>
-            array('remove'
-            => new PageList_Column_remove('remove', _("Remove")))));
-        $pagelist->addPageList($pages);
         if ($next_action == 'verify') {
+            $pagelist = new PageList_Unselectable($args['info'], $args['exclude'],
+                array('types' =>
+                array('remove'
+                => new PageList_Column_remove('remove', _("Remove")))));
+            $pagelist->addPageList($pages);
             $button_label = _("Yes");
             $header->pushContent(HTML::legend(_("Confirm removal")));
             $header->pushContent(HTML::p(HTML::strong(
                     _("Are you sure you want to remove the following pages?"))));
         } else {
+            $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
+                array('types' =>
+                array('remove'
+                => new PageList_Column_remove('remove', _("Remove")))));
+            $pagelist->addPageList($pages);
             $button_label = _("Remove selected pages");
             $header->pushContent(HTML::legend(_("Select the pages to remove")));
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10840] trunk/lib/plugin/WikiAdminPurge.php

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

Revision: 10840
          http://sourceforge.net/p/phpwiki/code/10840
Author:   vargenau
Date:     2022-01-06 09:18:03 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
lib/plugin/WikiAdminPurge.php: do not display checkbox when confirming

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminPurge.php

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2022-01-05 20:30:42 UTC (rev 10839)
+++ trunk/lib/plugin/WikiAdminPurge.php	2022-01-06 09:18:03 UTC (rev 10840)
@@ -108,9 +108,10 @@
         $this->preSelectS($args, $request);
 
         $p = $request->getArg('p');
-        if (!$p) $p = $this->_list;
+        if (!$p) {
+            $p = $this->_list;
+        }
         $post_args = $request->getArg('admin_purge');
-
         $next_action = 'select';
         $pages = array();
         if ($p && $request->isPost() &&
@@ -142,21 +143,27 @@
         }
         if ($next_action == 'select') {
             // List all pages to select from.
-            $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
+            $pages = $this->collectPages($pages, $dbi, $args['sortby'],
+                                         $args['limit'], $args['exclude']);
         }
 
         $header = HTML::fieldset();
-        $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
-            array('types' =>
-            array('purge'
-            => new PageList_Column_purge('purge', _("Purge")))));
-        $pagelist->addPageList($pages);
         if ($next_action == 'verify') {
+            $pagelist = new PageList_Unselectable($args['info'], $args['exclude'],
+                array('types' =>
+                array('purge'
+                => new PageList_Column_purge('purge', _("Purge")))));
+            $pagelist->addPageList($pages);
             $button_label = _("Yes");
             $header->pushContent(HTML::legend(_("Confirm purge")));
             $header->pushContent(HTML::p(HTML::strong(
                     _("Are you sure you want to permanently purge the following pages?"))));
         } else {
+            $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
+                array('types' =>
+                array('purge'
+                => new PageList_Column_purge('purge', _("Purge")))));
+            $pagelist->addPageList($pages);
             $button_label = _("Permanently purge selected pages");
             $header->pushContent(HTML::legend(_("Select the pages to purge")));
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10839] trunk/locale/Makefile

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

Revision: 10839
          http://sourceforge.net/p/phpwiki/code/10839
Author:   vargenau
Date:     2022-01-05 20:30:42 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
locale Makefile: remove themes/Wordpress/templates/navbar.tmpl

Modified Paths:
--------------
    trunk/locale/Makefile

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2022-01-05 20:28:41 UTC (rev 10838)
+++ trunk/locale/Makefile	2022-01-05 20:30:42 UTC (rev 10839)
@@ -516,7 +516,6 @@
 ${POT_FILE}: .././themes/Wordpress/templates/body.tmpl
 ${POT_FILE}: .././themes/Wordpress/templates/browse.tmpl
 ${POT_FILE}: .././themes/Wordpress/templates/editpage.tmpl
-${POT_FILE}: .././themes/Wordpress/templates/navbar.tmpl
 ${POT_FILE}: .././themes/Wordpress/templates/signin.tmpl
 ${POT_FILE}: .././themes/Wordpress/templates/viewsource.tmpl
 ${POT_FILE}: .././themes/Wordpress/themeinfo.php

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10838] trunk/lib/plugin

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

Revision: 10838
          http://sourceforge.net/p/phpwiki/code/10838
Author:   vargenau
Date:     2022-01-05 20:28:41 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Better error message

Modified Paths:
--------------
    trunk/lib/plugin/DebugAuthInfo.php
    trunk/lib/plugin/DebugBackendInfo.php
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminDeleteAcl.php
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/lib/plugin/WikiAdminSetAclSimple.php
    trunk/lib/plugin/WikiAdminSetExternal.php

Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/DebugAuthInfo.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -64,7 +64,7 @@
         }
         if (!$user->isAdmin() and !(DEBUG && _DEBUG_LOGIN)) {
             $request->_notAuthorized(WIKIAUTH_ADMIN);
-            $this->disabled("! user->isAdmin");
+            $this->disabled(_("You must be an administrator to use this plugin."));
         }
 
         $html = HTML(HTML::h2(fmt("General Auth Settings")));

Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/DebugBackendInfo.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -62,7 +62,7 @@
 
         if (!$user->isAdmin() and !(DEBUG && _DEBUG_LOGIN)) {
             $request->_notAuthorized(WIKIAUTH_ADMIN);
-            $this->disabled("! user->isAdmin");
+            $this->disabled(_("You must be an administrator to use this plugin."));
         }
 
         if (empty($page)) {

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminChown.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -25,7 +25,7 @@
 
 /**
  * Usage:   <<WikiAdminChown s||=* >> or called via WikiAdminSelect
- * @author:  Reini Urban <ru...@x-...>
+ * @author:  Reini Urban
  *
  */
 
@@ -142,7 +142,7 @@
             // without individual PagePermissions:
             if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
                 $request->_notAuthorized(WIKIAUTH_ADMIN);
-                $this->disabled("! user->isAdmin");
+                $this->disabled(_("You must be an administrator to use this plugin."));
             }
             if ($post_args['action'] == 'verify') {
                 // Real action

Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -111,7 +111,7 @@
         if ($p && $request->isPost()) {
             if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
                 $request->_notAuthorized(WIKIAUTH_ADMIN);
-                $this->disabled("! user->isAdmin");
+                $this->disabled(_("You must be an administrator to use this plugin."));
             }
             return $this->deleteaclPages($request, array_keys($p));
         }

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminPurge.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright © 2002,2004 $ThePhpWikiProgrammingTeam
  * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
@@ -119,7 +119,7 @@
             // check individual PagePermissions
             if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
                 $request->_notAuthorized(WIKIAUTH_ADMIN);
-                $this->disabled("! user->isAdmin");
+                $this->disabled(_("You must be an administrator to use this plugin."));
             }
             if ($post_args['action'] == 'verify') {
                 // Real purge.

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminRemove.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -123,7 +123,7 @@
             // check individual PagePermissions
             if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
                 $request->_notAuthorized(WIKIAUTH_ADMIN);
-                $this->disabled("! user->isAdmin");
+                $this->disabled(_("You must be an administrator to use this plugin."));
             }
             if ($post_args['action'] == 'verify') {
                 // Real delete.

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminRename.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -25,7 +25,7 @@
 
 /**
  * Usage:   <<WikiAdminRename >> or called via WikiAdminSelect
- * @author:  Reini Urban <ru...@x-...>
+ * @author:  Reini Urban
  *
  */
 
@@ -109,7 +109,7 @@
             // without individual PagePermissions:
             if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
                 $request->_notAuthorized(WIKIAUTH_ADMIN);
-                $this->disabled("! user->isAdmin");
+                $this->disabled(_("You must be an administrator to use this plugin."));
             }
             // DONE: error message if not allowed.
             if ($post_args['action'] == 'verify') {

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -25,7 +25,7 @@
 
 /**
  * Usage:   <<WikiAdminSearchReplace >> or called via WikiAdminSelect
- * Author:  Reini Urban <ru...@x-...>
+ * Author:  Reini Urban
  *
  */
 

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminSelect.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -28,7 +28,7 @@
  * WikiAdmin plugins then. Then do Rename, Remove, Chown, ...
  *
  * Usage:   <<WikiAdminSelect>>
- * Author:  Reini Urban <ru...@x-...>
+ * Author:  Reini Urban
  *
  * This is the base class for most WikiAdmin* classes, using
  * collectPages() and preSelectS().

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -27,7 +27,7 @@
  * Set individual PagePermissions
  *
  * Usage:   <<WikiAdminSetAcl >> or called via WikiAdminSelect
- * Author:  Reini Urban <ru...@x-...>
+ * Author:  Reini Urban
  *
  * TODO: UI to add custom group/username.
  * Currently it's easier to dump a page, fix it manually and
@@ -175,7 +175,7 @@
             // without individual PagePermissions:
             if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
                 $request->_notAuthorized(WIKIAUTH_ADMIN);
-                $this->disabled("! user->isAdmin");
+                $this->disabled(_("You must be an administrator to use this plugin."));
             }
             if ($post_args['action'] == 'verify') {
                 // Real action

Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -28,7 +28,6 @@
  *
  * Usage:   <<WikiAdminSetAclSimple >> or called via WikiAdminSelect
  * Author:  Marc-Etienne Vargenau, Alcatel-Lucent
- *
  */
 
 require_once 'lib/plugin/WikiAdminSetAcl.php';
@@ -79,7 +78,7 @@
             // without individual PagePermissions:
             if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
                 $request->_notAuthorized(WIKIAUTH_ADMIN);
-                $this->disabled("! user->isAdmin");
+                $this->disabled(_("You must be an administrator to use this plugin."));
             }
             if (!empty($post_args['aclliberal'])) {
                 return $this->setaclPages($request, array_keys($p), $this->liberalPerms());

Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php	2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminSetExternal.php	2022-01-05 20:28:41 UTC (rev 10838)
@@ -126,7 +126,7 @@
             // without individual PagePermissions:
             if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
                 $request->_notAuthorized(WIKIAUTH_ADMIN);
-                $this->disabled("! user->isAdmin");
+                $this->disabled(_("You must be an administrator to use this plugin."));
             }
             // Real action
             return $this->setExternalPages($dbi, array_keys($p));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10837] trunk/themes/Wordpress/templates

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

Revision: 10837
          http://sourceforge.net/p/phpwiki/code/10837
Author:   vargenau
Date:     2022-01-05 18:14:09 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Wordpress theme: remove empty navbar.tmpl

Modified Paths:
--------------
    trunk/themes/Wordpress/templates/body.tmpl

Removed Paths:
-------------
    trunk/themes/Wordpress/templates/navbar.tmpl

Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl	2022-01-05 17:57:12 UTC (rev 10836)
+++ trunk/themes/Wordpress/templates/body.tmpl	2022-01-05 18:14:09 UTC (rev 10837)
@@ -24,7 +24,6 @@
       <?php } ?>
       <?php echo $CONTENT ?>
       </main>
-      <?php echo Template('navbar') ?>
       <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
     <?php echo Template('bottom') ?>
 </body>

Deleted: trunk/themes/Wordpress/templates/navbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/navbar.tmpl	2022-01-05 17:57:12 UTC (rev 10836)
+++ trunk/themes/Wordpress/templates/navbar.tmpl	2022-01-05 18:14:09 UTC (rev 10837)
@@ -1,3 +0,0 @@
-<?php
-  $Sep = $WikiTheme->getButtonSeparator();
-?>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10836] trunk/locale

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

Revision: 10836
          http://sourceforge.net/p/phpwiki/code/10836
Author:   vargenau
Date:     2022-01-05 17:57:12 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2022-01-05 17:55:47 UTC (rev 10835)
+++ trunk/locale/po/de.po	2022-01-05 17:57:12 UTC (rev 10836)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 13:02+0100\n"
+"POT-Creation-Date: 2022-01-05 18:56+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5173,6 +5173,9 @@
 msgid "This is a minor change."
 msgstr "Kleinere Änderung."
 
+msgid "Make the page read-only?"
+msgstr ""
+
 #, php-format
 msgid "See %s tips for editing."
 msgstr "Siehe %s Tips fürs Edieren."
@@ -5226,12 +5229,9 @@
 msgid "Dialog"
 msgstr "Dialog"
 
-msgid "Make the page read-only?"
+msgid "Make the page public?"
 msgstr ""
 
-msgid "Export to a separate public area?"
-msgstr ""
-
 msgid "Public"
 msgstr ""
 
@@ -5604,9 +5604,6 @@
 msgid "This revision of the page does not exist."
 msgstr "Leider, Version ist nicht in der Datenbank."
 
-msgid "Make the page public?"
-msgstr ""
-
 msgid "Make the page external?"
 msgstr ""
 
@@ -5677,6 +5674,9 @@
 msgid "Watch"
 msgstr ""
 
+msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
+msgstr ""
+
 msgid "Special Actions Menu"
 msgstr ""
 
@@ -5747,9 +5747,6 @@
 msgid "Favorite Categories"
 msgstr ""
 
-msgid "EditText"
-msgstr "TextBearbeiten"
-
 #, php-format
 msgid "%s of this page"
 msgstr "%s von dieser Seite"
@@ -5777,9 +5774,6 @@
 msgid "Rename this page"
 msgstr "Diese Seite umbenennen"
 
-msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
-msgstr ""
-
 msgid "How to use this Wiki"
 msgstr "Wie man Wiki benutzt"
 
@@ -5807,9 +5801,12 @@
 msgid "Sidebar"
 msgstr "Sidebar"
 
-msgid "Edit this page"
-msgstr "Diese Seite bearbeiten"
+#~ msgid "EditText"
+#~ msgstr "TextBearbeiten"
 
+#~ msgid "Edit this page"
+#~ msgstr "Diese Seite bearbeiten"
+
 #~ msgid "Invalid filename."
 #~ msgstr "Ungültiger Dateiname."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022-01-05 17:55:47 UTC (rev 10835)
+++ trunk/locale/po/es.po	2022-01-05 17:57:12 UTC (rev 10836)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 13:02+0100\n"
+"POT-Creation-Date: 2022-01-05 18:56+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5066,6 +5066,9 @@
 msgid "This is a minor change."
 msgstr "Esto es un cambio pequeño."
 
+msgid "Make the page read-only?"
+msgstr ""
+
 #, php-format
 msgid "See %s tips for editing."
 msgstr "%s tips para editar."
@@ -5119,12 +5122,9 @@
 msgid "Dialog"
 msgstr ""
 
-msgid "Make the page read-only?"
+msgid "Make the page public?"
 msgstr ""
 
-msgid "Export to a separate public area?"
-msgstr ""
-
 msgid "Public"
 msgstr ""
 
@@ -5478,9 +5478,6 @@
 msgid "This revision of the page does not exist."
 msgstr "Esta revisión de la página no existe."
 
-msgid "Make the page public?"
-msgstr ""
-
 msgid "Make the page external?"
 msgstr ""
 
@@ -5551,6 +5548,9 @@
 msgid "Watch"
 msgstr ""
 
+msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
+msgstr ""
+
 msgid "Special Actions Menu"
 msgstr ""
 
@@ -5621,9 +5621,6 @@
 msgid "Favorite Categories"
 msgstr ""
 
-msgid "EditText"
-msgstr "Editar"
-
 #, php-format
 msgid "%s of this page"
 msgstr ""
@@ -5648,9 +5645,6 @@
 msgid "Rename this page"
 msgstr "Retitule esta página"
 
-msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
-msgstr ""
-
 msgid "How to use this Wiki"
 msgstr ""
 
@@ -5678,9 +5672,12 @@
 msgid "Sidebar"
 msgstr ""
 
-msgid "Edit this page"
-msgstr "Corrija esta página"
+#~ msgid "EditText"
+#~ msgstr "Editar"
 
+#~ msgid "Edit this page"
+#~ msgstr "Corrija esta página"
+
 #~ msgid "Invalid filename."
 #~ msgstr "Nombre de archivo inválido."
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022-01-05 17:55:47 UTC (rev 10835)
+++ trunk/locale/po/fr.po	2022-01-05 17:57:12 UTC (rev 10836)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 13:02+0100\n"
+"POT-Creation-Date: 2022-01-05 18:56+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5160,6 +5160,9 @@
 msgid "This is a minor change."
 msgstr "Modification mineure."
 
+msgid "Make the page read-only?"
+msgstr "Rendre la page non modifiable ?"
+
 #, php-format
 msgid "See %s tips for editing."
 msgstr "Voir les conseils pour éditer les pages dans %s."
@@ -5213,12 +5216,9 @@
 msgid "Dialog"
 msgstr "Dialogue"
 
-msgid "Make the page read-only?"
-msgstr "Rendre la page non modifiable ?"
+msgid "Make the page public?"
+msgstr "Rendre la page publique ?"
 
-msgid "Export to a separate public area?"
-msgstr "Exporter dans une zone publique distincte ?"
-
 msgid "Public"
 msgstr "Public"
 
@@ -5595,9 +5595,6 @@
 msgid "This revision of the page does not exist."
 msgstr "Cette version de la page n'existe pas."
 
-msgid "Make the page public?"
-msgstr "Rendre la page publique ?"
-
 msgid "Make the page external?"
 msgstr "Rendre la page externe ?"
 
@@ -5668,6 +5665,9 @@
 msgid "Watch"
 msgstr "Surveiller"
 
+msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
+msgstr "Ajouter ou supprimer de la liste de pages que vous surveillez"
+
 msgid "Special Actions Menu"
 msgstr "Menu des actions spéciales"
 
@@ -5738,9 +5738,6 @@
 msgid "Favorite Categories"
 msgstr "Catégories populaires"
 
-msgid "EditText"
-msgstr "ÉditerLeContenu"
-
 #, php-format
 msgid "%s of this page"
 msgstr "%s de cette page"
@@ -5769,9 +5766,6 @@
 msgid "Rename this page"
 msgstr "Renommer cette page"
 
-msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
-msgstr "Ajouter ou supprimer de la liste de pages que vous surveillez"
-
 msgid "How to use this Wiki"
 msgstr "Comment utiliser ce wiki"
 
@@ -5799,9 +5793,15 @@
 msgid "Sidebar"
 msgstr "Barre latérale"
 
-msgid "Edit this page"
-msgstr "Modifier cette page"
+#~ msgid "Export to a separate public area?"
+#~ msgstr "Exporter dans une zone publique distincte ?"
 
+#~ msgid "EditText"
+#~ msgstr "ÉditerLeContenu"
+
+#~ msgid "Edit this page"
+#~ msgstr "Modifier cette page"
+
 #~ msgid "Invalid filename."
 #~ msgstr "Nom de fichier incorrect."
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022-01-05 17:55:47 UTC (rev 10835)
+++ trunk/locale/po/it.po	2022-01-05 17:57:12 UTC (rev 10836)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 13:02+0100\n"
+"POT-Creation-Date: 2022-01-05 18:56+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -5026,6 +5026,9 @@
 msgid "This is a minor change."
 msgstr ""
 
+msgid "Make the page read-only?"
+msgstr ""
+
 #, php-format
 msgid "See %s tips for editing."
 msgstr "Vedere %s consigli per le modifiche."
@@ -5079,12 +5082,9 @@
 msgid "Dialog"
 msgstr ""
 
-msgid "Make the page read-only?"
+msgid "Make the page public?"
 msgstr ""
 
-msgid "Export to a separate public area?"
-msgstr ""
-
 msgid "Public"
 msgstr ""
 
@@ -5438,9 +5438,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Make the page public?"
-msgstr ""
-
 msgid "Make the page external?"
 msgstr ""
 
@@ -5511,6 +5508,9 @@
 msgid "Watch"
 msgstr ""
 
+msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
+msgstr ""
+
 msgid "Special Actions Menu"
 msgstr ""
 
@@ -5581,9 +5581,6 @@
 msgid "Favorite Categories"
 msgstr ""
 
-msgid "EditText"
-msgstr "ModificaIlTesto"
-
 #, php-format
 msgid "%s of this page"
 msgstr "%s di questa pagina"
@@ -5608,9 +5605,6 @@
 msgid "Rename this page"
 msgstr "Rinominare questa pagina"
 
-msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
-msgstr ""
-
 msgid "How to use this Wiki"
 msgstr "Come usare questo Wiki"
 
@@ -5638,8 +5632,8 @@
 msgid "Sidebar"
 msgstr ""
 
-msgid "Edit this page"
-msgstr ""
+#~ msgid "EditText"
+#~ msgstr "ModificaIlTesto"
 
 #~ msgid "Deleted"
 #~ msgstr "Rimossa"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022-01-05 17:55:47 UTC (rev 10835)
+++ trunk/locale/po/ja.po	2022-01-05 17:57:12 UTC (rev 10836)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 13:02+0100\n"
+"POT-Creation-Date: 2022-01-05 18:56+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5012,6 +5012,9 @@
 msgid "This is a minor change."
 msgstr ""
 
+msgid "Make the page read-only?"
+msgstr ""
+
 #, php-format
 msgid "See %s tips for editing."
 msgstr ""
@@ -5065,12 +5068,9 @@
 msgid "Dialog"
 msgstr "ダイアログ"
 
-msgid "Make the page read-only?"
+msgid "Make the page public?"
 msgstr ""
 
-msgid "Export to a separate public area?"
-msgstr ""
-
 msgid "Public"
 msgstr ""
 
@@ -5424,9 +5424,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Make the page public?"
-msgstr ""
-
 msgid "Make the page external?"
 msgstr ""
 
@@ -5497,6 +5494,9 @@
 msgid "Watch"
 msgstr ""
 
+msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
+msgstr ""
+
 msgid "Special Actions Menu"
 msgstr ""
 
@@ -5567,9 +5567,6 @@
 msgid "Favorite Categories"
 msgstr ""
 
-msgid "EditText"
-msgstr ""
-
 #, php-format
 msgid "%s of this page"
 msgstr ""
@@ -5594,9 +5591,6 @@
 msgid "Rename this page"
 msgstr ""
 
-msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
-msgstr ""
-
 msgid "How to use this Wiki"
 msgstr ""
 
@@ -5624,8 +5618,8 @@
 msgid "Sidebar"
 msgstr "スライドバー"
 
-msgid "Edit this page"
-msgstr "ページを編集しています"
+#~ msgid "Edit this page"
+#~ msgstr "ページを編集しています"
 
 #~ msgid "Deleted"
 #~ msgstr "削除しました"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022-01-05 17:55:47 UTC (rev 10835)
+++ trunk/locale/po/nl.po	2022-01-05 17:57:12 UTC (rev 10836)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 13:02+0100\n"
+"POT-Creation-Date: 2022-01-05 18:56+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -5018,6 +5018,9 @@
 msgid "This is a minor change."
 msgstr ""
 
+msgid "Make the page read-only?"
+msgstr ""
+
 #, php-format
 msgid "See %s tips for editing."
 msgstr "%s tips for veranderen."
@@ -5071,12 +5074,9 @@
 msgid "Dialog"
 msgstr ""
 
-msgid "Make the page read-only?"
+msgid "Make the page public?"
 msgstr ""
 
-msgid "Export to a separate public area?"
-msgstr ""
-
 msgid "Public"
 msgstr ""
 
@@ -5430,9 +5430,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Make the page public?"
-msgstr ""
-
 msgid "Make the page external?"
 msgstr ""
 
@@ -5503,6 +5500,9 @@
 msgid "Watch"
 msgstr ""
 
+msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
+msgstr ""
+
 msgid "Special Actions Menu"
 msgstr ""
 
@@ -5573,9 +5573,6 @@
 msgid "Favorite Categories"
 msgstr ""
 
-msgid "EditText"
-msgstr "VeranderTekst"
-
 #, php-format
 msgid "%s of this page"
 msgstr ""
@@ -5600,9 +5597,6 @@
 msgid "Rename this page"
 msgstr ""
 
-msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
-msgstr ""
-
 msgid "How to use this Wiki"
 msgstr ""
 
@@ -5630,8 +5624,8 @@
 msgid "Sidebar"
 msgstr "Zoek"
 
-msgid "Edit this page"
-msgstr ""
+#~ msgid "EditText"
+#~ msgstr "VeranderTekst"
 
 #~ msgid "Thank you for editing %s."
 #~ msgstr "Bedankt voor het veranderen van %s."

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022-01-05 17:55:47 UTC (rev 10835)
+++ trunk/locale/po/phpwiki.pot	2022-01-05 17:57:12 UTC (rev 10836)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 13:02+0100\n"
+"POT-Creation-Date: 2022-01-05 18:56+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5012,6 +5012,9 @@
 msgid "This is a minor change."
 msgstr ""
 
+msgid "Make the page read-only?"
+msgstr ""
+
 #, php-format
 msgid "See %s tips for editing."
 msgstr ""
@@ -5065,12 +5068,9 @@
 msgid "Dialog"
 msgstr ""
 
-msgid "Make the page read-only?"
+msgid "Make the page public?"
 msgstr ""
 
-msgid "Export to a separate public area?"
-msgstr ""
-
 msgid "Public"
 msgstr ""
 
@@ -5424,9 +5424,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Make the page public?"
-msgstr ""
-
 msgid "Make the page external?"
 msgstr ""
 
@@ -5497,6 +5494,9 @@
 msgid "Watch"
 msgstr ""
 
+msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
+msgstr ""
+
 msgid "Special Actions Menu"
 msgstr ""
 
@@ -5567,9 +5567,6 @@
 msgid "Favorite Categories"
 msgstr ""
 
-msgid "EditText"
-msgstr ""
-
 #, php-format
 msgid "%s of this page"
 msgstr ""
@@ -5594,9 +5591,6 @@
 msgid "Rename this page"
 msgstr ""
 
-msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
-msgstr ""
-
 msgid "How to use this Wiki"
 msgstr ""
 
@@ -5623,6 +5617,3 @@
 
 msgid "Sidebar"
 msgstr ""
-
-msgid "Edit this page"
-msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-05 17:55:47 UTC (rev 10835)
+++ trunk/locale/po/sv.po	2022-01-05 17:57:12 UTC (rev 10836)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 13:02+0100\n"
+"POT-Creation-Date: 2022-01-05 18:56+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5013,6 +5013,9 @@
 msgid "This is a minor change."
 msgstr ""
 
+msgid "Make the page read-only?"
+msgstr ""
+
 #, php-format
 msgid "See %s tips for editing."
 msgstr "%s: Redigeringstips."
@@ -5066,12 +5069,9 @@
 msgid "Dialog"
 msgstr ""
 
-msgid "Make the page read-only?"
+msgid "Make the page public?"
 msgstr ""
 
-msgid "Export to a separate public area?"
-msgstr ""
-
 msgid "Public"
 msgstr ""
 
@@ -5425,9 +5425,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Make the page public?"
-msgstr ""
-
 msgid "Make the page external?"
 msgstr ""
 
@@ -5498,6 +5495,9 @@
 msgid "Watch"
 msgstr ""
 
+msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
+msgstr ""
+
 msgid "Special Actions Menu"
 msgstr ""
 
@@ -5568,9 +5568,6 @@
 msgid "Favorite Categories"
 msgstr ""
 
-msgid "EditText"
-msgstr "RedigeraText"
-
 #, php-format
 msgid "%s of this page"
 msgstr "%s för den här sidan"
@@ -5595,9 +5592,6 @@
 msgid "Rename this page"
 msgstr ""
 
-msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
-msgstr ""
-
 msgid "How to use this Wiki"
 msgstr ""
 
@@ -5625,8 +5619,8 @@
 msgid "Sidebar"
 msgstr ""
 
-msgid "Edit this page"
-msgstr ""
+#~ msgid "EditText"
+#~ msgstr "RedigeraText"
 
 #~ msgid "Thank you for editing %s."
 #~ msgstr "Tack för att du redigerade %s."

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022-01-05 17:55:47 UTC (rev 10835)
+++ trunk/locale/po/zh.po	2022-01-05 17:57:12 UTC (rev 10836)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-05 13:02+0100\n"
+"POT-Creation-Date: 2022-01-05 18:56+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5034,6 +5034,9 @@
 msgid "This is a minor change."
 msgstr "這是次要變更."
 
+msgid "Make the page read-only?"
+msgstr ""
+
 #, php-format
 msgid "See %s tips for editing."
 msgstr "參照編輯時的 %s 小秘訣."
@@ -5087,12 +5090,9 @@
 msgid "Dialog"
 msgstr "對話盒"
 
-msgid "Make the page read-only?"
+msgid "Make the page public?"
 msgstr ""
 
-msgid "Export to a separate public area?"
-msgstr ""
-
 msgid "Public"
 msgstr ""
 
@@ -5452,9 +5452,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Make the page public?"
-msgstr ""
-
 msgid "Make the page external?"
 msgstr ""
 
@@ -5525,6 +5522,9 @@
 msgid "Watch"
 msgstr ""
 
+msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
+msgstr ""
+
 msgid "Special Actions Menu"
 msgstr ""
 
@@ -5595,9 +5595,6 @@
 msgid "Favorite Categories"
 msgstr ""
 
-msgid "EditText"
-msgstr ""
-
 #, php-format
 msgid "%s of this page"
 msgstr "此頁面的 %s"
@@ -5622,9 +5619,6 @@
 msgid "Rename this page"
 msgstr ""
 
-msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
-msgstr ""
-
 msgid "How to use this Wiki"
 msgstr ""
 
@@ -5652,8 +5646,8 @@
 msgid "Sidebar"
 msgstr ""
 
-msgid "Edit this page"
-msgstr "編輯此頁面"
+#~ msgid "Edit this page"
+#~ msgstr "編輯此頁面"
 
 #~ msgid "Deleted"
 #~ msgstr "已刪除"

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10835] trunk/themes

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

Revision: 10835
          http://sourceforge.net/p/phpwiki/code/10835
Author:   vargenau
Date:     2022-01-05 17:55:47 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
templates: move banners for old revision and locked pages from browse.tmpl and viewsource.tmpl to body.tmpl

Modified Paths:
--------------
    trunk/themes/Crao/templates/body.tmpl
    trunk/themes/Crao/templates/browse.tmpl
    trunk/themes/MonoBook/templates/body.tmpl
    trunk/themes/MonoBook/templates/browse.tmpl
    trunk/themes/MonoBook/templates/viewsource.tmpl
    trunk/themes/Portland/templates/body.tmpl
    trunk/themes/Portland/templates/browse.tmpl
    trunk/themes/Portland/templates/viewsource.tmpl
    trunk/themes/Sidebar/templates/body.tmpl
    trunk/themes/Wordpress/templates/body.tmpl
    trunk/themes/Wordpress/templates/browse.tmpl
    trunk/themes/Wordpress/templates/viewsource.tmpl
    trunk/themes/blog/templates/body.tmpl
    trunk/themes/default/templates/body.tmpl
    trunk/themes/default/templates/browse.tmpl
    trunk/themes/default/templates/viewsource.tmpl
    trunk/themes/wikilens/templates/body.tmpl

Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Crao/templates/body.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -12,6 +12,25 @@
       <h1><?php echo $HEADER ?></h1>
       <?php } ?>
       <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
+      }
+      if (($action != 'edit') && ($action != 'revert')
+                && $revision and !$revision->isCurrent()) { ?>
+        <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 } ?>
       <?php echo $CONTENT ?>
       </main>
     <?php echo Template('bottom') ?>

Modified: trunk/themes/Crao/templates/browse.tmpl
===================================================================
--- trunk/themes/Crao/templates/browse.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Crao/templates/browse.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,17 +1,4 @@
-<?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 } ?>
 <?php echo $CONTENT?>
-
 <div id="revision">
 <p class="editdate"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></p>
 <?php
@@ -19,5 +6,4 @@
 if (!$HIDE_TOOLBARS) {
 ?>
 </div>
-
 <?php } ?>

Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/MonoBook/templates/body.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -6,6 +6,25 @@
       <?php echo Template('top') ?>
       </header>
       <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
+      }
+      if (($action != 'edit') && ($action != 'revert')
+                && $revision and !$revision->isCurrent()) { ?>
+        <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 class="clear-floats"></div>

Modified: trunk/themes/MonoBook/templates/browse.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/MonoBook/templates/browse.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,13 +1 @@
-<?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 } ?>
 <?php echo $CONTENT?>

Modified: trunk/themes/MonoBook/templates/viewsource.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/viewsource.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/MonoBook/templates/viewsource.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,14 +1,3 @@
-<?php
-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 and !$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" />
 <textarea class="wikiedit"
           name="content"

Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Portland/templates/body.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -7,6 +7,25 @@
              class="bottom" /></a> <?php echo $HEADER ?></h1>
       </header>
       <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
+      }
+      if (($action != 'edit') && ($action != 'revert')
+                && $revision and !$revision->isCurrent()) { ?>
+        <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 } ?>
       <?php echo $CONTENT ?>
       </main>
       <?php echo Template('navbar') ?>

Modified: trunk/themes/Portland/templates/browse.tmpl
===================================================================
--- trunk/themes/Portland/templates/browse.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Portland/templates/browse.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,18 +1,3 @@
-<?php
-$action = $request->getArg('action');
-?>
-<br class="clear-floats" />
-<?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>
-  <hr class="ignore" />
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
-  <p><?php echo $redirected ?></p>
-<?php } ?>
 <?php echo $CONTENT?>
 <hr />
 <?php echo Template('actionbar') ?>
-<?php // The bottom navigation/search bar ?>

Modified: trunk/themes/Portland/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Portland/templates/viewsource.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Portland/templates/viewsource.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,14 +1,3 @@
-<?php
-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 and !$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 } ?>
 <textarea class="wikiedit"
           name="content"
           rows="<?php echo $request->getPref('editHeight') ?>"

Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Sidebar/templates/body.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -4,9 +4,28 @@
     <div id="content">
       <main role="main">
       <?php echo Template('top') ?>
+      <?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
+      }
+      if (($action != 'edit') && ($action != 'revert')
+                && $revision and !$revision->isCurrent()) { ?>
+        <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 class="clear-floats"></div>
+      <?php echo $CONTENT ?>
+      <div class="clear-floats"></div>
       </div>
       </main>
     </div>

Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Wordpress/templates/body.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -3,6 +3,25 @@
       <h1 id="header"><?php echo $HEADER ?></h1>
       </header>
       <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
+      }
+      if (($action != 'edit') && ($action != 'revert')
+                && $revision and !$revision->isCurrent()) { ?>
+        <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 } ?>
       <?php echo $CONTENT ?>
       </main>
       <?php echo Template('navbar') ?>

Modified: trunk/themes/Wordpress/templates/browse.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/browse.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Wordpress/templates/browse.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,18 +1,5 @@
-<?php
-$action = $request->getArg('action');
-?>
 <br class="clear-floats" />
-<?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>
-  <hr class="ignore" />
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
-  <p><?php echo $redirected ?></p>
-<?php } ?>
+<hr class="ignore" />
 <?php echo $CONTENT?>
 <hr />
 <?php echo Template('actionbar') ?>
-<?php // The bottom navigation/search bar ?>

Modified: trunk/themes/Wordpress/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/viewsource.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Wordpress/templates/viewsource.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,16 +1,4 @@
 <div class="wikitext">
-<?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 and !$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 } ?>
 <textarea class="wikiedit"
           name="content"
           rows="<?php echo $request->getPref('editHeight') ?>"

Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/blog/templates/body.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -4,23 +4,25 @@
       <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 } ?>
+      <?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
+      }
+      if (($action != 'edit') && ($action != 'revert')
+                && $revision and !$revision->isCurrent()) { ?>
+        <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/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/default/templates/body.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -5,6 +5,25 @@
       </div>
       </header>
       <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
+      }
+      if (($action != 'edit') && ($action != 'revert')
+                && $revision and !$revision->isCurrent()) { ?>
+        <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="content">
       <?php echo $CONTENT ?>
       </div>

Modified: trunk/themes/default/templates/browse.tmpl
===================================================================
--- trunk/themes/default/templates/browse.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/default/templates/browse.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,16 +1,4 @@
-<?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 } ?>
 <?php echo $CONTENT?>
-<div id="footer"><?php // for top & bottom toolbars stylesheet ?>
+<div id="footer">
   <?php echo Template('browse-footer') ?>
 </div>

Modified: trunk/themes/default/templates/viewsource.tmpl
===================================================================
--- trunk/themes/default/templates/viewsource.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/default/templates/viewsource.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,14 +1,3 @@
-<?php
-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 and !$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" />
 <textarea class="wikiedit"
           name="content"
@@ -17,6 +6,6 @@
           readonly="readonly"
 ><?php echo $PAGE_SOURCE ?>
 </textarea>
-<div id="footer"><?php // for top & bottom toolbars stylesheet ?>
+<div id="footer">
   <?php echo Template('browse-footer') ?>
 </div>

Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/wikilens/templates/body.tmpl	2022-01-05 17:55:47 UTC (rev 10835)
@@ -28,8 +28,27 @@
       $dbi = $request->getDbh(); // Needed in PHP 8
       printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup));
       } ?> </h1>
-        <?php echo $CONTENT ?>
-    </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
+      }
+      if (($action != 'edit') && ($action != 'revert')
+                && $revision and !$revision->isCurrent()) { ?>
+        <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 } ?>
+      <?php echo $CONTENT ?>
+      </main>
     <?php echo Template('bottom') ?>
 </td>
 </tr>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10834] trunk/themes/fusionforge/templates/browse.tmpl

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

Revision: 10834
          http://sourceforge.net/p/phpwiki/code/10834
Author:   vargenau
Date:     2022-01-05 17:51:01 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Remove comment

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/browse.tmpl

Modified: trunk/themes/fusionforge/templates/browse.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse.tmpl	2022-01-05 17:48:14 UTC (rev 10833)
+++ trunk/themes/fusionforge/templates/browse.tmpl	2022-01-05 17:51:01 UTC (rev 10834)
@@ -37,6 +37,6 @@
 
 <?php } ?>
 
-<div id="footer"><?php // for top & bottom toolbars stylesheet ?>
+<div id="footer">
   <?php echo Template('browse-footer') ?>
 </div>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10833] trunk/themes/default/templates/comment.tmpl

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

Revision: 10833
          http://sourceforge.net/p/phpwiki/code/10833
Author:   vargenau
Date:     2022-01-05 17:48:14 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Remove comment

Modified Paths:
--------------
    trunk/themes/default/templates/comment.tmpl

Modified: trunk/themes/default/templates/comment.tmpl
===================================================================
--- trunk/themes/default/templates/comment.tmpl	2022-01-05 17:47:11 UTC (rev 10832)
+++ trunk/themes/default/templates/comment.tmpl	2022-01-05 17:48:14 UTC (rev 10833)
@@ -19,7 +19,6 @@
 }
 ?>
 
-<?php // FIXME: move table formatting to css ?>
 <div title="<?php echo fmt("Comments on %s by %s.", $COMMENT_PARENT, $COMMENT_CREATOR)?>"
      class="wikicomment wikitext">
   <div class="wikicomment-footer">

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10832] trunk/themes/Portland/templates/navbar.tmpl

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

Revision: 10832
          http://sourceforge.net/p/phpwiki/code/10832
Author:   vargenau
Date:     2022-01-05 17:47:11 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Whitespace

Modified Paths:
--------------
    trunk/themes/Portland/templates/navbar.tmpl

Modified: trunk/themes/Portland/templates/navbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/navbar.tmpl	2022-01-05 17:46:48 UTC (rev 10831)
+++ trunk/themes/Portland/templates/navbar.tmpl	2022-01-05 17:47:11 UTC (rev 10832)
@@ -1,6 +1,5 @@
 <nav role="navigation" aria-label="<?php echo _("Main Menu") ?>">
 <?php // The bottom navigation/search bar ?>
-
     <?php echo WikiLink(__("FindPage"), "button") ?> by searching
     <?php if ($revision) { ?>
       (or browse <?php echo Button(__("LikePages"), _("LikePages")) ?>)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10831] trunk/themes/Wordpress/templates/navbar.tmpl

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

Revision: 10831
          http://sourceforge.net/p/phpwiki/code/10831
Author:   vargenau
Date:     2022-01-05 17:46:48 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Remove comment

Modified Paths:
--------------
    trunk/themes/Wordpress/templates/navbar.tmpl

Modified: trunk/themes/Wordpress/templates/navbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/navbar.tmpl	2022-01-05 17:45:47 UTC (rev 10830)
+++ trunk/themes/Wordpress/templates/navbar.tmpl	2022-01-05 17:46:48 UTC (rev 10831)
@@ -1,4 +1,3 @@
 <?php
   $Sep = $WikiTheme->getButtonSeparator();
 ?>
-<?php // The bottom navigation/search bar ?>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10830] trunk/themes

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

Revision: 10830
          http://sourceforge.net/p/phpwiki/code/10830
Author:   vargenau
Date:     2022-01-05 17:45:47 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Add label

Modified Paths:
--------------
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2022-01-05 17:45:25 UTC (rev 10829)
+++ trunk/themes/Portland/templates/editpage.tmpl	2022-01-05 17:45:47 UTC (rev 10830)
@@ -3,33 +3,35 @@
       accept-charset="UTF-8">
 <table class="toolbar fullwidth">
 <tr class="bottom">
-  <td>
-    <?php echo $PAGE_LOCKED_MESSAGE ?>
-    <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-    <?php if (!$IS_CURRENT) { ?>
+<td>
+<?php echo $PAGE_LOCKED_MESSAGE ?>
+<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
+<?php if (!$IS_CURRENT) { ?>
       <p class="warning_msg">
       <strong><?php echo _("Warning")._(": ") ?></strong>
       <?php echo _("You are editing an old revision.") ?>
       <?php echo _("Saving this page will overwrite the current version.") ?>
       </p>
-    <?php } ?>
-  </td>
+<?php } ?>
+</td>
 </tr>
 </table>
 <div id="editarea"><?php echo $EDIT_TEXTAREA?></div>
 <br />
-<?php echo _("Summary")._(":") ?> <?php echo $SUMMARY_INPUT ?>
+<?php echo _("Summary")._(":") ?><?php echo $SUMMARY_INPUT ?>
 <br />
-    <?php echo $PREVIEW_B ?>
-    <?php if ($SAVE_B) { ?>
-      <?php echo $SEP?><?php echo $SAVE_B ?>
-    <?php } ?>
+<?php echo $PREVIEW_B ?>
+<?php if ($SAVE_B) { ?>
+  <?php echo $SEP?><?php echo $SAVE_B ?>
+<?php } ?>
 <br />
 <?php echo fmt("Author will be logged as %s.", HTML::em($user->getId())) ?>
 <br />
 <?php echo $MINOR_EDIT_CB ?>
+<label for="edit-minor_edit">
 <?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
         WikiLink(__("RecentEdits"))) ?>
+</label>
 <br />
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <hr />
@@ -39,7 +41,6 @@
 <?php } ?>
 
 <div class="wiki-edithelp">
-<?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
 <p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
 <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2022-01-05 17:45:25 UTC (rev 10829)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2022-01-05 17:45:47 UTC (rev 10830)
@@ -5,19 +5,19 @@
   <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1">'; ?>
 <table class="toolbar fullwidth">
 <tr class="bottom">
-  <td>
-    <?php echo $PAGE_LOCKED_MESSAGE ?>
-    <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-    <?php if (!$IS_CURRENT) { ?>
+<td>
+<?php echo $PAGE_LOCKED_MESSAGE ?>
+<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
+<?php if (!$IS_CURRENT) { ?>
       <p class="warning_msg">
       <strong><?php echo _("Warning")._(": ") ?></strong>
       <?php echo _("You are editing an old revision.") ?>
       <?php echo _("Saving this page will overwrite the current version.") ?>
       </p>
-    <?php } ?>
-  </td>
-  <td>
-  </td>
+<?php } ?>
+</td>
+<td>
+</td>
 </tr>
 </table>
 <?php if (isset($EDIT_TOOLBAR)) { ?>
@@ -25,7 +25,8 @@
 <?php } ?>
 <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <p>
-<?php echo _("Summary")._(":") ?><?php echo $SUMMARY_INPUT ?>
+<label for="edit-summary"><?php echo _("Summary")._(":") ?></label>
+<?php echo $SUMMARY_INPUT ?>
 </p>
 <p>
 <?php echo $PREVIEW_B ?>
@@ -35,14 +36,16 @@
 </p>
 <?php if (ENABLE_CAPTCHA) { ?>
   <?php echo $CAPTCHA_IMAGE ?><br/>
-  <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?><br/>
+  <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?>
+<br/>
 <?php } ?>
 <?php echo fmt("Author will be logged as %s.", HTML::em($user->getId())) ?>
 <br />
 <?php echo $MINOR_EDIT_CB ?>
-  <label for="edit-minor_edit">
-  <?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
-        WikiLink(__("RecentEdits"))) ?></label>
+<label for="edit-minor_edit">
+<?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
+        WikiLink(__("RecentEdits"))) ?>
+</label>
 <br />
   <?php if ($user->isAdmin()) { ?>
     <?php echo $SEP?><?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
@@ -56,7 +59,6 @@
 <?php } ?>
 
 <div class="wiki-edithelp">
-<?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
 <p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
 <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10829] trunk/themes/Crao/templates/editpage.tmpl

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

Revision: 10829
          http://sourceforge.net/p/phpwiki/code/10829
Author:   vargenau
Date:     2022-01-05 17:45:25 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Add title

Modified Paths:
--------------
    trunk/themes/Crao/templates/editpage.tmpl

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2022-01-05 17:45:04 UTC (rev 10828)
+++ trunk/themes/Crao/templates/editpage.tmpl	2022-01-05 17:45:25 UTC (rev 10829)
@@ -9,7 +9,7 @@
 <?php } ?>
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (! $IS_CURRENT) { ?>
+<?php if (!$IS_CURRENT) { ?>
       <p class="warning_msg">
       <strong><?php echo _("Warning")._(": ") ?></strong>
       <?php echo _("You are editing an old revision.") ?>
@@ -19,29 +19,35 @@
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="UTF-8">
-  <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
-  <br class="clear-floats" />
-  <?php if (isset($EDIT_TOOLBAR)) { ?>
-      <?php echo $EDIT_TOOLBAR ?>
-  <?php } ?>
-  <fieldset class="editarea">
-  <legend><?php echo _("Page Content: ")?></legend>
-  <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
-  </fieldset>
- <fieldset class="editarea">
-    <legend><?php echo _("Summary")._(":") ?></legend><br />
-    <?php echo $SUMMARY_INPUT?>
-  </fieldset>
+<?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
+<br class="clear-floats" />
+<?php if (isset($EDIT_TOOLBAR)) { ?>
+    <?php echo $EDIT_TOOLBAR ?>
+<?php } ?>
+<fieldset class="editarea">
+<legend><?php echo _("Page Content: ")?></legend>
+<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
+</fieldset>
+<fieldset class="editarea">
+<legend><?php echo _("Summary")._(":") ?></legend><br />
+<?php echo $SUMMARY_INPUT ?>
+</fieldset>
 <?php if (ENABLE_CAPTCHA) { ?>
   <fieldset class="toolbar" style="text-align: center;">
   <?php echo $CAPTCHA_IMAGE ?><br/>
   <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?>
-  </fieldset>
-  <?php } ?>
-  <fieldset class="toolbar">
-    <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label>&nbsp;&nbsp;
+</fieldset>
+<?php } ?>
+<fieldset class="toolbar">
+<?php echo $MINOR_EDIT_CB ?>
+<label for="edit-minor_edit">
+<?php echo _("This is a minor change.")?>
+</label>&nbsp;&nbsp;
 <?php if ($user->isAdmin()) { ?>
-    <?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
+<?php echo $LOCKED_CB ?>
+<label for="edit-locked" title="<?php echo _("Make the page read-only?")?>">
+<?php echo _("Locked") ?>
+</label>
 <?php } ?>
   </fieldset>
   <fieldset class="toolbar">
@@ -56,7 +62,6 @@
   </fieldset>
 <hr />
 <div class="wiki-edithelp">
-<?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
 <p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
 <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10828] trunk/themes/default/templates/editpage.tmpl

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

Revision: 10828
          http://sourceforge.net/p/phpwiki/code/10828
Author:   vargenau
Date:     2022-01-05 17:45:04 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Less strings

Modified Paths:
--------------
    trunk/themes/default/templates/editpage.tmpl

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2022-01-05 17:44:40 UTC (rev 10827)
+++ trunk/themes/default/templates/editpage.tmpl	2022-01-05 17:45:04 UTC (rev 10828)
@@ -9,7 +9,7 @@
 <?php } ?>
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (! $IS_CURRENT) { ?>
+<?php if (!$IS_CURRENT) { ?>
       <p class="warning_msg">
       <strong><?php echo _("Warning")._(": ") ?></strong>
       <?php echo _("You are editing an old revision.") ?>
@@ -19,17 +19,18 @@
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="UTF-8">
-  <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
-  <br class="clear-floats" />
-  <?php if (isset($EDIT_TOOLBAR)) { ?>
-      <?php echo $EDIT_TOOLBAR ?>
-  <?php } ?>
+<?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
+<br class="clear-floats" />
+<?php if (isset($EDIT_TOOLBAR)) { ?>
+    <?php echo $EDIT_TOOLBAR ?>
+<?php } ?>
 <?php if (!empty($WYSIWYG_B)) { ?>
   <br /><div class="hint"><strong>Warning:</strong> Switching to the Wysiwyg editor will not keep your changes.</div>
 <?php } ?>
-  <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
+<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <div class="toolbar" style="text-align: center;">
-  <label for="edit-summary"><?php echo _("Summary")._(":") ?></label> <?php echo $SUMMARY_INPUT ?>
+<label for="edit-summary"><?php echo _("Summary")._(":") ?></label>
+<?php echo $SUMMARY_INPUT ?>
 </div>
 <?php if (ENABLE_CAPTCHA) { ?>
 <div class="toolbar" style="text-align: center;">
@@ -39,42 +40,47 @@
 <?php } ?>
 <table class="toolbar fullwidth">
 <tr class="middle">
-  <td>
-    <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
-  </td>
-  <td class="align-center">
-    <?php if (!empty($WYSIWYG_B)){ ?>
-    <?php echo $WYSIWYG_B?><?php echo $SEP?>
-    <?php } ?>
-    <?php echo $PREVIEW_B ?>
-    <?php if ($SAVE_B) { ?>
-      <?php echo $SEP?><?php echo $SAVE_B ?>
-    <?php } ?>
-    <?php echo $SEP?><?php echo $CHANGES_B ?>
-  </td>
-  <td><?php echo $AUTHOR_MESSAGE?></td>
+<td>
+<?php echo $MINOR_EDIT_CB ?>
+<label for="edit-minor_edit">
+<?php echo _("This is a minor change.")?>
+</label>
+<br />
+</td>
+<td class="align-center">
+<?php if (!empty($WYSIWYG_B)){ ?>
+<?php echo $WYSIWYG_B?><?php echo $SEP?>
+<?php } ?>
+<?php echo $PREVIEW_B ?>
+<?php if ($SAVE_B) { ?>
+<?php echo $SEP?><?php echo $SAVE_B ?>
+<?php } ?>
+<?php echo $SEP?><?php echo $CHANGES_B ?>
+</td>
+<td><?php echo $AUTHOR_MESSAGE?></td>
 </tr>
 <tr>
-  <td>
-    <?php if ($user->isAdmin()) { ?>
-      <?php echo $LOCKED_CB ?> <label for="edit-locked" title="<?php echo _("Make the page read-only?")?>"><?php echo _("Locked")?></label>
-      <?php if (ENABLE_PAGE_PUBLIC) { ?>
-        <?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Export to a separate public area?")?>"><?php echo _("Public")?></label>
-      <?php }} ?>
-  </td>
-  <td colspan="2" class="align-right">
-    <?php if (!$user->isAuthenticated()) { ?>
-    <?php echo Template('signin', array('FORMNAME' => 'editpage')) ?>
-    <?php } ?>
-  </td>
+<td>
+<?php if ($user->isAdmin()) { ?>
+<?php echo $LOCKED_CB ?>
+<label for="edit-locked" title="<?php echo _("Make the page read-only?")?>">
+<?php echo _("Locked") ?>
+</label>
+<?php if (ENABLE_PAGE_PUBLIC) { ?>
+<?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Make the page public?")?>"><?php echo _("Public")?></label>
+<?php }} ?>
+</td>
+<td colspan="2" class="align-right">
+<?php if (!$user->isAuthenticated()) { ?>
+<?php echo Template('signin', array('FORMNAME' => 'editpage')) ?>
+<?php } ?>
+</td>
 </tr>
 </table>
 <?php echo $HIDDEN_INPUTS?>
 </form>
-<div style="width:100%;text-align:center;"><?php /*plugin UpLoad autolink=0 mode=edit size=30 */?></div>
 <hr />
 <div class="wiki-edithelp">
-<?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
 <p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
 <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10827] trunk/themes/fusionforge/templates/ editpage.tmpl

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

Revision: 10827
          http://sourceforge.net/p/phpwiki/code/10827
Author:   vargenau
Date:     2022-01-05 17:44:40 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Whitespace

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2022-01-05 16:23:04 UTC (rev 10826)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2022-01-05 17:44:40 UTC (rev 10827)
@@ -7,7 +7,7 @@
 <?php } ?>
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (! $IS_CURRENT) { ?>
+<?php if (!$IS_CURRENT) { ?>
       <p class="warning_msg">
       <strong><?php echo _("Warning")._(": ") ?></strong>
       <?php echo _("You are editing an old revision.") ?>
@@ -73,30 +73,34 @@
 </div>
 <table class="fullwidth">
 <tr class="middle">
-  <td>
-    <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
-  </td>
-  <td class="align-center">
-    <?php echo $PREVIEW_B ?>
-    <?php if ($SAVE_B) { ?>
-      <?php echo $SEP?><?php echo $SAVE_B ?>
-    <?php } ?>
-    <?php echo $SEP?><?php echo $CHANGES_B ?>
-  </td>
-  <td><?php echo $AUTHOR_MESSAGE?></td>
+<td>
+<?php echo $MINOR_EDIT_CB ?>
+<label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
+</td>
+<td class="align-center">
+<?php echo $PREVIEW_B ?>
+<?php if ($SAVE_B) { ?>
+<?php echo $SEP?><?php echo $SAVE_B ?>
+<?php } ?>
+<?php echo $SEP?><?php echo $CHANGES_B ?>
+</td>
+<td><?php echo $AUTHOR_MESSAGE?></td>
 </tr>
 <tr>
-  <td colspan="3">
-    <?php if ($user->isAdmin()) { ?>
-      <?php echo $LOCKED_CB ?> <label for="edit-locked" title="<?php echo _("Make the page read-only?")?>"><?php echo _("Locked")?></label>
-      <?php if (ENABLE_PAGE_PUBLIC) { ?>
-        <?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Make the page public?")?>"><?php echo _("Public")?></label>
-      <?php } ?>
-      <?php if (ENABLE_EXTERNAL_PAGES) { ?>
-        <?php echo $EXTERNAL_CB ?> <label for="edit-external" title="<?php echo _("Make the page external?")?>"><?php echo _("External")?></label>
-      <?php } ?>
-    <?php } ?>
-  </td>
+<td colspan="3">
+<?php if ($user->isAdmin()) { ?>
+<?php echo $LOCKED_CB ?>
+<label for="edit-locked" title="<?php echo _("Make the page read-only?")?>">
+<?php echo _("Locked") ?>
+</label>
+<?php if (ENABLE_PAGE_PUBLIC) { ?>
+<?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Make the page public?")?>"><?php echo _("Public")?></label>
+<?php } ?>
+<?php if (ENABLE_EXTERNAL_PAGES) { ?>
+<?php echo $EXTERNAL_CB ?> <label for="edit-external" title="<?php echo _("Make the page external?")?>"><?php echo _("External")?></label>
+<?php } ?>
+<?php } ?>
+</td>
 </tr>
 </table>
 <?php echo $HIDDEN_INPUTS?>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10826] trunk/lib/editpage.php

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

Revision: 10826
          http://sourceforge.net/p/phpwiki/code/10826
Author:   vargenau
Date:     2022-01-05 16:23:04 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
lib/editpage.php: avoid warning

Modified Paths:
--------------
    trunk/lib/editpage.php

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2022-01-05 16:09:55 UTC (rev 10825)
+++ trunk/lib/editpage.php	2022-01-05 16:23:04 UTC (rev 10826)
@@ -315,10 +315,10 @@
     {
         $request = &$this->request;
 
+        $lock_changed = false;
         if ($this->isUnchanged()) {
             // Allow admin lock/unlock even if
             // no text changes were made.
-            $lock_changed = false;
             if ($this->updateLock()) {
                 $lock_changed = true;
             } else {

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