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

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

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

Revision: 10800
          http://sourceforge.net/p/phpwiki/code/10800
Author:   vargenau
Date:     2021-12-25 08:50:52 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
No need to translate this, modern browsers will display their own message

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
    trunk/themes/fusionforge/templates/editpage.tmpl

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	2021-12-16 17:24:40 UTC (rev 10799)
+++ trunk/locale/po/de.po	2021-12-25 08:50:52 UTC (rev 10800)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-15 16:33+0100\n"
+"POT-Creation-Date: 2021-12-22 15:23+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."
@@ -2950,9 +2950,6 @@
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr ""
 
-msgid "no cache used"
-msgstr "kein Cache verwendet"
-
 msgid "cached pagedata:"
 msgstr "Seitendaten in den Cachespeicher aufgenommen:"
 
@@ -5628,9 +5625,6 @@
 msgid "This revision of the page does not exist."
 msgstr "Leider, Version ist nicht in der Datenbank."
 
-msgid "Warning: leaving the page will lose all your modifications!"
-msgstr ""
-
 msgid "Make the page public?"
 msgstr ""
 
@@ -5837,6 +5831,9 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "no cache used"
+#~ msgstr "kein Cache verwendet"
+
 #~ msgid "External Links"
 #~ msgstr "Externe Links"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-12-16 17:24:40 UTC (rev 10799)
+++ trunk/locale/po/es.po	2021-12-25 08:50:52 UTC (rev 10800)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-15 16:33+0100\n"
+"POT-Creation-Date: 2021-12-22 15:23+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2884,9 +2884,6 @@
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr ""
 
-msgid "no cache used"
-msgstr ""
-
 msgid "cached pagedata:"
 msgstr "Página archivada:"
 
@@ -5501,9 +5498,6 @@
 msgid "This revision of the page does not exist."
 msgstr "Esta revisión de la página no existe."
 
-msgid "Warning: leaving the page will lose all your modifications!"
-msgstr ""
-
 msgid "Make the page public?"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-12-16 17:24:40 UTC (rev 10799)
+++ trunk/locale/po/fr.po	2021-12-25 08:50:52 UTC (rev 10800)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-15 16:33+0100\n"
+"POT-Creation-Date: 2021-12-22 15:23+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."
@@ -2935,9 +2935,6 @@
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr "Affiche les informations de bas niveau pour PhpWiki."
 
-msgid "no cache used"
-msgstr "pas de cache utilisé"
-
 msgid "cached pagedata:"
 msgstr "page en cache :"
 
@@ -5622,9 +5619,6 @@
 msgid "This revision of the page does not exist."
 msgstr "Cette version de la page n'existe pas."
 
-msgid "Warning: leaving the page will lose all your modifications!"
-msgstr "Attention : quitter cette page annulera toutes vos modifications !"
-
 msgid "Make the page public?"
 msgstr "Rendre la page publique ?"
 
@@ -5832,6 +5826,12 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "no cache used"
+#~ msgstr "pas de cache utilisé"
+
+#~ msgid "Warning: leaving the page will lose all your modifications!"
+#~ msgstr "Attention : quitter cette page annulera toutes vos modifications !"
+
 #~ msgid "Tutorial"
 #~ msgstr "Tutoriel"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-12-16 17:24:40 UTC (rev 10799)
+++ trunk/locale/po/it.po	2021-12-25 08:50:52 UTC (rev 10800)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-15 16:33+0100\n"
+"POT-Creation-Date: 2021-12-22 15:23+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"
@@ -2861,9 +2861,6 @@
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr ""
 
-msgid "no cache used"
-msgstr ""
-
 msgid "cached pagedata:"
 msgstr ""
 
@@ -5461,9 +5458,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Warning: leaving the page will lose all your modifications!"
-msgstr ""
-
 msgid "Make the page public?"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-12-16 17:24:40 UTC (rev 10799)
+++ trunk/locale/po/ja.po	2021-12-25 08:50:52 UTC (rev 10800)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-15 16:33+0100\n"
+"POT-Creation-Date: 2021-12-22 15:23+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"
@@ -2847,9 +2847,6 @@
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr ""
 
-msgid "no cache used"
-msgstr "キャッシュを使いません"
-
 msgid "cached pagedata:"
 msgstr "ページデータをキャッシュ:"
 
@@ -5447,9 +5444,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Warning: leaving the page will lose all your modifications!"
-msgstr ""
-
 msgid "Make the page public?"
 msgstr ""
 
@@ -5653,6 +5647,9 @@
 msgid "Edit this page"
 msgstr "ページを編集しています"
 
+#~ msgid "no cache used"
+#~ msgstr "キャッシュを使いません"
+
 #~ msgid "Submit country"
 #~ msgstr "国名送信"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-12-16 17:24:40 UTC (rev 10799)
+++ trunk/locale/po/nl.po	2021-12-25 08:50:52 UTC (rev 10800)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-15 16:33+0100\n"
+"POT-Creation-Date: 2021-12-22 15:23+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"
@@ -2853,9 +2853,6 @@
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr ""
 
-msgid "no cache used"
-msgstr ""
-
 msgid "cached pagedata:"
 msgstr ""
 
@@ -5453,9 +5450,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Warning: leaving the page will lose all your modifications!"
-msgstr ""
-
 msgid "Make the page public?"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-12-16 17:24:40 UTC (rev 10799)
+++ trunk/locale/po/phpwiki.pot	2021-12-25 08:50:52 UTC (rev 10800)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-15 16:33+0100\n"
+"POT-Creation-Date: 2021-12-22 15:23+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"
@@ -2847,9 +2847,6 @@
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr ""
 
-msgid "no cache used"
-msgstr ""
-
 msgid "cached pagedata:"
 msgstr ""
 
@@ -5447,9 +5444,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Warning: leaving the page will lose all your modifications!"
-msgstr ""
-
 msgid "Make the page public?"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-12-16 17:24:40 UTC (rev 10799)
+++ trunk/locale/po/sv.po	2021-12-25 08:50:52 UTC (rev 10800)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-15 16:33+0100\n"
+"POT-Creation-Date: 2021-12-22 15:23+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2848,9 +2848,6 @@
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr ""
 
-msgid "no cache used"
-msgstr ""
-
 msgid "cached pagedata:"
 msgstr ""
 
@@ -5448,9 +5445,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Warning: leaving the page will lose all your modifications!"
-msgstr ""
-
 msgid "Make the page public?"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-12-16 17:24:40 UTC (rev 10799)
+++ trunk/locale/po/zh.po	2021-12-25 08:50:52 UTC (rev 10800)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-15 16:33+0100\n"
+"POT-Creation-Date: 2021-12-22 15:23+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2856,9 +2856,6 @@
 msgid "Provide access to PhpWiki's lower level system information."
 msgstr "提供存取 PhpWiki 下層系統資訊."
 
-msgid "no cache used"
-msgstr "沒有快取被使用"
-
 msgid "cached pagedata:"
 msgstr "已置於快取的頁面資料:"
 
@@ -5475,9 +5472,6 @@
 msgid "This revision of the page does not exist."
 msgstr ""
 
-msgid "Warning: leaving the page will lose all your modifications!"
-msgstr ""
-
 msgid "Make the page public?"
 msgstr ""
 
@@ -5681,6 +5675,9 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid "no cache used"
+#~ msgstr "沒有快取被使用"
+
 #~ msgid "External Links"
 #~ msgstr "外部連結"
 

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

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

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2021-12-16 17:24:40 UTC (rev 10799)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2021-12-25 08:50:52 UTC (rev 10800)
@@ -25,7 +25,7 @@
         }
     }
     $(document).ready(function() {
-        $("#editpage").FormNavigate('<?php echo _('Warning: leaving the page will lose all your modifications!') ?>');
+        $("#editpage").FormNavigate('<?php echo 'Warning: leaving the page will lose all your modifications!' ?>');
         jQuery(this).find(":submit").unbind('click');
         jQuery(this).on('click', "input[name='edit[save]']", function () {
             global_formNavigate = 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:[10799] trunk/themes

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

Revision: 10799
          http://sourceforge.net/p/phpwiki/code/10799
Author:   vargenau
Date:     2021-12-16 17:24:40 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
templates/body.tmpl: formatting

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

Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
+++ trunk/themes/Crao/templates/body.tmpl	2021-12-16 17:24:40 UTC (rev 10799)
@@ -1,23 +1,22 @@
 <body <?php echo $WikiTheme->getMoreAttr('body') ?> >
-<header role="banner">
-<div id="header"><?php // for top toolbars style sheet ?>
-  <?php echo Template('top') ?>
-</div>
-</header>
-<div class="toolbar"><?php echo Template('navbar') ?></div>
-<?php // Page content ?>
-<div id="content">
-<?php if (isset($HEADER)) { ?>
-<?php // Page title ?>
-<h1><?php echo $HEADER ?></h1>
-<?php } ?>
-<main role="main">
-<?php echo $CONTENT ?>
-</main>
-<?php echo Template('bottom') ?>
-</div>
-<?php if (isset($revision)) { ?>
-<?php // Actionbar ?>
-<?php echo Template('actionbar') ?>
-<?php } ?>
+      <header role="banner">
+      <div id="header">
+      <?php echo Template('top') ?>
+      </div>
+      </header>
+      <div class="toolbar">
+      <?php echo Template('navbar') ?>
+      </div>
+      <div id="content">
+      <?php if (isset($HEADER)) { ?>
+      <h1><?php echo $HEADER ?></h1>
+      <?php } ?>
+      <main role="main">
+      <?php echo $CONTENT ?>
+      </main>
+    <?php echo Template('bottom') ?>
+    </div>
+    <?php if (isset($revision)) { ?>
+      <?php echo Template('actionbar') ?>
+    <?php } ?>
 </body>

Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
+++ trunk/themes/MonoBook/templates/body.tmpl	2021-12-16 17:24:40 UTC (rev 10799)
@@ -8,8 +8,6 @@
       <main role="main">
       <div id="bodyContent">
         <?php echo $CONTENT ?>
-
-        <?php // end content ?>
         <div class="clear-floats"></div>
       </div>
       </main>

Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
+++ trunk/themes/Portland/templates/body.tmpl	2021-12-16 17:24:40 UTC (rev 10799)
@@ -1,19 +1,15 @@
 <body <?php echo $WikiTheme->getMoreAttr('body') ?> >
-<header role="banner">
-<?php // Page title and logo ?>
-<h1><a class="wikilink"
+      <header role="banner">
+      <h1><a class="wikilink"
        href="<?php echo WikiURL(HOME_PAGE)?>"
        ><img src="<?php echo $WikiTheme->getImageURL('logo')?>"
              alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>"
-             class="bottom" /></a> <?php echo $HEADER?></h1>
-</header>
-<main role="main">
-<?php echo $CONTENT ?>
-</main>
-<?php echo Template('navbar') ?>
-<?php // RELATEDPAGES were here. ?>
-
-<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-
-<?php echo Template('bottom') ?>
+             class="bottom" /></a> <?php echo $HEADER ?></h1>
+      </header>
+      <main role="main">
+      <?php echo $CONTENT ?>
+      </main>
+      <?php echo Template('navbar') ?>
+      <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
+    <?php echo Template('bottom') ?>
 </body>

Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
+++ trunk/themes/Sidebar/templates/body.tmpl	2021-12-16 17:24:40 UTC (rev 10799)
@@ -1,14 +1,14 @@
-  <body <?php echo $WikiTheme->getMoreAttr('body') ?> >
+<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
     <div id="global-wrapper">
       <div id="column-content">
     <div id="content">
-    <main role="main">
+      <main role="main">
       <?php echo Template('top') ?>
       <div id="bodyContent">
         <?php echo $CONTENT ?>
         <div class="clear-floats"></div>
       </div>
-    </main>
+      </main>
     </div>
 <?php if (!$WikiTheme->DUMP_MODE) { ?>
     <?php echo Template('logo') ?>
@@ -32,4 +32,4 @@
       </div>
 <?php } // !DUMP_MODE ?>
     </div>
-  </body>
+</body>

Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
+++ trunk/themes/Wordpress/templates/body.tmpl	2021-12-16 17:24:40 UTC (rev 10799)
@@ -1,18 +1,11 @@
 <body <?php echo $WikiTheme->getMoreAttr('body') ?> >
-
-<header role="banner">
-<?php // Page title ?>
-<h1 id="header"><?php echo $HEADER ?></h1>
-</header>
-<main role="main">
-<?php // Page title and logo ?>
-<?php echo $CONTENT ?>
-</main>
-<?php echo Template('navbar') ?>
-<?php // RELATEDPAGES were here. ?>
-
-<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-
-<?php echo Template('bottom') ?>
-
+      <header role="banner">
+      <h1 id="header"><?php echo $HEADER ?></h1>
+      </header>
+      <main role="main">
+      <?php echo $CONTENT ?>
+      </main>
+      <?php echo Template('navbar') ?>
+      <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
+    <?php echo Template('bottom') ?>
 </body>

Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
+++ trunk/themes/blog/templates/body.tmpl	2021-12-16 17:24:40 UTC (rev 10799)
@@ -1,22 +1,18 @@
 <body <?php echo $WikiTheme->getMoreAttr('body') ?> >
-<div id="page">
-<?php echo Template('top') ?>
-
-<?php // $CONTENT includes browse.tmpl ?>
-<div id="pagetitle">
-<h1 id="pagetitleText"><?php echo $HEADER ?></h1></div>
-<main role="main">
-<div id="bodyContent">
-<?php echo $CONTENT?>
-</div>
-</main>
-
-<div id="bottom">
-<?php echo Template('bottom') ?>
-</div>
-<div id="footer">
-<?php echo Template('browse-footer') ?>
-</div>
-
-</div>
+    <div id="page">
+      <?php echo Template('top') ?>
+      <div id="pagetitle">
+      <h1 id="pagetitleText"><?php echo $HEADER ?></h1></div>
+      <main role="main">
+      <div id="bodyContent">
+      <?php echo $CONTENT ?>
+      </div>
+      </main>
+      <div id="bottom">
+    <?php echo Template('bottom') ?>
+      </div>
+      <div id="footer">
+      <?php echo Template('browse-footer') ?>
+      </div>
+    </div>
 </body>

Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
+++ trunk/themes/default/templates/body.tmpl	2021-12-16 17:24:40 UTC (rev 10799)
@@ -1,13 +1,13 @@
 <body <?php echo $WikiTheme->getMoreAttr('body') ?> >
-<header role="banner">
-<div id="header">
-  <?php echo Template('top') ?>
-</div>
-</header>
-<main role="main">
-<div id="content">
-<?php echo $CONTENT ?>
-</div>
-</main>
-<?php echo Template('bottom') ?>
+      <header role="banner">
+      <div id="header">
+      <?php echo Template('top') ?>
+      </div>
+      </header>
+      <main role="main">
+      <div id="content">
+      <?php echo $CONTENT ?>
+      </div>
+      </main>
+    <?php echo Template('bottom') ?>
 </body>

Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
+++ trunk/themes/wikilens/templates/body.tmpl	2021-12-16 17:24:40 UTC (rev 10799)
@@ -1,40 +1,38 @@
 <body <?php echo $WikiTheme->getMoreAttr('body') ?> >
-
-<table>
-<tr>
-<td colspan="2" class="header">
-<header role="banner">
-<div id="header">
-  <?php echo Template('top') ?>
-</div>
-</header>
+      <table>
+      <tr>
+      <td colspan="2" class="header">
+      <header role="banner">
+      <div id="header">
+      <?php echo Template('top') ?>
+      </div>
+      </header>
+      </td>
+      </tr>
+      <tr class="top">
+      <td class="leftnav" style="width:120px">
+      <nav role="navigation" aria-label="<?php echo _("Main Menu") ?>">
+      <div class="toolbar">
+      <?php echo Template('navbar') ?>
+      </div>
+      <hr />
+      <<IncludePage page="LeftbarContent" quiet="true" >>
+      </nav>
+      </td>
+      <td class="content">
+      <main role="main">
+      <h1><?php echo $HEADER ?>
+      <?php if (!empty($user) && $user->isSignedIn()) {
+      $loader = new WikiPluginLoader();
+      printXML(HTML::raw("&nbsp;&nbsp;"));
+      printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup));
+    } ?> </h1>
+    <div id="content">
+        <?php echo $CONTENT ?>
+    </div>
+    </main>
+    <?php echo Template('bottom') ?>
 </td>
 </tr>
-<tr class="top">
-<td class="leftnav" style="width:120px">
-<nav role="navigation" aria-label="<?php echo _("Main Menu") ?>">
-<div class="toolbar">
-  <?php echo Template('navbar') ?>
-</div>
-<hr />
-<<IncludePage page="LeftbarContent" quiet="true" >>
-</nav>
-</td>
-<td class="content">
-<main role="main">
-<?php // Page title ?>
-<h1><?php echo $HEADER ?>
-<?php if (!empty($user) && $user->isSignedIn()) {
-  $loader = new WikiPluginLoader();
-  printXML(HTML::raw("&nbsp;&nbsp;"));
-  printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup));
-} ?> </h1>
-<div id="content">
-<?php echo $CONTENT ?>
-</div>
-</main>
-<?php echo Template('bottom') ?>
-</td>
-</tr>
 </table>
 </body>

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

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

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

Revision: 10798
          http://sourceforge.net/p/phpwiki/code/10798
Author:   vargenau
Date:     2021-12-16 16:45:16 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
templates/signin.tmpl: formatting

Modified Paths:
--------------
    trunk/themes/Crao/templates/signin.tmpl
    trunk/themes/MonoBook/templates/signin.tmpl
    trunk/themes/Sidebar/templates/signin.tmpl
    trunk/themes/Wordpress/templates/signin.tmpl
    trunk/themes/default/templates/signin.tmpl
    trunk/themes/shamino_com/templates/signin.tmpl
    trunk/themes/smaller/templates/signin.tmpl

Modified: trunk/themes/Crao/templates/signin.tmpl
===================================================================
--- trunk/themes/Crao/templates/signin.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/Crao/templates/signin.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
@@ -7,9 +7,9 @@
 <?php if (empty($NOFORM)) { ?>
   <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
   <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
-<?php } ?>
-<?php if ($user->isSignedIn()) {
-  $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
+<?php }
+if ($user->isSignedIn()) {
+    $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
 ?>
 <span>
   <?php echo fmt("You are signed in as %s", WikiLink($user->getId(), 'auto')) ?>
@@ -33,7 +33,7 @@
                                    'size' => 12,
                                    'maxlength' => 256,
                                    'onchange' => "SignIn(this.form);"));
-  $SignInInput->addTooltip(_("Enter your UserId to sign in"))
+  $SignInInput->addTooltip(_("Enter your UserId to sign in"));
 ?>
   <script type="text/javascript"> <!--
     function SignIn(form) {

Modified: trunk/themes/MonoBook/templates/signin.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/signin.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/MonoBook/templates/signin.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
@@ -1,20 +1,20 @@
-<?php // On MonoBook we do away with only GET urls, no form.
+<?php
   $sp = HTML::raw("&nbsp;"); $id = $user->UserName();
 ?>
 <div class="portlet" id="p-personal"><div class="pBody">
- <ul>
-  <?php if ($user->isAuthenticated()) { ?>
+<ul>
+<?php if ($user->isAuthenticated()) { ?>
   <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
   <li><?php echo WikiLink($id . "/Discussion", 'auto' , _("My Discussion")) ?></li>
   <li><?php echo WikiLink(__("UserPreferences"), "", _("My Preferences")) ?></li>
   <li><?php echo WikiLink(__("MyRecentChanges"), "", _("My Changes")) ?></li>
   <li><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'),$sp,_("Logout"),$sp) ?></li>
-  <?php } else { ?>
-  <?php // Login or Register ?>
-  <?php if ($id) { ?>
+  <?php } else {
+if ($id) { ?>
     <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
   <?php } ?>
   <li id="pt-login"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[login]').'=1'),$sp,_("Sign In"),$sp) ?></li>
-  <?php } ?>
- </ul>
-</div></div>
+<?php } ?>
+</ul>
+</div>
+</div>

Modified: trunk/themes/Sidebar/templates/signin.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/signin.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/Sidebar/templates/signin.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
@@ -1,22 +1,22 @@
 <header role="banner">
-<div class="portlet" id="p-personal"><div class="pBody"><ul>
+<div class="portlet" id="p-personal"><div class="pBody">
+<ul>
 <?php if ($user->isAuthenticated()) {
-     $sp = HTML::raw("&nbsp;"); $id = $user->getAuthenticatedId(); ?>
-     <li id="pt-mypages"><?php echo WikiLink(__("RecentChangesMyPages"), 'auto', HTML($sp,"MyPages",$sp)) ?></li>
-     <li id="pt-mychanges"><?php echo WikiLink(__("MyRecentChanges"), 'auto', HTML($sp,"MyChanges",$sp)) ?></li>
-     <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
-     <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li>
+  $sp = HTML::raw("&nbsp;"); $id = $user->getAuthenticatedId(); ?>
+  <li id="pt-mypages"><?php echo WikiLink(__("RecentChangesMyPages"), 'auto', HTML($sp,"MyPages",$sp)) ?></li>
+  <li id="pt-mychanges"><?php echo WikiLink(__("MyRecentChanges"), 'auto', HTML($sp,"MyChanges",$sp)) ?></li>
+  <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
+  <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li>
 <?php } elseif (ALLOW_ANON_USER) {
   $sp = HTML::raw("&nbsp;"); $id = $user->getAuthenticatedId();
-  if ($id) { ?>
+if ($id) { ?>
     <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
   <?php } ?>
-  <?php // Login ?>
   <li id="pt-login"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[login]').'=1'),$sp,_("Sign In"),$sp) ?></li>
 <?php } else { ?>
      <li id="pt-login"><a id="login"><?php echo _("Login required...") ?></a></li>
 <?php } ?>
-  </ul>
- </div>
+</ul>
 </div>
+</div>
 </header>

Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/Wordpress/templates/signin.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
@@ -8,8 +8,7 @@
  <li>
   <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
   <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
-<?php } ?>
-<?php
+<?php }
 if ($user->isAuthenticated()) {
     $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
 ?>
@@ -31,10 +30,10 @@
   </noscript>
 <?php } else {
     $SignInInput = HTML::input(array('type' => 'text',
-                     'name' => "auth[userid]",
-                     'size' => 12,
-                     'maxlength' => 256,
-                     'onchange' => "SignIn(this.form,false);"));
+                                     'name' => "auth[userid]",
+                                     'size' => 12,
+                                     'maxlength' => 256,
+                                     'onchange' => "SignIn(this.form,false);"));
     $SignInInput->addTooltip(_("Enter your UserId to sign in"));
     $userid = $user->getId();
     if ($user->isSignedIn()) {

Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/default/templates/signin.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
@@ -7,12 +7,12 @@
 <?php if (empty($NOFORM)) { ?>
   <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
   <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
-<?php } ?>
-<?php
+<?php }
 if ($user->isAuthenticated()) {
     $Sep = $WikiTheme->getButtonSeparator();
     $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
-    $SignOutJS = JavaScript('    document.write(\'<input type="hidden" name="auth[logout]" value="0" />\');
+    $SignOutJS = JavaScript('
+    document.write(\'<input type="hidden" name="auth[logout]" value="0" />\');
     function SignOut() {
       var form = document.forms["'.$FORMNAME.'"];
       form.elements["auth[logout]"].value = 1;
@@ -21,14 +21,17 @@
     document.write(\''.AsXML($SignOutB).'\');');
 ?>
   <?php echo fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?>
-  <?php echo $SEP?><?php echo $SignOutJS?>
-  <noscript><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></noscript>
+  <?php echo $SEP?>
+  <?php echo $SignOutJS?>
+  <noscript>
+    <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?>
+  </noscript>
 <?php } else {
     $SignInInput = HTML::input(array('type' => 'text',
-                     'name' => "auth[userid]",
-                     'size' => 12,
-                     'maxlength' => 256,
-                     'onchange' => "SignIn(this.form,false);"));
+                                     'name' => "auth[userid]",
+                                     'size' => 12,
+                                     'maxlength' => 256,
+                                     'onchange' => "SignIn(this.form,false);"));
     $SignInInput->addTooltip(_("Enter your UserId to sign in"));
     $userid = $user->getId();
     if ($user->isSignedIn()) {

Modified: trunk/themes/shamino_com/templates/signin.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/signin.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/shamino_com/templates/signin.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
@@ -1,5 +1,4 @@
 <?php
-// signin only implicitly by clicking "Edit"
 if (empty($FORMNAME))
     $FORMNAME = 'signin';
 else
@@ -20,10 +19,15 @@
     }
     document.write(\''.AsXML($SignOutB).'\');');
 ?>
-  <span class="signin"><?php echo fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?>
-  <?php echo $SEP?><?php echo $SignOutJS?></span>
+  <span class="signin">
+  <?php echo fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?>
+  <?php echo $SEP?>
+  <?php echo $SignOutJS?>
+  </span>
   <noscript>
-    <span class="signin"><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></span>
+  <span class="signin">
+    <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?>
+  </span>
   </noscript>
 <?php } ?>
 <?php if (empty($NOFORM)) { ?>

Modified: trunk/themes/smaller/templates/signin.tmpl
===================================================================
--- trunk/themes/smaller/templates/signin.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/smaller/templates/signin.tmpl	2021-12-16 16:45:16 UTC (rev 10798)
@@ -7,12 +7,12 @@
 <?php if (empty($NOFORM)) { ?>
   <form style="display:inline" method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
   <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
-<?php } ?>
-<?php
+<?php }
 if ($user->isAuthenticated()) {
     $Sep = $WikiTheme->getButtonSeparator();
     $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
-    $SignOutJS = JavaScript('    document.write(\'<input type="hidden" name="auth[logout]" value="0" />\');
+    $SignOutJS = JavaScript('
+    document.write(\'<input type="hidden" name="auth[logout]" value="0" />\');
     function SignOut() {
       var form = document.forms["'.$FORMNAME.'"];
       form.elements["auth[logout]"].value = 1;
@@ -21,14 +21,16 @@
     document.write(\''.AsXML($SignOutB).'\');');
 ?>
   <?php echo $SignOutJS?>
-  <noscript><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></noscript>
+  <noscript>
+    <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?>
+  </noscript>
 <?php } else {
     $SignInInput = HTML::input(array('type' => 'text',
-                     'name' => "auth[userid]",
-                     'size' => 12,
-                     'maxlength' => 256,
-                     'onchange' => "SignIn(this.form,false);"));
-    if ($user->isSignedIn()) { // cookie
+                                     'name' => "auth[userid]",
+                                     'size' => 12,
+                                     'maxlength' => 256,
+                                     'onchange' => "SignIn(this.form,false);"));
+    if ($user->isSignedIn()) {
         $SignInInput->setAttr('value', $user->getId());
     }
     $SignInInput->addTooltip(_("Enter your UserId to sign in"));

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

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

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

Revision: 10797
          http://sourceforge.net/p/phpwiki/code/10797
Author:   vargenau
Date:     2021-12-16 16:21:43 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
templates/viewsource.tmpl: reformat

Modified Paths:
--------------
    trunk/themes/MonoBook/templates/viewsource.tmpl
    trunk/themes/Portland/templates/viewsource.tmpl
    trunk/themes/Wordpress/templates/viewsource.tmpl
    trunk/themes/default/templates/viewsource.tmpl

Modified: trunk/themes/MonoBook/templates/viewsource.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/viewsource.tmpl	2021-12-16 16:20:13 UTC (rev 10796)
+++ trunk/themes/MonoBook/templates/viewsource.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
@@ -1,4 +1,5 @@
-<?php if ($page->get('locked') && !$user->isAdmin()) { ?>
+<?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>
@@ -14,4 +15,5 @@
           rows="<?php echo $request->getPref('editHeight')?>"
           cols="<?php echo $request->getPref('editWidth')?>"
           readonly="readonly"
-><?php echo $PAGE_SOURCE ?></textarea>
+><?php echo $PAGE_SOURCE ?>
+</textarea>

Modified: trunk/themes/Portland/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Portland/templates/viewsource.tmpl	2021-12-16 16:20:13 UTC (rev 10796)
+++ trunk/themes/Portland/templates/viewsource.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
@@ -1,4 +1,5 @@
-<?php if ($page->get('locked') && !$user->isAdmin()) { ?>
+<?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>
@@ -13,7 +14,8 @@
           rows="<?php echo $request->getPref('editHeight')?>"
           cols="<?php echo $request->getPref('editWidth')?>"
           readonly="readonly"
-><?php echo $PAGE_SOURCE ?></textarea>
+><?php echo $PAGE_SOURCE ?>
+</textarea>
 <hr />
 <a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>">
 <?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>

Modified: trunk/themes/Wordpress/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/viewsource.tmpl	2021-12-16 16:20:13 UTC (rev 10796)
+++ trunk/themes/Wordpress/templates/viewsource.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
@@ -1,5 +1,4 @@
 <div class="wikitext">
-
 <?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
 if ($page->get('locked') && !$user->isAdmin()) { ?>
@@ -17,10 +16,10 @@
           rows="<?php echo $request->getPref('editHeight')?>"
           cols="<?php echo $request->getPref('editWidth')?>"
           readonly="readonly"
-><?php echo $PAGE_SOURCE ?></textarea>
+><?php echo $PAGE_SOURCE ?>
+</textarea>
 <hr />
 <a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>">
 <?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
 <br />
-
 </div>

Modified: trunk/themes/default/templates/viewsource.tmpl
===================================================================
--- trunk/themes/default/templates/viewsource.tmpl	2021-12-16 16:20:13 UTC (rev 10796)
+++ trunk/themes/default/templates/viewsource.tmpl	2021-12-16 16:21:43 UTC (rev 10797)
@@ -1,4 +1,5 @@
-<?php if ($page->get('locked') && !$user->isAdmin()) { ?>
+<?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>
@@ -14,8 +15,8 @@
           rows="<?php echo $request->getPref('editHeight')?>"
           cols="<?php echo $request->getPref('editWidth')?>"
           readonly="readonly"
-><?php echo $PAGE_SOURCE ?></textarea>
-
+><?php echo $PAGE_SOURCE ?>
+</textarea>
 <div id="footer"><?php // for top & bottom toolbars stylesheet ?>
 <?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:[10796] trunk/themes/blog/templates/viewsource.tmpl

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

Revision: 10796
          http://sourceforge.net/p/phpwiki/code/10796
Author:   vargenau
Date:     2021-12-16 16:20:13 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
themes/blog/templates/viewsource.tmpl: Button is viewsource, not edit

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

Modified: trunk/themes/blog/templates/viewsource.tmpl
===================================================================
--- trunk/themes/blog/templates/viewsource.tmpl	2021-12-16 16:05:35 UTC (rev 10795)
+++ trunk/themes/blog/templates/viewsource.tmpl	2021-12-16 16:20:13 UTC (rev 10796)
@@ -7,7 +7,7 @@
 <?php } ?>
 <?php if (! $revision->isCurrent()) { ?>
   <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('edit', _("View the current version."), $page) ?>
+  <?php echo Button('viewsource', _("View the current version."), $page) ?>
   </p>
 <?php } ?>
 <br class="clear-floats" />

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10795] trunk/themes/Sidebar/templates/tags.tmpl

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

Revision: 10795
          http://sourceforge.net/p/phpwiki/code/10795
Author:   vargenau
Date:     2021-12-16 16:05:35 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
themes/Sidebar/templates/tags.tmpl: whitespace

Modified Paths:
--------------
    trunk/themes/Sidebar/templates/tags.tmpl

Modified: trunk/themes/Sidebar/templates/tags.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/tags.tmpl	2021-12-16 16:03:48 UTC (rev 10794)
+++ trunk/themes/Sidebar/templates/tags.tmpl	2021-12-16 16:05:35 UTC (rev 10795)
@@ -3,7 +3,7 @@
 <div class="portlet" id="p-tags">
   <h2><?php echo _("Favorite Categories") ?> <?php echo $WikiTheme->folderArrow('p-tags', 'Open') ?></h2>
   <div class="pBody" id="p-tags-body">
-    << PopularTags >>
+    <<PopularTags>>
   </div>
 </div>
 </nav>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10794] trunk/themes/wikilens/templates/top.tmpl

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

Revision: 10794
          http://sourceforge.net/p/phpwiki/code/10794
Author:   vargenau
Date:     2021-12-16 16:03:48 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
themes/wikilens/templates/top.tmpl: formatting

Modified Paths:
--------------
    trunk/themes/wikilens/templates/top.tmpl

Modified: trunk/themes/wikilens/templates/top.tmpl
===================================================================
--- trunk/themes/wikilens/templates/top.tmpl	2021-12-16 15:49:37 UTC (rev 10793)
+++ trunk/themes/wikilens/templates/top.tmpl	2021-12-16 16:03:48 UTC (rev 10794)
@@ -1,6 +1,7 @@
 <?php
 global $HIDE_TOOLBARS;
-if (!$HIDE_TOOLBARS) { ?>
+if (!$HIDE_TOOLBARS) {
+?>
 <?php // The logo ?>
 <div id="logo" style="height: 51px;
      background-image: url(<?php echo $WikiTheme->getImageURL('splice')?>); background-repeat: repeat-x;"

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

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

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

Revision: 10793
          http://sourceforge.net/p/phpwiki/code/10793
Author:   vargenau
Date:     2021-12-16 15:49:37 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
Add class="feedback" for LOCK_CHANGED_MSG

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

Modified: trunk/themes/default/templates/savepage.tmpl
===================================================================
--- trunk/themes/default/templates/savepage.tmpl	2021-12-16 15:47:59 UTC (rev 10792)
+++ trunk/themes/default/templates/savepage.tmpl	2021-12-16 15:49:37 UTC (rev 10793)
@@ -3,7 +3,7 @@
 <?php } ?>
 
 <?php if (!empty($LOCK_CHANGED_MSG)) { ?>
-  <p><?php echo $LOCK_CHANGED_MSG?></p>
+  <p class="feedback"><?php echo $LOCK_CHANGED_MSG?></p>
 <?php } ?>
 
 <?php echo Template('browse') ?>

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

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

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

Revision: 10792
          http://sourceforge.net/p/phpwiki/code/10792
Author:   vargenau
Date:     2021-12-16 15:47:59 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
themes/Sidebar/templates/ratings.tmpl and themes/wikilens/templates/ratings.tmpl: remove comment

Modified Paths:
--------------
    trunk/themes/Sidebar/templates/ratings.tmpl
    trunk/themes/wikilens/templates/ratings.tmpl

Modified: trunk/themes/Sidebar/templates/ratings.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/ratings.tmpl	2021-12-16 15:45:20 UTC (rev 10791)
+++ trunk/themes/Sidebar/templates/ratings.tmpl	2021-12-16 15:47:59 UTC (rev 10792)
@@ -1,4 +1,3 @@
-<?php // Ratings ?>
 <?php if (!$WikiTheme->DUMP_MODE) {
   $loader = new WikiPluginLoader();
   $dbi = $request->getDbh(); // Needed in PHP 8

Modified: trunk/themes/wikilens/templates/ratings.tmpl
===================================================================
--- trunk/themes/wikilens/templates/ratings.tmpl	2021-12-16 15:45:20 UTC (rev 10791)
+++ trunk/themes/wikilens/templates/ratings.tmpl	2021-12-16 15:47:59 UTC (rev 10792)
@@ -1,4 +1,3 @@
-<?php // Ratings ?>
 <?php if (!$WikiTheme->DUMP_MODE) {
   $loader = new WikiPluginLoader();
   $dbi = $request->getDbh(); // Needed in PHP 8

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10791] trunk/themes/shamino_com/templates/debug.tmpl

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

Revision: 10791
          http://sourceforge.net/p/phpwiki/code/10791
Author:   vargenau
Date:     2021-12-16 15:45:20 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
themes/shamino_com/templates/debug.tmpl: reformat

Modified Paths:
--------------
    trunk/themes/shamino_com/templates/debug.tmpl

Modified: trunk/themes/shamino_com/templates/debug.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/debug.tmpl	2021-12-16 15:43:13 UTC (rev 10790)
+++ trunk/themes/shamino_com/templates/debug.tmpl	2021-12-16 15:45:20 UTC (rev 10791)
@@ -1,10 +1,17 @@
-<?php // shamino.com debug ?>
 <div class="debug">
-<?php global $RUNTIMER; ?>
+<?php
+global $RUNTIMER;
+?>
 <span id="html-validator"><a class="wikilink" href="http://validator.w3.org/check/referer">Valid HTML 5!</a> &nbsp; <a class="wikilink" href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS 3!</a>
 </span>
-  <span><?php echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats()) ?>
-<?php $mem = @memory_get_usage(); if ($mem) { ?>
-  <?php echo fmt(", Memory: %s", $mem) ?>
-<?php } ?></span></div>
+<span>
+<?php
+echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats());
+$mem = @memory_get_usage();
+if ($mem) {
+    echo fmt(", Memory: %s", $mem);
+}
+?>
+</span>
+</div>
 <br class="clear-floats" />

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

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

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

Revision: 10790
          http://sourceforge.net/p/phpwiki/code/10790
Author:   vargenau
Date:     2021-12-16 15:43:13 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
themes/default/templates/debug.tmpl: remove comment

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

Modified: trunk/themes/default/templates/debug.tmpl
===================================================================
--- trunk/themes/default/templates/debug.tmpl	2021-12-16 15:26:26 UTC (rev 10789)
+++ trunk/themes/default/templates/debug.tmpl	2021-12-16 15:43:13 UTC (rev 10790)
@@ -1,7 +1,6 @@
 <?php global $RUNTIMER; ?>
 <table class="fullwidth">
 <tr><td>
-<?php /* Note: The Portland theme's debug.tmpl overrides this file with it's own non-graphical variant. */ ?>
 <div id="html-validator"><a href="http://validator.w3.org/check/referer"><img
         id="xhtml"
         src="<?php echo $WikiTheme->_findData('buttons/valid-html5.png')?>"

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10789] trunk/lib/WikiDB.php

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

Revision: 10789
          http://sourceforge.net/p/phpwiki/code/10789
Author:   vargenau
Date:     2021-12-16 15:26:26 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
Whitespace

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-12-16 15:24:29 UTC (rev 10788)
+++ trunk/lib/WikiDB.php	2021-12-16 15:26:26 UTC (rev 10789)
@@ -2268,23 +2268,23 @@
     {
         //  FIXME: Seriously ugly hackage
         $readdata = false;
-            assert(is_string($pagename) && $pagename != '');
-            $nc = $need_content ? '1' : '0';
-            $cache = &$this->_versiondata_cache;
-            if (!isset($cache[$pagename][$version][$nc])
-                || !(is_array($cache[$pagename]))
-                || !(is_array($cache[$pagename][$version]))
-            ) {
-                $cache[$pagename][$version][$nc] =
-                    $this->_backend->get_versiondata($pagename, $version, $need_content);
-                $readdata = true;
-                // If we have retrieved all data, we may as well set the cache for
-                // $need_content = false
-                if ($need_content) {
-                    $cache[$pagename][$version]['0'] =& $cache[$pagename][$version]['1'];
-                }
+        assert(is_string($pagename) && $pagename != '');
+        $nc = $need_content ? '1' : '0';
+        $cache = &$this->_versiondata_cache;
+        if (!isset($cache[$pagename][$version][$nc])
+            || !(is_array($cache[$pagename]))
+            || !(is_array($cache[$pagename][$version]))
+        ) {
+            $cache[$pagename][$version][$nc] =
+                $this->_backend->get_versiondata($pagename, $version, $need_content);
+            $readdata = true;
+            // If we have retrieved all data, we may as well set the cache for
+            // $need_content = false
+            if ($need_content) {
+                $cache[$pagename][$version]['0'] =& $cache[$pagename][$version]['1'];
             }
-            $vdata = $cache[$pagename][$version][$nc];
+        }
+        $vdata = $cache[$pagename][$version][$nc];
 
         if ($readdata && is_array($vdata) && !empty($vdata['%pagedata'])) {
             if (empty($this->_pagedata_cache))

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10788] trunk/lib/plugin/PhotoAlbum.php

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

Revision: 10788
          http://sourceforge.net/p/phpwiki/code/10788
Author:   vargenau
Date:     2021-12-16 15:24:29 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: usage is in Help page

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

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2021-12-15 17:49:09 UTC (rev 10787)
+++ trunk/lib/plugin/PhotoAlbum.php	2021-12-16 15:24:29 UTC (rev 10788)
@@ -29,33 +29,6 @@
  * @author: Ted Vinke <te...@jo...>
  *          Reini Urban (local fs)
  *          Thomas Harding (slides mode, real thumbnails)
- *
- * Usage:
- * <<PhotoAlbum
- *          src="http://server/textfile" or localfile or localdir
- *          mode=[normal|column|row|thumbs|tiles|list|slide]
- *          desc=true
- *          numcols=3
- *          height=50%
- *          width=50%
- *          thumbswidth=80
- *          align=[center|left|right]
- *          duration=6
- * >>
- *
- * "src": textfile of images or directory of images or a single image (local or remote)
- *      Local or remote e.g. http://myserver/images/MyPhotos.txt or http://myserver/images/
- *      or /images/ or Upload:photos/
- *      Possible content of a valid textfile:
- *     photo-01.jpg; Me and my girlfriend
- *     photo-02.jpg
- *     christmas.gif; Merry Christmas!
- *
- *     Inside textfile, filenames and optional descriptions are separated by
- *     semi-colon on each line. Listed files must be in same directory as textfile
- *     itself, so don't use relative paths inside textfile.
- *
- * "url": defines the webpath to the srcdir directory
  */
 
 /**

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

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

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

Revision: 10787
          http://sourceforge.net/p/phpwiki/code/10787
Author:   vargenau
Date:     2021-12-15 17:49:09 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Remove USECACHE, always true

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/IniConfig.php
    trunk/lib/Request.php
    trunk/lib/WikiDB/backend/flatfile.php
    trunk/lib/WikiDB.php
    trunk/lib/loadsave.php
    trunk/lib/plugin/SystemInfo.php
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/ReleaseNotes
    trunk/themes/MonoBook/templates/actionbar.tmpl
    trunk/themes/Sidebar/templates/actionbar.tmpl
    trunk/themes/default/templates/actionbar.tmpl

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/config/config-default.ini	2021-12-15 17:49:09 UTC (rev 10787)
@@ -7,7 +7,6 @@
 JS_SEARCHREPLACE = true
 ENABLE_DOUBLECLICKEDIT = false
 ENABLE_OPEN_GRAPH = false
-USECACHE = true
 ISREADONLY = false
 
 ; calculated dynamically, but need a default

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/config/config-dist.ini	2021-12-15 17:49:09 UTC (rev 10787)
@@ -465,12 +465,6 @@
 ; to set this parameter to 0 (disabled).
 ;DATABASE_OPTIMISE_FREQUENCY = 50
 
-; Store DB query results (esp. for page lists) in memory to avoid duplicate queries.
-; Disable only for old php's with low memory or memory_limit=8MB.
-; Requires at least memory_limit=16MB
-; Default: true
-;USECACHE = false
-
 ;========================================================================
 ; Part Three: User Authentication
 ;========================================================================

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/configurator.php	2021-12-15 17:49:09 UTC (rev 10787)
@@ -805,9 +805,6 @@
 $properties["DATABASE_OPTIMISE_FREQUENCY"] =
     new numeric_define_optional('DATABASE_OPTIMISE_FREQUENCY', DATABASE_OPTIMISE_FREQUENCY);
 
-$properties["USECACHE"] =
-    new boolean_define_commented_optional('USECACHE');
-
 /////////////////////////////////////////////////////////////////////
 
 $properties["Part Three"] =

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/lib/IniConfig.php	2021-12-15 17:49:09 UTC (rev 10787)
@@ -129,7 +129,7 @@
     $_IC_VALID_BOOL = array
     ('ENABLE_PAGEPERM', 'ENABLE_EDIT_TOOLBAR', 'JS_SEARCHREPLACE',
         'ENABLE_DOUBLECLICKEDIT',
-        'USECACHE', 'WIKIDB_NOCACHE_MARKUP',
+        'WIKIDB_NOCACHE_MARKUP',
         'ENABLE_REVERSE_DNS', 'ENCRYPTED_PASSWD', 'ZIPDUMP_AUTH',
         'ENABLE_RAW_HTML', 'ENABLE_RAW_HTML_LOCKEDONLY', 'ENABLE_RAW_HTML_SAFE',
         'STRICT_MAILABLE_PAGEDUMPS', 'COMPRESS_OUTPUT',

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/lib/Request.php	2021-12-15 17:49:09 UTC (rev 10787)
@@ -334,11 +334,6 @@
 
     function buffer_output($compress = true)
     {
-        // FIXME: disables sessions (some byte before all headers_sent())
-        /*if (defined('USECACHE') and !USECACHE) {
-            $this->_is_buffering_output = false;
-            return;
-        }*/
         if (defined('COMPRESS_OUTPUT')) {
             if (!COMPRESS_OUTPUT)
                 $compress = false;

Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/lib/WikiDB/backend/flatfile.php	2021-12-15 17:49:09 UTC (rev 10787)
@@ -125,7 +125,7 @@
         // Construct a dummy page_revision object
         $page = new WikiDB_Page($this->_wikidb, $pagename);
         // data may be pagedate or versiondata updates
-        if (USECACHE and empty($data['pagedata'])) {
+        if (empty($data['pagedata'])) {
             $cache =& $this->_wikidb->_cache;
             if (!empty($cache->_pagedata_cache[$pagename])
                 and is_array($cache->_pagedata_cache[$pagename])

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/lib/WikiDB.php	2021-12-15 17:49:09 UTC (rev 10787)
@@ -529,11 +529,6 @@
      */
     public function renamePage($from, $to, $updateWikiLinks = false)
     {
-        /**
-         * @var WikiRequest $request
-         */
-        global $request;
-
         if (!empty($this->readonly)) {
             if ((int)DEBUG) {
                 trigger_error("readonly database", E_USER_WARNING);
@@ -1666,14 +1661,14 @@
 
         $possibly_cache_results = true;
 
-        if (!USECACHE or WIKIDB_NOCACHE_MARKUP) {
+        if (WIKIDB_NOCACHE_MARKUP) {
             if (WIKIDB_NOCACHE_MARKUP == 'purge') {
                 // flush cache for this page.
                 $page = $this->getPage();
-                $page->set('_cached_html', ''); // ignored with !USECACHE
+                $page->set('_cached_html', '');
             }
             $possibly_cache_results = false;
-        } elseif (USECACHE and !$this->_transformedContent) {
+        } elseif (!$this->_transformedContent) {
             //$backend->lock();
             if ($this->isCurrent()) {
                 $page = $this->getPage();
@@ -2196,17 +2191,13 @@
     public function get_pagedata($pagename)
     {
         assert(is_string($pagename) && $pagename != '');
-        if (USECACHE) {
-            $cache = &$this->_pagedata_cache;
-            if (!isset($cache[$pagename]) || !is_array($cache[$pagename])) {
-                $cache[$pagename] = $this->_backend->get_pagedata($pagename);
-                if (empty($cache[$pagename]))
-                    $cache[$pagename] = array();
-            }
-            return $cache[$pagename];
-        } else {
-            return $this->_backend->get_pagedata($pagename);
+        $cache = &$this->_pagedata_cache;
+        if (!isset($cache[$pagename]) || !is_array($cache[$pagename])) {
+            $cache[$pagename] = $this->_backend->get_pagedata($pagename);
+            if (empty($cache[$pagename]))
+                $cache[$pagename] = array();
         }
+        return $cache[$pagename];
     }
 
     public function update_pagedata($pagename, $newdata)
@@ -2221,16 +2212,14 @@
 
         $this->_backend->update_pagedata($pagename, $newdata);
 
-        if (USECACHE) {
-            if (!empty($this->_pagedata_cache[$pagename])
-                and is_array($this->_pagedata_cache[$pagename])
-            ) {
-                $cachedata = &$this->_pagedata_cache[$pagename];
-                foreach ($newdata as $key => $val)
-                    $cachedata[$key] = $val;
-            } else
-                $this->_pagedata_cache[$pagename] = $newdata;
-        }
+        if (!empty($this->_pagedata_cache[$pagename])
+            and is_array($this->_pagedata_cache[$pagename])
+        ) {
+            $cachedata = &$this->_pagedata_cache[$pagename];
+            foreach ($newdata as $key => $val)
+                $cachedata[$key] = $val;
+        } else
+            $this->_pagedata_cache[$pagename] = $newdata;
     }
 
     public function invalidate_cache($pagename)
@@ -2279,7 +2268,6 @@
     {
         //  FIXME: Seriously ugly hackage
         $readdata = false;
-        if (USECACHE) { //temporary - for debugging
             assert(is_string($pagename) && $pagename != '');
             $nc = $need_content ? '1' : '0';
             $cache = &$this->_versiondata_cache;
@@ -2297,14 +2285,10 @@
                 }
             }
             $vdata = $cache[$pagename][$version][$nc];
-        } else {
-            $vdata = $this->_backend->get_versiondata($pagename, $version, $need_content);
-            $readdata = true;
-        }
+
         if ($readdata && is_array($vdata) && !empty($vdata['%pagedata'])) {
             if (empty($this->_pagedata_cache))
                 $this->_pagedata_cache = array();
-            /* PHP Fatal error:  Cannot create references to/from string offsets nor overloaded objects in /var/www/html/phpwiki/lib/WikiDB.php on line 2180, referer: wiki/TitleSearch?s=and&auto_redirect=1 */
             $this->_pagedata_cache[$pagename] = $vdata['%pagedata'];
         }
         return $vdata;
@@ -2363,17 +2347,13 @@
 
     public function get_latest_version($pagename)
     {
-        if (USECACHE) {
-            assert(is_string($pagename) && $pagename != '');
-            $cache = &$this->_glv_cache;
-            if (!isset($cache[$pagename])) {
-                $cache[$pagename] = $this->_backend->get_latest_version($pagename);
-                if (empty($cache[$pagename]))
-                    $cache[$pagename] = 0;
-            }
-            return $cache[$pagename];
-        } else {
-            return $this->_backend->get_latest_version($pagename);
+        assert(is_string($pagename) && $pagename != '');
+        $cache = &$this->_glv_cache;
+        if (!isset($cache[$pagename])) {
+            $cache[$pagename] = $this->_backend->get_latest_version($pagename);
+            if (empty($cache[$pagename]))
+                $cache[$pagename] = 0;
         }
+        return $cache[$pagename];
     }
 }

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/lib/loadsave.php	2021-12-15 17:49:09 UTC (rev 10787)
@@ -730,12 +730,10 @@
             $zip->addFromString($filename, $data);
         }
 
-        if (USECACHE) {
-            $request->_dbi->_cache->invalidate_cache($pagename);
-            unset ($request->_dbi->_cache->_pagedata_cache);
-            unset ($request->_dbi->_cache->_versiondata_cache);
-            unset ($request->_dbi->_cache->_glv_cache);
-        }
+        $request->_dbi->_cache->invalidate_cache($pagename);
+        unset ($request->_dbi->_cache->_pagedata_cache);
+        unset ($request->_dbi->_cache->_versiondata_cache);
+        unset ($request->_dbi->_cache->_glv_cache);
         unset ($request->_dbi->_cache->_backend->_page_data);
 
         unset($msg);

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/lib/plugin/SystemInfo.php	2021-12-15 17:49:09 UTC (rev 10787)
@@ -137,8 +137,6 @@
 
     function cachestats()
     {
-        if (!defined('USECACHE') or !USECACHE)
-            return _("no cache used");
         $dbi =& $this->_dbi;
         $cache = $dbi->_cache;
         $s = _("cached pagedata:") . " " . count($cache->_pagedata_cache);

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2021-12-15 17:49:09 UTC (rev 10787)
@@ -1,4 +1,4 @@
-Date: Wed, 15 Dec 2021 10:20:21 +0000
+Date: Wed, 15 Dec 2021 18:48:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -15,6 +15,7 @@
 
 === Fixes ===
 * Make list of pages work with PDO (~AllPages, ~MostPopular...)
+* blog theme improved
 
 === Changes ===
 * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
@@ -22,6 +23,7 @@
 * Add sample images for ~PhotoAlbum in blog theme
 * Remove EDITING_POLICY
 * Remove ENABLE_XHTML_XML
+* Remove USECACHE, always true
 * More translations
 
 === Plugins ===

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/pgsrc/ReleaseNotes	2021-12-15 17:49:09 UTC (rev 10787)
@@ -1,4 +1,4 @@
-Date: Wed, 15 Dec 2021 10:20:21 +0000
+Date: Wed, 15 Dec 2021 18:48:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -15,6 +15,7 @@
 
 === Fixes ===
 * Make list of pages work with PDO (~AllPages, ~MostPopular...)
+* blog theme improved
 
 === Changes ===
 * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
@@ -22,6 +23,7 @@
 * Add sample images for ~PhotoAlbum in blog theme
 * Remove EDITING_POLICY
 * Remove ENABLE_XHTML_XML
+* Remove USECACHE, always true
 * More translations
 
 === Plugins ===

Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl	2021-12-15 17:49:09 UTC (rev 10787)
@@ -76,7 +76,7 @@
     <?php echo ActionButton(array('action'=>__("AuthorHistory")), _("Author History"), $pagename) ?>
     <?php echo ActionButton("diff") ?>
     <?php echo ActionButton(array('action'=>__("PageDump")), _("Page Dump"), $pagename) ?>
-    <?php if (DEBUG and USECACHE) {
+    <?php if (DEBUG) {
       $PurgeCache = ActionButton(array('nocache' => 'purge'),
                      _("Purge HTML cache"), $pagename);
       $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); ?>

Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl	2021-12-15 17:49:09 UTC (rev 10787)
@@ -62,10 +62,9 @@
      <?php echo ActionButton("diff") ?>
      <?php if ($isAdmin) { ?>
       <?php echo ActionButton(__("PageDump"), _("Page Dump")) ?>
-      <?php if (USECACHE) { ?>
        <?php echo ActionButton(array('nocache' => 'purge'), _("Purge HTML cache"), $pagename,
                array('title'=>_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."))) ?>
-     <?php }} ?>
+     <?php } ?>
   </ul>
   </div>
 </div>

Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl	2021-12-15 15:46:35 UTC (rev 10786)
+++ trunk/themes/default/templates/actionbar.tmpl	2021-12-15 17:49:09 UTC (rev 10787)
@@ -31,7 +31,7 @@
     <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
     <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
 <?php
-    if (DEBUG & _DEBUG_SQL and USECACHE) {
+    if (DEBUG & _DEBUG_SQL) {
       $PurgeCache = Button(array('nocache' => 'purge'),
                      _("Purge HTML cache"), $page->getName());
       $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));

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

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

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

Revision: 10786
          http://sourceforge.net/p/phpwiki/code/10786
Author:   vargenau
Date:     2021-12-15 15:46:35 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Update translations; less strings

Modified Paths:
--------------
    trunk/config/config-dist.ini
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/locale/Makefile
    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
    trunk/locale/zh/pgsrc/PhpWikiDebug
    trunk/pgsrc/PhpWikiDebug
    trunk/themes/Crao/templates/actionbar.tmpl
    trunk/themes/MonoBook/templates/info.tmpl
    trunk/themes/Sidebar/templates/actionbar.tmpl
    trunk/themes/default/templates/actionbar.tmpl
    trunk/themes/smaller/templates/info.tmpl

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/config/config-dist.ini	2021-12-15 15:46:35 UTC (rev 10786)
@@ -354,7 +354,7 @@
 ; to the URL to the page or by adding a NoCache plugin line.
 ; Use '?nocache=purge' to completely discard the cached version of the page.
 ; You can also purge the cached markup globally by using the
-; "Purge HTML Cache" button on the PhpWikiDebug page.
+; "Purge HTML cache" button on the PhpWikiDebug page.
 ; Enable only for old php's with low memory or memory_limit=8MB.
 ; Default: false
 ;WIKIDB_NOCACHE_MARKUP = true

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-12-15 15:46:35 UTC (rev 10786)
@@ -120,11 +120,11 @@
     {
         switch ($action) {
             case 'purge-cache':
-                return _("Purge HTML Cache");
+                return _("Purge HTML cache");
             case 'purge-bad-pagenames':
-                return _("Purge all Pages With Invalid Names");
+                return _("Purge all pages with invalid names");
             case 'purge-empty-pages':
-                return _("Purge all empty, unreferenced Pages");
+                return _("Purge all empty, unreferenced pages");
             case 'email-verification':
                 return _("E-mail Verification");
             case 'db-check':

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/Makefile	2021-12-15 15:46:35 UTC (rev 10786)
@@ -394,7 +394,6 @@
 ${POT_FILE}: .././themes/Crao/templates/bottom.tmpl
 ${POT_FILE}: .././themes/Crao/templates/browse.tmpl
 ${POT_FILE}: .././themes/Crao/templates/editpage.tmpl
-${POT_FILE}: .././themes/Crao/templates/head.tmpl
 ${POT_FILE}: .././themes/Crao/templates/htmldump.tmpl
 ${POT_FILE}: .././themes/Crao/templates/navbar.tmpl
 ${POT_FILE}: .././themes/Crao/templates/signin.tmpl
@@ -490,7 +489,6 @@
 ${POT_FILE}: .././themes/Sidebar/templates/debug.tmpl
 ${POT_FILE}: .././themes/Sidebar/templates/dump-footer.tmpl
 ${POT_FILE}: .././themes/Sidebar/templates/htmldump.tmpl
-${POT_FILE}: .././themes/Sidebar/templates/html.tmpl
 ${POT_FILE}: .././themes/Sidebar/templates/logo.tmpl
 ${POT_FILE}: .././themes/Sidebar/templates/navbar.tmpl
 ${POT_FILE}: .././themes/Sidebar/templates/ratings.tmpl

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	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/de.po	2021-12-15 15:46:35 UTC (rev 10786)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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."
@@ -3823,13 +3823,13 @@
 msgid "Back"
 msgstr "Zurück"
 
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
 msgstr "HTML-Cachedatei Säubern"
 
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
 msgstr "Alle Seiten mit ungültigen Namen endgültig entfernen"
 
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
 msgstr "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind."
 
 msgid "E-mail Verification"
@@ -5713,9 +5713,6 @@
 msgid "Author History"
 msgstr "Autoren Protokoll"
 
-msgid "Purge HTML cache"
-msgstr "HTML-Cachedatei Säubern"
-
 #, php-format
 msgid "Statistics about %s."
 msgstr "Statistik über %s."
@@ -5837,9 +5834,6 @@
 msgid "Sidebar"
 msgstr "Sidebar"
 
-msgid "Tutorial"
-msgstr ""
-
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/es.po	2021-12-15 15:46:35 UTC (rev 10786)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3731,13 +3731,13 @@
 msgid "Back"
 msgstr ""
 
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
 msgstr ""
 
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
 msgstr ""
 
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
 msgstr ""
 
 msgid "E-mail Verification"
@@ -5586,9 +5586,6 @@
 msgid "Author History"
 msgstr ""
 
-msgid "Purge HTML cache"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5707,9 +5704,6 @@
 msgid "Sidebar"
 msgstr ""
 
-msgid "Tutorial"
-msgstr ""
-
 msgid "Edit this page"
 msgstr "Corrija esta página"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/fr.po	2021-12-15 15:46:35 UTC (rev 10786)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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."
@@ -3819,13 +3819,13 @@
 msgid "Back"
 msgstr "Retour"
 
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
 msgstr "Purger le cache HTML"
 
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
 msgstr "Supprimer les pages dont le nom n'est pas valide"
 
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
 msgstr "Supprimer les pages vides et non référencées"
 
 msgid "E-mail Verification"
@@ -5707,9 +5707,6 @@
 msgid "Author History"
 msgstr "Historique des auteurs"
 
-msgid "Purge HTML cache"
-msgstr "Purger le cache HTML"
-
 #, php-format
 msgid "Statistics about %s."
 msgstr "Statistiques sur %s."
@@ -5832,12 +5829,12 @@
 msgid "Sidebar"
 msgstr "Barre latérale"
 
-msgid "Tutorial"
-msgstr "Tutoriel"
-
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "Tutorial"
+#~ msgstr "Tutoriel"
+
 #~ msgid "External Links"
 #~ msgstr "Liens externes"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/it.po	2021-12-15 15:46:35 UTC (rev 10786)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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"
@@ -3708,13 +3708,13 @@
 msgid "Back"
 msgstr ""
 
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
 msgstr "Rimuovi dalla cache HTML"
 
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
 msgstr ""
 
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
 msgstr ""
 
 msgid "E-mail Verification"
@@ -5546,9 +5546,6 @@
 msgid "Author History"
 msgstr ""
 
-msgid "Purge HTML cache"
-msgstr "RimuoviDallaCacheHtml"
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5667,9 +5664,6 @@
 msgid "Sidebar"
 msgstr ""
 
-msgid "Tutorial"
-msgstr ""
-
 msgid "Edit this page"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/ja.po	2021-12-15 15:46:35 UTC (rev 10786)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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"
@@ -3694,13 +3694,13 @@
 msgid "Back"
 msgstr ""
 
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
 msgstr "マークアップキャッシュの破棄"
 
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
 msgstr ""
 
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
 msgstr ""
 
 msgid "E-mail Verification"
@@ -5532,9 +5532,6 @@
 msgid "Author History"
 msgstr ""
 
-msgid "Purge HTML cache"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5653,9 +5650,6 @@
 msgid "Sidebar"
 msgstr "スライドバー"
 
-msgid "Tutorial"
-msgstr ""
-
 msgid "Edit this page"
 msgstr "ページを編集しています"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/nl.po	2021-12-15 15:46:35 UTC (rev 10786)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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"
@@ -3700,13 +3700,13 @@
 msgid "Back"
 msgstr "Terug"
 
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
 msgstr ""
 
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
 msgstr ""
 
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
 msgstr ""
 
 msgid "E-mail Verification"
@@ -5538,9 +5538,6 @@
 msgid "Author History"
 msgstr ""
 
-msgid "Purge HTML cache"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5659,9 +5656,6 @@
 msgid "Sidebar"
 msgstr "Zoek"
 
-msgid "Tutorial"
-msgstr ""
-
 msgid "Edit this page"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/phpwiki.pot	2021-12-15 15:46:35 UTC (rev 10786)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+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"
@@ -3694,13 +3694,13 @@
 msgid "Back"
 msgstr ""
 
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
 msgstr ""
 
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
 msgstr ""
 
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
 msgstr ""
 
 msgid "E-mail Verification"
@@ -5532,9 +5532,6 @@
 msgid "Author History"
 msgstr ""
 
-msgid "Purge HTML cache"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5653,8 +5650,5 @@
 msgid "Sidebar"
 msgstr ""
 
-msgid "Tutorial"
-msgstr ""
-
 msgid "Edit this page"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/sv.po	2021-12-15 15:46:35 UTC (rev 10786)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -3695,13 +3695,13 @@
 msgid "Back"
 msgstr ""
 
-msgid "Purge HTML Cache"
+msgid "Purge HTML cache"
 msgstr ""
 
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
 msgstr ""
 
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
 msgstr ""
 
 msgid "E-mail Verification"
@@ -5533,9 +5533,6 @@
 msgid "Author History"
 msgstr ""
 
-msgid "Purge HTML cache"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr ""
@@ -5654,9 +5651,6 @@
 msgid "Sidebar"
 msgstr ""
 
-msgid "Tutorial"
-msgstr ""
-
 msgid "Edit this page"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/po/zh.po	2021-12-15 15:46:35 UTC (rev 10786)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:44+0100\n"
+"POT-Creation-Date: 2021-12-15 16:33+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3705,13 +3705,13 @@
 msgid "Back"
 msgstr ""
 
-msgid "Purge HTML Cache"
-msgstr "清除標記快取"
+msgid "Purge HTML cache"
+msgstr ""
 
-msgid "Purge all Pages With Invalid Names"
+msgid "Purge all pages with invalid names"
 msgstr "用錯誤的名稱刪除頁面"
 
-msgid "Purge all empty, unreferenced Pages"
+msgid "Purge all empty, unreferenced pages"
 msgstr ""
 
 msgid "E-mail Verification"
@@ -5560,9 +5560,6 @@
 msgid "Author History"
 msgstr "作者歷程"
 
-msgid "Purge HTML cache"
-msgstr ""
-
 #, php-format
 msgid "Statistics about %s."
 msgstr "關於 %s 的統計."
@@ -5681,9 +5678,6 @@
 msgid "Sidebar"
 msgstr ""
 
-msgid "Tutorial"
-msgstr ""
-
 msgid "Edit this page"
 msgstr "編輯此頁面"
 

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

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

Modified: trunk/locale/zh/pgsrc/PhpWikiDebug
===================================================================
--- trunk/locale/zh/pgsrc/PhpWikiDebug	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/locale/zh/pgsrc/PhpWikiDebug	2021-12-15 15:46:35 UTC (rev 10786)
@@ -1,4 +1,4 @@
-Date: Sat,  6 Nov 2021 09:39:42 +0000
+Date: Wed, 15 Dec 2021 16:41:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDebug;
@@ -15,7 +15,7 @@
 
 在正常情況下,你不需要使用這些,不過他們應該也不會造成任何損害.
 
-== 清理標記快取 Purge HTML Cache ==
+== 清理標記快取 Purge HTML cache ==
 
 (如果你的 wiki 已經設置,) 每個頁面的最新版本的轉換內容(幾乎是 HTML)都被
 快取了. 這會避免再剖析 wiki-text ,而使得頁面輸出的速度加快一些.

Modified: trunk/pgsrc/PhpWikiDebug
===================================================================
--- trunk/pgsrc/PhpWikiDebug	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/pgsrc/PhpWikiDebug	2021-12-15 15:46:35 UTC (rev 10786)
@@ -1,4 +1,4 @@
-Date: Sat,  6 Nov 2021 09:39:42 +0000
+Date: Wed, 15 Dec 2021 16:26:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDebug;
@@ -16,7 +16,7 @@
 In normal use, you should not need to use these, though, then again,
 they should not really do any harm.
 
-== Purge HTML Cache ==
+== Purge HTML cache ==
 
 (If your wiki is so configured,) the transformed (almost-HTML) content
 of the most recent version of each page is cached. This speeds up page

Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/themes/Crao/templates/actionbar.tmpl	2021-12-15 15:46:35 UTC (rev 10786)
@@ -25,7 +25,7 @@
 <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
 <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
 <?php $purgeb = Button(array('nocache' => 'purge'),
-                       _("Purge HTML Cache"), $page->getName());
+                       _("Purge HTML cache"), $page->getName());
       $purgeb->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
 ?>
 <?php echo $SEP?><?php echo $purgeb ?>

Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/themes/MonoBook/templates/info.tmpl	2021-12-15 15:46:35 UTC (rev 10786)
@@ -179,7 +179,7 @@
     <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
 <?php
      $PurgeCache = Button(array('nocache' => 'purge'),
-                     _("Purge HTML Cache"), $page->getName());
+                     _("Purge HTML cache"), $page->getName());
      $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
 ?>
     <?php echo $SEP?><?php echo $PurgeCache ?>

Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl	2021-12-15 15:46:35 UTC (rev 10786)
@@ -63,7 +63,7 @@
      <?php if ($isAdmin) { ?>
       <?php echo ActionButton(__("PageDump"), _("Page Dump")) ?>
       <?php if (USECACHE) { ?>
-       <?php echo ActionButton(array('nocache' => 'purge'), _("Purge HTML Cache"), $pagename,
+       <?php echo ActionButton(array('nocache' => 'purge'), _("Purge HTML cache"), $pagename,
                array('title'=>_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."))) ?>
      <?php }} ?>
   </ul>

Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/themes/default/templates/actionbar.tmpl	2021-12-15 15:46:35 UTC (rev 10786)
@@ -33,7 +33,7 @@
 <?php
     if (DEBUG & _DEBUG_SQL and USECACHE) {
       $PurgeCache = Button(array('nocache' => 'purge'),
-                     _("Purge HTML Cache"), $page->getName());
+                     _("Purge HTML cache"), $page->getName());
       $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
 ?>
       <?php echo $SEP?><?php echo $PurgeCache ?>

Modified: trunk/themes/smaller/templates/info.tmpl
===================================================================
--- trunk/themes/smaller/templates/info.tmpl	2021-12-15 14:08:31 UTC (rev 10785)
+++ trunk/themes/smaller/templates/info.tmpl	2021-12-15 15:46:35 UTC (rev 10786)
@@ -13,7 +13,7 @@
     <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
 <?php
     $PurgeCache = Button(array('nocache' => 'purge'),
-                     _("Purge HTML Cache"), $page->getName());
+                     _("Purge HTML cache"), $page->getName());
     $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
 ?>
     <?php echo $SEP?><?php echo $PurgeCache ?>

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

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

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

Revision: 10785
          http://sourceforge.net/p/phpwiki/code/10785
Author:   vargenau
Date:     2021-12-15 14:08:31 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Simpler charset syntax

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

Modified: trunk/themes/default/templates/redirect.tmpl
===================================================================
--- trunk/themes/default/templates/redirect.tmpl	2021-12-15 14:00:55 UTC (rev 10784)
+++ trunk/themes/default/templates/redirect.tmpl	2021-12-15 14:08:31 UTC (rev 10785)
@@ -15,7 +15,7 @@
 <!DOCTYPE html>
 <html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta charset="UTF-8" />
 <meta name="robots" content="noindex, nofollow" />
 <meta name="generator" content="PhpWiki <?php echo PHPWIKI_VERSION?>" />
 <base href="<?php echo PHPWIKI_BASE_URL?>" />

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

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

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

Revision: 10784
          http://sourceforge.net/p/phpwiki/code/10784
Author:   vargenau
Date:     2021-12-15 14:00:55 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Set $LANG in templates

Modified Paths:
--------------
    trunk/themes/Crao/templates/htmldump.tmpl
    trunk/themes/Sidebar/templates/htmldump.tmpl
    trunk/themes/default/templates/dialog.tmpl
    trunk/themes/default/templates/html.tmpl
    trunk/themes/default/templates/htmldump.tmpl
    trunk/themes/default/templates/redirect.tmpl

Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl	2021-12-15 12:06:39 UTC (rev 10783)
+++ trunk/themes/Crao/templates/htmldump.tmpl	2021-12-15 14:00:55 UTC (rev 10784)
@@ -1,11 +1,20 @@
 <?php
 /*
  * This template is used only for html file dumps, and is responsible
- * mainly for the outer level <html> stuff and the and <head>.
+ * mainly for the outer level <html> stuff and the <head>.
  */
+global $LANG;
+if (empty($LANG)) {
+    $pref = &$request->_prefs;
+    if ($pref) {
+        $LANG = $pref->get('lang');
+    } else {
+        $LANG = DEFAULT_LANGUAGE;
+    }
+}
 ?>
 <!DOCTYPE html>
-<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
+<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>">
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />

Modified: trunk/themes/Sidebar/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/htmldump.tmpl	2021-12-15 12:06:39 UTC (rev 10783)
+++ trunk/themes/Sidebar/templates/htmldump.tmpl	2021-12-15 14:00:55 UTC (rev 10784)
@@ -1,11 +1,20 @@
 <?php
 /*
  * This template is used only for html file dumps, and is responsible
- * mainly for the outer level <html> stuff and the and <head>.
+ * mainly for the outer level <html> stuff and the <head>.
  */
+global $LANG;
+if (empty($LANG)) {
+    $pref = &$request->_prefs;
+    if ($pref) {
+        $LANG = $pref->get('lang');
+    } else {
+        $LANG = DEFAULT_LANGUAGE;
+    }
+}
 ?>
 <!DOCTYPE html>
-<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
+<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>">
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />

Modified: trunk/themes/default/templates/dialog.tmpl
===================================================================
--- trunk/themes/default/templates/dialog.tmpl	2021-12-15 12:06:39 UTC (rev 10783)
+++ trunk/themes/default/templates/dialog.tmpl	2021-12-15 14:00:55 UTC (rev 10784)
@@ -2,9 +2,18 @@
 /*
  * A "popup" dialog.  (Though it does not pop up yet.)
  */
+global $LANG;
+if (empty($LANG)) {
+    $pref = &$request->_prefs;
+    if ($pref) {
+        $LANG = $pref->get('lang');
+    } else {
+        $LANG = DEFAULT_LANGUAGE;
+    }
+}
 ?>
 <!DOCTYPE html>
-<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
+<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>">
 <head>
 <meta charset="UTF-8" />
 <meta name="robots" content="noindex, nofollow" />

Modified: trunk/themes/default/templates/html.tmpl
===================================================================
--- trunk/themes/default/templates/html.tmpl	2021-12-15 12:06:39 UTC (rev 10783)
+++ trunk/themes/default/templates/html.tmpl	2021-12-15 14:00:55 UTC (rev 10784)
@@ -2,9 +2,18 @@
 /*
  * This template is responsible mainly for the outer level <html> stuff.
  */
+global $LANG;
+if (empty($LANG)) {
+    $pref = &$request->_prefs;
+    if ($pref) {
+        $LANG = $pref->get('lang');
+    } else {
+        $LANG = DEFAULT_LANGUAGE;
+    }
+}
 ?>
 <!DOCTYPE html>
-<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
+<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>">
 <?php echo Template('head') ?>
 <?php echo Template('body') ?>
 </html>

Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl	2021-12-15 12:06:39 UTC (rev 10783)
+++ trunk/themes/default/templates/htmldump.tmpl	2021-12-15 14:00:55 UTC (rev 10784)
@@ -1,11 +1,20 @@
 <?php
 /*
  * This template is used only for html file dumps, and is responsible
- * mainly for the outer level <html> stuff and the and <head>.
+ * mainly for the outer level <html> stuff and the <head>.
  */
+global $LANG;
+if (empty($LANG)) {
+    $pref = &$request->_prefs;
+    if ($pref) {
+        $LANG = $pref->get('lang');
+    } else {
+        $LANG = DEFAULT_LANGUAGE;
+    }
+}
 ?>
 <!DOCTYPE html>
-<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
+<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>">
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />

Modified: trunk/themes/default/templates/redirect.tmpl
===================================================================
--- trunk/themes/default/templates/redirect.tmpl	2021-12-15 12:06:39 UTC (rev 10783)
+++ trunk/themes/default/templates/redirect.tmpl	2021-12-15 14:00:55 UTC (rev 10784)
@@ -2,9 +2,18 @@
 /*
  * Redirect output.
  */
+global $LANG;
+if (empty($LANG)) {
+    $pref = &$request->_prefs;
+    if ($pref) {
+        $LANG = $pref->get('lang');
+    } else {
+        $LANG = DEFAULT_LANGUAGE;
+    }
+}
 ?>
 <!DOCTYPE html>
-<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
+<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="robots" content="noindex, nofollow" />

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10783] trunk/themes/Sidebar/templates/html.tmpl

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

Revision: 10783
          http://sourceforge.net/p/phpwiki/code/10783
Author:   vargenau
Date:     2021-12-15 12:06:39 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Remove ./themes/Sidebar/templates/html.tmpl, same as ./themes/default/templates/html.tmpl

Removed Paths:
-------------
    trunk/themes/Sidebar/templates/html.tmpl

Deleted: trunk/themes/Sidebar/templates/html.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/html.tmpl	2021-12-15 12:05:15 UTC (rev 10782)
+++ trunk/themes/Sidebar/templates/html.tmpl	2021-12-15 12:06:39 UTC (rev 10783)
@@ -1,10 +0,0 @@
-<?php
-/*
- * This template is responsible mainly for the outer level <html> stuff.
- */
-?>
-<!DOCTYPE html>
-<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
-<?php echo Template('head') ?>
-<?php echo Template('body') ?>
-</html>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10782] trunk/themes/Sidebar/templates/search.tmpl

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

Revision: 10782
          http://sourceforge.net/p/phpwiki/code/10782
Author:   vargenau
Date:     2021-12-15 12:05:15 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
themes/Sidebar/templates/search.tmpl: add ARIA role "search"

Modified Paths:
--------------
    trunk/themes/Sidebar/templates/search.tmpl

Modified: trunk/themes/Sidebar/templates/search.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/search.tmpl	2021-12-15 09:54:31 UTC (rev 10781)
+++ trunk/themes/Sidebar/templates/search.tmpl	2021-12-15 12:05:15 UTC (rev 10782)
@@ -1,4 +1,4 @@
-<div id="searchholder">
+<div role="search" id="searchholder">
 <form id="searchform" action="<?php echo WikiURL(_("FindPage"))?>"
       method="get" accept-charset="UTF-8" style="display:inline" class="searchform">
 <?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:[10781] trunk/themes/wikilens/templates/head.tmpl

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

Revision: 10781
          http://sourceforge.net/p/phpwiki/code/10781
Author:   vargenau
Date:     2021-12-15 09:54:31 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Merge ./themes/wikilens/templates/head.tmpl with ./themes/default/templates/head.tmpl

Modified Paths:
--------------
    trunk/themes/wikilens/templates/head.tmpl

Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl	2021-12-15 09:53:44 UTC (rev 10780)
+++ trunk/themes/wikilens/templates/head.tmpl	2021-12-15 09:54:31 UTC (rev 10781)
@@ -14,12 +14,10 @@
 <link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH ?>/themes/default/highlight.js/styles/github.css"/>
 <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo _("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(
-_("Help")."/"._("HowToUseWiki"))?>" />
+<link rel="help" title="<?php echo _("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(_("Help")."/"._("HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
-<link rel="search" title="<?php echo _("FindPage")?>" href="<?php echo WikiURL(
-_("FindPage"))?>" />
+<link rel="search" title="<?php echo _("FindPage")?>" href="<?php echo WikiURL(_("FindPage"))?>" />
 <?php /**
        * Provide alternate variations of the page content:
        * 'viewsource' and 'browse'.
@@ -26,8 +24,8 @@
        * Translated pages could go here too.
        */
       if (!empty($revision)) {
-          $args = $request->getargs();
-          $action = $args['action'];
+          $args = $request->getArgs();
+          $action = empty($args['action']) ? 'browse' : $args['action'];
           if (!($action == "viewsource")) {
             $alternatelinkTitle = fmt("%s: %s", _("View Source"), $page->getName());
             $alternatelinkUrl = WikiURL($revision, array('action' => 'viewsource'));
@@ -45,7 +43,7 @@
        */
 ?>
 <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo WikiURL(_("RecentChanges"), array('format' => 'rss'))?>" />
-
+<link rel="alternate" type="application/atom+xml" title="ATOM" href="<?php echo WikiURL(_("RecentChanges"), array('format' => 'atom'))?>" />
 <?php /**
        * Add some user-specific links.
        */ ?>
@@ -53,10 +51,9 @@
       /* For users not signed in */ ?>
 <?php } ?>
 <link rel="alternate" type="application/x-wiki" title="Edit this page!" href="<?php echo WikiURL($page,array('action'=>'edit')) ?>" />
-<?php if ($user->isadmin()) {
+<?php if ($user->isAdmin()) {
       /* Only for the Administrator */ ?>
 <?php } ?>
-
 <?php if ($user->isSignedIn()) {
       /* For signed-in users */ ?>
 <?php /* User's calendar page
@@ -73,7 +70,6 @@
           ?>
 <?php } ?>
 <?php } //end of links for signed-in user ?>
-
 <?php echo $WikiTheme->getCSS() ?>
 <?php
   // avoid redundant bookmark title for custom home page

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

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

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

Revision: 10780
          http://sourceforge.net/p/phpwiki/code/10780
Author:   vargenau
Date:     2021-12-15 09:53:44 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Remove themes/Crao/templates/head.tmpl, identical with themes/default/templates/head.tmpl

Removed Paths:
-------------
    trunk/themes/Crao/templates/head.tmpl

Deleted: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl	2021-12-15 09:52:44 UTC (rev 10779)
+++ trunk/themes/Crao/templates/head.tmpl	2021-12-15 09:53:44 UTC (rev 10780)
@@ -1,91 +0,0 @@
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
-<meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
-<?php if (!empty($PAGE_DESCRIPTION)) { ?>
-<meta name="description" content="<?php echo $PAGE_DESCRIPTION?>" />
-<?php } ?>
-<?php if (!empty($PAGE_KEYWORDS)) { ?>
-<meta name="keywords" content="<?php echo $PAGE_KEYWORDS?>" />
-<?php } ?>
-<meta name="generator" content="PhpWiki <?php echo PHPWIKI_VERSION?>" />
-<base href="<?php echo PHPWIKI_BASE_URL?>" />
-<link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" />
-<link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH ?>/themes/default/highlight.js/styles/github.css"/>
-<?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
-<link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo
-_("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(
-_("Help")."/"._("HowToUseWiki"))?>" />
-<link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
-<link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
-<link rel="search" title="<?php echo
-_("FindPage")?>" href="<?php echo WikiURL(
-_("FindPage"))?>" />
-<?php /**
-       * Provide alternate variations of the page content:
-       * 'viewsource' and 'browse'.
-       * Translated pages could go here too.
-       */
-      if (!empty($revision)) {
-          $args = $request->getargs();
-          $action = $args['action'];
-          if (!($action == "viewsource")) {
-            $alternatelinkTitle = fmt("%s: %s", _("View Source"), $page->getName());
-            $alternatelinkUrl = WikiURL($revision, array('action' => 'viewsource'));
-          }
-          if (!($action == "browse")) {
-            $alternatelinkTitle = $page->getName();
-            $alternatelinkUrl = WikiURL($revision, array('action' => 'browse'));
-          } ?>
-<link rel="alternate" title="<?php echo $alternatelinkTitle ?>" href="<?php echo $alternatelinkUrl ?>" />
-<?php }
-      /**
-       * Link tag for RSS auto-discovery.  See
-       * http://diveintomark.org/archives/2002/05/30.html#rss_autodiscovery
-       * http://www.oreillynet.com/cs/weblog/view/wlg/1475
-       */
-?>
-<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo WikiURL(
-_("RecentChanges"), array('format' => 'rss'))?>" />
-<?php /**
-       * Add some user-specific links.
-       */ ?>
-<?php if (!$user->isSignedIn()) {
-      /* For users not signed in */ ?>
-<?php } ?>
-<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="<?php echo WikiURL($page,array('action'=>'edit')) ?>" />
-<?php if ($user->isadmin()) {
-      /* Only for the Administrator */ ?>
-<?php } ?>
-<?php if ($user->isSignedIn()) {
-      /* For signed-in users */ ?>
-<?php /* User's calendar page
-       */
-      $UserCalPageTitle = $user->getId() . '/' ._("Calendar");
-      $UserCalPageUrl = WikiURL($UserCalPageTitle);
-      ?>
-<?php /* Today's calendar page for the user if it exists
-       */
-      $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
-      $dbi = $request->getDbh();
-      if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
-          $UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
-          ?>
-<?php } ?>
-<?php } //end of links for signed-in user ?>
-<?php echo $WikiTheme->getCSS() ?>
-<?php
-  // avoid redundant bookmark title for custom home page
-  if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME)
-      $pagetitle = "";
-  else
-      $pagetitle = " - ". AsString($TITLE);
-?>
-<title><?php echo WIKI_NAME.$pagetitle?></title>
-<?php if (ENABLE_OPEN_GRAPH) { ?>
-<meta property="og:title" content="<?php echo strip_tags($TITLE) ?>"/>
-<meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/>
-<?php } ?>
-<?php echo $WikiTheme->getMoreHeaders() ?>
-</head>

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

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

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

Revision: 10779
          http://sourceforge.net/p/phpwiki/code/10779
Author:   vargenau
Date:     2021-12-15 09:52:44 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
themes/default/templates/head.tmpl: simpler charset syntax, add ATOM link

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

Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl	2021-12-15 09:28:33 UTC (rev 10778)
+++ trunk/themes/default/templates/head.tmpl	2021-12-15 09:52:44 UTC (rev 10779)
@@ -1,5 +1,5 @@
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta charset="UTF-8" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
 <?php if (!empty($PAGE_DESCRIPTION)) { ?>
@@ -14,14 +14,10 @@
 <link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH ?>/themes/default/highlight.js/styles/github.css"/>
 <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo
-_("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(
-_("Help")."/"._("HowToUseWiki"))?>" />
+<link rel="help" title="<?php echo _("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(_("Help")."/"._("HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
-<link rel="search" title="<?php echo
-_("FindPage")?>" href="<?php echo WikiURL(
-_("FindPage"))?>" />
+<link rel="search" title="<?php echo _("FindPage")?>" href="<?php echo WikiURL(_("FindPage"))?>" />
 <?php /**
        * Provide alternate variations of the page content:
        * 'viewsource' and 'browse'.
@@ -46,10 +42,8 @@
        * http://www.oreillynet.com/cs/weblog/view/wlg/1475
        */
 ?>
-<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo WikiURL(
-_("RecentChanges"), array('format' => 'rss'))?>" />
-<link rel="alternate" type="application/atom+xml" title="ATOM" href="<?php echo WikiURL(
-_("RecentChanges"), array('format' => 'atom'))?>" />
+<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo WikiURL(_("RecentChanges"), array('format' => 'rss'))?>" />
+<link rel="alternate" type="application/atom+xml" title="ATOM" href="<?php echo WikiURL(_("RecentChanges"), array('format' => 'atom'))?>" />
 <?php /**
        * Add some user-specific links.
        */ ?>
@@ -76,7 +70,8 @@
           ?>
 <?php } ?>
 <?php } //end of links for signed-in user ?>
-<?php echo $WikiTheme->getCSS() ?><?php
+<?php echo $WikiTheme->getCSS() ?>
+<?php
   // avoid redundant bookmark title for custom home page
   if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME)
       $pagetitle = "";

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

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

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

Revision: 10778
          http://sourceforge.net/p/phpwiki/code/10778
Author:   vargenau
Date:     2021-12-15 09:28:33 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Remove ENABLE_XHTML_XML

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/HtmlElement.php
    trunk/lib/IniConfig.php
    trunk/lib/WysiwygEdit/tinymce.php
    trunk/lib/WysiwygEdit.php
    trunk/lib/plugin/AsciiMath.php
    trunk/lib/plugin/AsciiSVG.php
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/Help%2FAsciiSVGPlugin
    trunk/pgsrc/ReleaseNotes
    trunk/themes/default/templates/head.tmpl

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/config/config-default.ini	2021-12-15 09:28:33 UTC (rev 10778)
@@ -6,7 +6,6 @@
 ENABLE_EDIT_TOOLBAR = true
 JS_SEARCHREPLACE = true
 ENABLE_DOUBLECLICKEDIT = false
-ENABLE_XHTML_XML = false
 ENABLE_OPEN_GRAPH = false
 USECACHE = true
 ISREADONLY = false

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/config/config-dist.ini	2021-12-15 09:28:33 UTC (rev 10778)
@@ -85,11 +85,6 @@
 ; Install e.g. with Homebrew: brew install gnu-units
 ;UNITS_EXE = /usr/local/bin/gunits
 
-; Needed for inlined SVG and MathM, but conflicts with document.write().
-; Experimental. Default: false.
-; See http://hixie.ch/advocacy/xhtml
-;ENABLE_XHTML_XML = true
-
 ; Needed for FacebookLike plugin
 ;ENABLE_OPEN_GRAPH = true
 

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/configurator.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -453,9 +453,6 @@
 $properties["UNITS_EXE"] =
     new _define_commented_optional('UNITS_EXE');
 
-$properties["ENABLE_XHTML_XML"] =
-    new boolean_define_commented_optional('ENABLE_XHTML_XML');
-
 $properties["ENABLE_OPEN_GRAPH"] =
     new boolean_define_commented_optional('ENABLE_OPEN_GRAPH');
 

Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/HtmlElement.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -677,9 +677,7 @@
         return HTML(HTML::script($script_args), "\n");
     else
         return HTML(HTML::script($script_args,
-            new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
-                . "\n" . trim($js) . "\n"
-                . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))), "\n");
+            new RawXml("\n<!--//" . "\n" . trim($js) . "\n" . "// -->")), "\n");
 }
 
 /** Conditionally display content based of whether javascript is supported.

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/IniConfig.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -128,7 +128,7 @@
     // List of all valid config options to be define()d which take booleans.
     $_IC_VALID_BOOL = array
     ('ENABLE_PAGEPERM', 'ENABLE_EDIT_TOOLBAR', 'JS_SEARCHREPLACE',
-        'ENABLE_XHTML_XML', 'ENABLE_DOUBLECLICKEDIT',
+        'ENABLE_DOUBLECLICKEDIT',
         'USECACHE', 'WIKIDB_NOCACHE_MARKUP',
         'ENABLE_REVERSE_DNS', 'ENCRYPTED_PASSWD', 'ZIPDUMP_AUTH',
         'ENABLE_RAW_HTML', 'ENABLE_RAW_HTML_LOCKEDONLY', 'ENABLE_RAW_HTML_SAFE',

Modified: trunk/lib/WysiwygEdit/tinymce.php
===================================================================
--- trunk/lib/WysiwygEdit/tinymce.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/WysiwygEdit/tinymce.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -30,8 +30,6 @@
  * Suggested installation of the jscripts subdirectory
  *   tinymce/jscripts/tiny_mce/ into themes/default/tiny_mce/
  *
- * WARNING! Probably incompatible with ENABLE_XHTML_XML
- *
  * @package WysiwygEdit
  * @author Reini Urban
  */

Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/WysiwygEdit.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -37,8 +37,6 @@
  *       when HtmlParser is finished.
  * Based upon htmlarea3.php and tinymce.php
  *
- * WARNING! Probably incompatible with ENABLE_XHTML_XML (TestMe)
- *
  * @package WysiwygEdit
  * @author Reini Urban
  */

Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/plugin/AsciiMath.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -27,7 +27,6 @@
 
 /**
  * Render ASCII math as MathML
- * Requires ENABLE_XHTML_XML = true
  * See http://www.jcphysics.com/ASCIIMath/
  * Syntax: http://www1.chapman.edu/~jipsen/mathml/asciimathsyntax.xml
  * Example: "int_-1^1 sqrt(1-x^2)dx = pi/2"

Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/plugin/AsciiSVG.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -24,7 +24,6 @@
 
 /**
  * Interface to http://www1.chapman.edu/~jipsen/svg/asciisvg.html
- * Requires ENABLE_XHTML_XML = true
  * Syntax: http://www1.chapman.edu/~jipsen/svg/asciisvgcommands.html
  */
 

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,4 +1,4 @@
-Date: Mon,  6 Dec 2021 12:42:19 +0000
+Date: Wed, 15 Dec 2021 10:20:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -21,6 +21,7 @@
 * Add “Rename” tab in Sidebar theme.
 * Add sample images for ~PhotoAlbum in blog theme
 * Remove EDITING_POLICY
+* Remove ENABLE_XHTML_XML
 * More translations
 
 === Plugins ===

Modified: trunk/pgsrc/Help%2FAsciiSVGPlugin
===================================================================
--- trunk/pgsrc/Help%2FAsciiSVGPlugin	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/pgsrc/Help%2FAsciiSVGPlugin	2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Wed, 15 Dec 2021 10:20:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAsciiSVGPlugin;
@@ -9,8 +9,6 @@
 The **~AsciiSVGPlugin** [[Help:WikiPlugin|plugin]] is an interface to
 [[http://www1.chapman.edu/~jipsen/svg/asciisvg.html]]
 
-Requires ENABLE_XHTML_XML = true
-
 Syntax: [[http://www1.chapman.edu/~jipsen/svg/asciisvgcommands.html]]
 
 The browser must support SVG in order graphs to be displayed.

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/pgsrc/ReleaseNotes	2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,4 +1,4 @@
-Date: Mon,  6 Dec 2021 12:42:19 +0000
+Date: Wed, 15 Dec 2021 10:20:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -21,6 +21,7 @@
 * Add “Rename” tab in Sidebar theme.
 * Add sample images for ~PhotoAlbum in blog theme
 * Remove EDITING_POLICY
+* Remove ENABLE_XHTML_XML
 * More translations
 
 === Plugins ===

Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/themes/default/templates/head.tmpl	2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,9 +1,5 @@
 <head>
-<?php if (ENABLE_XHTML_XML and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml')) { ?>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<?php } else { ?>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<?php } ?>
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
 <?php if (!empty($PAGE_DESCRIPTION)) { ?>

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

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

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

Revision: 10777
          http://sourceforge.net/p/phpwiki/code/10777
Author:   vargenau
Date:     2021-12-15 08:19:13 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Remove unused template themes/wikilens/templates/newuserwelcomepage.tmpl

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

Removed Paths:
-------------
    trunk/themes/wikilens/templates/newuserwelcomepage.tmpl

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2021-12-14 18:00:57 UTC (rev 10776)
+++ trunk/TODO	2021-12-15 08:19:13 UTC (rev 10777)
@@ -62,7 +62,6 @@
   to statically define predicates used by PhpWiki:SemanticWeb
   (semantically enriched links, like interwiki links).
 * SqlResult paging (finished?)
-* plugin\NewUserWelcomePage.php (some better template solution)
 * plugin\SearchHighlight
 * logfile stuff:
 *   plugin\RecentReferrers

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2021-12-14 18:00:57 UTC (rev 10776)
+++ trunk/locale/Makefile	2021-12-15 08:19:13 UTC (rev 10777)
@@ -510,7 +510,6 @@
 ${POT_FILE}: .././themes/wikilens/templates/body.tmpl
 ${POT_FILE}: .././themes/wikilens/templates/head.tmpl
 ${POT_FILE}: .././themes/wikilens/templates/navbar.tmpl
-${POT_FILE}: .././themes/wikilens/templates/newuserwelcomepage.tmpl
 ${POT_FILE}: .././themes/wikilens/templates/ratings.tmpl
 ${POT_FILE}: .././themes/wikilens/templates/top.tmpl
 ${POT_FILE}: .././themes/wikilens/themeinfo.php

Deleted: trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/newuserwelcomepage.tmpl	2021-12-14 18:00:57 UTC (rev 10776)
+++ trunk/themes/wikilens/templates/newuserwelcomepage.tmpl	2021-12-15 08:19:13 UTC (rev 10777)
@@ -1,27 +0,0 @@
-<?php
-  $dbi = $request->getDbh();
-?>
-<div>
-<h2>Welcome <?php echo $FRIEND ?></h2>
-<p>Welcome to <?php echo WIKI_NAME ?>.  A good place to learn about <?php echo WIKI_NAME ?> is to check out the <a href="<?php echo WikiURL(WIKI_NAME.'/'
-._("Tutorial"), '', true); ?>"><?php echo WIKI_NAME ?> Tutorial</a></p>
-<br />
-<?php if ($PAGE1 || $PAGE2 || $PAGE3) { ?>
-Here are pages on <?php echo WIKI_NAME ?> that <?php echo $SENDER ?> thinks you will be interested in:<br />
-<?php
-    foreach (array($PAGE1, $PAGE2, $PAGE3) as $pagename) {
-      if ($dbi->isWikiPage($pagename)) {
-?>
-        <a href="<?php echo WikiURL($pagename, '', true); ?>"><?php echo $pagename ?></a><br>
-<?php
-      }
-    }
-  }
-?>
-<br />
-<?php if ($dbi->isWikiPage($SENDERUSERNAME)) { ?>
-<p>Also, <?php echo $SENDER; ?> has his own homepage at <?php echo WIKI_NAME._(': ') ?><a href="<?php echo WikiURL($SENDERUSERNAME, '', true); ?>"><?php echo $SENDER ?>'s page</a></p>
-<?php } ?>
-<br>
-<p>To create your own login on <?php echo WIKI_NAME ?>, you can <a href="<?php echo WikiURL('NewUserRegister', '', true) ?>">Register</a></p>
-</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:[10776] trunk/themes/Wordpress/templates/ viewsource.tmpl

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

Revision: 10776
          http://sourceforge.net/p/phpwiki/code/10776
Author:   vargenau
Date:     2021-12-14 18:00:57 +0000 (Tue, 14 Dec 2021)
Log Message:
-----------
themes/Wordpress/templates/viewsource.tmpl: id is not used

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

Modified: trunk/themes/Wordpress/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/viewsource.tmpl	2021-12-14 17:58:32 UTC (rev 10775)
+++ trunk/themes/Wordpress/templates/viewsource.tmpl	2021-12-14 18:00:57 UTC (rev 10776)
@@ -1,4 +1,4 @@
-<div class="wikitext" id="viewform">
+<div class="wikitext">
 
 <?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
@@ -19,8 +19,8 @@
           readonly="readonly"
 ><?php echo $PAGE_SOURCE ?></textarea>
 <hr />
-<a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>"
-   ><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
+<a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>">
+<?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
 <br />
 
 </div>

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