Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2022-01-04 11:21:26
|
Revision: 10815
http://sourceforge.net/p/phpwiki/code/10815
Author: vargenau
Date: 2022-01-04 11:21:24 +0000 (Tue, 04 Jan 2022)
Log Message:
-----------
themes/Portland/templates/browse.tmpl and themes/Wordpress/templates/browse.tmpl: use Button
Modified Paths:
--------------
trunk/themes/Portland/templates/browse.tmpl
trunk/themes/Wordpress/templates/browse.tmpl
Modified: trunk/themes/Portland/templates/browse.tmpl
===================================================================
--- trunk/themes/Portland/templates/browse.tmpl 2022-01-04 11:20:37 UTC (rev 10814)
+++ trunk/themes/Portland/templates/browse.tmpl 2022-01-04 11:21:24 UTC (rev 10815)
@@ -5,7 +5,7 @@
<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
<p class="warning_msg"><?php echo _("Note:") ?>
<?php echo _("You are viewing an old revision of this page.") ?>
- <?php echo WikiLink($page, 'existing', _("View the current version.")) ?>
+ <?php echo Button('browse', _("View the current version."), $page) ?>
</p>
<hr class="ignore" />
<?php } ?>
Modified: trunk/themes/Wordpress/templates/browse.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/browse.tmpl 2022-01-04 11:20:37 UTC (rev 10814)
+++ trunk/themes/Wordpress/templates/browse.tmpl 2022-01-04 11:21:24 UTC (rev 10815)
@@ -5,7 +5,7 @@
<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
<p class="warning_msg"><?php echo _("Note:") ?>
<?php echo _("You are viewing an old revision of this page.") ?>
- <?php echo WikiLink($page, 'existing', _("View the current version.")) ?>
+ <?php echo Button('browse', _("View the current version."), $page) ?>
</p>
<hr class="ignore" />
<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-05 17:45:50
|
Revision: 10830
http://sourceforge.net/p/phpwiki/code/10830
Author: vargenau
Date: 2022-01-05 17:45:47 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Add label
Modified Paths:
--------------
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2022-01-05 17:45:25 UTC (rev 10829)
+++ trunk/themes/Portland/templates/editpage.tmpl 2022-01-05 17:45:47 UTC (rev 10830)
@@ -3,33 +3,35 @@
accept-charset="UTF-8">
<table class="toolbar fullwidth">
<tr class="bottom">
- <td>
- <?php echo $PAGE_LOCKED_MESSAGE ?>
- <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
- <?php if (!$IS_CURRENT) { ?>
+<td>
+<?php echo $PAGE_LOCKED_MESSAGE ?>
+<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
+<?php if (!$IS_CURRENT) { ?>
<p class="warning_msg">
<strong><?php echo _("Warning")._(": ") ?></strong>
<?php echo _("You are editing an old revision.") ?>
<?php echo _("Saving this page will overwrite the current version.") ?>
</p>
- <?php } ?>
- </td>
+<?php } ?>
+</td>
</tr>
</table>
<div id="editarea"><?php echo $EDIT_TEXTAREA?></div>
<br />
-<?php echo _("Summary")._(":") ?> <?php echo $SUMMARY_INPUT ?>
+<?php echo _("Summary")._(":") ?><?php echo $SUMMARY_INPUT ?>
<br />
- <?php echo $PREVIEW_B ?>
- <?php if ($SAVE_B) { ?>
- <?php echo $SEP?><?php echo $SAVE_B ?>
- <?php } ?>
+<?php echo $PREVIEW_B ?>
+<?php if ($SAVE_B) { ?>
+ <?php echo $SEP?><?php echo $SAVE_B ?>
+<?php } ?>
<br />
<?php echo fmt("Author will be logged as %s.", HTML::em($user->getId())) ?>
<br />
<?php echo $MINOR_EDIT_CB ?>
+<label for="edit-minor_edit">
<?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
WikiLink(__("RecentEdits"))) ?>
+</label>
<br />
<?php if (isset($PREVIEW_CONTENT)) { ?>
<hr />
@@ -39,7 +41,6 @@
<?php } ?>
<div class="wiki-edithelp">
-<?php // FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules ?>
<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
</div>
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2022-01-05 17:45:25 UTC (rev 10829)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2022-01-05 17:45:47 UTC (rev 10830)
@@ -5,19 +5,19 @@
<?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1">'; ?>
<table class="toolbar fullwidth">
<tr class="bottom">
- <td>
- <?php echo $PAGE_LOCKED_MESSAGE ?>
- <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
- <?php if (!$IS_CURRENT) { ?>
+<td>
+<?php echo $PAGE_LOCKED_MESSAGE ?>
+<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
+<?php if (!$IS_CURRENT) { ?>
<p class="warning_msg">
<strong><?php echo _("Warning")._(": ") ?></strong>
<?php echo _("You are editing an old revision.") ?>
<?php echo _("Saving this page will overwrite the current version.") ?>
</p>
- <?php } ?>
- </td>
- <td>
- </td>
+<?php } ?>
+</td>
+<td>
+</td>
</tr>
</table>
<?php if (isset($EDIT_TOOLBAR)) { ?>
@@ -25,7 +25,8 @@
<?php } ?>
<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
<p>
-<?php echo _("Summary")._(":") ?><?php echo $SUMMARY_INPUT ?>
+<label for="edit-summary"><?php echo _("Summary")._(":") ?></label>
+<?php echo $SUMMARY_INPUT ?>
</p>
<p>
<?php echo $PREVIEW_B ?>
@@ -35,14 +36,16 @@
</p>
<?php if (ENABLE_CAPTCHA) { ?>
<?php echo $CAPTCHA_IMAGE ?><br/>
- <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?><br/>
+ <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?>
+<br/>
<?php } ?>
<?php echo fmt("Author will be logged as %s.", HTML::em($user->getId())) ?>
<br />
<?php echo $MINOR_EDIT_CB ?>
- <label for="edit-minor_edit">
- <?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
- WikiLink(__("RecentEdits"))) ?></label>
+<label for="edit-minor_edit">
+<?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
+ WikiLink(__("RecentEdits"))) ?>
+</label>
<br />
<?php if ($user->isAdmin()) { ?>
<?php echo $SEP?><?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
@@ -56,7 +59,6 @@
<?php } ?>
<div class="wiki-edithelp">
-<?php // FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules ?>
<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-05 17:55:51
|
Revision: 10835
http://sourceforge.net/p/phpwiki/code/10835
Author: vargenau
Date: 2022-01-05 17:55:47 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
templates: move banners for old revision and locked pages from browse.tmpl and viewsource.tmpl to body.tmpl
Modified Paths:
--------------
trunk/themes/Crao/templates/body.tmpl
trunk/themes/Crao/templates/browse.tmpl
trunk/themes/MonoBook/templates/body.tmpl
trunk/themes/MonoBook/templates/browse.tmpl
trunk/themes/MonoBook/templates/viewsource.tmpl
trunk/themes/Portland/templates/body.tmpl
trunk/themes/Portland/templates/browse.tmpl
trunk/themes/Portland/templates/viewsource.tmpl
trunk/themes/Sidebar/templates/body.tmpl
trunk/themes/Wordpress/templates/body.tmpl
trunk/themes/Wordpress/templates/browse.tmpl
trunk/themes/Wordpress/templates/viewsource.tmpl
trunk/themes/blog/templates/body.tmpl
trunk/themes/default/templates/body.tmpl
trunk/themes/default/templates/browse.tmpl
trunk/themes/default/templates/viewsource.tmpl
trunk/themes/wikilens/templates/body.tmpl
Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Crao/templates/body.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -12,6 +12,25 @@
<h1><?php echo $HEADER ?></h1>
<?php } ?>
<main role="main">
+ <?php
+ $action = $request->getArg('action');
+ if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("This page has been locked and cannot be edited.") ?>
+ </p>
+ <?php
+ }
+ if (($action != 'edit') && ($action != 'revert')
+ && $revision and !$revision->isCurrent()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
+ </p>
+ <?php } ?>
+ <?php if (!empty($redirected)) { ?>
+ <p><?php echo $redirected ?></p>
+ <?php } ?>
<?php echo $CONTENT ?>
</main>
<?php echo Template('bottom') ?>
Modified: trunk/themes/Crao/templates/browse.tmpl
===================================================================
--- trunk/themes/Crao/templates/browse.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Crao/templates/browse.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,17 +1,4 @@
-<?php
-$action = $request->getArg('action');
-?>
-<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
- <p class="warning_msg"><?php echo _("Note:") ?>
- <?php echo _("You are viewing an old revision of this page.") ?>
- <?php echo Button('browse', _("View the current version."), $page) ?>
- </p>
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
- <p><?php echo $redirected ?></p>
-<?php } ?>
<?php echo $CONTENT?>
-
<div id="revision">
<p class="editdate"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></p>
<?php
@@ -19,5 +6,4 @@
if (!$HIDE_TOOLBARS) {
?>
</div>
-
<?php } ?>
Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/MonoBook/templates/body.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -6,6 +6,25 @@
<?php echo Template('top') ?>
</header>
<main role="main">
+ <?php
+ $action = $request->getArg('action');
+ if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("This page has been locked and cannot be edited.") ?>
+ </p>
+ <?php
+ }
+ if (($action != 'edit') && ($action != 'revert')
+ && $revision and !$revision->isCurrent()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
+ </p>
+ <?php } ?>
+ <?php if (!empty($redirected)) { ?>
+ <p><?php echo $redirected ?></p>
+ <?php } ?>
<div id="bodyContent">
<?php echo $CONTENT ?>
<div class="clear-floats"></div>
Modified: trunk/themes/MonoBook/templates/browse.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/MonoBook/templates/browse.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,13 +1 @@
-<?php
-$action = $request->getArg('action');
-?>
-<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
- <p class="warning_msg"><?php echo _("Note:") ?>
- <?php echo _("You are viewing an old revision of this page.") ?>
- <?php echo Button('browse', _("View the current version."), $page) ?>
- </p>
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
- <p><?php echo $redirected ?></p>
-<?php } ?>
<?php echo $CONTENT?>
Modified: trunk/themes/MonoBook/templates/viewsource.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/viewsource.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/MonoBook/templates/viewsource.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,14 +1,3 @@
-<?php
-if ($page->get('locked') && !$user->isAdmin()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("This page has been locked and cannot be edited.") ?>
- </p>
-<?php } ?>
-<?php if ($revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('viewsource', _("View the current version."), $page) ?>
- </p>
-<?php } ?>
<br class="clear-floats" />
<textarea class="wikiedit"
name="content"
Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Portland/templates/body.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -7,6 +7,25 @@
class="bottom" /></a> <?php echo $HEADER ?></h1>
</header>
<main role="main">
+ <?php
+ $action = $request->getArg('action');
+ if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("This page has been locked and cannot be edited.") ?>
+ </p>
+ <?php
+ }
+ if (($action != 'edit') && ($action != 'revert')
+ && $revision and !$revision->isCurrent()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
+ </p>
+ <?php } ?>
+ <?php if (!empty($redirected)) { ?>
+ <p><?php echo $redirected ?></p>
+ <?php } ?>
<?php echo $CONTENT ?>
</main>
<?php echo Template('navbar') ?>
Modified: trunk/themes/Portland/templates/browse.tmpl
===================================================================
--- trunk/themes/Portland/templates/browse.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Portland/templates/browse.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,18 +1,3 @@
-<?php
-$action = $request->getArg('action');
-?>
-<br class="clear-floats" />
-<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
- <p class="warning_msg"><?php echo _("Note:") ?>
- <?php echo _("You are viewing an old revision of this page.") ?>
- <?php echo Button('browse', _("View the current version."), $page) ?>
- </p>
- <hr class="ignore" />
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
- <p><?php echo $redirected ?></p>
-<?php } ?>
<?php echo $CONTENT?>
<hr />
<?php echo Template('actionbar') ?>
-<?php // The bottom navigation/search bar ?>
Modified: trunk/themes/Portland/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Portland/templates/viewsource.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Portland/templates/viewsource.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,14 +1,3 @@
-<?php
-if ($page->get('locked') && !$user->isAdmin()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("This page has been locked and cannot be edited.") ?>
- </p>
-<?php } ?>
-<?php if ($revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('viewsource', _("View the current version."), $page) ?>
- </p>
-<?php } ?>
<textarea class="wikiedit"
name="content"
rows="<?php echo $request->getPref('editHeight') ?>"
Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Sidebar/templates/body.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -4,9 +4,28 @@
<div id="content">
<main role="main">
<?php echo Template('top') ?>
+ <?php
+ $action = $request->getArg('action');
+ if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("This page has been locked and cannot be edited.") ?>
+ </p>
+ <?php
+ }
+ if (($action != 'edit') && ($action != 'revert')
+ && $revision and !$revision->isCurrent()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
+ </p>
+ <?php } ?>
+ <?php if (!empty($redirected)) { ?>
+ <p><?php echo $redirected ?></p>
+ <?php } ?>
<div id="bodyContent">
- <?php echo $CONTENT ?>
- <div class="clear-floats"></div>
+ <?php echo $CONTENT ?>
+ <div class="clear-floats"></div>
</div>
</main>
</div>
Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Wordpress/templates/body.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -3,6 +3,25 @@
<h1 id="header"><?php echo $HEADER ?></h1>
</header>
<main role="main">
+ <?php
+ $action = $request->getArg('action');
+ if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("This page has been locked and cannot be edited.") ?>
+ </p>
+ <?php
+ }
+ if (($action != 'edit') && ($action != 'revert')
+ && $revision and !$revision->isCurrent()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
+ </p>
+ <?php } ?>
+ <?php if (!empty($redirected)) { ?>
+ <p><?php echo $redirected ?></p>
+ <?php } ?>
<?php echo $CONTENT ?>
</main>
<?php echo Template('navbar') ?>
Modified: trunk/themes/Wordpress/templates/browse.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/browse.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Wordpress/templates/browse.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,18 +1,5 @@
-<?php
-$action = $request->getArg('action');
-?>
<br class="clear-floats" />
-<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
- <p class="warning_msg"><?php echo _("Note:") ?>
- <?php echo _("You are viewing an old revision of this page.") ?>
- <?php echo Button('browse', _("View the current version."), $page) ?>
- </p>
- <hr class="ignore" />
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
- <p><?php echo $redirected ?></p>
-<?php } ?>
+<hr class="ignore" />
<?php echo $CONTENT?>
<hr />
<?php echo Template('actionbar') ?>
-<?php // The bottom navigation/search bar ?>
Modified: trunk/themes/Wordpress/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/viewsource.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/Wordpress/templates/viewsource.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,16 +1,4 @@
<div class="wikitext">
-<?php
-if (empty($revision)) $revision = $page->getCurrentRevision(false);
-if ($page->get('locked') && !$user->isAdmin()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("This page has been locked and cannot be edited.") ?>
- </p>
-<?php } ?>
-<?php if ($revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('viewsource', _("View the current version."), $page) ?>
- </p>
-<?php } ?>
<textarea class="wikiedit"
name="content"
rows="<?php echo $request->getPref('editHeight') ?>"
Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/blog/templates/body.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -4,23 +4,25 @@
<div id="pagetitle">
<h1 id="pagetitleText"><?php echo $HEADER ?></h1></div>
<main role="main">
-<?php
-$action = $request->getArg('action');
-if (empty($revision)) $revision = $page->getCurrentRevision(false);
-if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("This page has been locked and cannot be edited.") ?>
- </p>
-<?php } ?>
-<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version."), $page)?>
- </p>
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
- <p><?php echo $redirected ?></p>
-<?php } ?>
+ <?php
+ $action = $request->getArg('action');
+ if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("This page has been locked and cannot be edited.") ?>
+ </p>
+ <?php
+ }
+ if (($action != 'edit') && ($action != 'revert')
+ && $revision and !$revision->isCurrent()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
+ </p>
+ <?php } ?>
+ <?php if (!empty($redirected)) { ?>
+ <p><?php echo $redirected ?></p>
+ <?php } ?>
<div id="bodyContent">
<?php echo $CONTENT ?>
</div>
Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/default/templates/body.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -5,6 +5,25 @@
</div>
</header>
<main role="main">
+ <?php
+ $action = $request->getArg('action');
+ if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("This page has been locked and cannot be edited.") ?>
+ </p>
+ <?php
+ }
+ if (($action != 'edit') && ($action != 'revert')
+ && $revision and !$revision->isCurrent()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
+ </p>
+ <?php } ?>
+ <?php if (!empty($redirected)) { ?>
+ <p><?php echo $redirected ?></p>
+ <?php } ?>
<div id="content">
<?php echo $CONTENT ?>
</div>
Modified: trunk/themes/default/templates/browse.tmpl
===================================================================
--- trunk/themes/default/templates/browse.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/default/templates/browse.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,16 +1,4 @@
-<?php
-$action = $request->getArg('action');
-?>
-<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
- <p class="warning_msg"><?php echo _("Note:") ?>
- <?php echo _("You are viewing an old revision of this page.") ?>
- <?php echo Button('browse', _("View the current version."), $page) ?>
- </p>
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
- <p><?php echo $redirected ?></p>
-<?php } ?>
<?php echo $CONTENT?>
-<div id="footer"><?php // for top & bottom toolbars stylesheet ?>
+<div id="footer">
<?php echo Template('browse-footer') ?>
</div>
Modified: trunk/themes/default/templates/viewsource.tmpl
===================================================================
--- trunk/themes/default/templates/viewsource.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/default/templates/viewsource.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -1,14 +1,3 @@
-<?php
-if ($page->get('locked') && !$user->isAdmin()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("This page has been locked and cannot be edited.") ?>
- </p>
-<?php } ?>
-<?php if ($revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('viewsource', _("View the current version."), $page) ?>
- </p>
-<?php } ?>
<br class="clear-floats" />
<textarea class="wikiedit"
name="content"
@@ -17,6 +6,6 @@
readonly="readonly"
><?php echo $PAGE_SOURCE ?>
</textarea>
-<div id="footer"><?php // for top & bottom toolbars stylesheet ?>
+<div id="footer">
<?php echo Template('browse-footer') ?>
</div>
Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl 2022-01-05 17:51:01 UTC (rev 10834)
+++ trunk/themes/wikilens/templates/body.tmpl 2022-01-05 17:55:47 UTC (rev 10835)
@@ -28,8 +28,27 @@
$dbi = $request->getDbh(); // Needed in PHP 8
printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup));
} ?> </h1>
- <?php echo $CONTENT ?>
- </main>
+ <?php
+ $action = $request->getArg('action');
+ if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("This page has been locked and cannot be edited.") ?>
+ </p>
+ <?php
+ }
+ if (($action != 'edit') && ($action != 'revert')
+ && $revision and !$revision->isCurrent()) { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
+ </p>
+ <?php } ?>
+ <?php if (!empty($redirected)) { ?>
+ <p><?php echo $redirected ?></p>
+ <?php } ?>
+ <?php echo $CONTENT ?>
+ </main>
<?php echo Template('bottom') ?>
</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-06 14:51:59
|
Revision: 10851
http://sourceforge.net/p/phpwiki/code/10851
Author: vargenau
Date: 2022-01-06 14:51:57 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
Add {}
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 2022-01-06 14:51:17 UTC (rev 10850)
+++ trunk/themes/Crao/templates/body.tmpl 2022-01-06 14:51:57 UTC (rev 10851)
@@ -1,4 +1,4 @@
-<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
+<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
<header role="banner">
<div id="header">
<?php echo Template('top') ?>
@@ -14,7 +14,9 @@
<main role="main">
<?php
$action = $request->getArg('action');
- if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl 2022-01-06 14:51:17 UTC (rev 10850)
+++ trunk/themes/MonoBook/templates/body.tmpl 2022-01-06 14:51:57 UTC (rev 10851)
@@ -1,4 +1,4 @@
-<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
+<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
<div id="global-wrapper">
<div id="column-content">
<div id="content">
@@ -8,7 +8,9 @@
<main role="main">
<?php
$action = $request->getArg('action');
- if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
@@ -26,8 +28,8 @@
<p><?php echo $redirected ?></p>
<?php } ?>
<div id="bodyContent">
- <?php echo $CONTENT ?>
- <div class="clear-floats"></div>
+ <?php echo $CONTENT ?>
+ <div class="clear-floats"></div>
</div>
</main>
</div>
@@ -43,7 +45,7 @@
<?php echo Template('tags') ?>
<?php } ?>
</div>
- <div id="footer"><?php // for top & bottom toolbars stylesheet ?>
+ <div id="footer">
<?php echo Template('browse-footer') ?>
</div>
<div id="bottom">
Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl 2022-01-06 14:51:17 UTC (rev 10850)
+++ trunk/themes/Portland/templates/body.tmpl 2022-01-06 14:51:57 UTC (rev 10851)
@@ -1,4 +1,4 @@
-<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
+<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
<header role="banner">
<h1><a class="wikilink"
href="<?php echo WikiURL(HOME_PAGE)?>"
@@ -9,7 +9,9 @@
<main role="main">
<?php
$action = $request->getArg('action');
- if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl 2022-01-06 14:51:17 UTC (rev 10850)
+++ trunk/themes/Sidebar/templates/body.tmpl 2022-01-06 14:51:57 UTC (rev 10851)
@@ -1,4 +1,4 @@
-<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
+<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
<div id="global-wrapper">
<div id="column-content">
<div id="content">
@@ -6,7 +6,9 @@
<?php echo Template('top') ?>
<?php
$action = $request->getArg('action');
- if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl 2022-01-06 14:51:17 UTC (rev 10850)
+++ trunk/themes/Wordpress/templates/body.tmpl 2022-01-06 14:51:57 UTC (rev 10851)
@@ -1,4 +1,4 @@
-<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
+<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
<header role="banner">
<h1 id="header"><?php echo $HEADER ?></h1>
</header>
@@ -5,7 +5,9 @@
<main role="main">
<?php
$action = $request->getArg('action');
- if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl 2022-01-06 14:51:17 UTC (rev 10850)
+++ trunk/themes/blog/templates/body.tmpl 2022-01-06 14:51:57 UTC (rev 10851)
@@ -1,4 +1,4 @@
-<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
+<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
<div id="page">
<?php echo Template('top') ?>
<div id="pagetitle">
@@ -6,7 +6,9 @@
<main role="main">
<?php
$action = $request->getArg('action');
- if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl 2022-01-06 14:51:17 UTC (rev 10850)
+++ trunk/themes/default/templates/body.tmpl 2022-01-06 14:51:57 UTC (rev 10851)
@@ -1,4 +1,4 @@
-<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
+<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
<header role="banner">
<div id="header">
<?php echo Template('top') ?>
@@ -7,7 +7,9 @@
<main role="main">
<?php
$action = $request->getArg('action');
- if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl 2022-01-06 14:51:17 UTC (rev 10850)
+++ trunk/themes/wikilens/templates/body.tmpl 2022-01-06 14:51:57 UTC (rev 10851)
@@ -1,4 +1,4 @@
-<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
+<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
<table>
<tr>
<td colspan="2" class="header">
@@ -30,7 +30,9 @@
} ?> </h1>
<?php
$action = $request->getArg('action');
- if (empty($revision)) $revision = $page->getCurrentRevision(false);
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-06 17:28:02
|
Revision: 10858
http://sourceforge.net/p/phpwiki/code/10858
Author: vargenau
Date: 2022-01-06 17:28:01 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
templates: DEBUG is always defined
Modified Paths:
--------------
trunk/themes/Crao/templates/bottom.tmpl
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/blog/templates/bottom.tmpl
trunk/themes/default/templates/bottom.tmpl
trunk/themes/fusionforge/templates/bottom.tmpl
trunk/themes/smaller/templates/info.tmpl
Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl 2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/Crao/templates/bottom.tmpl 2022-01-06 17:28:01 UTC (rev 10858)
@@ -1,7 +1,11 @@
<footer role="contentinfo">
<?php // Add your Disclaimer here ?>
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php if (defined('DEBUG') and DEBUG) { ?><?php echo Template('debug') ?><?php } ?>
+<?php
+if (DEBUG) {
+ echo Template('debug');
+}
+?>
</footer>
<script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script>
<script>
Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl 2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/MonoBook/templates/info.tmpl 2022-01-06 17:28:01 UTC (rev 10858)
@@ -174,16 +174,15 @@
<?php echo $SEP?><?php echo Button("Diff") ?>
<?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
<?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
-<?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
+<?php if (DEBUG || $user->isAdmin()) { ?>
<?php // Buttons really only for debugging ?>
<?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
<?php
- $PurgeCache = Button(array('nocache' => 'purge'),
+ $PurgeCache = Button(array('nocache' => 'purge'),
_("Purge HTML cache"), $page->getName());
- $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
+ $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
?>
<?php echo $SEP?><?php echo $PurgeCache ?>
-
<?php // End debugging buttons ?>
<?php } ?>
</div>
Modified: trunk/themes/blog/templates/bottom.tmpl
===================================================================
--- trunk/themes/blog/templates/bottom.tmpl 2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/blog/templates/bottom.tmpl 2022-01-06 17:28:01 UTC (rev 10858)
@@ -1,7 +1,11 @@
<?php // Add your Disclaimer here ?>
<?php if (!$WikiTheme->DUMP_MODE) { ?>
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php if (DEBUG & _DEBUG_VERBOSE) { ?><?php echo Template('debug') ?><?php } ?>
+<?php
+if (DEBUG) {
+ echo Template('debug');
+}
+?>
<?php } ?>
<script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script>
<script>
Modified: trunk/themes/default/templates/bottom.tmpl
===================================================================
--- trunk/themes/default/templates/bottom.tmpl 2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/default/templates/bottom.tmpl 2022-01-06 17:28:01 UTC (rev 10858)
@@ -3,7 +3,11 @@
<?php if (!$WikiTheme->DUMP_MODE) { ?>
<?php echo empty($WARNINGS) ? '' : $WARNINGS ?>
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php if (defined('DEBUG') and DEBUG & 1) { ?><?php echo Template('debug') ?><?php } ?>
+<?php
+if (DEBUG) {
+ echo Template('debug');
+}
+?>
<?php } ?>
</footer>
<script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script>
Modified: trunk/themes/fusionforge/templates/bottom.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/bottom.tmpl 2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/fusionforge/templates/bottom.tmpl 2022-01-06 17:28:01 UTC (rev 10858)
@@ -1,8 +1,10 @@
<?php if (!$WikiTheme->DUMP_MODE) { ?>
-<?php if (defined('DEBUG') and DEBUG) { ?>
+<?php if (DEBUG) { ?>
<?php echo empty($WARNINGS) ? '' : $WARNINGS ?>
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php echo Template('debug') ?>
+<?php
+ echo Template('debug');
+?>
<?php } ?>
<?php } ?>
<script type="text/javascript" src="/wiki/themes/default/highlight.js/highlight.pack.js"></script>
Modified: trunk/themes/smaller/templates/info.tmpl
===================================================================
--- trunk/themes/smaller/templates/info.tmpl 2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/smaller/templates/info.tmpl 2022-01-06 17:28:01 UTC (rev 10858)
@@ -8,7 +8,7 @@
<?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
<?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
<?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
- <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
+<?php if (DEBUG || $user->isAdmin()) { ?>
<?php // Buttons really only for debugging ?>
<?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
<?php
@@ -18,5 +18,5 @@
?>
<?php echo $SEP?><?php echo $PurgeCache ?>
<?php // End debugging buttons ?>
- <?php } ?>
+<?php } ?>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-07 16:59:38
|
Revision: 10862
http://sourceforge.net/p/phpwiki/code/10862
Author: vargenau
Date: 2022-01-07 16:59:37 +0000 (Fri, 07 Jan 2022)
Log Message:
-----------
Fix fatal error in template expansion
Modified Paths:
--------------
trunk/themes/Crao/templates/bottom.tmpl
trunk/themes/blog/templates/bottom.tmpl
trunk/themes/fusionforge/templates/bottom.tmpl
Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl 2022-01-07 16:11:32 UTC (rev 10861)
+++ trunk/themes/Crao/templates/bottom.tmpl 2022-01-07 16:59:37 UTC (rev 10862)
@@ -3,7 +3,7 @@
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
<?php
if (DEBUG) {
- echo Template('debug');
+ echo Template('debug')
}
?>
</footer>
Modified: trunk/themes/blog/templates/bottom.tmpl
===================================================================
--- trunk/themes/blog/templates/bottom.tmpl 2022-01-07 16:11:32 UTC (rev 10861)
+++ trunk/themes/blog/templates/bottom.tmpl 2022-01-07 16:59:37 UTC (rev 10862)
@@ -3,7 +3,7 @@
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
<?php
if (DEBUG) {
- echo Template('debug');
+ echo Template('debug')
}
?>
<?php } ?>
Modified: trunk/themes/fusionforge/templates/bottom.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/bottom.tmpl 2022-01-07 16:11:32 UTC (rev 10861)
+++ trunk/themes/fusionforge/templates/bottom.tmpl 2022-01-07 16:59:37 UTC (rev 10862)
@@ -2,9 +2,7 @@
<?php if (DEBUG) { ?>
<?php echo empty($WARNINGS) ? '' : $WARNINGS ?>
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php
- echo Template('debug');
-?>
+<?php echo Template('debug') ?>
<?php } ?>
<?php } ?>
<script type="text/javascript" src="/wiki/themes/default/highlight.js/highlight.pack.js"></script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-07 17:29:06
|
Revision: 10863
http://sourceforge.net/p/phpwiki/code/10863
Author: vargenau
Date: 2022-01-07 17:29:04 +0000 (Fri, 07 Jan 2022)
Log Message:
-----------
Fix fatal error in template expansion
Modified Paths:
--------------
trunk/themes/Crao/templates/bottom.tmpl
trunk/themes/blog/templates/bottom.tmpl
trunk/themes/default/templates/bottom.tmpl
Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl 2022-01-07 16:59:37 UTC (rev 10862)
+++ trunk/themes/Crao/templates/bottom.tmpl 2022-01-07 17:29:04 UTC (rev 10863)
@@ -1,11 +1,7 @@
<footer role="contentinfo">
<?php // Add your Disclaimer here ?>
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php
-if (DEBUG) {
- echo Template('debug')
-}
-?>
+<?php if (DEBUG) { ?><?php echo Template('debug') ?><?php } ?>
</footer>
<script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script>
<script>
Modified: trunk/themes/blog/templates/bottom.tmpl
===================================================================
--- trunk/themes/blog/templates/bottom.tmpl 2022-01-07 16:59:37 UTC (rev 10862)
+++ trunk/themes/blog/templates/bottom.tmpl 2022-01-07 17:29:04 UTC (rev 10863)
@@ -1,11 +1,7 @@
<?php // Add your Disclaimer here ?>
<?php if (!$WikiTheme->DUMP_MODE) { ?>
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php
-if (DEBUG) {
- echo Template('debug')
-}
-?>
+<?php if (DEBUG) { ?><?php echo Template('debug') ?><?php } ?>
<?php } ?>
<script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script>
<script>
Modified: trunk/themes/default/templates/bottom.tmpl
===================================================================
--- trunk/themes/default/templates/bottom.tmpl 2022-01-07 16:59:37 UTC (rev 10862)
+++ trunk/themes/default/templates/bottom.tmpl 2022-01-07 17:29:04 UTC (rev 10863)
@@ -3,11 +3,7 @@
<?php if (!$WikiTheme->DUMP_MODE) { ?>
<?php echo empty($WARNINGS) ? '' : $WARNINGS ?>
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php
-if (DEBUG) {
- echo Template('debug')
-}
-?>
+<?php if (DEBUG) { ?><?php echo Template('debug') ?><?php } ?>
<?php } ?>
</footer>
<script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-10 16:17:29
|
Revision: 10872
http://sourceforge.net/p/phpwiki/code/10872
Author: vargenau
Date: 2022-01-10 16:17:26 +0000 (Mon, 10 Jan 2022)
Log Message:
-----------
No executable flag for png files
Property Changed:
----------------
trunk/themes/Crao/buttons/zh/%E5%81%8F%E5%A5%BD%E8%A8%AD%E5%AE%9A.png
trunk/themes/Crao/buttons/zh/%E5%B7%AE%E7%95%B0.png
trunk/themes/Crao/buttons/zh/%E6%9F%A5%E7%9C%8B%E6%BA%90%E7%A2%BC.png
trunk/themes/Crao/buttons/zh/%E7%A7%BB%E9%99%A4%E9%A0%81%E9%9D%A2.png
trunk/themes/Crao/buttons/zh/%E7%AE%A1%E7%90%86%E8%80%85.png
trunk/themes/Crao/buttons/zh/%E7%B0%BD%E5%85%A5.png
trunk/themes/Crao/buttons/zh/%E7%B0%BD%E5%87%BA.png
trunk/themes/Crao/buttons/zh/%E7%B7%A8%E8%BC%AF.png
trunk/themes/Crao/buttons/zh/%E8%A7%A3%E9%99%A4%E9%8E%96%E5%AE%9A%E9%A0%81%E9%9D%A2.png
trunk/themes/Crao/buttons/zh/%E9%A0%81%E9%9D%A2%E6%AD%B7%E7%A8%8B.png
trunk/themes/default/buttons/rss.png
Index: trunk/themes/Crao/buttons/zh/%E5%81%8F%E5%A5%BD%E8%A8%AD%E5%AE%9A.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E5%81%8F%E5%A5%BD%E8%A8%AD%E5%AE%9A.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/Crao/buttons/zh/%E5%81%8F%E5%A5%BD%E8%A8%AD%E5%AE%9A.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/Crao/buttons/zh/%E5%81%8F%E5%A5%BD%E8%A8%AD%E5%AE%9A.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/themes/Crao/buttons/zh/%E5%B7%AE%E7%95%B0.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E5%B7%AE%E7%95%B0.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/Crao/buttons/zh/%E5%B7%AE%E7%95%B0.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/Crao/buttons/zh/%E5%B7%AE%E7%95%B0.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/themes/Crao/buttons/zh/%E6%9F%A5%E7%9C%8B%E6%BA%90%E7%A2%BC.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E6%9F%A5%E7%9C%8B%E6%BA%90%E7%A2%BC.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/Crao/buttons/zh/%E6%9F%A5%E7%9C%8B%E6%BA%90%E7%A2%BC.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/Crao/buttons/zh/%E6%9F%A5%E7%9C%8B%E6%BA%90%E7%A2%BC.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/themes/Crao/buttons/zh/%E7%A7%BB%E9%99%A4%E9%A0%81%E9%9D%A2.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E7%A7%BB%E9%99%A4%E9%A0%81%E9%9D%A2.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/Crao/buttons/zh/%E7%A7%BB%E9%99%A4%E9%A0%81%E9%9D%A2.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/Crao/buttons/zh/%E7%A7%BB%E9%99%A4%E9%A0%81%E9%9D%A2.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/themes/Crao/buttons/zh/%E7%AE%A1%E7%90%86%E8%80%85.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E7%AE%A1%E7%90%86%E8%80%85.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/Crao/buttons/zh/%E7%AE%A1%E7%90%86%E8%80%85.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/Crao/buttons/zh/%E7%AE%A1%E7%90%86%E8%80%85.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/themes/Crao/buttons/zh/%E7%B0%BD%E5%85%A5.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E7%B0%BD%E5%85%A5.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/Crao/buttons/zh/%E7%B0%BD%E5%85%A5.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/Crao/buttons/zh/%E7%B0%BD%E5%85%A5.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/themes/Crao/buttons/zh/%E7%B0%BD%E5%87%BA.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E7%B0%BD%E5%87%BA.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/Crao/buttons/zh/%E7%B0%BD%E5%87%BA.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/Crao/buttons/zh/%E7%B0%BD%E5%87%BA.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/themes/Crao/buttons/zh/%E7%B7%A8%E8%BC%AF.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E7%B7%A8%E8%BC%AF.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/Crao/buttons/zh/%E7%B7%A8%E8%BC%AF.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/Crao/buttons/zh/%E7%B7%A8%E8%BC%AF.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/themes/Crao/buttons/zh/%E8%A7%A3%E9%99%A4%E9%8E%96%E5%AE%9A%E9%A0%81%E9%9D%A2.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E8%A7%A3%E9%99%A4%E9%8E%96%E5%AE%9A%E9%A0%81%E9%9D%A2.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/Crao/buttons/zh/%E8%A7%A3%E9%99%A4%E9%8E%96%E5%AE%9A%E9%A0%81%E9%9D%A2.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/Crao/buttons/zh/%E8%A7%A3%E9%99%A4%E9%8E%96%E5%AE%9A%E9%A0%81%E9%9D%A2.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/themes/Crao/buttons/zh/%E9%A0%81%E9%9D%A2%E6%AD%B7%E7%A8%8B.png
===================================================================
--- trunk/themes/Crao/buttons/zh/%E9%A0%81%E9%9D%A2%E6%AD%B7%E7%A8%8B.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/Crao/buttons/zh/%E9%A0%81%E9%9D%A2%E6%AD%B7%E7%A8%8B.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/Crao/buttons/zh/%E9%A0%81%E9%9D%A2%E6%AD%B7%E7%A8%8B.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/themes/default/buttons/rss.png
===================================================================
--- trunk/themes/default/buttons/rss.png 2022-01-10 11:34:03 UTC (rev 10871)
+++ trunk/themes/default/buttons/rss.png 2022-01-10 16:17:26 UTC (rev 10872)
Property changes on: trunk/themes/default/buttons/rss.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-24 15:39:40
|
Revision: 10932
http://sourceforge.net/p/phpwiki/code/10932
Author: vargenau
Date: 2022-01-24 15:39:38 +0000 (Mon, 24 Jan 2022)
Log Message:
-----------
Tell that a version of the page does not exist; say "Edit", not "Edit Old Version" when the version does not exist; Revision --> Version
Modified Paths:
--------------
trunk/themes/Crao/templates/actionbar.tmpl
trunk/themes/Crao/templates/body.tmpl
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/MonoBook/templates/body.tmpl
trunk/themes/Portland/templates/actionbar.tmpl
trunk/themes/Portland/templates/body.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Sidebar/templates/actionbar.tmpl
trunk/themes/Sidebar/templates/body.tmpl
trunk/themes/Wordpress/templates/actionbar.tmpl
trunk/themes/Wordpress/templates/body.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/blog/templates/body.tmpl
trunk/themes/default/templates/actionbar.tmpl
trunk/themes/default/templates/body.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/fusionforge/templates/actionbar.tmpl
trunk/themes/fusionforge/templates/browse.tmpl
trunk/themes/fusionforge/templates/editpage.tmpl
trunk/themes/shamino_com/templates/actionbar.tmpl
trunk/themes/smaller/templates/actionbar.tmpl
trunk/themes/wikilens/templates/body.tmpl
Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Crao/templates/actionbar.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -1,6 +1,6 @@
<?php
if ($revision && (!$page->get('locked') || $user->isAdmin())) {
- $EditB = Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
+ $EditB = Button("edit", ($revision->isCurrent() || $revision->hasDefaultContents()) ? _("Edit") : _("Edit Old Version"));
} else {
$EditB = Button("viewsource", _("View Source"));
}
Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Crao/templates/body.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -25,11 +25,16 @@
<?php
}
if (($action != 'edit') && ($action != 'revert')
- && $revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version."), $page)?>
- </p>
+ && $revision and !$revision->isCurrent()) {
+ if ($revision->hasDefaultContents()) { ?>
+ <p class="error">
+ <?php echo _("This version of the page does not exist.") ?>
+ <?php } else { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old version of this page.") ?>
+ <?php } ?>
+ <?php echo Button('browse', _("View the current version."), $page) ?>
+ </p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Crao/templates/editpage.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -9,7 +9,7 @@
<?php } ?>
<?php echo $PAGE_LOCKED_MESSAGE ?>
<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (!$IS_CURRENT) { ?>
+<?php if (!$revision->isCurrent() && !$revision->hasDefaultContents()) { ?>
<p class="warning_msg">
<strong><?php echo _("Warning")._(": ") ?></strong>
<?php echo _("You are editing an old revision.") ?>
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -28,7 +28,7 @@
<?php echo ActionButton(array(), _("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?>
<?php } ?>
<?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?>
- <?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false,
+ <?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() || $revision->hasDefaultContents() ? _("Edit") : _("Edit Old Version")) : _("Create Page"), false,
array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving.")) ?>
<?php } else { ?>
<?php echo ActionButton("viewsource", _("View Source")) ?>
Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/MonoBook/templates/body.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -19,11 +19,16 @@
<?php
}
if (($action != 'edit') && ($action != 'revert')
- && $revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version."), $page)?>
- </p>
+ && $revision and !$revision->isCurrent()) {
+ if ($revision->hasDefaultContents()) { ?>
+ <p class="error">
+ <?php echo _("This version of the page does not exist.") ?>
+ <?php } else { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old version of this page.") ?>
+ <?php } ?>
+ <?php echo Button('browse', _("View the current version."), $page) ?>
+ </p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
Modified: trunk/themes/Portland/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/actionbar.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Portland/templates/actionbar.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -1,9 +1,9 @@
<?php
if ($revision && (!$page->get('locked') || $user->isAdmin())) {
- if ($revision->isCurrent()) {
+ if (($revision->isCurrent() || $revision->hasDefaultContents())) {
$EditB = Button("edit", _("Edit this page"));
} else {
- $EditB = Button("edit", _("Edit Old Revision"));
+ $EditB = Button("edit", _("Edit Old Version"));
$EditB = fmt("%s of this page", $EditB);
}
} else {
Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Portland/templates/body.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -20,11 +20,16 @@
<?php
}
if (($action != 'edit') && ($action != 'revert')
- && $revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version."), $page)?>
- </p>
+ && $revision and !$revision->isCurrent()) {
+ if ($revision->hasDefaultContents()) { ?>
+ <p class="error">
+ <?php echo _("This version of the page does not exist.") ?>
+ <?php } else { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old version of this page.") ?>
+ <?php } ?>
+ <?php echo Button('browse', _("View the current version."), $page) ?>
+ </p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Portland/templates/editpage.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -6,7 +6,7 @@
<td>
<?php echo $PAGE_LOCKED_MESSAGE ?>
<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (!$IS_CURRENT) { ?>
+<?php if (!$revision->isCurrent() && !$revision->hasDefaultContents()) { ?>
<p class="warning_msg">
<strong><?php echo _("Warning")._(": ") ?></strong>
<?php echo _("You are editing an old revision.") ?>
Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -16,7 +16,8 @@
<li class="selected"><a class="named-wiki" name="browse"><?php echo _("View Page") ?></a></li>
<?php } ?>
<?php if (($isAdmin or $mayEdit) and $revision) { ?>
- <?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false, array('id' => 'btn-edit', 'title' => _("You can edit this page. Please use the preview button before saving."))) ?>
+ <?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() || $revision->hasDefaultContents() ? _("Edit") : _("Edit Old Version")) : _("Create Page"), false,
+ array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving.")) ?>
<?php if (ENABLE_WYSIWYG) { ?>
<?php echo Button(array("action" => "edit", "mode"=> "wysiwyg"), _("Wysiwyg Editor"), false, array('id' => 'btn-wysiwyg-edit')) ?>
<?php } ?>
Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Sidebar/templates/body.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -17,11 +17,16 @@
<?php
}
if (($action != 'edit') && ($action != 'revert')
- && $revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version."), $page)?>
- </p>
+ && $revision and !$revision->isCurrent()) {
+ if ($revision->hasDefaultContents()) { ?>
+ <p class="error">
+ <?php echo _("This version of the page does not exist.") ?>
+ <?php } else { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old version of this page.") ?>
+ <?php } ?>
+ <?php echo Button('browse', _("View the current version."), $page) ?>
+ </p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -2,7 +2,7 @@
<div id="actionbar">
<?php
if ($revision && (!$page->get('locked') || $user->isAdmin())) {
- $EditB = Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
+ $EditB = Button("edit", ($revision->isCurrent() || $revision->hasDefaultContents()) ? _("Edit") : _("Edit Old Version"));
} else {
$EditB = Button("viewsource", _("View Source"));
}
Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Wordpress/templates/body.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -16,11 +16,16 @@
<?php
}
if (($action != 'edit') && ($action != 'revert')
- && $revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version."), $page)?>
- </p>
+ && $revision and !$revision->isCurrent()) {
+ if ($revision->hasDefaultContents()) { ?>
+ <p class="error">
+ <?php echo _("This version of the page does not exist.") ?>
+ <?php } else { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old version of this page.") ?>
+ <?php } ?>
+ <?php echo Button('browse', _("View the current version."), $page) ?>
+ </p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -8,7 +8,7 @@
<td>
<?php echo $PAGE_LOCKED_MESSAGE ?>
<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (!$IS_CURRENT) { ?>
+<?php if (!$revision->isCurrent() && !$revision->hasDefaultContents()) { ?>
<p class="warning_msg">
<strong><?php echo _("Warning")._(": ") ?></strong>
<?php echo _("You are editing an old revision.") ?>
Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/blog/templates/body.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -17,11 +17,16 @@
<?php
}
if (($action != 'edit') && ($action != 'revert')
- && $revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version."), $page)?>
- </p>
+ && $revision and !$revision->isCurrent()) {
+ if ($revision->hasDefaultContents()) { ?>
+ <p class="error">
+ <?php echo _("This version of the page does not exist.") ?>
+ <?php } else { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old version of this page.") ?>
+ <?php } ?>
+ <?php echo Button('browse', _("View the current version."), $page) ?>
+ </p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/default/templates/actionbar.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -4,8 +4,10 @@
<tr class="baseline">
<td>
<div id="actionbuttons">
- <?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
- <?php echo Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"), false, array('id'=>'btn-edit')) ?>
+ <?php if (!$page->exists()) { ?>
+ <?php echo Button("create", _("Create Page"), false, array('id'=>'btn-edit')) ?>
+ <?php } elseif ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
+ <?php echo Button("edit", ($revision->isCurrent() || $revision->hasDefaultContents()) ? _("Edit") : _("Edit Old Version"), false, array('id'=>'btn-edit')) ?>
<?php if (ENABLE_WYSIWYG) { ?>
<?php echo $SEP?><?php echo Button(array("action" => "edit", "mode"=> "wysiwyg"), "Wysiwyg Editor", false, array('id' => 'btn-wysiwyg-edit')) ?>
<?php } ?>
Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/default/templates/body.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -18,11 +18,16 @@
<?php
}
if (($action != 'edit') && ($action != 'revert')
- && $revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version."), $page)?>
- </p>
+ && $revision and !$revision->isCurrent()) {
+ if ($revision->hasDefaultContents()) { ?>
+ <p class="error">
+ <?php echo _("This version of the page does not exist.") ?>
+ <?php } else { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old version of this page.") ?>
+ <?php } ?>
+ <?php echo Button('browse', _("View the current version."), $page) ?>
+ </p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/default/templates/editpage.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -9,7 +9,7 @@
<?php } ?>
<?php echo $PAGE_LOCKED_MESSAGE ?>
<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (!$IS_CURRENT) { ?>
+<?php if (!$revision->isCurrent() && !$revision->hasDefaultContents()) { ?>
<p class="warning_msg">
<strong><?php echo _("Warning")._(": ") ?></strong>
<?php echo _("You are editing an old revision.") ?>
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -46,7 +46,7 @@
<?php } else if ($revision && (($revision->isCurrent()) || ($revision->hasDefaultContents()))) { ?>
<?php echo Button("edit", _("Edit")) ?>
<?php } else { ?>
- <?php echo Button("edit", _("Edit Old Revision")) ?>
+ <?php echo Button("edit", _("Edit Old Version")) ?>
<?php } ?>
</li>
<?php } else if ($dbh->isWikiPage($page->getName())) { ?>
Modified: trunk/themes/fusionforge/templates/browse.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/fusionforge/templates/browse.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -5,13 +5,13 @@
<?php if ($page->exists() and $revision and $revision->hasDefaultContents()) { ?>
<p class="error"><?php echo _('Error')._(': ') ?>
- <?php echo _("This revision of the page does not exist.") ?>
+ <?php echo _("This version of the page does not exist.") ?>
<?php echo Button('browse', _("View the current version."), $page) ?>
</p>
<?php } else { ?>
<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?>
<p class="warning_msg"><?php echo _("Note:") ?>
- <?php echo _("You are viewing an old revision of this page.") ?>
+ <?php echo _("You are viewing an old version of this page.") ?>
<?php echo Button('browse', _("View the current version."), $page) ?>
</p>
<?php } ?>
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/fusionforge/templates/editpage.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -7,7 +7,7 @@
<?php } ?>
<?php echo $PAGE_LOCKED_MESSAGE ?>
<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-<?php if (!$IS_CURRENT) { ?>
+<?php if (!$revision->isCurrent() && !$revision->hasDefaultContents()) { ?>
<p class="warning_msg">
<strong><?php echo _("Warning")._(": ") ?></strong>
<?php echo _("You are editing an old revision.") ?>
Modified: trunk/themes/shamino_com/templates/actionbar.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/actionbar.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/shamino_com/templates/actionbar.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -3,7 +3,7 @@
if (empty($revision)) $revision = $page->getCurrentRevision(false);
?>
<?php echo Button(array('action'=>__('PageInfo')), _("Page Info"),$page->getName()) ?>
-<?php echo $SEP?><?php echo Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?>
+<?php echo $SEP?><?php echo Button("edit", ($revision->isCurrent() || $revision->hasDefaultContents()) ? _("Edit") : _("Edit Old Version")) ?>
<?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
<?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
<?php if (ENABLE_PAGEPERM) { ?>
Modified: trunk/themes/smaller/templates/actionbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/actionbar.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/smaller/templates/actionbar.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -3,9 +3,11 @@
<tr class="baseline">
<td>
<div id="actionbuttons">
- <?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
- <?php echo Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?>
- <?php } else { ?>
+ <?php if (!$page->exists()) { ?>
+ <?php echo Button("create", _("Create Page"), false, array('id'=>'btn-edit')) ?>
+ <?php } elseif ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
+ <?php echo Button("edit", ($revision->isCurrent() || $revision->hasDefaultContents()) ? _("Edit") : _("Edit Old Version"), false, array('id'=>'btn-edit')) ?>
+ <?php } else { ?>
<?php echo Button("viewsource", _("View Source")) ?>
<?php } ?>
<?php if ( $user->isSignedIn()) { ?>
Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl 2022-01-23 17:29:40 UTC (rev 10931)
+++ trunk/themes/wikilens/templates/body.tmpl 2022-01-24 15:39:38 UTC (rev 10932)
@@ -41,11 +41,16 @@
<?php
}
if (($action != 'edit') && ($action != 'revert')
- && $revision and !$revision->isCurrent()) { ?>
- <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version."), $page)?>
- </p>
+ && $revision and !$revision->isCurrent()) {
+ if ($revision->hasDefaultContents()) { ?>
+ <p class="error">
+ <?php echo _("This version of the page does not exist.") ?>
+ <?php } else { ?>
+ <p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
+ <?php echo _("You are viewing an old version of this page.") ?>
+ <?php } ?>
+ <?php echo Button('browse', _("View the current version."), $page) ?>
+ </p>
<?php } ?>
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-28 11:20:38
|
Revision: 10957
http://sourceforge.net/p/phpwiki/code/10957
Author: vargenau
Date: 2022-01-28 11:20:35 +0000 (Fri, 28 Jan 2022)
Log Message:
-----------
Do not display the message "Create it." after purge or remove
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 2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/Crao/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
@@ -39,7 +39,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+ <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl 2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/MonoBook/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
@@ -33,7 +33,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+ <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl 2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/Portland/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
@@ -34,7 +34,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+ <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl 2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/Sidebar/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
@@ -31,7 +31,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+ <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl 2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/Wordpress/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
@@ -30,7 +30,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+ <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl 2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/blog/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
@@ -31,7 +31,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+ <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl 2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/default/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
@@ -32,7 +32,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+ <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl 2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/wikilens/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
@@ -55,7 +55,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+ <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-01-28 11:33:22
|
Revision: 10958
http://sourceforge.net/p/phpwiki/code/10958
Author: vargenau
Date: 2022-01-28 11:33:19 +0000 (Fri, 28 Jan 2022)
Log Message:
-----------
Do not display the message "Create it." at initialisation of wiki
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 2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/Crao/templates/body.tmpl 2022-01-28 11:33:19 UTC (rev 10958)
@@ -39,7 +39,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+ <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/MonoBook/templates/body.tmpl 2022-01-28 11:33:19 UTC (rev 10958)
@@ -33,7 +33,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+ <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/Portland/templates/body.tmpl 2022-01-28 11:33:19 UTC (rev 10958)
@@ -34,7 +34,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+ <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/Sidebar/templates/body.tmpl 2022-01-28 11:33:19 UTC (rev 10958)
@@ -31,7 +31,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+ <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/Wordpress/templates/body.tmpl 2022-01-28 11:33:19 UTC (rev 10958)
@@ -30,7 +30,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+ <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/blog/templates/body.tmpl 2022-01-28 11:33:19 UTC (rev 10958)
@@ -31,7 +31,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+ <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/default/templates/body.tmpl 2022-01-28 11:33:19 UTC (rev 10958)
@@ -32,7 +32,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+ <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl 2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/wikilens/templates/body.tmpl 2022-01-28 11:33:19 UTC (rev 10958)
@@ -55,7 +55,7 @@
<?php if (!empty($redirected)) { ?>
<p><?php echo $redirected ?></p>
<?php } ?>
- <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+ <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
<p class="warning_msg">
<?php echo _("This page does not exist.") ?>
<?php echo Button('create', _("Create it."), $page)?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-04-19 14:15:18
|
Revision: 11018
http://sourceforge.net/p/phpwiki/code/11018
Author: vargenau
Date: 2022-04-19 14:15:16 +0000 (Tue, 19 Apr 2022)
Log Message:
-----------
Whitespace
Modified Paths:
--------------
trunk/themes/fusionforge/templates/ratings.tmpl
trunk/themes/wikilens/templates/ratings.tmpl
Modified: trunk/themes/fusionforge/templates/ratings.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/ratings.tmpl 2022-04-19 13:41:30 UTC (rev 11017)
+++ trunk/themes/fusionforge/templates/ratings.tmpl 2022-04-19 14:15:16 UTC (rev 11018)
@@ -1,5 +1,5 @@
<?php if (!$WikiTheme->DUMP_MODE) {
- $loader = new WikiPluginLoader();
- $dbi = $request->getDbh(); // Needed in PHP 8
- printXML($loader->expandPI("<"."?plugin RateIt show=top imgPrefix=BStar ?".">", $request, $dbi->_markup));
+ $loader = new WikiPluginLoader();
+ $dbi = $request->getDbh(); // Needed in PHP 8
+ printXML($loader->expandPI("<"."?plugin RateIt show=top imgPrefix=BStar ?".">", $request, $dbi->_markup));
} ?>
Modified: trunk/themes/wikilens/templates/ratings.tmpl
===================================================================
--- trunk/themes/wikilens/templates/ratings.tmpl 2022-04-19 13:41:30 UTC (rev 11017)
+++ trunk/themes/wikilens/templates/ratings.tmpl 2022-04-19 14:15:16 UTC (rev 11018)
@@ -1,5 +1,5 @@
<?php if (!$WikiTheme->DUMP_MODE) {
- $loader = new WikiPluginLoader();
- $dbi = $request->getDbh(); // Needed in PHP 8
- printXML($loader->expandPI("<"."?plugin RateIt show=top imgPrefix=BStar ?".">", $request, $dbi->_markup));
+ $loader = new WikiPluginLoader();
+ $dbi = $request->getDbh(); // Needed in PHP 8
+ printXML($loader->expandPI("<"."?plugin RateIt show=top imgPrefix=BStar ?".">", $request, $dbi->_markup));
} ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-04-19 14:18:37
|
Revision: 11019
http://sourceforge.net/p/phpwiki/code/11019
Author: vargenau
Date: 2022-04-19 14:18:34 +0000 (Tue, 19 Apr 2022)
Log Message:
-----------
Whitespace
Modified Paths:
--------------
trunk/themes/MonoBook/templates/navbar.tmpl
trunk/themes/blog/templates/navbar.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl 2022-04-19 14:15:16 UTC (rev 11018)
+++ trunk/themes/MonoBook/templates/navbar.tmpl 2022-04-19 14:18:34 UTC (rev 11019)
@@ -14,9 +14,9 @@
<li><?php $link = WikiLink(__("RecentChanges"), "", _("Recent Changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?></li>
<li><?php echo WikiLink(__("RecentComments"), "", _("Recent Comments")) ?></li>
<li><?php echo WikiLink(__("RecentNewPages"), "", _("Recent New Pages")) ?></li>
- <li><?php echo Button(array('action'=>__("LikePages")),_("Like Pages"), $page->getName()) ?></li>
+ <li><?php echo Button(array('action'=>__("LikePages")), _("Like Pages"), $page->getName()) ?></li>
<li><?php echo WikiLink(__("RandomPage"), "", _("Random Page")) ?></li>
- <li><?php echo WikiLink(__("Help"),"", _("Help")) ?></li>
+ <li><?php echo WikiLink(__("Help"), "", _("Help")) ?></li>
</ul>
</div>
</div>
Modified: trunk/themes/blog/templates/navbar.tmpl
===================================================================
--- trunk/themes/blog/templates/navbar.tmpl 2022-04-19 14:15:16 UTC (rev 11018)
+++ trunk/themes/blog/templates/navbar.tmpl 2022-04-19 14:18:34 UTC (rev 11019)
@@ -7,7 +7,7 @@
<div class="box-data">
<ul>
<?php if (!empty($revision)) { ?>
-<li><?php echo WikiLink(__("BackLinks"), "button",_("Back Links")) ?></li>
+<li><?php echo WikiLink(__("BackLinks"), "button", _("Back Links")) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
<li><?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Administration")) ?></li>
Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl 2022-04-19 14:15:16 UTC (rev 11018)
+++ trunk/themes/default/templates/navbar.tmpl 2022-04-19 14:18:34 UTC (rev 11019)
@@ -7,7 +7,7 @@
<?php echo $SEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()),
'button', _("Discussion")) ?>
<?php } else { ?>
- <?php echo $SEP?><?php echo Button(array(),_("Article"), $page->getName()) ?>
+ <?php echo $SEP?><?php echo Button(array(), _("Article"), $page->getName()) ?>
<?php } ?>
<?php echo $SEP?>
<?php } ?>
@@ -16,8 +16,8 @@
array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
?>
<?php if (!empty($revision)) { ?>
-<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"), __("LikePages")) ?>
-<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"), __("BackLinks")) ?>
+<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision, _("LikePages"), __("LikePages")) ?>
+<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision, _("BackLinks"), __("BackLinks")) ?>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
<?php echo $SEP?>
@@ -44,7 +44,7 @@
$p = $links->next();
$s = $p->_pagename;
while ($p = $links->next()) { $s .= ', ' . $p->_pagename; }
- echo asXML(HTML::strong("PageLinks: "),$s ? HTML::em($s) : HTML::em('<none>'));
+ echo asXML(HTML::strong("PageLinks: "), $s ? HTML::em($s) : HTML::em('<none>'));
}
} ?>
</nav>
Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl 2022-04-19 14:15:16 UTC (rev 11018)
+++ trunk/themes/wikilens/templates/navbar.tmpl 2022-04-19 14:18:34 UTC (rev 11019)
@@ -36,7 +36,7 @@
$p = $links->next();
$s = $p->_pagename;
while ($p = $links->next()) { $s .= ', ' . $p->_pagename; }
- echo asXML(HTML::strong("PageLinks: "),$s ? HTML::em($s) : HTML::em('<none>'));
+ echo asXML(HTML::strong("PageLinks: "), $s ? HTML::em($s) : HTML::em('<none>'));
}
} ?>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-04-19 14:23:16
|
Revision: 11020
http://sourceforge.net/p/phpwiki/code/11020
Author: vargenau
Date: 2022-04-19 14:23:13 +0000 (Tue, 19 Apr 2022)
Log Message:
-----------
Whitespace, braces
Modified Paths:
--------------
trunk/themes/default/templates/head.tmpl
trunk/themes/wikilens/templates/head.tmpl
Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl 2022-04-19 14:18:34 UTC (rev 11019)
+++ trunk/themes/default/templates/head.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
@@ -27,12 +27,12 @@
$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'));
+ $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'));
+ $alternatelinkTitle = $page->getName();
+ $alternatelinkUrl = WikiURL($revision, array('action' => 'browse'));
} ?>
<link rel="alternate" title="<?php echo $alternatelinkTitle ?>" href="<?php echo $alternatelinkUrl ?>" />
<?php }
@@ -50,7 +50,7 @@
<?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')) ?>" />
+<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 } ?>
@@ -73,10 +73,11 @@
<?php echo $WikiTheme->getCSS() ?>
<?php
// avoid redundant bookmark title for custom home page
- if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME)
+ if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME) {
$pagetitle = "";
- else
+ } else {
$pagetitle = " - ". AsString($TITLE);
+ }
?>
<title><?php echo WIKI_NAME.$pagetitle ?></title>
<?php if (ENABLE_OPEN_GRAPH) { ?>
Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl 2022-04-19 14:18:34 UTC (rev 11019)
+++ trunk/themes/wikilens/templates/head.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
@@ -27,12 +27,12 @@
$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'));
+ $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'));
+ $alternatelinkTitle = $page->getName();
+ $alternatelinkUrl = WikiURL($revision, array('action' => 'browse'));
} ?>
<link rel="alternate" title="<?php echo $alternatelinkTitle ?>" href="<?php echo $alternatelinkUrl ?>" />
<?php }
@@ -50,7 +50,7 @@
<?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')) ?>" />
+<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 } ?>
@@ -73,10 +73,11 @@
<?php echo $WikiTheme->getCSS() ?>
<?php
// avoid redundant bookmark title for custom home page
- if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME)
+ if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME) {
$pagetitle = "";
- else
+ } else {
$pagetitle = " - ". AsString($TITLE);
+ }
?>
<title><?php echo WIKI_NAME.$pagetitle ?></title>
<?php if (ENABLE_OPEN_GRAPH) { ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-04-19 14:28:03
|
Revision: 11021
http://sourceforge.net/p/phpwiki/code/11021
Author: vargenau
Date: 2022-04-19 14:28:00 +0000 (Tue, 19 Apr 2022)
Log Message:
-----------
Whitespace
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/fusionforge/templates/body.tmpl
trunk/themes/wikilens/templates/body.tmpl
Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
+++ trunk/themes/Crao/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021)
@@ -15,16 +15,16 @@
<?php
$action = $request->getArg('action');
if ($page->exists()) {
- if (empty($revision)) {
- $revision = $page->getCurrentRevision(false);
- }
- if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
</p>
<?php
}
- if (($action != 'edit') && ($action != 'revert')
+ if (($action != 'edit') && ($action != 'revert')
&& $revision and !$revision->isCurrent()) {
if ($revision->hasDefaultContents()) { ?>
<p class="error">
Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
+++ trunk/themes/MonoBook/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021)
@@ -9,16 +9,16 @@
<?php
$action = $request->getArg('action');
if ($page->exists()) {
- if (empty($revision)) {
- $revision = $page->getCurrentRevision(false);
- }
- if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
</p>
<?php
}
- if (($action != 'edit') && ($action != 'revert')
+ if (($action != 'edit') && ($action != 'revert')
&& $revision and !$revision->isCurrent()) {
if ($revision->hasDefaultContents()) { ?>
<p class="error">
Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
+++ trunk/themes/Portland/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021)
@@ -10,16 +10,16 @@
<?php
$action = $request->getArg('action');
if ($page->exists()) {
- if (empty($revision)) {
- $revision = $page->getCurrentRevision(false);
- }
- if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
</p>
<?php
}
- if (($action != 'edit') && ($action != 'revert')
+ if (($action != 'edit') && ($action != 'revert')
&& $revision and !$revision->isCurrent()) {
if ($revision->hasDefaultContents()) { ?>
<p class="error">
Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
+++ trunk/themes/Sidebar/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021)
@@ -7,16 +7,16 @@
<?php
$action = $request->getArg('action');
if ($page->exists()) {
- if (empty($revision)) {
- $revision = $page->getCurrentRevision(false);
- }
- if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
</p>
<?php
}
- if (($action != 'edit') && ($action != 'revert')
+ if (($action != 'edit') && ($action != 'revert')
&& $revision and !$revision->isCurrent()) {
if ($revision->hasDefaultContents()) { ?>
<p class="error">
Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
+++ trunk/themes/Wordpress/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021)
@@ -6,16 +6,16 @@
<?php
$action = $request->getArg('action');
if ($page->exists()) {
- if (empty($revision)) {
- $revision = $page->getCurrentRevision(false);
- }
- if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
</p>
<?php
}
- if (($action != 'edit') && ($action != 'revert')
+ if (($action != 'edit') && ($action != 'revert')
&& $revision and !$revision->isCurrent()) {
if ($revision->hasDefaultContents()) { ?>
<p class="error">
Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
+++ trunk/themes/blog/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021)
@@ -7,16 +7,16 @@
<?php
$action = $request->getArg('action');
if ($page->exists()) {
- if (empty($revision)) {
- $revision = $page->getCurrentRevision(false);
- }
- if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
</p>
<?php
}
- if (($action != 'edit') && ($action != 'revert')
+ if (($action != 'edit') && ($action != 'revert')
&& $revision and !$revision->isCurrent()) {
if ($revision->hasDefaultContents()) { ?>
<p class="error">
Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
+++ trunk/themes/default/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021)
@@ -8,16 +8,16 @@
<?php
$action = $request->getArg('action');
if ($page->exists()) {
- if (empty($revision)) {
- $revision = $page->getCurrentRevision(false);
- }
- if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
</p>
<?php
}
- if (($action != 'edit') && ($action != 'revert')
+ if (($action != 'edit') && ($action != 'revert')
&& $revision and !$revision->isCurrent()) {
if ($revision->hasDefaultContents()) { ?>
<p class="error">
Modified: trunk/themes/fusionforge/templates/body.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
+++ trunk/themes/fusionforge/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021)
@@ -9,10 +9,11 @@
<?php } ?>
<div id="content">
<?php
-if (ENABLE_RATEIT && $page->exists())
- $rating = 1;
-else
+if (ENABLE_RATEIT && $page->exists()) {
+ $rating = 1;
+ } else {
$rating = 0;
+}
?>
<a id="contentTop"></a>
<h1>
Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020)
+++ trunk/themes/wikilens/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021)
@@ -23,24 +23,24 @@
<main role="main">
<h1><?php echo $HEADER ?>
<?php if (!empty($user) && $user->isSignedIn()) {
- $loader = new WikiPluginLoader();
- printXML(HTML::raw(" "));
- $dbi = $request->getDbh(); // Needed in PHP 8
- printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup));
- } ?> </h1>
+ $loader = new WikiPluginLoader();
+ printXML(HTML::raw(" "));
+ $dbi = $request->getDbh(); // Needed in PHP 8
+ printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup));
+} ?> </h1>
<?php
$action = $request->getArg('action');
if ($page->exists()) {
- if (empty($revision)) {
- $revision = $page->getCurrentRevision(false);
- }
- if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+ }
+ if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?>
<p class="warning_msg"><strong><?php echo _("Note:") ?></strong>
<?php echo _("This page has been locked and cannot be edited.") ?>
</p>
<?php
}
- if (($action != 'edit') && ($action != 'revert')
+ if (($action != 'edit') && ($action != 'revert')
&& $revision and !$revision->isCurrent()) {
if ($revision->hasDefaultContents()) { ?>
<p class="error">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-04-19 14:38:47
|
Revision: 11023
http://sourceforge.net/p/phpwiki/code/11023
Author: vargenau
Date: 2022-04-19 14:38:46 +0000 (Tue, 19 Apr 2022)
Log Message:
-----------
Whitespace, braces
Modified Paths:
--------------
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/default/templates/info.tmpl
trunk/themes/smaller/templates/info.tmpl
Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl 2022-04-19 14:36:33 UTC (rev 11022)
+++ trunk/themes/MonoBook/templates/info.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
@@ -1,5 +1,7 @@
<?php
-if (empty($revision)) $revision = $page->getCurrentRevision(false);
+if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+}
$modified = $WikiTheme->formatDateTime($revision->get('mtime'));
$author = $revision->get('author');
@@ -7,8 +9,9 @@
$dbi = $request->getDbh();
$author = $revision->get('author');
$authorLink = $author;
-if (preg_match("/^$WikiNameRegexp\$/", $author) && $dbi->isWikiPage($author))
+if (preg_match("/^$WikiNameRegexp\$/", $author) && $dbi->isWikiPage($author)) {
$authorLink = WikiLink($author);
+}
$authorId = $revision->get('author_id');
$version = $revision->getVersion();
@@ -23,18 +26,19 @@
/* better way to do this? */
$bytes = strlen($revision->_data['%content']);
-if ($bytes < 1024 )
+if ($bytes < 1024) {
$size = fmt("%s bytes", $bytes);
-else {
+} else {
$kb = round($bytes / 1024, 1);
$size = fmt("%s KiB (%s bytes)", $kb, $bytes);
}
// Count words
preg_match_all('/\\w+\\W*/', $revision->_data['%content'], $whitespacematches);
-if (1 == ($c = count_all($whitespacematches)))
- $wordcount = fmt("1 word");
-else
- $wordcount = fmt("%s words", $c);
+if (1 == ($c = count_all($whitespacematches))) {
+ $wordcount = fmt("1 word");
+} else {
+ $wordcount = fmt("%s words", $c);
+}
$summary = HTML::textarea(array('name' => 'summary',
@@ -47,7 +51,6 @@
$revision->get('summary'));
if ($is_current = $revision->isCurrent()) {
-
$LOCKED_CB = HTML::input(array('type' => 'checkbox',
'name' => 'edit[locked]',
'id' => 'locked',
@@ -65,7 +68,6 @@
$label['date'] = _("Last Modified") . _(":");
$label['author'] = _("Last Author") . _(":");
$label['summary'] = _("Last Summary") . _(":");
-
} else {
$label['date'] = _("Saved on") . _(":");
$label['author'] = _("Author") . _(":");
@@ -172,8 +174,8 @@
<?php echo $SEP?><?php echo Button(__("PageHistory"), _("Page History")) ?>
<?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("Author History")) ?>
<?php echo $SEP?><?php echo Button("Diff") ?>
- <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
- <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
+ <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'), _("Diff previous Revision"), $page->getName()) ?>
+ <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'), _("Diff previous Author"), $page->getName()) ?>
<?php if (DEBUG || $user->isAdmin()) { ?>
<?php // Buttons really only for debugging ?>
<?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2022-04-19 14:36:33 UTC (rev 11022)
+++ trunk/themes/default/templates/info.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
@@ -1,12 +1,15 @@
<?php
-if (empty($revision)) $revision = $page->getCurrentRevision(false);
+if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+}
$modified = $WikiTheme->formatDateTime($revision->get('mtime'));
$dbi = $request->getDbh();
$author = $revision->get('author');
$authorLink = $author;
-if ($dbi->isWikiPage($author))
+if ($dbi->isWikiPage($author)) {
$authorLink = WikiLink($author);
+}
$authorId = $revision->get('author_id');
$version = $revision->getVersion();
@@ -24,16 +27,16 @@
$size = ByteFormatter($bytes, /* $longformat = */true);
// Count words
preg_match_all('/\\w+\\W*/', $revision->_data['%content'], $whitespacematches);
-if (1 == ($c = count_all($whitespacematches)))
- $wordcount = fmt("1 word");
-else
- $wordcount = fmt("%s words", $c);
+if (1 == ($c = count_all($whitespacematches))) {
+ $wordcount = fmt("1 word");
+} else {
+ $wordcount = fmt("%s words", $c);
+}
$summary = $revision->get('summary');
if ($is_current = $revision->isCurrent()) {
-
$LOCKED_CB = HTML::input(array('type' => 'checkbox',
'name' => 'edit[locked]',
'id' => 'locked',
@@ -51,7 +54,6 @@
$label['date'] = _("Last Modified") . _(":");
$label['author'] = _("Last Author") . _(":");
$label['summary'] = _("Last Summary") . _(":");
-
} else {
$label['date'] = _("Saved on") . _(":");
$label['author'] = _("Author") . _(":");
Modified: trunk/themes/smaller/templates/info.tmpl
===================================================================
--- trunk/themes/smaller/templates/info.tmpl 2022-04-19 14:36:33 UTC (rev 11022)
+++ trunk/themes/smaller/templates/info.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
@@ -5,8 +5,8 @@
<?php echo $SEP?><?php echo Button(__("PageHistory"), _("Page History")) ?>
<?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("Author History")) ?>
<?php echo $SEP?><?php echo Button("Diff") ?>
- <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
- <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
+ <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'), _("Diff previous Revision"), $page->getName()) ?>
+ <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'), _("Diff previous Author"), $page->getName()) ?>
<?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
<?php if (DEBUG || $user->isAdmin()) { ?>
<?php // Buttons really only for debugging ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-04-19 14:43:38
|
Revision: 11024
http://sourceforge.net/p/phpwiki/code/11024
Author: vargenau
Date: 2022-04-19 14:43:35 +0000 (Tue, 19 Apr 2022)
Log Message:
-----------
Whitespace, braces
Modified Paths:
--------------
trunk/themes/Crao/templates/actionbar.tmpl
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/Portland/templates/actionbar.tmpl
trunk/themes/Sidebar/templates/actionbar.tmpl
trunk/themes/Wordpress/templates/actionbar.tmpl
trunk/themes/blog/templates/actionbar.tmpl
trunk/themes/fusionforge/templates/actionbar.tmpl
trunk/themes/shamino_com/templates/actionbar.tmpl
Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
+++ trunk/themes/Crao/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
@@ -16,7 +16,7 @@
<?php echo $SEP?><?php echo Button('chown') ?>
<?php echo $SEP?><?php echo Button('setacl') ?>
<?php }} ?>
-<?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?>
+<?php if ($user->isAdmin() or mayAccessPage('remove', $page->getName())) { ?>
<?php echo $SEP?><?php echo Button('remove') ?>
<?php } ?>
<?php echo $SEP?><?php echo Button(__("PageHistory"), _("Page History")) ?>
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
@@ -24,7 +24,7 @@
<?php } ?>
<?php } else {
$talk = new WikiPageName($pagename); ?>
- <?php echo ActionButton(array(),$isActionPage ? _("Action Page") : _("Article"), $talk->getParent(), array('title' => "View the page")) ?>
+ <?php echo ActionButton(array(), $isActionPage ? _("Action Page") : _("Article"), $talk->getParent(), array('title' => "View the page")) ?>
<?php echo ActionButton(array(), _("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?>
<?php } ?>
<?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?>
@@ -67,7 +67,7 @@
<?php echo ActionButton('setacl') ?>
<?php }} ?>
<?php if (!empty($revision) and ($isAdmin or mayAccessPage('remove', $pagename))) { ?>
- <?php echo ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
+ <?php echo ActionButton('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
<?php echo ActionButton('remove') ?>
<?php } ?>
<?php } ?>
Modified: trunk/themes/Portland/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
+++ trunk/themes/Portland/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
@@ -16,7 +16,7 @@
?>
<?php echo $EditB ?>
<?php echo $SEP?>
-<a href="<?php echo WikiURL($revision,array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
+<a href="<?php echo WikiURL($revision, array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
<?php echo $SEP?>
<?php echo Button(__("PageHistory"), _("Page History")) ?>
<?php echo $SEP?>
Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
@@ -48,7 +48,7 @@
<?php if (!empty($revision) and ($isAdmin or mayAccessPage('remove', $pagename))) { ?>
<?php echo ActionButton('remove') ?>
<?php echo ActionButton('purge') ?>
- <?php echo ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
+ <?php echo ActionButton('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
<?php } ?>
<?php if ($isAdmin or $mayChange) { ?>
<?php echo ActionButton($page->get('locked') ? 'unlock' : 'lock') ?>
Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
@@ -62,7 +62,7 @@
<li><?php echo _("Information") ?>
<ul>
<li>
- <a href="<?php echo WikiURL($revision,array('action'=>'diff')) ?>">
+ <a href="<?php echo WikiURL($revision, array('action'=>'diff')) ?>">
<?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
</li>
<li>
Modified: trunk/themes/blog/templates/actionbar.tmpl
===================================================================
--- trunk/themes/blog/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
+++ trunk/themes/blog/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
@@ -2,7 +2,7 @@
<tr class="baseline">
<td>
<div class="actionbuttons">
- <?php echo WikiLink(HOME_PAGE, "known",_("Home")) ?>
+ <?php echo WikiLink(HOME_PAGE, "known", _("Home")) ?>
<?php echo $SEP?><?php echo WikiLink(__("About")) ?>
<?php echo $SEP?><?php echo WikiLink(__("BlogArchives"), '', _("Archives")) ?>
<?php echo $SEP?><?php echo WikiLink(__("PhotoAlbum")) ?>
@@ -11,10 +11,11 @@
<?php echo $SEP?><?php echo Button(__("PageInfo"), _("Info")) ?>
<?php
if ($user->isAuthenticated()) {
- if (mayAccessPage('edit', $page->getName()))
+ if (mayAccessPage('edit', $page->getName())) {
$EditB = Button("edit", _("Edit"), false, array('id'=>'btn-edit'));
- else
+ } else {
$EditB = Button("viewsource", _("View Source"));
+ }
?>
<?php echo $SEP?><?php echo $EditB ?>
<?php } ?>
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
@@ -43,13 +43,13 @@
<li class="bold">
<?php if (! $dbh->isWikiPage($page->getName())) { ?>
<?php echo Button("edit", _("Create Page")) ?>
- <?php } else if ($revision && (($revision->isCurrent()) || ($revision->hasDefaultContents()))) { ?>
+ <?php } elseif ($revision && (($revision->isCurrent()) || ($revision->hasDefaultContents()))) { ?>
<?php echo Button("edit", _("Edit")) ?>
<?php } else { ?>
<?php echo Button("edit", _("Edit Old Version")) ?>
<?php } ?>
</li>
- <?php } else if ($dbh->isWikiPage($page->getName())) { ?>
+ <?php } elseif ($dbh->isWikiPage($page->getName())) { ?>
<li><?php echo Button("viewsource", _("View Source")) ?></li>
<?php } ?>
@@ -62,7 +62,7 @@
<?php } ?>
<?php if ($revision && $curuserprefs->get('revertMenuItem')) { ?>
- <li><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
+ <li><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
<?php } ?>
<li><?php echo Button(__("PageInfo"), _("Page Info")) ?></li>
Modified: trunk/themes/shamino_com/templates/actionbar.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/actionbar.tmpl 2022-04-19 14:38:46 UTC (rev 11023)
+++ trunk/themes/shamino_com/templates/actionbar.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
@@ -1,10 +1,12 @@
<nav role="navigation" aria-label="<?php echo _("Actions Menu") ?>">
<?php
-if (empty($revision)) $revision = $page->getCurrentRevision(false);
+if (empty($revision)) {
+ $revision = $page->getCurrentRevision(false);
+}
?>
-<?php echo Button(array('action'=>__('PageInfo')), _("Page Info"),$page->getName()) ?>
+<?php echo Button(array('action'=>__('PageInfo')), _("Page Info"), $page->getName()) ?>
<?php echo $SEP?><?php echo Button("edit", ($revision->isCurrent() || $revision->hasDefaultContents()) ? _("Edit") : _("Edit Old Version")) ?>
-<?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
+<?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?>
<?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
<?php if (ENABLE_PAGEPERM) { ?>
<?php echo $SEP?><?php echo Button('chown') ?>
@@ -11,7 +13,7 @@
<?php echo $SEP?><?php echo Button('setacl') ?>
<?php } ?>
<?php } ?>
-<?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?>
+<?php if ($user->isAdmin() or mayAccessPage('remove', $page->getName())) { ?>
<?php echo $SEP?><?php echo Button('remove') ?>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-04-19 14:53:49
|
Revision: 11025
http://sourceforge.net/p/phpwiki/code/11025
Author: vargenau
Date: 2022-04-19 14:53:46 +0000 (Tue, 19 Apr 2022)
Log Message:
-----------
Whitespace, braces
Modified Paths:
--------------
trunk/themes/Crao/templates/htmldump.tmpl
trunk/themes/Portland/templates/viewsource.tmpl
trunk/themes/Sidebar/templates/dump-footer.tmpl
trunk/themes/Sidebar/templates/top.tmpl
trunk/themes/Wordpress/templates/viewsource.tmpl
trunk/themes/blog/templates/browse-footer.tmpl
trunk/themes/blog/templates/calendar.tmpl
trunk/themes/blog/templates/sidebar.tmpl
trunk/themes/default/templates/addcomment.tmpl
trunk/themes/default/templates/comment.tmpl
trunk/themes/default/templates/htmldump.tmpl
trunk/themes/default/templates/login.tmpl
trunk/themes/default/templates/online.tmpl
trunk/themes/default/templates/pagelink.tmpl
trunk/themes/default/templates/userprefs.tmpl
trunk/themes/default/templates/wikiblog.tmpl
trunk/themes/default/templates/wikiforum.tmpl
trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/Crao/templates/htmldump.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -25,10 +25,11 @@
<?php echo $WikiTheme->getCSS() ?>
<?php
// avoid redundant bookmark title for custom home page
- if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME)
+ if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME) {
$pagetitle = "";
- else
+ } else {
$pagetitle = " - ". AsString($TITLE);
+ }
?>
<title><?php echo WIKI_NAME.$pagetitle?></title>
</head>
Modified: trunk/themes/Portland/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Portland/templates/viewsource.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/Portland/templates/viewsource.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -6,6 +6,6 @@
><?php echo $PAGE_SOURCE ?>
</textarea>
<hr />
-<a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>">
+<a href="<?php echo WikiURL($page, array('action'=>_("PageHistory")))?>">
<?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
<br />
Modified: trunk/themes/Sidebar/templates/dump-footer.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/dump-footer.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/Sidebar/templates/dump-footer.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -1,5 +1,7 @@
<?php
- if (empty($revision)) $revision = $page->getCurrentRevision();
+ if (empty($revision)) {
+ $revision = $page->getCurrentRevision();
+ }
?>
<hr class="printer" />
<div class="clear-floats"></div>
Modified: trunk/themes/Sidebar/templates/top.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/top.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/Sidebar/templates/top.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -1,15 +1,17 @@
<?php
$pagename = $page->getName();
$isActionPage = isActionPage($pagename);
-if (ENABLE_PAGE_PUBLIC)
+if (ENABLE_PAGE_PUBLIC) {
$public = $page->get('public');
-else
+} else {
$public = false;
+}
if (ENABLE_RATEIT && !empty($user) && $user->isAuthenticated()
- && $page->exists() && !$isActionPage && !$WikiTheme->DUMP_MODE)
+ && $page->exists() && !$isActionPage && !$WikiTheme->DUMP_MODE) {
$rating = 1;
-else
+} else {
$rating = 0;
+}
?>
<?php // Page title ?>
<a id="contentTop"></a>
Modified: trunk/themes/Wordpress/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/viewsource.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/Wordpress/templates/viewsource.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -7,7 +7,7 @@
><?php echo $PAGE_SOURCE ?>
</textarea>
<hr />
-<a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>">
+<a href="<?php echo WikiURL($page, array('action'=>_("PageHistory")))?>">
<?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
<br />
</div>
Modified: trunk/themes/blog/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/blog/templates/browse-footer.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/blog/templates/browse-footer.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -1,6 +1,6 @@
<footer role="contentinfo">
<p class="editdate">
-<?php if( $page->getName() != _("HomePage")) { ?>
+<?php if ($page->getName() != _("HomePage")) { ?>
<?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?><br />
<?php } ?>
This site is powered by <a href="https://sourceforge.net/projects/phpwiki/">PhpWiki</a>. Page design based on Kubrick,<br />adapted by <a href="https://the.taoofmac.com">Rui Carmo</a> from an original design by <a href="https://binarybonsai.com">Michael Heilemann</a>.</p>
Modified: trunk/themes/blog/templates/calendar.tmpl
===================================================================
--- trunk/themes/blog/templates/calendar.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/blog/templates/calendar.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -7,7 +7,7 @@
var d = calendar.date.getDate(); // integer, 1..31
m = m < 10 ? "0" + m : m;
d = d < 10 ? "0" + d : d;
- window.location = "' . WikiURL($WikiTheme->calendarBase(),0,1) . '/' . '" + y + "-" + m + "-" + d;
+ window.location = "' . WikiURL($WikiTheme->calendarBase(), 0, 1) . '/' . '" + y + "-" + m + "-" + d;
}
};
Calendar.setup({flat : "calendar", flatCallback : dateChanged, setDateStatusFunc : dateStatusFunc, weekNumbers : false})') ?>
Modified: trunk/themes/blog/templates/sidebar.tmpl
===================================================================
--- trunk/themes/blog/templates/sidebar.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/blog/templates/sidebar.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -22,8 +22,9 @@
$box = new RelatedLinksBox();
$body = $box->body;
-if ($body->asString() != "")
+if ($body->asString() != "") {
printXml($box->format());
+}
$box = new PluginSidebarBox("RecentChanges");
printXml($box->format());
Modified: trunk/themes/default/templates/addcomment.tmpl
===================================================================
--- trunk/themes/default/templates/addcomment.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/default/templates/addcomment.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -1,5 +1,5 @@
<?php
- $request->setArg('action',false);
+ $request->setArg('action', false);
?>
<div class="wikicomment wikicomment-form">
<?php if (!$WikiTheme->DUMP_MODE) { ?>
Modified: trunk/themes/default/templates/comment.tmpl
===================================================================
--- trunk/themes/default/templates/comment.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/default/templates/comment.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -5,8 +5,9 @@
if ($user->isAdmin() or $user->getId() == $COMMENT_CREATOR) {
$buttons = HTML::small(array('class' => 'floatleft'),
Button('edit', false, $page));
- if ($user->isAdmin())
+ if ($user->isAdmin()) {
$buttons->pushContent($SEP, Button('remove', _("Remove Comment"), $page));
+ }
}
// This is a hack, but since we only have a fake PageRevision,
Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/default/templates/htmldump.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -37,10 +37,11 @@
<?php echo $WikiTheme->getCSS() ?>
<?php
// avoid redundant bookmark title for custom home page
- if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME)
+ if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME) {
$pagetitle = "";
- else
+ } else {
$pagetitle = " - ". AsString($TITLE);
+ }
?>
<title><?php echo WIKI_NAME.$pagetitle?></title>
</head>
Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/default/templates/login.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -7,9 +7,9 @@
<?php
$dbh = $request->getDbh();
if (ISREADONLY) {
- echo asXML(HTML::p(array('class' => 'warning_msg'), _("System is locked as read-only for maintenance")));
+ echo asXML(HTML::p(array('class' => 'warning_msg'), _("System is locked as read-only for maintenance")));
} elseif ($dbh->readonly) {
- echo asXML(HTML::p(array('class' => 'warning_msg'), _("Database is locked as read-only for maintenance")));
+ echo asXML(HTML::p(array('class' => 'warning_msg'), _("Database is locked as read-only for maintenance")));
}
if (DEBUG & _DEBUG_LOGIN) {
Modified: trunk/themes/default/templates/online.tmpl
===================================================================
--- trunk/themes/default/templates/online.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/default/templates/online.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -4,22 +4,23 @@
// We have two modes: 1. a simple "summary" block, and
// 2. "detail" with a table of online users, date and current actions
$header = _("Who is Online");
-if ($MAX_ONLINE_TIME and $MAX_ONLINE_NUM)
- $MAX_ONLINE_TIME = $WikiTheme->formatDateTime($MAX_ONLINE_TIME);
+if ($MAX_ONLINE_TIME and $MAX_ONLINE_NUM) {
+ $MAX_ONLINE_TIME = $WikiTheme->formatDateTime($MAX_ONLINE_TIME);
+}
?>
<?php if ($mode == 'summary') {
if ($allow_detail) {
- $url = WikiURL($pagename,array("mode"=>"detail"));
- $header = HTML::a(array('href'=>$url,'title'=>_("Switch to detailed list")),_("Who is Online"));
+ $url = WikiURL($pagename, array("mode"=>"detail"));
+ $header = HTML::a(array('href'=>$url,'title'=>_("Switch to detailed list")), _("Who is Online"));
}
?>
<table class="forumline fullwidth">
<tr><td class="cat" colspan="2"><?php echo $header ?></td></tr>
<tr><td class="row1" rowspan="3"><?php echo $ONLINE_ICON ?></td>
- <td class="row1 gensmall"><?php echo fmt("Our users created a total of %d pages.",$NUM_PAGES) ?><br />
- <?php echo fmt("We have a total of %d registered users.",$NUM_USERS) ?><br />
- <?php echo $NEWEST_USER ? fmt("The newest registered user is %s.",$NEWEST_USER) : ''?>
+ <td class="row1 gensmall"><?php echo fmt("Our users created a total of %d pages.", $NUM_PAGES) ?><br />
+ <?php echo fmt("We have a total of %d registered users.", $NUM_USERS) ?><br />
+ <?php echo $NEWEST_USER ? fmt("The newest registered user is %s.", $NEWEST_USER) : ''?>
</td></tr>
<?php if ($SESSDATA_BOOL) { ?>
<tr><td class="row1 gensmall">
@@ -30,11 +31,14 @@
<?php
$s='';
foreach ($REGISTERED as $user) {
- $link = WikiLink($user['name']);
- $s .= $link->asXML() . ", ";
+ $link = WikiLink($user['name']);
+ $s .= $link->asXML() . ", ";
}
- if (!count($REGISTERED)) echo(htmlentities(_("None")));
- else echo(substr($s,0,-2));
+ if (!count($REGISTERED)) {
+ echo(htmlentities(_("None")));
+ } else {
+ echo(substr($s, 0, -2));
+ }
?>
<?php if (!empty($ADMINS) and $dispose_admin) { ?>
<br />
@@ -42,7 +46,7 @@
<?php } ?>
</td></tr>
<tr><td class="row1 gensmall">
- <?php echo fmt("This data is based on users active over the past %s.",$SESSION_TIME) ?><br />
+ <?php echo fmt("This data is based on users active over the past %s.", $SESSION_TIME) ?><br />
</td></tr>
<?php } else { ?>
<tr><td class="row1 gensmall"><br />
@@ -53,8 +57,8 @@
<?php } ?>
<?php if ($mode == 'detail') {
- $url = WikiURL($pagename,array("mode"=>"summary"));
- $header = HTML::a(array('href'=>$url,'title'=>_("Switch to summary")),_("Who is Online"));
+ $url = WikiURL($pagename, array("mode"=>"summary"));
+ $header = HTML::a(array('href'=>$url,'title'=>_("Switch to summary")), _("Who is Online"));
?>
<table class="forumline fullwidth">
<tr><td class="cat" colspan="3"><?php echo $header ?></td></tr>
Modified: trunk/themes/default/templates/pagelink.tmpl
===================================================================
--- trunk/themes/default/templates/pagelink.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/default/templates/pagelink.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -7,8 +7,8 @@
* More ideas: FIRST, LAST, ...
*/
if ($WikiTheme->DUMP_MODE) {
- $PREV = false;
- $NEXT = false;
+ $PREV = false;
+ $NEXT = false;
}
?>
<tr><td style="width:100%" colspan="<?php echo $COLS ?>"><table class="fullwidth wikipaging"><tr class="wikipaging">
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/default/templates/userprefs.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -1,5 +1,7 @@
<?php
-if (empty($errmsg)) $errmsg = '';
+if (empty($errmsg)) {
+ $errmsg = '';
+}
$plugin = $request->getArg('pagename');
$time = time();
@@ -7,8 +9,9 @@
$pref = $request->_prefs;
$num = $request->getArg('num');
-if (!$pref) return;
-
+if (!$pref) {
+ return;
+}
$offset = $pref->get('timeOffset');
$serverTime = $time - $offset * 3600;
$timeOffsetInput = HTML::input(array('type' => "text",
@@ -49,12 +52,12 @@
'value' => '1',
'checked' => (bool) $pref->get('doubleClickEdit')));
if (!function_exists('selectedOption')) {
- function selectedOption ($value, $label = false) {
- return HTML::option(array('value' => $value,'selected'=>"selected"), ($label ? $label : $value) . "\n");
- }
- function unselectedOption ($value, $label = false) {
- return HTML::option(array('value' => $value), ($label ? $label : $value) . "\n");
- }
+ function selectedOption($value, $label = false) {
+ return HTML::option(array('value' => $value,'selected'=>"selected"), ($label ? $label : $value) . "\n");
+ }
+ function unselectedOption($value, $label = false) {
+ return HTML::option(array('value' => $value), ($label ? $label : $value) . "\n");
+ }
}
$SelectThemes = ''; $SelectLanguages = '';
@@ -62,9 +65,9 @@
$SelectOptions = HTML();
if (!empty($available_themes) and is_array($available_themes)) {
if (!$pref->get('theme') or $pref->get('theme') == THEME) {
- $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
+ $SelectOptions->pushContent(selectedOption("", _("<system theme>")));
} else {
- $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
+ $SelectOptions->pushContent(unselectedOption("", _("<system theme>")));
}
foreach ($available_themes as $theme) {
if ($theme == $pref->get('theme') and $theme != THEME) {
@@ -80,9 +83,9 @@
$SelectOptions = HTML();
if (!empty($available_languages) and is_array($available_languages)) {
if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE) {
- $SelectOptions->pushContent(selectedOption("",_("<system language>")));
+ $SelectOptions->pushContent(selectedOption("", _("<system language>")));
} else {
- $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
+ $SelectOptions->pushContent(unselectedOption("", _("<system language>")));
}
foreach ($available_languages as $lang) {
if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE) {
Modified: trunk/themes/default/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/default/templates/wikiblog.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/default/templates/wikiblog.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -1,7 +1,9 @@
<?php
$CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
$buttons = $modified = '';
-if (empty($SEP)) $SEP = ' - ';
+if (empty($SEP)) {
+ $SEP = ' - ';
+}
if ($user->isAdmin() or $user->getId() == $BLOG_CREATOR) {
$buttons = HTML::small(array('class' => 'floatleft'),
Modified: trunk/themes/default/templates/wikiforum.tmpl
===================================================================
--- trunk/themes/default/templates/wikiforum.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/default/templates/wikiforum.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -24,7 +24,7 @@
<td class="align-left"><?php echo WikiLink($FORUM_CREATOR, 'if_known')?></td>
<td>
<table class="wikiforum wikiforum-message">
- <tr><td class="align-left"><?php echo fmt("Posted: %s",$CDATE)?></td>
+ <tr><td class="align-left"><?php echo fmt("Posted: %s", $CDATE)?></td>
<td class="align-right"><?php echo _("Reply")?></td></tr>
<tr><td><?php echo $CONTENT ?></td></tr>
</table>
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl 2022-04-19 14:43:35 UTC (rev 11024)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl 2022-04-19 14:53:46 UTC (rev 11025)
@@ -1,19 +1,23 @@
<?php
// Todo: Move the logic and code to the plugin
// This is very experimental and the read-only part an ugly hack so far.
-foreach (explode(',','errmsg,isForm') as $var) {
- if (empty($$var)) $$var = false;
+foreach (explode(',', 'errmsg,isForm') as $var) {
+ if (empty($$var)) {
+ $$var = false;
+ }
}
$plugin = $request->getArg('pagename');
$time = time();
-$user =& $request->getUser();
-$pref =& $request->_prefs;
+$user = $request->getUser();
+$pref = $request->_prefs;
-if (!$pref) return;
+if (!$pref) {
+ return;
+}
$offset = $pref->get('timeOffset');
$serverTime = $time - $offset * 3600;
-if ($isForm)
+if ($isForm) {
$timeOffsetInput = HTML::input(array('type' => "text",
'id' => 'timeOffsetInput',
'size' => 6,
@@ -21,8 +25,9 @@
'name' => "pref[timeOffset]",
'class' => "numeric",
'value' => $offset));
-else
+} else {
$timeOffsetInput = $pref->get('timeOffset');
+}
$OwnModificationsCB = HTML::input(array('type' => 'checkbox',
'id' => 'ownModifications',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2023-07-14 09:44:43
|
Revision: 11049
http://sourceforge.net/p/phpwiki/code/11049
Author: vargenau
Date: 2023-07-14 09:44:40 +0000 (Fri, 14 Jul 2023)
Log Message:
-----------
themes: PHP 7: add types for function arguments and return
Modified Paths:
--------------
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/Sidebar/themeinfo.php
trunk/themes/blog/jscalendar/calendar.php
trunk/themes/blog/themeinfo.php
Modified: trunk/themes/Hawaiian/themeinfo.php
===================================================================
--- trunk/themes/Hawaiian/themeinfo.php 2023-07-14 09:19:32 UTC (rev 11048)
+++ trunk/themes/Hawaiian/themeinfo.php 2023-07-14 09:44:40 UTC (rev 11049)
@@ -38,7 +38,7 @@
class WikiTheme_Hawaiian extends WikiTheme
{
- public function getCSS()
+ public function getCSS(): string
{
// FIXME: this is a hack which will not be needed once
// we have dynamic CSS.
Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php 2023-07-14 09:19:32 UTC (rev 11048)
+++ trunk/themes/Sidebar/themeinfo.php 2023-07-14 09:44:40 UTC (rev 11049)
@@ -105,7 +105,7 @@
* if (!$WikiTheme->CbUpload($request, $file_dir . $userfile_name))
* unlink($file_dir . $userfile_name);
*/
- public function CbUpload(&$request, $pathname)
+ public function CbUpload(&$request, $pathname): bool
{
$cmdline = CLAMDSCAN_PATH . " --nosummary --move=" . CLAMDSCAN_VIRUS;
$report = `$cmdline "$pathname"`;
Modified: trunk/themes/blog/jscalendar/calendar.php
===================================================================
--- trunk/themes/blog/jscalendar/calendar.php 2023-07-14 09:19:32 UTC (rev 11048)
+++ trunk/themes/blog/jscalendar/calendar.php 2023-07-14 09:44:40 UTC (rev 11049)
@@ -16,11 +16,11 @@
{
public $calendar_lib_path;
- public $calendar_file;
- public $calendar_lang_file;
- public $calendar_setup_file;
- public $calendar_theme_file;
- public $calendar_options;
+ public string $calendar_file;
+ public string $calendar_lang_file;
+ public string $calendar_setup_file;
+ public string $calendar_theme_file;
+ public array $calendar_options;
public function __construct(
$calendar_lib_path = '/calendar/',
@@ -53,7 +53,7 @@
echo $this->get_load_files_code();
}
- public function get_load_files_code()
+ public function get_load_files_code(): string
{
$code = ('<link rel="stylesheet" type="text/css" media="all" href="' .
$this->calendar_lib_path . $this->calendar_theme_file .
@@ -70,7 +70,7 @@
return $code;
}
- public function _make_calendar($other_options = array())
+ public function _make_calendar($other_options = array()): string
{
$js_options = $this->_make_js_hash(array_merge($this->calendar_options, $other_options));
$code = ('<script type="text/javascript">Calendar.setup({' .
@@ -101,21 +101,21 @@
/// PRIVATE SECTION
- public function _field_id($id)
+ public function _field_id($id): string
{
return 'f-calendar-field-' . $id;
}
- public function _trigger_id($id)
+ public function _trigger_id($id): string
{
return 'f-calendar-trigger-' . $id;
}
- public function _gen_id()
+ public function _gen_id(): int
{
static $id = 0;
return ++$id;
}
- public function _make_js_hash($array)
+ public function _make_js_hash($array): string
{
$jstr = '';
reset($array);
@@ -133,7 +133,7 @@
return $jstr;
}
- public function _make_html_attr($array)
+ public function _make_html_attr($array): string
{
$attrstr = '';
reset($array);
Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php 2023-07-14 09:19:32 UTC (rev 11048)
+++ trunk/themes/blog/themeinfo.php 2023-07-14 09:44:40 UTC (rev 11049)
@@ -86,7 +86,7 @@
'title' => _("Click to hide/show")));
}
- protected function _labelForAction($action)
+ protected function _labelForAction($action): string
{
switch ($action) {
case 'edit':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2025-02-19 16:48:10
|
Revision: 11146
http://sourceforge.net/p/phpwiki/code/11146
Author: vargenau
Date: 2025-02-19 16:48:08 +0000 (Wed, 19 Feb 2025)
Log Message:
-----------
Fix CSS syntax
Modified Paths:
--------------
trunk/themes/Hawaiian/Hawaiian.css
trunk/themes/MacOSX/MacOSX.css
trunk/themes/SpaceWiki/SpaceWiki.css
trunk/themes/default/phpwiki-common.css
trunk/themes/default/phpwiki.css
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css 2025-02-19 14:40:17 UTC (rev 11145)
+++ trunk/themes/Hawaiian/Hawaiian.css 2025-02-19 16:48:08 UTC (rev 11146)
@@ -600,7 +600,7 @@
background-image: url("images/tchecker-white.png");
background-repeat: repeat;
*/
- zbackground-color: rgb(255 255 255 / 0.5); /* transparency */
+ background-color: rgb(255 255 255 / 0.5); /* transparency */
background-color: white;
opacity: 0.8;
}
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css 2025-02-19 14:40:17 UTC (rev 11145)
+++ trunk/themes/MacOSX/MacOSX.css 2025-02-19 16:48:08 UTC (rev 11146)
@@ -79,7 +79,7 @@
.toolbar,
td {
font-family: "Lucida Grande", "SF Pro", "San Francisco", "Lucida Sans", Helvetica, Arial, sans-serif;
- // border-top: 1px solid #7c7c7c;
+ /* border-top: 1px solid #7c7c7c; */
padding-left: 0.8em;
padding-right: 0.8em;
padding-top: 0.5em;
@@ -104,7 +104,7 @@
div.toclist p {
/*toc items*/
font-family: "Lucida Grande", "SF Pro", "San Francisco", "Lucida Sans", Helvetica, Arial, sans-serif;
- text-decoration: italic;
+ font-style: italic;
padding-top: 0ex;
margin-left: 5px;
}
@@ -640,8 +640,8 @@
text-decoration: none;
font-size: small;
font-weight: normal;
- // font-family: Tahoma, Arial, Helvetica, sans-serif;
- // background-color: ThreeDLightShadow;//doesn't work in chrome,shows as black!
+ /* font-family: Tahoma, Arial, Helvetica, sans-serif; */
+ /* background-color: ThreeDLightShadow; //doesn't work in chrome,shows as black! */
color: black;
}
@@ -1187,7 +1187,7 @@
div#actionbuttons a.wikiadmin,
input[type=submit] {
background: url('buttons/en/button-template.png');
- // background-position: top left;
+ /* background-position: top left; */
padding-top: 6px !important;
padding-left: 0.6em !important;
padding-bottom: 8px !important;
@@ -1197,7 +1197,7 @@
/*looks ugly for really wide buttons */
font-family: "Lucida Grande", "Helvetica Narrow", Arial, sans-serif;
- // font-weight: bold;
+ /* font-weight: bold; */
font-size: 10pt;
text-decoration: none;
color: black;
Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css 2025-02-19 14:40:17 UTC (rev 11145)
+++ trunk/themes/SpaceWiki/SpaceWiki.css 2025-02-19 16:48:08 UTC (rev 11146)
@@ -92,7 +92,7 @@
font-weight: bold;
font-weight: 700;
- color: 5791ff;
+ color: #5791ff;
}
h2,
@@ -210,7 +210,7 @@
div#searchholder {
display: inline;
- align: center;
+ text-align: center;
}
fieldset {
@@ -248,7 +248,7 @@
padding: 12px 20px;
margin-left: 8px;
- align: center;
+ text-align: center;
border-radius: 4px;
margin-bottom: 0ex;
@@ -577,7 +577,7 @@
div.toclist p {
/*toc items*/
- text-decoration: italic;
+ font-style: italic;
padding-top: 0ex;
margin-left: 5px;
}
@@ -622,8 +622,8 @@
background: #d8d8d8;
background: #5791ff;
display: inline-block;
- margin-top: 1 em;
- margin-bottom: 1 em;
+ margin-top: 1em;
+ margin-bottom: 1em;
}
/* individual blocks */
Modified: trunk/themes/default/phpwiki-common.css
===================================================================
--- trunk/themes/default/phpwiki-common.css 2025-02-19 14:40:17 UTC (rev 11145)
+++ trunk/themes/default/phpwiki-common.css 2025-02-19 16:48:08 UTC (rev 11146)
@@ -211,13 +211,13 @@
table.boxed caption, table.bordered caption {
text-align: center;
-// font-weight: bold;
+ /* font-weight: bold; */
caption-side: bottom;
padding-top: 0.8em;
}
table.boxed th, table.bordered th {
-// font-weight: bold;
+ /* font-weight: bold; */
background-color: #d8d8d8;
}
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css 2025-02-19 14:40:17 UTC (rev 11145)
+++ trunk/themes/default/phpwiki.css 2025-02-19 16:48:08 UTC (rev 11146)
@@ -355,7 +355,7 @@
*/
#logo img {
float: right;
- align: right;
+ text-align: right;
/* "paper" borders */
border-top: 1px #e8e6df solid;
border-left: 1px #e8e6df solid;
@@ -1163,4 +1163,4 @@
h1.firstHeading-rating-public {
background-color: #ffce7b;
border: 1px solid #ffa500;
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2025-03-15 17:35:10
|
Revision: 11186
http://sourceforge.net/p/phpwiki/code/11186
Author: vargenau
Date: 2025-03-15 17:34:59 +0000 (Sat, 15 Mar 2025)
Log Message:
-----------
Add author in themes/blog/pgsrc themes/fusionforge/pgsrc and themes/wikilens/pgsrc
Modified Paths:
--------------
trunk/themes/blog/pgsrc/About
trunk/themes/blog/pgsrc/Blog
trunk/themes/blog/pgsrc/CategoryHowTo
trunk/themes/blog/pgsrc/HomePage
trunk/themes/blog/pgsrc/HowTo
trunk/themes/blog/pgsrc/PhotoAlbum
trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates
trunk/themes/fusionforge/pgsrc/CategoryWiki%20user
trunk/themes/fusionforge/pgsrc/ExternalPages
trunk/themes/fusionforge/pgsrc/FindPage
trunk/themes/fusionforge/pgsrc/FullTextSearch
trunk/themes/fusionforge/pgsrc/HomePage
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
trunk/themes/fusionforge/pgsrc/SpecialPages
trunk/themes/fusionforge/pgsrc/TextFormattingRules
trunk/themes/fusionforge/pgsrc/TitleSearch
trunk/themes/fusionforge/pgsrc/UpLoad
trunk/themes/fusionforge/pgsrc/colorbox
trunk/themes/fusionforge/pgsrc/titlebar
trunk/themes/wikilens/pgsrc/LeftbarContent
Modified: trunk/themes/blog/pgsrc/About
===================================================================
--- trunk/themes/blog/pgsrc/About 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/blog/pgsrc/About 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=About;
flags="";
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/blog/pgsrc/Blog
===================================================================
--- trunk/themes/blog/pgsrc/Blog 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/blog/pgsrc/Blog 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=Blog;
flags="";
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/blog/pgsrc/CategoryHowTo
===================================================================
--- trunk/themes/blog/pgsrc/CategoryHowTo 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/blog/pgsrc/CategoryHowTo 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=CategoryHowTo;
flags="";
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/blog/pgsrc/HomePage
===================================================================
--- trunk/themes/blog/pgsrc/HomePage 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/blog/pgsrc/HomePage 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=HomePage;
flags="";
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/blog/pgsrc/HowTo
===================================================================
--- trunk/themes/blog/pgsrc/HowTo 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/blog/pgsrc/HowTo 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=HowTo;
flags="";
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/blog/pgsrc/PhotoAlbum
===================================================================
--- trunk/themes/blog/pgsrc/PhotoAlbum 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/blog/pgsrc/PhotoAlbum 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=PhotoAlbum;
flags="";
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates
===================================================================
--- trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=CategoryWiki%20templates;
flags=EXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/CategoryWiki%20user
===================================================================
--- trunk/themes/fusionforge/pgsrc/CategoryWiki%20user 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/CategoryWiki%20user 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=CategoryWiki%20user;
flags=EXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/ExternalPages
===================================================================
--- trunk/themes/fusionforge/pgsrc/ExternalPages 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/ExternalPages 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=ExternalPages;
flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/FindPage
===================================================================
--- trunk/themes/fusionforge/pgsrc/FindPage 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/FindPage 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=FindPage;
flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/FullTextSearch
===================================================================
--- trunk/themes/fusionforge/pgsrc/FullTextSearch 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/FullTextSearch 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=FullTextSearch;
flags=PAGE_LOCKED;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/HomePage
===================================================================
--- trunk/themes/fusionforge/pgsrc/HomePage 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/HomePage 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=HomePage;
flags=EXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=PhpWikiAdministration;
flags=PAGE_LOCKED;
+ author=The%20PhpWiki%20Team;
acl="view:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY";
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=PhpWikiAdministration%2FSetAclSimple;
flags=PAGE_LOCKED;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=PhpWikiAdministration%2FSetExternal;
flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=SetGlobalAccessRightsSimple;
flags=PAGE_LOCKED;
+ author=The%20PhpWiki%20Team;
acl="view:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY";
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/SpecialPages
===================================================================
--- trunk/themes/fusionforge/pgsrc/SpecialPages 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/SpecialPages 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=SpecialPages;
flags=EXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/TextFormattingRules
===================================================================
--- trunk/themes/fusionforge/pgsrc/TextFormattingRules 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/TextFormattingRules 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,12 +1,13 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=TextFormattingRules;
flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
-== Synopsis
+== Synopsis ==
**Emphasis:** ##~/~/## for //italics//, ##~*~*## for **bold**, ##~*~*~/~/...~/~/~*~*## for **//both//**, ##~#~### for ##fixed width##. \\
**Lists:** ##~*## for bullet lists, ##~### for numbered lists; use multiple ##~*## or ##~### for nested lists. \\
Modified: trunk/themes/fusionforge/pgsrc/TitleSearch
===================================================================
--- trunk/themes/fusionforge/pgsrc/TitleSearch 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/TitleSearch 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=TitleSearch;
flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/UpLoad
===================================================================
--- trunk/themes/fusionforge/pgsrc/UpLoad 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/UpLoad 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=UpLoad;
flags=EXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/colorbox
===================================================================
--- trunk/themes/fusionforge/pgsrc/colorbox 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/colorbox 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=colorbox;
flags=EXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/fusionforge/pgsrc/titlebar
===================================================================
--- trunk/themes/fusionforge/pgsrc/titlebar 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/fusionforge/pgsrc/titlebar 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=titlebar;
flags=EXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
Modified: trunk/themes/wikilens/pgsrc/LeftbarContent
===================================================================
--- trunk/themes/wikilens/pgsrc/LeftbarContent 2025-03-15 10:17:28 UTC (rev 11185)
+++ trunk/themes/wikilens/pgsrc/LeftbarContent 2025-03-15 17:34:59 UTC (rev 11186)
@@ -1,8 +1,9 @@
-Date: Wed, 19 Feb 2025 11:10:15 +0000
+Date: Sat, 15 Mar 2025 18:22:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
Content-Type: application/x-phpwiki;
pagename=LeftbarContent;
flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ author=The%20PhpWiki%20Team;
charset=UTF-8
Content-Transfer-Encoding: binary
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2025-05-05 17:33:55
|
Revision: 11195
http://sourceforge.net/p/phpwiki/code/11195
Author: vargenau
Date: 2025-05-05 17:33:37 +0000 (Mon, 05 May 2025)
Log Message:
-----------
Default value for font-family; minor CSS improvements
Modified Paths:
--------------
trunk/themes/Hawaiian/Hawaiian.css
trunk/themes/MacOSX/MacOSX.css
trunk/themes/SpaceWiki/SpaceWiki.css
trunk/themes/default/phpwiki-common.css
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css 2025-05-05 17:32:16 UTC (rev 11194)
+++ trunk/themes/Hawaiian/Hawaiian.css 2025-05-05 17:33:37 UTC (rev 11195)
@@ -83,7 +83,7 @@
/* Adds space between the image and the heading */
border: 1px outset gray;
- margin-left: 0em;
+ margin-left: 0;
margin-bottom: 1ex;
}
@@ -629,7 +629,7 @@
div.toc p {
/*toc title*/
text-decoration: none;
- padding-top: 0ex;
+ padding-top: 0;
margin-left: 5px;
}
@@ -636,7 +636,7 @@
div.toclist p a {
/*toc items*/
text-decoration: none;
- padding-top: 0ex;
+ padding-top: 0;
margin-left: 5px;
}
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css 2025-05-05 17:32:16 UTC (rev 11194)
+++ trunk/themes/MacOSX/MacOSX.css 2025-05-05 17:33:37 UTC (rev 11195)
@@ -27,7 +27,7 @@
body {
background: #fafafa url("images/bgpaper8.png");
- font-family: "New York", Palatino;
+ font-family: "New York", Palatino, serif;
}
body.edit {
@@ -42,13 +42,8 @@
}
#logo img {
- margin-right: 0ex;
- /* Adds space between the image and the heading */
- /*
- margin-left: 0em;
- margin-bottom: 1ex;
- */
- margin-left: 0em;
+ margin-right: 0;
+ margin-left: 0;
}
@@ -94,22 +89,21 @@
/* CreateTocPlugin plugin ================================================== */
div.toc p {
- /*toc title*/
+ /* toc title */
font-family: "Lucida Grande", "SF Pro", "San Francisco", "Lucida Sans", Helvetica, Arial, sans-serif;
text-decoration: none;
- padding-top: 0ex;
+ padding-top: 0;
margin-left: 5px;
}
div.toclist p {
- /*toc items*/
+ /* toc items */
font-family: "Lucida Grande", "SF Pro", "San Francisco", "Lucida Sans", Helvetica, Arial, sans-serif;
font-style: italic;
- padding-top: 0ex;
+ padding-top: 0;
margin-left: 5px;
}
-
input.button {
font-family: "Lucida Grande", "SF Pro", "San Francisco", "Lucida Sans", Helvetica, Arial, sans-serif;
}
@@ -1266,7 +1260,6 @@
.tdunselected {
font-weight: normal;
- background: white;
text-decoration: underline;
background: #f8f8f8;
}
Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css 2025-05-05 17:32:16 UTC (rev 11194)
+++ trunk/themes/SpaceWiki/SpaceWiki.css 2025-05-05 17:33:37 UTC (rev 11195)
@@ -32,7 +32,7 @@
}
*/
@font-face {
- font-family: 'Antonio';
+ font-family: 'Antonio', sans-serif;
font-weight: normal;
font-weight: 400;
src: url('fonts/Antonio-Regular.woff2') format('woff2'),
@@ -91,7 +91,6 @@
h1 {
font-weight: bold;
font-weight: 700;
-
color: #5791ff;
}
@@ -180,10 +179,6 @@
form {
color: red;
/* background-color: black;*/
- padding-top: 1ex;
- padding-left: 1ex;
- padding-bottom: 3pt;
- padding-right: 0pt;
padding: 0;
}
@@ -190,7 +185,6 @@
textarea {
display: flex;
-
padding: 12px 20px;
margin-left: 8px;
@@ -251,7 +245,7 @@
text-align: center;
border-radius: 4px;
- margin-bottom: 0ex;
+ margin-bottom: 0;
margin-right: 1ex;
color: white !important;
background: #090230;
@@ -290,7 +284,7 @@
cursor: pointer;
/* Pointer cursor on hover */
border: 0;
-vertical-align: middle;
+ vertical-align: middle;
padding-top: 0.5ex;
padding-left: 4ex;
padding-bottom: 3pt;
@@ -367,7 +361,6 @@
"Arial Narrow", Helvetica, Arial, sans-serif;
font-weight: normal;
font-weight: 400;
-
color: black;
background-color: yellow;
padding-top: 1ex;
@@ -424,7 +417,7 @@
#actionbuttons a.wikiadmin,
a.wikiadmin {
- font-family: 'Antonio';
+ font-family: 'Antonio', sans-serif;
font-weight: normal;
font-weight: 400;
background-color: #BB0002;
@@ -564,7 +557,7 @@
/* CreateTocPlugin plugin ================================================== */
div.toc p.toctitle {
- /*toc title*/
+ /* toc title */
text-decoration: none;
margin-left: 5px;
color: black;
@@ -576,9 +569,9 @@
}
div.toclist p {
- /*toc items*/
+ /* toc items */
font-style: italic;
- padding-top: 0ex;
+ padding-top: 0;
margin-left: 5px;
}
@@ -619,7 +612,6 @@
}
.diff .block {
- background: #d8d8d8;
background: #5791ff;
display: inline-block;
margin-top: 1em;
@@ -758,25 +750,6 @@
font-weight: 700;
}
-
-/*a.wikiadmin {
- margin-left: 1ex;
- font-weight: 700;
- background-color: #ddc300;
- color: black;
- border-top-right-radius: 18px;
- border-bottom-right-radius: 18px;
- padding-right: 3ex;
- cursor: pointer;
- border: 0;
-
- padding-top: 1ex;
- padding-left: 4ex;
- padding-bottom: 3pt;
- padding-right: 1.5ex;
-}
-*/
-
.wiki-edithelp {
display: inline-block;
margin-left: 1ex;
Modified: trunk/themes/default/phpwiki-common.css
===================================================================
--- trunk/themes/default/phpwiki-common.css 2025-05-05 17:32:16 UTC (rev 11194)
+++ trunk/themes/default/phpwiki-common.css 2025-05-05 17:33:37 UTC (rev 11195)
@@ -168,14 +168,13 @@
padding: 1ex;
}
-div.toc p { /*toc title*/
+div.toc p { /* toc title */
text-decoration: none;
- padding-top: 0ex;
+ padding-top: 0;
margin-left: 5px;
}
-div.toclist p a { /*toc items*/
-/* text-decoration: none;*/
- padding-top: 0ex;
+div.toclist p a { /* toc items */
+ padding-top: 0;
margin-left: 5px;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X