Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2014-07-31 10:25:22
|
Revision: 9039
http://sourceforge.net/p/phpwiki/code/9039
Author: vargenau
Date: 2014-07-31 10:25:18 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Translate ":"
Modified Paths:
--------------
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/fusionforge/templates/editpage.tmpl
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2014-07-31 09:50:05 UTC (rev 9038)
+++ trunk/themes/Crao/templates/editpage.tmpl 2014-07-31 10:25:18 UTC (rev 9039)
@@ -32,7 +32,7 @@
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td class="align-right"><div id="editarea-size">
- <?php echo _("Size").':'?>
+ <?php echo _("Size")._(":"); ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
<noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
@@ -43,7 +43,7 @@
</fieldset>
<!-- FIXME: fix layout, move CSS to CSS -->
<fieldset class="editarea">
- <legend><?php echo _("Summary").':'?></legend><br />
+ <legend><?php echo _("Summary")._(":"); ?></legend><br />
<?php echo $SUMMARY_INPUT?>
</fieldset>
<?php if (ENABLE_CAPTCHA) { ?>
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2014-07-31 09:50:05 UTC (rev 9038)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2014-07-31 10:25:18 UTC (rev 9039)
@@ -34,14 +34,14 @@
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td class="align-right"><div id="editarea-size">
- <?php echo _("Size").':'?>
+ <?php echo _("Size")._(":"); ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
<noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
</div></td></tr></table>
<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
<br /><small>
-<?php echo _("Summary")?>: <?php echo $SUMMARY_INPUT ?>
+<?php echo _("Summary")._(":"); ?><?php echo $SUMMARY_INPUT ?>
<br />
<?php if (ENABLE_CAPTCHA) { ?>
<?php echo $CAPTCHA_IMAGE ?><br/>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2014-07-31 09:50:05 UTC (rev 9038)
+++ trunk/themes/default/templates/editpage.tmpl 2014-07-31 10:25:18 UTC (rev 9039)
@@ -34,7 +34,7 @@
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td class="align-right"><div id="editarea-size">
- <?php echo _("Size").':'?>
+ <?php echo _("Size")._(":"); ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
<noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
@@ -45,7 +45,7 @@
<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
<!-- FIXME: fix layout, move CSS to CSS -->
<div class="toolbar" style="text-align: center;">
- <label for="edit-summary"><?php echo _("Summary").':'?></label> <?php echo $SUMMARY_INPUT?>
+ <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT?>
</div>
<?php if (ENABLE_CAPTCHA) { ?>
<div class="toolbar" style="text-align: center;">
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl 2014-07-31 09:50:05 UTC (rev 9038)
+++ trunk/themes/fusionforge/templates/editpage.tmpl 2014-07-31 10:25:18 UTC (rev 9039)
@@ -67,14 +67,14 @@
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td class="align-right"><div id="editarea-size">
- <?php echo _("Size").':'?>
+ <?php echo _("Size")._(":"); ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
<noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
</div></td></tr></table>
<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
<div style="text-align: center;">
- <label for="edit-summary"><?php echo _("Summary").':'?></label> <?php echo $SUMMARY_INPUT?>
+ <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT?>
</div>
<table class="fullwidth">
<tr class="middle">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-07-31 10:34:44
|
Revision: 9040
http://sourceforge.net/p/phpwiki/code/9040
Author: vargenau
Date: 2014-07-31 10:34:35 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Whitespace
Modified Paths:
--------------
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/fusionforge/templates/editpage.tmpl
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2014-07-31 10:25:18 UTC (rev 9039)
+++ trunk/themes/Crao/templates/editpage.tmpl 2014-07-31 10:34:35 UTC (rev 9040)
@@ -17,12 +17,13 @@
<?php echo _("Saving this page will overwrite the current version.")?></strong></p>
<?php } ?>
<?php /*
- * FIXME: Hack!
+ * FIXME: Hack!
* The funky URL used for the form action parameter is bogus.
* This is needed, otherwise the redirect to the real browser
* page won't work with some browsers. (NS4 and Mozilla 0.97 won't accept
* a redirect from a page to itself.)
- */ ?>
+ */
+?>
<form method="post" id="editpage" name="editpage"
action="<?php echo $request->getPostURL() ?>"
accept-charset="UTF-8">
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2014-07-31 10:25:18 UTC (rev 9039)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2014-07-31 10:34:35 UTC (rev 9040)
@@ -7,9 +7,8 @@
* a redirect from a page to itself.)
*/
?>
-
<div class="wikitext" id="editform">
-<form method="post" name="editpage" id="editpage"
+<form method="post" id="editpage" name="editpage"
action="<?php echo $request->getPostURL() ?>"
accept-charset="UTF-8">
<?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1">'; ?>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2014-07-31 10:25:18 UTC (rev 9039)
+++ trunk/themes/default/templates/editpage.tmpl 2014-07-31 10:34:35 UTC (rev 9040)
@@ -10,21 +10,20 @@
<?php echo $PREVIEW_CONTENT ?>
<hr class="printer" />
<?php } ?>
-
<?php echo $PAGE_LOCKED_MESSAGE ?>
<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-
<?php if (! $IS_CURRENT) { ?>
<p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
<?php echo _("Saving this page will overwrite the current version.")?></strong></p>
<?php } ?>
<?php /*
- * FIXME: Hack!
+ * FIXME: Hack!
* The funky URL used for the form action parameter is bogus.
* This is needed, otherwise the redirect to the real browser
* page won't work with some browsers. (NS4 and Mozilla 0.97 won't accept
* a redirect from a page to itself.)
- */ ?>
+ */
+?>
<form method="post" id="editpage" name="editpage"
action="<?php echo $request->getPostURL() ?>"
accept-charset="UTF-8">
@@ -35,7 +34,7 @@
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td class="align-right"><div id="editarea-size">
<?php echo _("Size")._(":"); ?>
- <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
+ <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
<noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
</div></td></tr></table>
@@ -45,7 +44,7 @@
<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
<!-- FIXME: fix layout, move CSS to CSS -->
<div class="toolbar" style="text-align: center;">
- <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT?>
+ <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT ?>
</div>
<?php if (ENABLE_CAPTCHA) { ?>
<div class="toolbar" style="text-align: center;">
@@ -63,20 +62,20 @@
<?php echo $WYSIWYG_B?><?php echo $SEP?>
<?php } ?>
<?php echo $PREVIEW_B ?>
- <?php if ($SAVE_B) { ?>
+ <?php if ($SAVE_B) { ?>
<?php echo $SEP?><?php echo $SAVE_B ?>
<?php } ?>
<?php echo $SEP?><?php echo $CHANGES_B ?>
</td>
- <td> <?php echo $AUTHOR_MESSAGE?></td>
+ <td><?php echo $AUTHOR_MESSAGE?></td>
</tr>
<tr>
<td>
- <?php if ($user->isAdmin()) { ?>
- <?php echo $LOCKED_CB ?> <label for="edit-locked" title="<?php echo _("Make the page read-only?")?>"><?php echo _("Locked")?></label>
- <?php if (ENABLE_PAGE_PUBLIC) { ?>
- <?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Export to a separate public area?")?>"><?php echo _("Public")?></label>
- <?php }} ?>
+ <?php if ($user->isAdmin()) { ?>
+ <?php echo $LOCKED_CB ?> <label for="edit-locked" title="<?php echo _("Make the page read-only?")?>"><?php echo _("Locked")?></label>
+ <?php if (ENABLE_PAGE_PUBLIC) { ?>
+ <?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Export to a separate public area?")?>"><?php echo _("Public")?></label>
+ <?php }} ?>
</td>
<td colspan="2" class="align-right">
<?php if (!$user->isAuthenticated()) { ?>
@@ -88,9 +87,7 @@
<?php echo $HIDDEN_INPUTS?>
</form>
<div style="width:100%;text-align:center;"><?php /*plugin UpLoad autolink=0 mode=edit size=30 */?></div>
-
<hr />
-
<div class="wiki-edithelp">
<!-- 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>
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl 2014-07-31 10:25:18 UTC (rev 9039)
+++ trunk/themes/fusionforge/templates/editpage.tmpl 2014-07-31 10:34:35 UTC (rev 9040)
@@ -4,10 +4,8 @@
</p>
<?php echo $PREVIEW_CONTENT ?>
<?php } ?>
-
<?php echo $PAGE_LOCKED_MESSAGE ?>
<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-
<?php if (! $IS_CURRENT) { ?>
<p class="warning_msg">
<?php echo _("Warning: You are editing an old revision. Saving this page will overwrite the current version.")?>
@@ -106,9 +104,7 @@
</table>
<?php echo $HIDDEN_INPUTS?>
</form>
-
<hr />
-
<div class="wiki-edithelp">
<?php if (WIKI_NAME == "help") { ?>
<?plugin IncludePage page="Help/TextFormattingRules" section="Synopsis" quiet=1?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-07-31 11:14:48
|
Revision: 9043
http://sourceforge.net/p/phpwiki/code/9043
Author: vargenau
Date: 2014-07-31 11:14:40 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Whitespace
Modified Paths:
--------------
trunk/themes/Crao/templates/wikiblog.tmpl
trunk/themes/Portland/templates/viewsource.tmpl
trunk/themes/Wordpress/templates/viewsource.tmpl
trunk/themes/blog/templates/wikiblog.tmpl
trunk/themes/default/templates/blogform.tmpl
trunk/themes/default/templates/frameset.tmpl
trunk/themes/default/templates/userprefs.tmpl
trunk/themes/default/templates/viewsource.tmpl
trunk/themes/default/templates/wikiblog.tmpl
trunk/themes/fusionforge/templates/userprefs.tmpl
trunk/themes/wikilens/templates/categorypage.tmpl
Modified: trunk/themes/Crao/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/Crao/templates/wikiblog.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/Crao/templates/wikiblog.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -1,13 +1,13 @@
<?php
$CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
-
$buttons = $modified = '';
if ($user->isAdmin() or $user->getId() == $BLOG_CREATOR) {
$buttons = HTML::small(array('class' => 'floatleft'),
Button('edit', false, $page));
- if ($user->isAdmin())
- $buttons->pushContent(Button('remove', false, $page));
+ if ($user->isAdmin()) {
+ $buttons->pushContent(Button('remove', false, $page));
+ }
}
// This is a hack, but since we only have a fake PageRevision,
@@ -19,8 +19,6 @@
$mtime, $rev->get('author')));
}
?>
-
-<!-- FIXME: move table formatting to css -->
<div title="<?php echo fmt("Comments on %s by %s.", $BLOG_PARENT, $BLOG_CREATOR)?>"
class="wikiblog wikitext">
<div class="wikiblog-header">
Modified: trunk/themes/Portland/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Portland/templates/viewsource.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/Portland/templates/viewsource.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -1,10 +1,12 @@
<?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 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 echo Button('viewsource', _("View the current version."), $page) ?>
+ </p>
<?php } ?>
<textarea class="wikiedit"
name="content"
Modified: trunk/themes/Wordpress/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/viewsource.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/Wordpress/templates/viewsource.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -4,11 +4,13 @@
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 echo _("This page has been locked and cannot be edited.")?>
+ </p>
<?php } ?>
-<?php if (! $revision->isCurrent()) { ?>
+<?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 echo Button('viewsource', _("View the current version."), $page) ?>
+ </p>
<?php } ?>
<textarea class="wikiedit"
name="content"
Modified: trunk/themes/blog/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/blog/templates/wikiblog.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/blog/templates/wikiblog.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -1,6 +1,5 @@
<?php
$CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
-
$buttons = $modified = '';
if ($user->isAdmin() or $user->getId() == $BLOG_CREATOR) {
Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/default/templates/blogform.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -9,7 +9,7 @@
maxlength="256" name="edit[summary]" value="" />
<?php echo $EDIT_TOOLBAR ?>
<a id="editarea"></a>
- <textarea id="edit-content" class="edit-content" rows="8" cols="68" style="width:540px"
+ <textarea id="edit-content" class="edit-content" rows="8" style="width:540px"
name="edit[content]"></textarea>
<br />
<input id="wikiblog-submit" type="submit" value="<?php echo _("Add Entry")?>"
Modified: trunk/themes/default/templates/frameset.tmpl
===================================================================
--- trunk/themes/default/templates/frameset.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/default/templates/frameset.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -1,5 +1,7 @@
<?php
-// This template is used for the FrameInclude plugin.
+/*
+ * This template is used for the FrameInclude plugin.
+ */
$topurl = $request->getURLtoSelf(array('frame' => 'header'));
$boturl = $request->getURLtoSelf(array('frame' => 'footer'));
@@ -12,9 +14,9 @@
<?php echo Template('head') ?>
<frameset rows="<?php echo $ROWS?>">
- <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?>/>
+ <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?> />
<?php echo $CONTENT_FRAME ?>
- <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?>/>
+ <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?> />
<noframes><?php echo Template('body') ?></noframes>
</frameset>
</html>
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/default/templates/userprefs.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -176,6 +176,7 @@
<tr><td colspan="2">
<?php echo _("Get an e-mail notification at changes of the following pages:")?>
</td></tr>
+
<tr>
<?php if ($isForm) { ?>
<td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td>
@@ -288,11 +289,12 @@
</table>
<?php if ($isForm) { ?>
- <hr />
- <p><?php echo Button("submit:", _("Update Preferences"), 'wikiadmin')?>
+<hr />
+<p>
+ <?php echo Button("submit:", _("Update Preferences"), 'wikiadmin')?>
<?php echo Button("submit:delete", _("Reset Preferences"), 'wikiadmin')?>
- <?php echo Button("submit:cancel", _("Cancel"), 'button')?></p>
-
-<?php echo HiddenInputs($request->getArgs(), false, array('pref')) ?>
+ <?php echo Button("submit:cancel", _("Cancel"), 'button')?>
+ <?php echo HiddenInputs($request->getArgs(), false, array('pref')) ?>
+</p>
</form>
<?php } ?>
Modified: trunk/themes/default/templates/viewsource.tmpl
===================================================================
--- trunk/themes/default/templates/viewsource.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/default/templates/viewsource.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -5,7 +5,7 @@
<?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('edit', _("View the current version."), $page) ?>
+ <?php echo Button('viewsource', _("View the current version."), $page) ?>
</p>
<?php } ?>
<br class="clear-floats" />
Modified: trunk/themes/default/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/default/templates/wikiblog.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/default/templates/wikiblog.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -6,7 +6,7 @@
$buttons = HTML::small(array('class' => 'floatleft'),
Button('edit', false, $page));
if ($user->isAdmin()) {
- $buttons->pushContent($SEP, Button('remove', false, $page));
+ $buttons->pushContent($SEP, Button('remove', false, $page));
}
}
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -130,16 +130,16 @@
<legend><strong><?php echo _("User preferences for this project")?></strong></legend>
<table class="fullwidth">
- <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
+ <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
- <tr><td colspan="2">
+ <tr><td colspan="2">
<?php echo _("Get an e-mail notification at changes of the following pages:")?>
- </td></tr>
+ </td></tr>
- <tr>
+ <tr>
<?php if ($isForm) { ?>
<td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td>
- <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td>
+ <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td>
<?php } else { ?>
<td colspan="2"><?php echo $pref->get('notifyPages')?></td>
<?php } ?>
@@ -153,7 +153,9 @@
<table class="fullwidth">
- <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
+ <tr>
+ <td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td>
+ </tr>
<tr>
<td>
Modified: trunk/themes/wikilens/templates/categorypage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/categorypage.tmpl 2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/wikilens/templates/categorypage.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
@@ -1,3 +1,6 @@
+<?php
+// This template is used for the CategoryPage plugin.
+?>
<div class="categorypage categorypage-form">
<p>This page represents the <?php echo $SINGULAR?> category.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-07-31 14:20:26
|
Revision: 9044
http://sourceforge.net/p/phpwiki/code/9044
Author: vargenau
Date: 2014-07-31 14:20:18 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Removing ";" to please Template.php
Modified Paths:
--------------
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/fusionforge/templates/editpage.tmpl
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
+++ trunk/themes/Crao/templates/editpage.tmpl 2014-07-31 14:20:18 UTC (rev 9044)
@@ -33,7 +33,7 @@
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td class="align-right"><div id="editarea-size">
- <?php echo _("Size")._(":"); ?>
+ <?php echo _("Size")._(":") ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
<noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
@@ -44,7 +44,7 @@
</fieldset>
<!-- FIXME: fix layout, move CSS to CSS -->
<fieldset class="editarea">
- <legend><?php echo _("Summary")._(":"); ?></legend><br />
+ <legend><?php echo _("Summary")._(":") ?></legend><br />
<?php echo $SUMMARY_INPUT?>
</fieldset>
<?php if (ENABLE_CAPTCHA) { ?>
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
+++ trunk/themes/Portland/templates/editpage.tmpl 2014-07-31 14:20:18 UTC (rev 9044)
@@ -29,7 +29,7 @@
</table>
<a id="editarea"><?php echo $EDIT_TEXTAREA?></a>
<br />
-<?php echo _("Summary")._(":"); ?> <?php echo $SUMMARY_INPUT ?>
+<?php echo _("Summary")._(":") ?> <?php echo $SUMMARY_INPUT ?>
<br />
<?php echo fmt("Author will be logged as %s.", HTML::em($user->getId())) ?>
<br />
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2014-07-31 14:20:18 UTC (rev 9044)
@@ -33,14 +33,14 @@
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td class="align-right"><div id="editarea-size">
- <?php echo _("Size")._(":"); ?>
+ <?php echo _("Size")._(":") ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
<noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
</div></td></tr></table>
<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
<br /><small>
-<?php echo _("Summary")._(":"); ?><?php echo $SUMMARY_INPUT ?>
+<?php echo _("Summary")._(":") ?><?php echo $SUMMARY_INPUT ?>
<br />
<?php if (ENABLE_CAPTCHA) { ?>
<?php echo $CAPTCHA_IMAGE ?><br/>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
+++ trunk/themes/default/templates/editpage.tmpl 2014-07-31 14:20:18 UTC (rev 9044)
@@ -33,7 +33,7 @@
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td class="align-right"><div id="editarea-size">
- <?php echo _("Size")._(":"); ?>
+ <?php echo _("Size")._(":") ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
<noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
@@ -44,7 +44,7 @@
<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
<!-- FIXME: fix layout, move CSS to CSS -->
<div class="toolbar" style="text-align: center;">
- <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT ?>
+ <label for="edit-summary"><?php echo _("Summary")._(":") ?></label> <?php echo $SUMMARY_INPUT ?>
</div>
<?php if (ENABLE_CAPTCHA) { ?>
<div class="toolbar" style="text-align: center;">
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl 2014-07-31 11:14:40 UTC (rev 9043)
+++ trunk/themes/fusionforge/templates/editpage.tmpl 2014-07-31 14:20:18 UTC (rev 9044)
@@ -65,14 +65,14 @@
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
<td class="align-right"><div id="editarea-size">
- <?php echo _("Size")._(":"); ?>
+ <?php echo _("Size")._(":") ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
<noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
</div></td></tr></table>
<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
<div style="text-align: center;">
- <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT?>
+ <label for="edit-summary"><?php echo _("Summary")._(":") ?></label> <?php echo $SUMMARY_INPUT?>
</div>
<table class="fullwidth">
<tr class="middle">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-09-11 09:40:27
|
Revision: 9068
http://sourceforge.net/p/phpwiki/code/9068
Author: vargenau
Date: 2014-09-11 09:40:19 +0000 (Thu, 11 Sep 2014)
Log Message:
-----------
Fix caption placement bug in themes default, SpaceWiki and Hawaiian
Modified Paths:
--------------
trunk/themes/Hawaiian/Hawaiian.css
trunk/themes/SpaceWiki/SpaceWiki.css
trunk/themes/default/phpwiki-modern.css
trunk/themes/default/phpwiki-printer.css
trunk/themes/default/phpwiki.css
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css 2014-09-11 09:27:18 UTC (rev 9067)
+++ trunk/themes/Hawaiian/Hawaiian.css 2014-09-11 09:40:19 UTC (rev 9068)
@@ -37,8 +37,6 @@
caption-side: top;
text-align: left;
margin-bottom: .5ex;
- /* Allow the caption to extend to the full page width */
- width: 100%;
}
/* generic classes ----------------------------------------------- */
Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css 2014-09-11 09:27:18 UTC (rev 9067)
+++ trunk/themes/SpaceWiki/SpaceWiki.css 2014-09-11 09:40:19 UTC (rev 9068)
@@ -60,8 +60,6 @@
caption-side: top;
text-align: left;
margin-bottom: .5ex;
- /* Allow the caption to extend to the full page width */
- width: 100%;
}
a {
Modified: trunk/themes/default/phpwiki-modern.css
===================================================================
--- trunk/themes/default/phpwiki-modern.css 2014-09-11 09:27:18 UTC (rev 9067)
+++ trunk/themes/default/phpwiki-modern.css 2014-09-11 09:40:19 UTC (rev 9068)
@@ -42,8 +42,6 @@
caption-side: top;
text-align: left;
margin-bottom: .5ex;
- /* Allow the caption to extend to the full page width */
- width: 100%;
}
/**
Modified: trunk/themes/default/phpwiki-printer.css
===================================================================
--- trunk/themes/default/phpwiki-printer.css 2014-09-11 09:27:18 UTC (rev 9067)
+++ trunk/themes/default/phpwiki-printer.css 2014-09-11 09:40:19 UTC (rev 9068)
@@ -61,9 +61,6 @@
caption-side: top;
text-align: left;
margin-bottom: .5ex;
- /* Allow the caption to extend to the full page width
- Mac ie5.1 ignores this*/
- width: 100%;
}
/**
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css 2014-09-11 09:27:18 UTC (rev 9067)
+++ trunk/themes/default/phpwiki.css 2014-09-11 09:40:19 UTC (rev 9068)
@@ -28,9 +28,6 @@
caption-side: top;
text-align: left;
margin-bottom: .5ex;
- /* Allow the caption to extend to the full page width
- Mac ie5.1 ignores this*/
- width: 100%;
}
/* generic classes ----------------------------------------------- */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-09-12 16:11:34
|
Revision: 9078
http://sourceforge.net/p/phpwiki/code/9078
Author: vargenau
Date: 2014-09-12 16:11:24 +0000 (Fri, 12 Sep 2014)
Log Message:
-----------
Class "tablesorter" is not needed
Modified Paths:
--------------
trunk/themes/Crao/crao.css
trunk/themes/Crao/templates/bottom.tmpl
trunk/themes/Hawaiian/Hawaiian.css
trunk/themes/MacOSX/MacOSX.css
trunk/themes/MonoBook/monobook.css
trunk/themes/Portland/portland.css
trunk/themes/Sidebar/sidebar.css
trunk/themes/SpaceWiki/SpaceWiki.css
trunk/themes/Wordpress/Wordpress.css
trunk/themes/blog/Kubrick.css
trunk/themes/blog/templates/bottom.tmpl
trunk/themes/default/phpwiki.css
trunk/themes/default/templates/bottom.tmpl
trunk/themes/fusionforge/fusionforge.css
trunk/themes/fusionforge/templates/bottom.tmpl
trunk/themes/shamino_com/shamino_com.css
trunk/themes/wikilens/wikilens.css
Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/Crao/crao.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -1304,7 +1304,7 @@
background-color: #d8d8d8;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1312,7 +1312,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1320,7 +1320,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/Crao/templates/bottom.tmpl 2014-09-12 16:11:24 UTC (rev 9078)
@@ -9,9 +9,8 @@
<script>
jQuery(document).ready(function()
{
- // Compatibility: allow class "sortable" to make table sortable
jQuery(".sortable").addClass("tablesorter");
- jQuery(".tablesorter").tablesorter();
+ jQuery(".sortable").tablesorter();
}
);
</script>
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/Hawaiian/Hawaiian.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -676,7 +676,7 @@
background-color: #d8d8d8;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -684,7 +684,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -692,7 +692,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/MacOSX/MacOSX.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -1200,7 +1200,7 @@
background-color: #d8d8d8;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1208,7 +1208,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1216,7 +1216,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/MonoBook/monobook.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -2251,7 +2251,7 @@
margin-bottom: 1ex;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -2259,7 +2259,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -2267,7 +2267,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/Portland/portland.css
===================================================================
--- trunk/themes/Portland/portland.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/Portland/portland.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -185,7 +185,7 @@
background-color: #d8d8d8;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -193,7 +193,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -201,7 +201,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/Sidebar/sidebar.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -2305,7 +2305,7 @@
padding: 0.5em;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -2313,7 +2313,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -2321,34 +2321,10 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
background-position: center right;
padding-right: 20px;
}
-
-table.tablesorter th.header {
- background-image: url(../default/images/sort_none.gif);
- cursor: pointer;
- background-repeat: no-repeat;
- background-position: center right;
- padding-right: 20px;
-}
-
-table.tablesorter th.headerSortUp {
- background-image: url(../default/images/sort_up.gif);
- cursor: pointer;
- background-repeat: no-repeat;
- background-position: center right;
- padding-right: 20px;
-}
-
-table.tablesorter th.headerSortDown {
- background-image: url(../default/images/sort_down.gif);
- cursor: pointer;
- background-repeat: no-repeat;
- background-position: center right;
- padding-right: 20px;
-}
Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/SpaceWiki/SpaceWiki.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -1036,7 +1036,7 @@
background-color: #d8d8d8;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1044,7 +1044,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1052,7 +1052,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/Wordpress/Wordpress.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -1117,7 +1117,7 @@
background-color: #d8d8d8;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1125,7 +1125,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1133,7 +1133,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/blog/Kubrick.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -1023,7 +1023,7 @@
background-color: #d8d8d8;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1031,7 +1031,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1039,7 +1039,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/blog/templates/bottom.tmpl
===================================================================
--- trunk/themes/blog/templates/bottom.tmpl 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/blog/templates/bottom.tmpl 2014-09-12 16:11:24 UTC (rev 9078)
@@ -12,9 +12,8 @@
<script>
jQuery(document).ready(function()
{
- // Compatibility: allow class "sortable" to make table sortable
jQuery(".sortable").addClass("tablesorter");
- jQuery(".tablesorter").tablesorter();
+ jQuery(".sortable").tablesorter();
}
);
</script>
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/default/phpwiki.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -1290,7 +1290,7 @@
border: 1px solid #ffa500;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1298,7 +1298,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -1306,7 +1306,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/default/templates/bottom.tmpl
===================================================================
--- trunk/themes/default/templates/bottom.tmpl 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/default/templates/bottom.tmpl 2014-09-12 16:11:24 UTC (rev 9078)
@@ -12,9 +12,7 @@
<script>
jQuery(document).ready(function()
{
- // Compatibility: allow class "sortable" to make table sortable
- jQuery(".sortable").addClass("tablesorter");
- jQuery(".tablesorter").tablesorter();
+ jQuery(".sortable").tablesorter();
}
);
</script>
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/fusionforge/fusionforge.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -153,7 +153,7 @@
white-space: nowrap;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -161,7 +161,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -169,7 +169,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/fusionforge/templates/bottom.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/bottom.tmpl 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/fusionforge/templates/bottom.tmpl 2014-09-12 16:11:24 UTC (rev 9078)
@@ -13,9 +13,7 @@
<script>
jQuery(document).ready(function()
{
- // Compatibility: allow class "sortable" to make table sortable
- jQuery(".sortable").addClass("tablesorter");
- jQuery(".tablesorter").tablesorter();
+ jQuery(".sortable").tablesorter();
}
);
</script>
Modified: trunk/themes/shamino_com/shamino_com.css
===================================================================
--- trunk/themes/shamino_com/shamino_com.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/shamino_com/shamino_com.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -394,7 +394,7 @@
background-color: #d8d8d8;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -402,7 +402,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -410,7 +410,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
Modified: trunk/themes/wikilens/wikilens.css
===================================================================
--- trunk/themes/wikilens/wikilens.css 2014-09-12 15:12:56 UTC (rev 9077)
+++ trunk/themes/wikilens/wikilens.css 2014-09-12 16:11:24 UTC (rev 9078)
@@ -42,7 +42,7 @@
margin: 1.5ex 1em 0 1em;
}
-table.tablesorter th.header {
+table.sortable th.header {
background-image: url(../default/images/sort_none.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -50,7 +50,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortUp {
+table.sortable th.headerSortUp {
background-image: url(../default/images/sort_up.gif);
cursor: pointer;
background-repeat: no-repeat;
@@ -58,7 +58,7 @@
padding-right: 20px;
}
-table.tablesorter th.headerSortDown {
+table.sortable th.headerSortDown {
background-image: url(../default/images/sort_down.gif);
cursor: pointer;
background-repeat: no-repeat;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-09-18 14:21:47
|
Revision: 9093
http://sourceforge.net/p/phpwiki/code/9093
Author: vargenau
Date: 2014-09-18 14:21:42 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
No tabs
Modified Paths:
--------------
trunk/themes/Crao/templates/wikiblog.tmpl
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/MonoBook/templates/body.tmpl
trunk/themes/MonoBook/templates/browse-footer.tmpl
trunk/themes/MonoBook/templates/navbar.tmpl
trunk/themes/Sidebar/templates/actionbar.tmpl
trunk/themes/Sidebar/templates/body.tmpl
trunk/themes/Sidebar/templates/navbar.tmpl
trunk/themes/Wordpress/templates/signin.tmpl
trunk/themes/blog/templates/wikiblog.tmpl
trunk/themes/default/templates/categorypage.tmpl
trunk/themes/default/templates/comment.tmpl
trunk/themes/default/templates/login.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/default/templates/online.tmpl
trunk/themes/default/templates/signin.tmpl
trunk/themes/default/templates/wikiblog.tmpl
trunk/themes/smaller/templates/signin.tmpl
trunk/themes/wikilens/templates/categorypage.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
Modified: trunk/themes/Crao/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/Crao/templates/wikiblog.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/Crao/templates/wikiblog.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -15,8 +15,8 @@
if ($rev->get('mtime') != $BLOG_CTIME) {
$mtime = $WikiTheme->formatDateTime($rev->get('mtime'));
$modified = HTML::small(array('class' => 'floatright'),
- fmt("Comment modified on %s by %s",
- $mtime, $rev->get('author')));
+ fmt("Comment modified on %s by %s",
+ $mtime, $rev->get('author')));
}
?>
<div title="<?php echo fmt("Comments on %s by %s.", $BLOG_PARENT, $BLOG_CREATOR)?>"
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -11,15 +11,15 @@
<?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
<?php $talk = new WikiPageName('Talk:'.$pagename); ?>
<?php echo ActionButton(array(),
- $isActionPage ? _("ActionPage") : _("Article"),
- $talk->getParent(), array('class'=>$isBrowse ? "selected" : "", 'title' => "View the page [alt-c]")) ?>
+ $isActionPage ? _("ActionPage") : _("Article"),
+ $talk->getParent(), array('class'=>$isBrowse ? "selected" : "", 'title' => "View the page [alt-c]")) ?>
<?php if (!$isActionPage) { ?>
<?php if ($dbh->isWikiPage($talk->getName())) { ?>
- <?php echo ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?>
+ <?php echo ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?>
<?php } else { ?>
- <?php echo ActionButton(array('action'=>'create',
- 'template'=>_("Template/Talk")),
- _("Discussion"), $talk->getName()) ?>
+ <?php echo ActionButton(array('action'=>'create',
+ 'template'=>_("Template/Talk")),
+ _("Discussion"), $talk->getName()) ?>
<?php } ?>
<?php } ?>
<?php } else {
@@ -29,7 +29,7 @@
<?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,
- array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving. [alt-e]")) ?>
+ array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving. [alt-e]")) ?>
<?php } else { ?>
<?php echo ActionButton("viewsource", _("View Source")) ?>
<?php } ?>
@@ -51,7 +51,7 @@
<?php if ( $user->isSignedIn() ) { ?>
<?php echo ActionButton(_("WatchPage"), _("Watch"), false,
- array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?>
+ array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?>
<?php } ?>
</ul>
</div>
Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/MonoBook/templates/body.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -4,32 +4,32 @@
<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
<div id="global-wrapper">
<div id="column-content">
- <div id="content">
- <?php echo Template('top') ?>
- <div id="bodyContent">
- <?php echo $CONTENT ?>
+ <div id="content">
+ <?php echo Template('top') ?>
+ <div id="bodyContent">
+ <?php echo $CONTENT ?>
- <!-- end content -->
- <div class="visualClear"></div>
- </div>
- </div>
- <?php if (empty($NOSIGNIN)) { ?>
- <?php echo Template('signin') ?>
- <?php } ?>
- <?php echo Template('logo') ?>
+ <!-- end content -->
+ <div class="visualClear"></div>
</div>
+ </div>
+ <?php if (empty($NOSIGNIN)) { ?>
+ <?php echo Template('signin') ?>
+ <?php } ?>
+ <?php echo Template('logo') ?>
+ </div>
<div id="column-one">
- <?php echo Template('navbar') ?>
- <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>
- <?php echo Template('actionbar') ?>
- <?php echo Template('tags') ?>
- <?php } ?>
+ <?php echo Template('navbar') ?>
+ <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>
+ <?php echo Template('actionbar') ?>
+ <?php echo Template('tags') ?>
+ <?php } ?>
</div>
<div id="footer"><?php // for top & bottom toolbars stylesheet ?>
<?php echo Template('browse-footer') ?>
</div>
<div id="bottom">
- <?php echo Template('bottom') ?>
+ <?php echo Template('bottom') ?>
</div>
</div>
</body>
Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -3,7 +3,7 @@
<div id="f-poweredbyico"><a href="http://www.phpwiki.fr/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div>
<ul id="f-list">
<li id="f-lastmod"> <?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?> </li>
-
+
<li id="f-copyright">All text is available under the terms of the <a class="internal" href="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation License</a> (see <b>
<?php if ($request->_dbi->isWikiPage(_("Copyrights"))) { ?>
<?php echo WikiLink(_("Copyrights")) ?>
Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/MonoBook/templates/navbar.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -25,17 +25,17 @@
<div class="pBody">
<?php echo Template("search",
array('SEARCH_BEFORE' => WikiLink(_("FindPage"), "",_("Find page")),
- 'SEARCH_AFTER' => HTML::input(array('id' => 'searchGoButton',
- 'type'=>'submit',
- 'value'=>_("Go"))))) ?>
+ 'SEARCH_AFTER' => HTML::input(array('id' => 'searchGoButton',
+ 'type'=>'submit',
+ 'value'=>_("Go"))))) ?>
<!-- <form action="<?php echo WikiURL(_("TitleSearch"))?>"
method="get" accept-charset="UTF-8">
<?php echo WikiLink(_("FindPage"), "searchButton",_("Search:")) ?>
<input type="hidden" name="auto_redirect" value="1" />
<input type="text" name="s" size="12" maxlength="256"
- title='<?php echo _("Quick Search")?>'
- onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
- onmouseout="window.status=''; return true;" />
+ title='<?php echo _("Quick Search")?>'
+ onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
+ onmouseout="window.status=''; return true;" />
</form>
-->
</div>
Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -26,7 +26,7 @@
<?php echo ActionButton("diff") ?>
<?php if ($user->isSignedIn()) { ?>
<?php echo ActionButton(_("WatchPage"), _("Watch"), false,
- array('title'=>_("Add/Remove this to/from the list of pages you're monitoring for changes")." [alt-l]")) ?>
+ array('title'=>_("Add/Remove this to/from the list of pages you're monitoring for changes")." [alt-l]")) ?>
<?php } ?>
</ul>
</div>
@@ -59,7 +59,7 @@
<?php echo ActionButton(_("PageDump")) ?>
<?php if (USECACHE) { ?>
<?php echo ActionButton(array('nocache' => 'purge'), _("PurgeHtmlCache"), $pagename,
- array('title'=>_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."))) ?>
+ array('title'=>_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."))) ?>
<?php }} ?>
</ul>
</div>
Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/Sidebar/templates/body.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -1,34 +1,34 @@
<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
<div id="global-wrapper">
<div id="column-content">
- <div id="content">
- <?php echo Template('top') ?>
- <div id="bodyContent">
- <?php echo $CONTENT ?>
+ <div id="content">
+ <?php echo Template('top') ?>
+ <div id="bodyContent">
+ <?php echo $CONTENT ?>
- <!-- end content -->
- <div class="visualClear"></div>
- </div>
- </div>
+ <!-- end content -->
+ <div class="visualClear"></div>
+ </div>
+ </div>
<?php if (!$WikiTheme->DUMP_MODE) { ?>
- <?php echo Template('logo') ?>
+ <?php echo Template('logo') ?>
<div id="footer"><?php // for top & bottom toolbars stylesheet ?>
<?php echo Template('browse-footer') ?>
</div>
<div id="bottom">
- <?php echo Template('bottom') ?>
+ <?php echo Template('bottom') ?>
</div>
</div>
<div id="column-one">
<?php if (ALLOW_ANON_USER or $user->isAuthenticated()) { ?>
- <?php echo Template('navbar') ?>
- <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>
- <?php echo Template('actionbar') ?>
- <?php } ?>
+ <?php echo Template('navbar') ?>
+ <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>
+ <?php echo Template('actionbar') ?>
+ <?php } ?>
<?php } // isAuthenticated ?>
- <?php if (empty($NOSIGNIN)) { ?>
- <?php echo Template('signin', array('NOFORM' => 0)) ?>
- <?php } ?>
+ <?php if (empty($NOSIGNIN)) { ?>
+ <?php echo Template('signin', array('NOFORM' => 0)) ?>
+ <?php } ?>
</div>
<?php } // !DUMP_MODE ?>
</div>
Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/Sidebar/templates/navbar.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -31,7 +31,7 @@
<div class="pBody">
<?php echo Template("search",
array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(_("FindPage")))*/,
- 'SEARCH_AFTER' => HTML::Raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" /> <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?>
+ 'SEARCH_AFTER' => HTML::Raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" /> <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?>
</div>
</div>
Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/Wordpress/templates/signin.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -33,19 +33,19 @@
</noscript>
<?php } else {
$SignInInput = HTML::input(array('type' => 'text',
- 'name' => "auth[userid]",
- 'size' => 12,
- 'maxlength' => 256,
- 'onchange' => "SignIn(this.form,false);"));
+ 'name' => "auth[userid]",
+ 'size' => 12,
+ 'maxlength' => 256,
+ 'onchange' => "SignIn(this.form,false);"));
$SignInInput->addTooltip(_("Enter your UserId to sign in"));
$userid = $user->getId();
if ($user->isSignedIn())
echo sprintf(_("You are signed but not authenticated as %s. "),
- asXml(HTML::a(array(
- 'href'=>'#',
- 'title' => sprintf(_("Click to authenticate as %s"),$userid),
- 'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
- $userid)));
+ asXml(HTML::a(array(
+ 'href'=>'#',
+ 'title' => sprintf(_("Click to authenticate as %s"),$userid),
+ 'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
+ $userid)));
?>
<script type="text/javascript"> <!--
function SignIn(form,userid) {
Modified: trunk/themes/blog/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/blog/templates/wikiblog.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/blog/templates/wikiblog.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -15,8 +15,8 @@
// we can't get the version.
if ($rev->get('mtime') != $BLOG_CTIME) {
$modified = HTML::small(array('class' => 'floatright'),
- fmt("Comment modified on %s by %s",
- $WikiTheme->formatDateTime($rev->get('mtime')),
+ fmt("Comment modified on %s by %s",
+ $WikiTheme->formatDateTime($rev->get('mtime')),
WikiLink($rev->get('author'))));
}
?>
Modified: trunk/themes/default/templates/categorypage.tmpl
===================================================================
--- trunk/themes/default/templates/categorypage.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/categorypage.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -30,7 +30,7 @@
$bpage = "~~[" . $PAGENAME . "]";
$initial_content = "\"This page is in the $bpage category. You must leave in at least one reference to $bpage in order for this page to be in the $bpage category. Otherwise, edit this text to describe your page.\"";
- $adder = "";
+ $adder = "";
$this->_printPlugin("<" . "?plugin-form CreatePage " . $adder . " initial_content=" . $initial_content . " ?" . ">");
?>
Modified: trunk/themes/default/templates/comment.tmpl
===================================================================
--- trunk/themes/default/templates/comment.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/comment.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -6,7 +6,7 @@
$buttons = HTML::small(array('class' => 'floatleft'),
Button('edit', false, $page));
if ($user->isAdmin())
- $buttons->pushContent($SEP, Button('remove', _("Remove Comment"), $page));
+ $buttons->pushContent($SEP, Button('remove', _("Remove Comment"), $page));
}
// This is a hack, but since we only have a fake PageRevision,
@@ -14,8 +14,8 @@
if ($rev->get('mtime') != $COMMENT_CTIME) {
$mtime = $WikiTheme->formatDateTime($rev->get('mtime'));
$modified = HTML::small(array('class' => 'floatright'),
- fmt("Modified on %s by %s",
- $mtime, $rev->get('author')));
+ fmt("Modified on %s by %s",
+ $mtime, $rev->get('author')));
}
?>
Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/login.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -14,9 +14,9 @@
if (DEBUG & _DEBUG_LOGIN) {
$t = sprintf(" DEBUG: ALLOW_ANON_EDIT = %s, ALLOW_BOGO_LOGIN = %s, ALLOW_USER_PASSWORDS = %s, ENABLE_PAGEPERM = %s, ",
- ALLOW_ANON_EDIT ? "true" : "false",
- ALLOW_BOGO_LOGIN ? "true" : "false",
- ALLOW_USER_PASSWORDS ? "true" : "false",
+ ALLOW_ANON_EDIT ? "true" : "false",
+ ALLOW_BOGO_LOGIN ? "true" : "false",
+ ALLOW_USER_PASSWORDS ? "true" : "false",
ENABLE_PAGEPERM ? "true" : "false");
if (ALLOW_USER_PASSWORDS) {
if ($fail_message) { // add for each method the exact failing reason.
@@ -27,7 +27,7 @@
$t .= " ($fail)";
}
} else
- $t .= sprintf(" USER_AUTH_ORDER: %s", join(" => ", $GLOBALS['USER_AUTH_ORDER']));
+ $t .= sprintf(" USER_AUTH_ORDER: %s", join(" => ", $GLOBALS['USER_AUTH_ORDER']));
$t .= sprintf(", USER_AUTH_POLICY: %s", USER_AUTH_POLICY)
. sprintf(", PASSWORD_LENGTH_MINIMUM: %s", PASSWORD_LENGTH_MINIMUM);
}
Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/navbar.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -12,7 +12,7 @@
<?php } ?>
<?php echo WikiLink(_("RecentChanges"), "button") ?>
<?php echo $SEP?><?php echo Template('search',
- array('SEARCH_BEFORE' => HTML::Button(_("FindPage"))))
+ 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"))
Modified: trunk/themes/default/templates/online.tmpl
===================================================================
--- trunk/themes/default/templates/online.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/online.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -18,13 +18,13 @@
<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 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">
<?php echo fmt("In total there are %d user sessions online. :: Unique %d Registered and %d Guests",
- $NUM_ONLINE,$NUM_REGISTERED,$NUM_GUESTS) ?><br />
+ $NUM_ONLINE,$NUM_REGISTERED,$NUM_GUESTS) ?><br />
<?php echo $MAX_ONLINE_NUM ? fmt("Most users ever online was %d at %s.",$MAX_ONLINE_NUM,$MAX_ONLINE_TIME) : '' ?><br />
<?php echo fmt("Registered Users Online: ") ?>
<?php
Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/signin.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -25,19 +25,19 @@
<noscript><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></noscript>
<?php } else {
$SignInInput = HTML::input(array('type' => 'text',
- 'name' => "auth[userid]",
- 'size' => 12,
- 'maxlength' => 256,
- 'onchange' => "SignIn(this.form,false);"));
+ 'name' => "auth[userid]",
+ 'size' => 12,
+ 'maxlength' => 256,
+ 'onchange' => "SignIn(this.form,false);"));
$SignInInput->addTooltip(_("Enter your UserId to sign in"));
$userid = $user->getId();
if ($user->isSignedIn()) {
echo sprintf(_("You are signed but not authenticated as %s. "),
- asXml(HTML::a(array(
- 'href'=>'#',
- 'title' => sprintf(_("Click to authenticate as %s"),$userid),
- 'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
- $userid)));
+ asXml(HTML::a(array(
+ 'href'=>'#',
+ 'title' => sprintf(_("Click to authenticate as %s"),$userid),
+ 'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
+ $userid)));
}
$editing_policy = (defined('EDITING_POLICY') and $request->_dbi->isWikiPage(EDITING_POLICY));
$SignInJS = JavaScript('
Modified: trunk/themes/default/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/default/templates/wikiblog.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/default/templates/wikiblog.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -14,8 +14,8 @@
// we can't get the version.
if ($rev->get('mtime') != $BLOG_CTIME) {
$modified = HTML::small(array('class' => 'floatright'),
- fmt("Modified on %s by %s",
- $WikiTheme->formatDateTime($rev->get('mtime')),
+ fmt("Modified on %s by %s",
+ $WikiTheme->formatDateTime($rev->get('mtime')),
WikiLink($rev->get('author'))));
}
?>
Modified: trunk/themes/smaller/templates/signin.tmpl
===================================================================
--- trunk/themes/smaller/templates/signin.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/smaller/templates/signin.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -25,10 +25,10 @@
<noscript><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></noscript>
<?php } else {
$SignInInput = HTML::input(array('type' => 'text',
- 'name' => "auth[userid]",
- 'size' => 12,
- 'maxlength' => 256,
- 'onchange' => "SignIn(this.form,false);"));
+ 'name' => "auth[userid]",
+ 'size' => 12,
+ 'maxlength' => 256,
+ 'onchange' => "SignIn(this.form,false);"));
if ($user->isSignedIn()) { // cookie
$SignInInput->setAttr('value', $user->getId());
}
Modified: trunk/themes/wikilens/templates/categorypage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/categorypage.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/wikilens/templates/categorypage.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -14,19 +14,19 @@
<br/>
<?php
if ($SHOWBUDS){
- $btn = Button(array('exclude' => "$EXCLUDE",
- 'category' => "$PAGENAME",
- 'showbuds' => false),
- _("Hide Buddy Ratings in the $SINGULAR category"),
- $PAGENAME);
+ $btn = Button(array('exclude' => "$EXCLUDE",
+ 'category' => "$PAGENAME",
+ 'showbuds' => false),
+ _("Hide Buddy Ratings in the $SINGULAR category"),
+ $PAGENAME);
} else {
$btn = Button(array('exclude' => "$EXCLUDE",
- 'category' => "$PAGENAME",
+ 'category' => "$PAGENAME",
'showbuds' => true),
_("Show Buddy Ratings in the $SINGULAR category"),
- $PAGENAME);
+ $PAGENAME);
}
?>
<?php echo $btn ?>
@@ -55,7 +55,7 @@
$bpage = "~~[" . $PAGENAME . "]";
$initial_content = "\"This page is in the $bpage category. You must leave in at least one reference to $bpage in order for this page to be in the $bpage category. Otherwise, edit this text to describe your page.\"";
- $adder = "";
+ $adder = "";
$this->_printPlugin("<" . "?plugin-form CreatePage " . $adder . " initial_content=" . $initial_content . " ?" . ">");
?>
Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl 2014-09-18 14:20:25 UTC (rev 9092)
+++ trunk/themes/wikilens/templates/navbar.tmpl 2014-09-18 14:21:42 UTC (rev 9093)
@@ -15,7 +15,7 @@
<?php } ?>
<?php echo WikiLink(_("RecentChanges"), "button") ?>
<?php echo $NSEP?><?php echo Template('search',
- array('SEARCH_BEFORE' => HTML::Button(_("FindPage"))))
+ array('SEARCH_BEFORE' => HTML::Button(_("FindPage"))))
?><?php if (!empty($revision)) { ?>
<?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages"))
?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks"))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-09-22 08:39:10
|
Revision: 9105
http://sourceforge.net/p/phpwiki/code/9105
Author: vargenau
Date: 2014-09-22 08:39:06 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
Class "tablesorter" is not needed
Modified Paths:
--------------
trunk/themes/Crao/templates/bottom.tmpl
trunk/themes/blog/templates/bottom.tmpl
Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl 2014-09-19 17:20:07 UTC (rev 9104)
+++ trunk/themes/Crao/templates/bottom.tmpl 2014-09-22 08:39:06 UTC (rev 9105)
@@ -9,7 +9,6 @@
<script>
jQuery(document).ready(function()
{
- jQuery(".sortable").addClass("tablesorter");
jQuery(".sortable").tablesorter();
}
);
Modified: trunk/themes/blog/templates/bottom.tmpl
===================================================================
--- trunk/themes/blog/templates/bottom.tmpl 2014-09-19 17:20:07 UTC (rev 9104)
+++ trunk/themes/blog/templates/bottom.tmpl 2014-09-22 08:39:06 UTC (rev 9105)
@@ -12,7 +12,6 @@
<script>
jQuery(document).ready(function()
{
- jQuery(".sortable").addClass("tablesorter");
jQuery(".sortable").tablesorter();
}
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-09-26 12:30:02
|
Revision: 9122
http://sourceforge.net/p/phpwiki/code/9122
Author: vargenau
Date: 2014-09-26 12:29:57 +0000 (Fri, 26 Sep 2014)
Log Message:
-----------
Remove redundunt CSS
Modified Paths:
--------------
trunk/themes/Crao/crao.css
trunk/themes/MacOSX/MacOSX.css
trunk/themes/MonoBook/monobook.css
trunk/themes/Sidebar/sidebar.css
trunk/themes/Wordpress/Wordpress.css
trunk/themes/blog/Kubrick.css
trunk/themes/default/phpwiki.css
trunk/themes/fusionforge/fusionforge.css
trunk/themes/shamino_com/shamino_com.css
Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css 2014-09-26 09:23:38 UTC (rev 9121)
+++ trunk/themes/Crao/crao.css 2014-09-26 12:29:57 UTC (rev 9122)
@@ -335,7 +335,6 @@
}
blockquote.mail-style-quote {
- border-left: #FF9933; /* MODIFY-color */
margin: 0;
margin-bottom: 1em;
border: 1px solid #FF9933; /* MODIFY-color */
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css 2014-09-26 09:23:38 UTC (rev 9121)
+++ trunk/themes/MacOSX/MacOSX.css 2014-09-26 12:29:57 UTC (rev 9122)
@@ -875,7 +875,6 @@
.dialog div.message {
background-color: white;
color: black;
- color: black;
margin: 0 1em;
padding: 0.5em 0.5em;
}
@@ -969,7 +968,6 @@
padding: 0.5em;
float: right;
border: thin solid #888888;
- padding: 0.5em;
}
/* RssFeed */
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css 2014-09-26 09:23:38 UTC (rev 9121)
+++ trunk/themes/MonoBook/monobook.css 2014-09-26 12:29:57 UTC (rev 9122)
@@ -749,10 +749,6 @@
border-left: 1px solid #494f5d;
border-bottom: 1px solid #c6d2de;
border-right: 1px solid #c6d2de;
- padding-top: 1px;
- padding-bottom: 1px;
- padding-left: .125em;
- padding-right: .125em;
padding: 0;
clear: both;
}
@@ -1023,7 +1019,7 @@
.portlet h6 {
background-color: #ffae2e;
- border: 1px solid #2f6fab;
+ border: 1px #2f6fab;
border-style: solid solid none solid;
padding: 0 1em 0 1em;
text-transform: lowercase;
@@ -1061,7 +1057,6 @@
.portlet li {
padding: 0;
margin: 0 0 0 0;
- margin-bottom: 0;
}
/*
@@ -1102,7 +1097,6 @@
height: 86px;
width: 86px;
background: url("images/wiki_stamp.png") left no-repeat;
- background-repeat: no-repeat;
overflow: visible;
}
@@ -1252,7 +1246,6 @@
li#pt-login {
/*background: url('images/wikiuser.png') top left bottom no-repeat;*/
background: url('images/wikiuser.png') left no-repeat;
- background-repeat: no-repeat;
padding-left: 20px;
text-transform: none;
}
@@ -1336,7 +1329,6 @@
/* http://universaleditbutton.org */
#p-cactions li a#btn-edit {
background: url('images/UEB16.png') top left no-repeat;
- background-repeat: no-repeat;
padding-left: 20px !important;
text-transform: none;
}
@@ -1915,7 +1907,6 @@
padding: 0.5em;
float: right;
border: thin solid #888888;
- padding: 0.5em;
}
div#bottom {
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css 2014-09-26 09:23:38 UTC (rev 9121)
+++ trunk/themes/Sidebar/sidebar.css 2014-09-26 12:29:57 UTC (rev 9122)
@@ -1020,7 +1020,7 @@
.portlet h6 {
background-color: #ffae2e;
- border: 1px solid #2f6fab;
+ border: 1px #2f6fab;
border-style: solid solid none solid;
padding: 0 1em 0 1em;
/*text-transform: lowercase;*/
@@ -1056,7 +1056,6 @@
.portlet li {
padding: 0;
margin: 0 0 0 0;
- margin-bottom: 0;
}
/*
Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css 2014-09-26 09:23:38 UTC (rev 9121)
+++ trunk/themes/Wordpress/Wordpress.css 2014-09-26 12:29:57 UTC (rev 9122)
@@ -513,10 +513,6 @@
border-left: 1px solid #494f5d;
border-bottom: 1px solid #c6d2de;
border-right: 1px solid #c6d2de;
- padding-top: 1px;
- padding-bottom: 1px;
- padding-left: .125em;
- padding-right: .125em;
padding: 0;
clear: both;
}
@@ -860,7 +856,6 @@
.dialog div.message {
background-color: white;
color: black;
- color: black;
margin: 0 1em;
padding: 0.5em 0.5em;
}
@@ -958,7 +953,6 @@
padding: 0.5em;
float: right;
border: thin solid #888888;
- padding: 0.5em;
}
/* RssFeed */
Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css 2014-09-26 09:23:38 UTC (rev 9121)
+++ trunk/themes/blog/Kubrick.css 2014-09-26 12:29:57 UTC (rev 9122)
@@ -51,7 +51,6 @@
/* http://universaleditbutton.org */
div.actionbuttons a#btn-edit {
background: url('images/UEB16.png') bottom left no-repeat;
- background-repeat: no-repeat;
padding-left: 13px !important;
}
@@ -749,10 +748,6 @@
border-left: 1px solid #494f5d;
border-bottom: 1px solid #c6d2de;
border-right: 1px solid #c6d2de;
- padding-top: 1px;
- padding-bottom: 1px;
- padding-left: .125em;
- padding-right: .125em;
padding: 0;
clear: both;
}
@@ -855,7 +850,6 @@
padding: 0.5em;
float: right;
border: thin solid #888888;
- padding: 0.5em;
}
/* RssFeed */
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css 2014-09-26 09:23:38 UTC (rev 9121)
+++ trunk/themes/default/phpwiki.css 2014-09-26 12:29:57 UTC (rev 9122)
@@ -129,7 +129,6 @@
input#inp-openid {
background: url('images/openid.png') bottom left no-repeat;
- background-repeat: no-repeat;
padding-left: 18px !important;
}
@@ -561,10 +560,6 @@
border-left: 1px solid #494f5d;
border-bottom: 1px solid #c6d2de;
border-right: 1px solid #c6d2de;
- padding-top: 1px;
- padding-bottom: 1px;
- padding-left: .125em;
- padding-right: .125em;
padding: 0;
clear: both;
}
@@ -908,7 +903,6 @@
.dialog div.message {
background-color: white;
color: black;
- color: black;
margin: 0 1em;
padding: 0.5em 0.5em;
}
@@ -1006,7 +1000,6 @@
padding: 0.5em;
float: right;
border: thin solid #888888;
- padding: 0.5em;
}
/* RssFeed */
@@ -1219,7 +1212,6 @@
/* http://universaleditbutton.org */
div#actionbuttons a#btn-edit {
background: url('images/UEB16.png') bottom left no-repeat;
- background-repeat: no-repeat;
padding-left: 20px !important;
padding-right: 0.5em !important;
}
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css 2014-09-26 09:23:38 UTC (rev 9121)
+++ trunk/themes/fusionforge/fusionforge.css 2014-09-26 12:29:57 UTC (rev 9122)
@@ -1063,7 +1063,6 @@
.dialog div.message {
background-color: white;
color: black;
- color: black;
margin: 0 1em;
padding: 0.5em 0.5em;
}
Modified: trunk/themes/shamino_com/shamino_com.css
===================================================================
--- trunk/themes/shamino_com/shamino_com.css 2014-09-26 09:23:38 UTC (rev 9121)
+++ trunk/themes/shamino_com/shamino_com.css 2014-09-26 12:29:57 UTC (rev 9122)
@@ -317,7 +317,6 @@
padding: 0.5em;
float: right;
border: thin solid #888888;
- padding: 0.5em;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-09-26 14:39:43
|
Revision: 9125
http://sourceforge.net/p/phpwiki/code/9125
Author: vargenau
Date: 2014-09-26 14:39:38 +0000 (Fri, 26 Sep 2014)
Log Message:
-----------
Add PHPWIKI_VERSION in meta name generator
Modified Paths:
--------------
trunk/themes/Crao/templates/head.tmpl
trunk/themes/Sidebar/templates/htmldump.tmpl
trunk/themes/default/templates/dialog.tmpl
trunk/themes/default/templates/head.tmpl
trunk/themes/default/templates/htmldump.tmpl
trunk/themes/default/templates/redirect.tmpl
trunk/themes/wikilens/templates/head.tmpl
Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl 2014-09-26 14:22:08 UTC (rev 9124)
+++ trunk/themes/Crao/templates/head.tmpl 2014-09-26 14:39:38 UTC (rev 9125)
@@ -8,7 +8,7 @@
<?php if (!empty($PAGE_KEYWORDS)) { ?>
<meta name="keywords" content="<?php echo $PAGE_KEYWORDS?>" />
<?php } ?>
-<meta name="generator" content="PhpWiki" />
+<meta name="generator" content="PhpWiki <?php echo PHPWIKI_VERSION?>" />
<base href="<?php echo PHPWIKI_BASE_URL?>" />
<link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" />
<link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH ?>/highlight.js/styles/github.css"/>
Modified: trunk/themes/Sidebar/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/htmldump.tmpl 2014-09-26 14:22:08 UTC (rev 9124)
+++ trunk/themes/Sidebar/templates/htmldump.tmpl 2014-09-26 14:39:38 UTC (rev 9125)
@@ -20,7 +20,7 @@
<?php if (!empty($PAGE_KEYWORDS)) { ?>
<meta name="keywords" content="<?php echo $PAGE_KEYWORDS?>" />
<?php } ?>
-<meta name="generator" content="PhpWiki" />
+<meta name="generator" content="PhpWiki <?php echo PHPWIKI_VERSION?>" />
<?php if (!empty($relative_base)) { ?>
<base href="<?php echo $relative_base?>" />
Modified: trunk/themes/default/templates/dialog.tmpl
===================================================================
--- trunk/themes/default/templates/dialog.tmpl 2014-09-26 14:22:08 UTC (rev 9124)
+++ trunk/themes/default/templates/dialog.tmpl 2014-09-26 14:39:38 UTC (rev 9125)
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="robots" content="noindex, nofollow" />
-<meta name="generator" content="phpWiki" />
+<meta name="generator" content="PhpWiki <?php echo PHPWIKI_VERSION?>" />
<base href="<?php echo PHPWIKI_BASE_URL?>" />
<?php echo $WikiTheme->getCSS() ?>
<title><?php echo WIKI_NAME . ' - ' . _("Dialog")?></title>
Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl 2014-09-26 14:22:08 UTC (rev 9124)
+++ trunk/themes/default/templates/head.tmpl 2014-09-26 14:39:38 UTC (rev 9125)
@@ -12,7 +12,7 @@
<?php if (!empty($PAGE_KEYWORDS)) { ?>
<meta name="keywords" content="<?php echo $PAGE_KEYWORDS?>" />
<?php } ?>
-<meta name="generator" content="PhpWiki" />
+<meta name="generator" content="PhpWiki <?php echo PHPWIKI_VERSION?>" />
<base href="<?php echo PHPWIKI_BASE_URL?>" />
<link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" />
<link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH ?>/highlight.js/styles/github.css"/>
Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl 2014-09-26 14:22:08 UTC (rev 9124)
+++ trunk/themes/default/templates/htmldump.tmpl 2014-09-26 14:39:38 UTC (rev 9125)
@@ -20,7 +20,7 @@
<?php if (!empty($PAGE_KEYWORDS)) { ?>
<meta name="keywords" content="<?php echo $PAGE_KEYWORDS?>" />
<?php } ?>
-<meta name="generator" content="PhpWiki" />
+<meta name="generator" content="PhpWiki <?php echo PHPWIKI_VERSION?>" />
<?php if (!empty($relative_base)) { ?>
<base href="<?php echo $relative_base?>" />
Modified: trunk/themes/default/templates/redirect.tmpl
===================================================================
--- trunk/themes/default/templates/redirect.tmpl 2014-09-26 14:22:08 UTC (rev 9124)
+++ trunk/themes/default/templates/redirect.tmpl 2014-09-26 14:39:38 UTC (rev 9125)
@@ -8,7 +8,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="robots" content="noindex, nofollow" />
-<meta name="generator" content="PhpWiki" />
+<meta name="generator" content="PhpWiki <?php echo PHPWIKI_VERSION?>" />
<base href="<?php echo PHPWIKI_BASE_URL?>" />
<?php echo $WikiTheme->getCSS() ?>
<title><?php echo WIKI_NAME . ' - ' . _("Redirect")?></title>
Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl 2014-09-26 14:22:08 UTC (rev 9124)
+++ trunk/themes/wikilens/templates/head.tmpl 2014-09-26 14:39:38 UTC (rev 9125)
@@ -8,7 +8,7 @@
<?php if (!empty($PAGE_KEYWORDS)) { ?>
<meta name="keywords" content="<?php echo $PAGE_KEYWORDS?>" />
<?php } ?>
-<meta name="generator" content="PhpWiki" />
+<meta name="generator" content="PhpWiki <?php echo PHPWIKI_VERSION?>" />
<base href="<?php echo PHPWIKI_BASE_URL?>" />
<link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" />
<link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH ?>/highlight.js/styles/github.css"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-07 15:48:37
|
Revision: 9218
http://sourceforge.net/p/phpwiki/code/9218
Author: vargenau
Date: 2014-10-07 15:48:30 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
Fix CSS class named-wiki
Modified Paths:
--------------
trunk/themes/MacOSX/MacOSX.css
trunk/themes/default/phpwiki.css
trunk/themes/fusionforge/fusionforge.css
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css 2014-10-07 15:27:04 UTC (rev 9217)
+++ trunk/themes/MacOSX/MacOSX.css 2014-10-07 15:48:30 UTC (rev 9218)
@@ -833,7 +833,7 @@
padding: 0.2ex 0.5em;
}
-div.wikicomment div.wikicomment-footer named-wiki {
+div.wikicomment div.wikicomment-footer .named-wiki {
font-size: small;
}
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css 2014-10-07 15:27:04 UTC (rev 9217)
+++ trunk/themes/default/phpwiki.css 2014-10-07 15:48:30 UTC (rev 9218)
@@ -123,8 +123,7 @@
/* for the login template */
div#browse {
margin-top: 1px;
- margin-bottom: 0.5px;
- /*background: #dddddd;*/
+ margin-bottom: 1px;
}
input#inp-openid {
@@ -861,7 +860,7 @@
padding: 0.2ex 0.5em;
}
-div.wikicomment div.wikicomment-footer named-wiki {
+div.wikicomment div.wikicomment-footer .named-wiki {
font-size: small;
}
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css 2014-10-07 15:27:04 UTC (rev 9217)
+++ trunk/themes/fusionforge/fusionforge.css 2014-10-07 15:48:30 UTC (rev 9218)
@@ -1021,7 +1021,7 @@
padding: 0.2ex 0.5em;
}
-div.wikicomment div.wikicomment-footer named-wiki {
+div.wikicomment div.wikicomment-footer .named-wiki {
font-size: small;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-10 08:43:57
|
Revision: 9241
http://sourceforge.net/p/phpwiki/code/9241
Author: vargenau
Date: 2014-10-10 08:43:49 +0000 (Fri, 10 Oct 2014)
Log Message:
-----------
Add warning_msg as synonym of warning
Modified Paths:
--------------
trunk/themes/MonoBook/monobook.css
trunk/themes/Sidebar/sidebar.css
trunk/themes/Wordpress/Wordpress.css
trunk/themes/default/phpwiki.css
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css 2014-10-10 08:22:57 UTC (rev 9240)
+++ trunk/themes/MonoBook/monobook.css 2014-10-10 08:43:49 UTC (rev 9241)
@@ -1926,7 +1926,7 @@
clear: both;
}
-.warning {
+.warning, .warning_msg {
color: black;
background-color: #eee;
margin-top: 1em;
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css 2014-10-10 08:22:57 UTC (rev 9240)
+++ trunk/themes/Sidebar/sidebar.css 2014-10-10 08:43:49 UTC (rev 9241)
@@ -1955,7 +1955,7 @@
clear: both;
}
-.warning {
+.warning, .warning_msg {
color: black;
background-color: #FFCCCC;
margin-top: 1em;
Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css 2014-10-10 08:22:57 UTC (rev 9240)
+++ trunk/themes/Wordpress/Wordpress.css 2014-10-10 08:43:49 UTC (rev 9241)
@@ -620,7 +620,7 @@
clear: both;
}
-.warning {
+.warning, .warning_msg {
color: black;
background: #eee;
margin-top: 1em;
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css 2014-10-10 08:22:57 UTC (rev 9240)
+++ trunk/themes/default/phpwiki.css 2014-10-10 08:43:49 UTC (rev 9241)
@@ -666,7 +666,7 @@
clear: both;
}
-.warning {
+.warning, .warning_msg {
color: black;
background: #eee;
margin-top: 1em;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-10-25 15:25:45
|
Revision: 9277
http://sourceforge.net/p/phpwiki/code/9277
Author: vargenau
Date: 2014-10-25 15:25:42 +0000 (Sat, 25 Oct 2014)
Log Message:
-----------
wikipaging is too small
Modified Paths:
--------------
trunk/themes/MonoBook/monobook.css
trunk/themes/Sidebar/sidebar.css
trunk/themes/Wordpress/Wordpress.css
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css 2014-10-25 15:24:36 UTC (rev 9276)
+++ trunk/themes/MonoBook/monobook.css 2014-10-25 15:25:42 UTC (rev 9277)
@@ -1891,10 +1891,6 @@
color: black;
}
-.wikipaging {
- font-size: 80%
-}
-
.wikipaging-disabled {
color: #999
}
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css 2014-10-25 15:24:36 UTC (rev 9276)
+++ trunk/themes/Sidebar/sidebar.css 2014-10-25 15:25:42 UTC (rev 9277)
@@ -1918,10 +1918,6 @@
color: black;
}
-.wikipaging {
- font-size: 80%
-}
-
.wikipaging-disabled {
color: #999
}
Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css 2014-10-25 15:24:36 UTC (rev 9276)
+++ trunk/themes/Wordpress/Wordpress.css 2014-10-25 15:25:42 UTC (rev 9277)
@@ -323,10 +323,6 @@
color: black;
}
-.wikipaging {
- font-size: x-small;
-}
-
.toolbar {
padding: 0;
margin: 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-05 15:30:19
|
Revision: 9282
http://sourceforge.net/p/phpwiki/code/9282
Author: vargenau
Date: 2014-11-05 15:30:15 +0000 (Wed, 05 Nov 2014)
Log Message:
-----------
Add labels
Modified Paths:
--------------
trunk/themes/default/templates/userprefs.tmpl
trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2014-11-03 14:33:29 UTC (rev 9281)
+++ trunk/themes/default/templates/userprefs.tmpl 2014-11-05 15:30:15 UTC (rev 9282)
@@ -17,8 +17,9 @@
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,
'maxlength' => 6,
'name' => "pref[timeOffset]",
@@ -28,29 +29,35 @@
$timeOffsetInput = $pref->get('timeOffset');
$OwnModificationsCB = HTML::input(array('type' => 'checkbox',
+ 'id' => 'ownModifications',
'name' => 'pref[ownModifications]',
'value' => '1',
'checked' => (bool) $pref->get('ownModifications')));
$MajorModificationsOnlyCB = HTML::input(array('type' => 'checkbox',
+ 'id' => 'majorModificationsOnly',
'name' => 'pref[majorModificationsOnly]',
'value' => '1',
'checked' => (bool) $pref->get('majorModificationsOnly')));
$RelativeDatesCB = HTML::input(array('type' => 'checkbox',
+ 'id' => 'relativeDates',
'name' => 'pref[relativeDates]',
'value' => '1',
'checked' => (bool) $pref->get('relativeDates')));
$NoLinkIconsCB = HTML::input(array('type' => 'checkbox',
- 'name' => 'pref[noLinkIcons]',
- 'value' => '1',
- 'checked' => (bool) $pref->get('noLinkIcons')));
+ 'id' => 'noLinkIcons',
+ 'name' => 'pref[noLinkIcons]',
+ 'value' => '1',
+ 'checked' => (bool) $pref->get('noLinkIcons')));
$GoogleLinkCB = HTML::input(array('type' => 'checkbox',
- 'name' => 'pref[googleLink]',
- 'value' => '1',
- 'checked' => (bool) $pref->get('googleLink')));
+ 'id' => 'googleLink',
+ 'name' => 'pref[googleLink]',
+ 'value' => '1',
+ 'checked' => (bool) $pref->get('googleLink')));
$DoubleClickCB = HTML::input(array('type' => 'checkbox',
- 'name' => 'pref[doubleClickEdit]',
- 'value' => '1',
- 'checked' => (bool) $pref->get('doubleClickEdit')));
+ 'id' => 'doubleClickEdit',
+ 'name' => 'pref[doubleClickEdit]',
+ '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");
@@ -119,7 +126,7 @@
<?php echo fmt("User preferences for user %s", WikiLink($user->UserName())) ?>
<?php if ($isForm) { ?>
-<form action="<?php echo $request->getPostURL()?>" method="post">
+<form action="<?php echo $request->getPostURL() ?>" method="post">
<?php } else {
$fill = " ";
// See also plugin DebugAuthInfo
@@ -173,15 +180,19 @@
</td><td><p class="hint"><?php echo _("Note, that user accounts with bouncing e-mails will be disabled.")?></p></td></tr>
<tr><td colspan="2">
- <?php echo _("Get an e-mail notification at changes of the following pages:")?>
+ <?php echo _("Get an e-mail notification at changes of the following pages:") ?>
</td></tr>
<tr>
<?php if ($isForm) { ?>
- <td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td>
- <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td>
+ <td>
+ <label for="notifyPages">
+ <textarea id="notifyPages" name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages') ?></textarea>
+ </label>
+ </td>
+ <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.") ?></p></td>
<?php } else { ?>
- <td><?php echo $pref->get('notifyPages')?></td>
+ <td colspan="2"><?php echo $pref->get('notifyPages') ?></td>
<?php } ?>
</tr>
@@ -189,11 +200,13 @@
<td>
<p class="nowrap">
<?php echo $OwnModificationsCB ?>
- <?php echo _("Do not send my own modifications")?>
+ <label for="ownModifications">
+ <?php echo _("Do not send my own modifications") ?>
+ </label>
</p>
</td>
<td>
- <p class="hint"><?php echo _("Check if you do not want to be notified of your own modifications.")?></p>
+ <p class="hint"><?php echo _("Check if you do not want to be notified of your own modifications.") ?></p>
</td>
</tr>
@@ -201,86 +214,119 @@
<td>
<p class="nowrap">
<?php echo $MajorModificationsOnlyCB ?>
- <?php echo _("Do not send minor modifications")?>
+ <label for="majorModificationsOnly">
+ <?php echo _("Do not send minor modifications") ?>
+ </label>
</p>
</td>
<td>
- <p class="hint"><?php echo _("Check if you do not want to be notified of minor modifications.")?></p>
+ <p class="hint"><?php echo _("Check if you do not want to be notified of minor modifications.") ?></p>
</td>
</tr>
- <tr><td colspan="2"><h2><?php echo _("Appearance")?></h2></td></tr>
+ <tr><td colspan="2"><h2><?php echo _("Appearance") ?></h2></td></tr>
<tr><td colspan="2"><?php echo _("Here you can override site-specific default values.") ?></td></tr>
- <?php /* Alternatively this could be done with <fieldset> and <legend>. */ ?>
- <tr><td>
+ <tr>
+ <td>
<?php echo $SelectThemesDesc?>
<?php echo $SelectThemes ?>
</td>
- <td><p class="hint"><?php echo _("System default:")?> <?php echo THEME ?></p></td></tr>
- <tr><td>
+ <td><p class="hint"><?php echo _("System default:") ?> <?php echo THEME ?></p></td></tr>
+ <tr>
+ <td>
<?php echo $SelectLanguagesDesc?>
<?php echo $SelectLanguages ?>
</td>
- <td><p class="hint"><?php echo _("System default:")?> <?php echo DEFAULT_LANGUAGE ?></p></td></tr>
- <tr><td>
- <?php echo $NoLinkIconsCB?>
- <?php echo fmt("Hide %s", WikiLink("Help:LinkIcons"))?>
+ <td><p class="hint"><?php echo _("System default:") ?> <?php echo DEFAULT_LANGUAGE ?></p></td></tr>
+ <tr>
+ <td>
+ <p class="nowrap">
+ <?php echo $NoLinkIconsCB ?>
+ <label for="noLinkIcons">
+ <?php echo fmt("Hide %s", WikiLink("Help:LinkIcons")) ?>
+ </label>
+ </p>
</td>
<td><p class="hint"><?php echo _("Hide or show LinkIcons (if supported by the current theme). Useful for text-only browsers or slow connections.")?></p></td></tr>
- <tr><td>
- <?php echo $GoogleLinkCB?>
- <?php echo fmt("Add %s", WikiLink("Help:GoogleLink"))?>
+ <tr>
+ <td>
+ <p class="nowrap">
+ <?php echo $GoogleLinkCB ?>
+ <label for="googleLink">
+ <?php echo fmt("Add %s", WikiLink("Help:GoogleLink")) ?>
+ </label>
+ </p>
</td>
- <td><p class="hint"><?php echo fmt("Add Google links to unknown pages behind the '?', and the create action behind the pagename instead. See %s.", WikiLink("MeatBall:GooglePrompt"))?></p></td></tr>
- <tr><td>
+ <td><p class="hint"><?php echo fmt("Add Google links to unknown pages behind the '?', and the create action behind the pagename instead. See %s.", WikiLink("MeatBall:GooglePrompt")) ?></p></td>
+ </tr>
+ <tr>
+ <td>
<?php echo $DoubleClickCB?>
- <?php echo fmt("Enable DoubleClick Edit")?>
+ <?php echo fmt("Enable DoubleClick Edit") ?>
</td>
- <td><p class="hint"><?php echo fmt("Enabled makes it hard to double-click words and sentences for cut and paste. See %s.", WikiLink("PhpWiki:DoubleClickToEditPage"))?></p></td></tr>
+ <td><p class="hint"><?php echo fmt("Enabled makes it hard to double-click words and sentences for cut and paste. See %s.", WikiLink("PhpWiki:DoubleClickToEditPage"))?></p>
+ </td>
+ </tr>
- <tr><td colspan="2"><h2><?php echo _("Edit Area Size")?></h2></td></tr>
+ <tr><td colspan="2"><h2><?php echo _("Edit Area Size") ?></h2></td></tr>
<tr><td>
- <?php echo _("Height") . _(":")?>
<?php if ($isForm) { ?>
- <input type="text" name="pref[editHeight]" size="4" maxlength="4" class="numeric"
- value="<?php echo $pref->get('editHeight')?>" />
+ <label for="height">
+ <?php } ?>
+ <?php echo _("Height") . _(":") ?>
+ <?php if ($isForm) { ?>
+ </label>
+ <input id="height" type="text" name="pref[editHeight]" size="4" maxlength="4" class="numeric"
+ value="<?php echo $pref->get('editHeight') ?>" />
<?php } else { ?>
- <?php echo $pref->get('editHeight')?>
+ <?php echo $pref->get('editHeight') ?>
<?php } ?>
- <?php echo _("Width") . _(":")?>
<?php if ($isForm) { ?>
- <input type="text" name="pref[editWidth]" size="4" maxlength="4" class="numeric"
- value="<?php echo $pref->get('editWidth')?>" />
+ <label for="width">
+ <?php } ?>
+ <?php echo _("Width") . _(":") ?>
+ <?php if ($isForm) { ?>
+ </label>
+ <input id="width" type="text" name="pref[editWidth]" size="4" maxlength="4" class="numeric"
+ value="<?php echo $pref->get('editWidth') ?>" />
<?php } else { ?>
- <?php echo $pref->get('editWidth')?>
+ <?php echo $pref->get('editWidth') ?>
<?php } ?>
</td>
<td><p class="hint">
- <?php echo _("Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored.")?></p>
+ <?php echo _("Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored.") ?></p>
</td></tr>
<tr><td colspan="2"><h2><?php echo _("Time Zone")?></h2></td></tr>
- <tr><td><p>
- <?php echo fmt("Add %s hours to the server's local time when reporting times.",
- $timeOffsetInput)?>
- </p></td><td>
- <p class="hint">
- <?php echo fmt("The current time at the server is %s.",
- HTML::strong($WikiTheme->formatDateTime($serverTime)))?>
- <?php echo fmt("With the current offset, this would be reported as %s.",
- HTML::strong($WikiTheme->formatDateTime($time)))?>
- </p>
- </td></tr>
+ <tr>
+ <td>
+ <p>
+ <label for="timeOffsetInput">
+ <?php echo fmt("Add %s hours to the server's local time when reporting times.", $timeOffsetInput) ?>
+ </label>
+ </p>
+ </td>
+ <td>
+ <p class="hint">
+ <?php echo fmt("The current time at the server is %s.",
+ HTML::strong($WikiTheme->formatDateTime($serverTime))) ?>
+ <?php echo fmt("With the current offset, this would be reported as %s.",
+ HTML::strong($WikiTheme->formatDateTime($time))) ?>
+ </p>
+ </td>
+ </tr>
- <tr><td colspan="2"><h2><?php echo _("Date Format")?></h2></td></tr>
+ <tr><td colspan="2"><h2><?php echo _("Date Format") ?></h2></td></tr>
<tr><td colspan="2">
<p>
<?php echo $RelativeDatesCB ?>
- <?php echo _("Show relative dates using 'Today' and 'Yesterday'")?>
+ <label for="relativeDates">
+ <?php echo _("Show relative dates using 'Today' and 'Yesterday'") ?>
+ </label>
</p>
</td></tr>
</table>
@@ -288,9 +334,9 @@
<?php if ($isForm) { ?>
<hr />
<p>
- <?php echo Button("submit:", _("Update Preferences"), 'wikiadmin')?>
- <?php echo Button("submit:delete", _("Reset Preferences"), 'wikiadmin')?>
- <?php echo Button("submit:cancel", _("Cancel"), 'button')?>
+ <?php echo Button("submit:", _("Update Preferences"), 'wikiadmin') ?>
+ <?php echo Button("submit:delete", _("Reset Preferences"), 'wikiadmin') ?>
+ <?php echo Button("submit:cancel", _("Cancel"), 'button') ?>
<?php echo HiddenInputs($request->getArgs(), false, array('pref')) ?>
</p>
</form>
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl 2014-11-03 14:33:29 UTC (rev 9281)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl 2014-11-05 15:30:15 UTC (rev 9282)
@@ -17,8 +17,9 @@
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,
'maxlength' => 6,
'name' => "pref[timeOffset]",
@@ -28,93 +29,115 @@
$timeOffsetInput = $pref->get('timeOffset');
$OwnModificationsCB = HTML::input(array('type' => 'checkbox',
+ 'id' => 'ownModifications',
'name' => 'pref[ownModifications]',
'value' => '1',
'checked' => (bool) $pref->get('ownModifications')));
$MajorModificationsOnlyCB = HTML::input(array('type' => 'checkbox',
+ 'id' => 'majorModificationsOnly',
'name' => 'pref[majorModificationsOnly]',
'value' => '1',
'checked' => (bool) $pref->get('majorModificationsOnly')));
$DiffMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'diffMenuItem',
'name' => 'pref[diffMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('diffMenuItem')));
$PageInfoMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'pageInfoMenuItem',
'name' => 'pref[pageInfoMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('pageInfoMenuItem')));
$PDFMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'pdfMenuItem',
'name' => 'pref[pdfMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('pdfMenuItem')));
$ChownMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'chownMenuItem',
'name' => 'pref[chownMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('chownMenuItem')));
$SetaclMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'setaclMenuItem',
'name' => 'pref[setaclMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('setaclMenuItem')));
$RemoveMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'removeMenuItem',
'name' => 'pref[removeMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('removeMenuItem')));
$RenameMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'renameMenuItem',
'name' => 'pref[renameMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('renameMenuItem')));
$RevertMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'revertMenuItem',
'name' => 'pref[revertMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('revertMenuItem')));
$LockMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'lockMenuItem',
'name' => 'pref[lockMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('lockMenuItem')));
$BackLinksMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'backLinksMenuItem',
'name' => 'pref[backLinksMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('backLinksMenuItem')));
$WatchPageMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'watchPageMenuItem',
'name' => 'pref[watchPageMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('watchPageMenuItem')));
$RecentChangesMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'recentChangesMenuItem',
'name' => 'pref[recentChangesMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('recentChangesMenuItem')));
$RandomPageMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'randomPageMenuItem',
'name' => 'pref[randomPageMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('randomPageMenuItem')));
$LikePagesPageMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'likePagesMenuItem',
'name' => 'pref[likePagesMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('likePagesMenuItem')));
$SpecialPagesMenuItem = HTML::input(array('type' => 'checkbox',
+ 'id' => 'specialPagesMenuItem',
'name' => 'pref[specialPagesMenuItem]',
'value' => '1',
'checked' => (bool) $pref->get('specialPagesMenuItem')));
$RelativeDatesCB = HTML::input(array('type' => 'checkbox',
+ 'id' => 'relativeDates',
'name' => 'pref[relativeDates]',
'value' => '1',
'checked' => (bool) $pref->get('relativeDates')));
$PageTrailCB = HTML::input(array('type' => 'checkbox',
- 'name' => 'pref[pageTrail]',
- 'value' => '1',
- 'checked' => (bool) $pref->get('pageTrail')));
+ 'id' => 'pageTrail',
+ 'name' => 'pref[pageTrail]',
+ 'value' => '1',
+ 'checked' => (bool) $pref->get('pageTrail')));
$NoLinkIconsCB = HTML::input(array('type' => 'checkbox',
- 'name' => 'pref[noLinkIcons]',
- 'value' => '1',
- 'checked' => (bool) $pref->get('noLinkIcons')));
+ 'id' => 'noLinkIcons',
+ 'name' => 'pref[noLinkIcons]',
+ 'value' => '1',
+ 'checked' => (bool) $pref->get('noLinkIcons')));
$GoogleLinkCB = HTML::input(array('type' => 'checkbox',
- 'name' => 'pref[googleLink]',
- 'value' => '1',
- 'checked' => (bool) $pref->get('googleLink')));
+ 'id' => 'googleLink',
+ 'name' => 'pref[googleLink]',
+ 'value' => '1',
+ 'checked' => (bool) $pref->get('googleLink')));
$DoubleClickCB = HTML::input(array('type' => 'checkbox',
- 'name' => 'pref[doubleClickEdit]',
- 'value' => '1',
- 'checked' => (bool) $pref->get('doubleClickEdit')));
+ 'id' => 'doubleClickEdit',
+ 'name' => 'pref[doubleClickEdit]',
+ 'value' => '1',
+ 'checked' => (bool) $pref->get('doubleClickEdit')));
?>
<?php echo $errmsg ?>
@@ -123,25 +146,29 @@
</h2>
<?php if ($isForm) { ?>
-<form action="<?php echo $request->getPostURL()?>" method="post">
+<form action="<?php echo $request->getPostURL() ?>" method="post">
<?php } ?>
<fieldset style="margin-bottom: 1em;">
-<legend><strong><?php echo _("User preferences for this project")?></strong></legend>
+<legend><strong><?php echo _("User preferences for this project") ?></strong></legend>
<table class="fullwidth">
- <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
+ <tr><td colspan="2"><h3><?php echo _("E-mail Notification") ?></h3></td></tr>
<tr><td colspan="2">
- <?php echo _("Get an e-mail notification at changes of the following pages:")?>
+ <?php echo _("Get an e-mail notification at changes of the following pages:") ?>
</td></tr>
<tr>
<?php if ($isForm) { ?>
- <td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td>
- <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td>
+ <td>
+ <label for="notifyPages">
+ <textarea id="notifyPages" name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages') ?></textarea>
+ </label>
+ </td>
+ <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.") ?></p></td>
<?php } else { ?>
- <td colspan="2"><?php echo $pref->get('notifyPages')?></td>
+ <td colspan="2"><?php echo $pref->get('notifyPages') ?></td>
<?php } ?>
</tr>
@@ -149,23 +176,25 @@
</fieldset>
<fieldset style="margin-bottom: 1em;">
-<legend><strong><?php echo _("Global user preferences (for all projects)")?></strong></legend>
+<legend><strong><?php echo _("Global user preferences (for all projects)") ?></strong></legend>
<table class="fullwidth">
<tr>
- <td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td>
+ <td colspan="2"><h3><?php echo _("E-mail Notification") ?></h3></td>
</tr>
<tr>
<td>
<p class="nowrap">
<?php echo $OwnModificationsCB ?>
- <?php echo _("Do not send my own modifications")?>
+ <label for="ownModifications">
+ <?php echo _("Do not send my own modifications") ?>
+ </label>
</p>
</td>
<td>
- <p class="hint"><?php echo _("Check if you do not want to be notified of your own modifications.")?></p>
+ <p class="hint"><?php echo _("Check if you do not want to be notified of your own modifications.") ?></p>
</td>
</tr>
@@ -173,73 +202,115 @@
<td>
<p class="nowrap">
<?php echo $MajorModificationsOnlyCB ?>
- <?php echo _("Do not send minor modifications")?>
+ <label for="majorModificationsOnly">
+ <?php echo _("Do not send minor modifications") ?>
+ </label>
</p>
</td>
<td>
- <p class="hint"><?php echo _("Check if you do not want to be notified of minor modifications.")?></p>
+ <p class="hint"><?php echo _("Check if you do not want to be notified of minor modifications.") ?></p>
</td>
</tr>
- <tr><td colspan="2"><h3><?php echo _("Menus")?></h3></td></tr>
+ <tr><td colspan="2"><h3><?php echo _("Menus") ?></h3></td></tr>
<tr>
<td>
<fieldset>
- <legend><?php echo _("Top Menu")?></legend>
+ <legend><?php echo _("Top Menu") ?></legend>
<table>
<tr>
<td>
- <p class="nowrap"><?php echo $DiffMenuItem ?> <?php echo _("Last Difference")?></p>
+ <p class="nowrap">
+ <?php echo $DiffMenuItem ?>
+ <label for="diffMenuItem">
+ <?php echo _("Last Difference") ?>
+ </label>
+ </p>
</td>
</tr>
<tr>
<td>
- <p class="nowrap"><?php echo $RevertMenuItem ?> <?php echo _("Revert")?></p>
+ <p class="nowrap">
+ <?php echo $RevertMenuItem ?>
+ <label for="revertMenuItem">
+ <?php echo _("Revert") ?>
+ </label>
+ </p>
</td>
</tr>
<?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
<tr>
<td>
- <p class="nowrap"><?php echo $PDFMenuItem ?> <?php echo _("PDF")?></p>
+ <p class="nowrap">
+ <?php echo $PDFMenuItem ?>
+ <label for="pdfMenuItem">
+ <?php echo _("PDF") ?>
+ </label>
+ </p>
</td>
</tr>
<?php } ?>
<tr>
<td>
- <p class="nowrap"><?php echo $LockMenuItem ?> <?php echo _("Lock")?></p>
+ <p class="nowrap">
+ <?php echo $LockMenuItem ?>
+ <label for="lockMenuItem">
+ <?php echo _("Lock") ?>
+ </label>
+ </p>
</td>
</tr>
<tr>
<td>
- <p class="nowrap"><?php echo $ChownMenuItem ?> <?php echo _("Change Owner")?></p>
+ <p class="nowrap">
+ <?php echo $ChownMenuItem ?>
+ <label for="chownMenuItem">
+ <?php echo _("Change Owner") ?>
+ </label>
+ </p>
</td>
</tr>
<tr>
<td>
- <p class="nowrap"><?php echo $SetaclMenuItem ?> <?php echo _("Access Rights")?></p>
+ <p class="nowrap">
+ <?php echo $SetaclMenuItem ?>
+ <label for="setaclMenuItem">
+ <?php echo _("Access Rights") ?>
+ </label>
+ </p>
</td>
</tr>
</table>
</fieldset>
</td>
<td class="top">
- <p class="hint"><?php echo _("Check menu items to display.")?></p>
+ <p class="hint"><?php echo _("Check menu items to display.") ?></p>
</td>
</tr>
<tr>
<td class="top">
<fieldset>
- <legend><?php echo _("Left Menu")?></legend>
+ <legend><?php echo _("Left Menu") ?></legend>
<table>
<tr>
<td>
- <p class="nowrap"><?php echo $RandomPageMenuItem ?> <?php echo _("Random Page")?></p>
+ <p class="nowrap">
+ <?php echo $RandomPageMenuItem ?>
+ <label for="randomPageMenuItem">
+ <?php echo _("Random Page") ?>
+ </label>
+ </p>
</td>
</tr>
<tr>
<td>
- <p class="nowrap"><?php echo $LikePagesPageMenuItem ?> <?php echo _("Like Pages")?></p>
+ <p class="nowrap">
+ <?php echo $LikePagesPageMenuItem ?>
+ <label for="likePagesMenuItem">
+ <?php echo _("Like Pages") ?>
+ </label>
+ </p>
</td>
</tr>
</table>
@@ -249,79 +320,101 @@
</td>
</tr>
- <tr><td colspan="2"><h3><?php echo _("Appearance")?></h3></td></tr>
+ <tr><td colspan="2"><h3><?php echo _("Appearance") ?></h3></td></tr>
<tr><td colspan="2"><?php echo _("Here you can override site-specific default values.") ?></td></tr>
<tr>
<td>
<p class="nowrap">
- <?php echo $PageTrailCB?>
- <?php echo _("Show Page Trail")?>
+ <?php echo $PageTrailCB ?>
+ <label for="pageTrail">
+ <?php echo _("Show Page Trail") ?>
+ </label>
</p>
</td>
- <td><p class="hint"><?php echo _("Show Page Trail at top of page.")?></p></td>
+ <td><p class="hint"><?php echo _("Show Page Trail at top of page.") ?></p></td>
</tr>
<tr>
<td>
<p class="nowrap">
- <?php echo $NoLinkIconsCB?>
- <?php echo fmt("Hide %s", WikiLink("Help:LinkIcons"))?>
+ <?php echo $NoLinkIconsCB ?>
+ <label for="noLinkIcons">
+ <?php echo fmt("Hide %s", WikiLink("Help:LinkIcons")) ?>
+ </label>
</p>
</td>
- <td><p class="hint"><?php echo _("Hide or show LinkIcons.")?></p></td>
+ <td><p class="hint"><?php echo _("Hide or show LinkIcons.") ?></p></td>
</tr>
<tr>
<td>
<p class="nowrap">
- <?php echo $GoogleLinkCB?>
- <?php echo fmt("Add %s", WikiLink("Help:GoogleLink"))?>
+ <?php echo $GoogleLinkCB ?>
+ <label for="googleLink">
+ <?php echo fmt("Add %s", WikiLink("Help:GoogleLink")) ?>
+ </label>
</p>
</td>
- <td><p class="hint"><?php echo fmt("Add Google links to unknown pages behind the '?', and the create action behind the pagename instead. See %s.", WikiLink("MeatBall:GooglePrompt"))?></p></td>
+ <td><p class="hint"><?php echo fmt("Add Google links to unknown pages behind the '?', and the create action behind the pagename instead. See %s.", WikiLink("MeatBall:GooglePrompt")) ?></p></td>
</tr>
- <tr><td colspan="2"><h3><?php echo _("Edit Area Size")?></h3></td></tr>
+ <tr><td colspan="2"><h3><?php echo _("Edit Area Size") ?></h3></td></tr>
<tr><td>
- <?php echo _("Height") . _(":")?>
<?php if ($isForm) { ?>
- <input type="text" name="pref[editHeight]" size="4" maxlength="4" class="numeric"
- value="<?php echo $pref->get('editHeight')?>" />
+ <label for="height">
+ <?php } ?>
+ <?php echo _("Height") . _(":") ?>
+ <?php if ($isForm) { ?>
+ </label>
+ <input id="height" type="text" name="pref[editHeight]" size="4" maxlength="4" class="numeric"
+ value="<?php echo $pref->get('editHeight') ?>" />
<?php } else { ?>
- <?php echo $pref->get('editHeight')?>
+ <?php echo $pref->get('editHeight') ?>
<?php } ?>
- <?php echo _("Width") . _(":")?>
<?php if ($isForm) { ?>
- <input type="text" name="pref[editWidth]" size="4" maxlength="4" class="numeric"
- value="<?php echo $pref->get('editWidth')?>" />
+ <label for="width">
+ <?php } ?>
+ <?php echo _("Width") . _(":") ?>
+ <?php if ($isForm) { ?>
+ </label>
+ <input id="width" type="text" name="pref[editWidth]" size="4" maxlength="4" class="numeric"
+ value="<?php echo $pref->get('editWidth') ?>" />
<?php } else { ?>
- <?php echo $pref->get('editWidth')?>
+ <?php echo $pref->get('editWidth') ?>
<?php } ?>
</td>
<td><p class="hint">
- <?php echo _("Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored.")?></p>
+ <?php echo _("Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored.") ?></p>
</td></tr>
- <tr><td colspan="2"><h3><?php echo _("Time Zone")?></h3></td></tr>
+ <tr><td colspan="2"><h3><?php echo _("Time Zone") ?></h3></td></tr>
- <tr><td><p>
- <?php echo fmt("Add %s hours to the server's local time when reporting times.",
- $timeOffsetInput)?>
- </p></td><td>
- <p class="hint">
- <?php echo fmt("The current time at the server is %s.",
- HTML::strong($WikiTheme->formatDateTime($serverTime)))?>
- <?php echo fmt("With the current offset, this would be reported as %s.",
- HTML::strong($WikiTheme->formatDateTime($time)))?>
- </p>
- </td></tr>
+ <tr>
+ <td>
+ <p>
+ <label for="timeOffsetInput">
+ <?php echo fmt("Add %s hours to the server's local time when reporting times.", $timeOffsetInput) ?>
+ </label>
+ </p>
+ </td>
+ <td>
+ <p class="hint">
+ <?php echo fmt("The current time at the server is %s.",
+ HTML::strong($WikiTheme->formatDateTime($serverTime))) ?>
+ <?php echo fmt("With the current offset, this would be reported as %s.",
+ HTML::strong($WikiTheme->formatDateTime($time))) ?>
+ </p>
+ </td>
+ </tr>
- <tr><td colspan="2"><h3><?php echo _("Date Format")?></h3></td></tr>
+ <tr><td colspan="2"><h3><?php echo _("Date Format") ?></h3></td></tr>
<tr><td colspan="2">
<p>
<?php echo $RelativeDatesCB ?>
- <?php echo _("Show relative dates using 'Today' and 'Yesterday'")?>
+ <label for="relativeDates">
+ <?php echo _("Show relative dates using 'Today' and 'Yesterday'") ?>
+ </label>
</p>
</td></tr>
</table>
@@ -329,9 +422,9 @@
<?php if ($isForm) { ?>
<p>
- <?php echo Button("submit:", _("Update Preferences"), 'wikiadmin')?>
- <?php echo Button("submit:delete", _("Reset Preferences"), 'wikiadmin')?>
- <?php echo Button("submit:cancel", _("Cancel"), 'button')?>
+ <?php echo Button("submit:", _("Update Preferences"), 'wikiadmin') ?>
+ <?php echo Button("submit:delete", _("Reset Preferences"), 'wikiadmin') ?>
+ <?php echo Button("submit:cancel", _("Cancel"), 'button') ?>
<?php echo HiddenInputs($request->getArgs(), false, array('pref')) ?>
</p>
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-27 15:32:25
|
Revision: 9385
http://sourceforge.net/p/phpwiki/code/9385
Author: vargenau
Date: 2014-11-27 15:32:22 +0000 (Thu, 27 Nov 2014)
Log Message:
-----------
Add <label>
Modified Paths:
--------------
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/default/templates/info.tmpl
Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl 2014-11-26 13:47:32 UTC (rev 9384)
+++ trunk/themes/MonoBook/templates/info.tmpl 2014-11-27 15:32:22 UTC (rev 9385)
@@ -31,7 +31,7 @@
}
// Count words
preg_match_all('/\\w+\\W*/', $revision->_data['%content'], $whitespacematches);
-if (1 == $c = count_all($whitespacematches))
+if (1 == ($c = count_all($whitespacematches)))
$wordcount = fmt("1 word");
else
$wordcount = fmt("%s words", $c);
@@ -50,6 +50,7 @@
$LOCKED_CB = HTML::input(array('type' => 'checkbox',
'name' => 'edit[locked]',
+ 'id' => 'locked',
'disabled' => !$user->isadmin(),
'checked' => $page->get('locked')));
@@ -125,7 +126,7 @@
<?php if ($is_current) { ?>
<tr>
<td class="align-right"><?php echo $LOCKED_CB ?></td>
- <td class="pageinfo"><?php echo _("Locked")?></td>
+ <td class="pageinfo"><label for="locked"><?php echo _("Locked")?></label></td>
</tr>
<tr>
<td class="align-right pageinfo"><?php echo _("ACL type") . _(":") ?></td>
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2014-11-26 13:47:32 UTC (rev 9384)
+++ trunk/themes/default/templates/info.tmpl 2014-11-27 15:32:22 UTC (rev 9385)
@@ -36,6 +36,7 @@
$LOCKED_CB = HTML::input(array('type' => 'checkbox',
'name' => 'edit[locked]',
+ 'id' => 'locked',
'disabled' => !$user->isadmin(),
'checked' => $page->get('locked')));
@@ -112,7 +113,7 @@
<?php if ($is_current) { ?>
<tr>
<td class="align-right"><?php echo $LOCKED_CB ?></td>
- <td class="pageinfo"><?php echo _("Locked")?></td>
+ <td class="pageinfo"><label for="locked"><?php echo _("Locked")?></label></td>
</tr>
<?php if (ENABLE_EXTERNAL_PAGES) { ?>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-12-01 15:52:54
|
Revision: 9397
http://sourceforge.net/p/phpwiki/code/9397
Author: vargenau
Date: 2014-12-01 15:52:46 +0000 (Mon, 01 Dec 2014)
Log Message:
-----------
Fix CSS prefixes
Modified Paths:
--------------
trunk/themes/Sidebar/sidebar.css
trunk/themes/fusionforge/fusionforge.css
trunk/themes/smaller/phpwiki.css
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css 2014-12-01 14:46:35 UTC (rev 9396)
+++ trunk/themes/Sidebar/sidebar.css 2014-12-01 15:52:46 UTC (rev 9397)
@@ -1210,6 +1210,8 @@
border-style: solid;
border-color: #aaa #eee #eee #aaa;
-moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
}
/*
@@ -1801,7 +1803,7 @@
border: solid 1px silver;
padding: 4px;
margin: 1em;
- -moz-border-radius: 6px;
+ border-radius: 6px;
background-color: #f0f0f0;
}
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css 2014-12-01 14:46:35 UTC (rev 9396)
+++ trunk/themes/fusionforge/fusionforge.css 2014-12-01 15:52:46 UTC (rev 9397)
@@ -799,8 +799,6 @@
text-align: left;
background-repeat: no-repeat;
background-position: 10px;
- -moz-border-radius: 1em;
- -webkit-border-radius: 1em;
border-radius: 1em;
padding: 10px 10px 10px 50px;
}
Modified: trunk/themes/smaller/phpwiki.css
===================================================================
--- trunk/themes/smaller/phpwiki.css 2014-12-01 14:46:35 UTC (rev 9396)
+++ trunk/themes/smaller/phpwiki.css 2014-12-01 15:52:46 UTC (rev 9397)
@@ -19,8 +19,11 @@
background-color: #dddddd;
border: 0;
-moz-appearance: none;
+ -webkit-appearance: none;
-moz-box-sizing: content-box;
- -moz-border-radius: 0;
+ -webkit-box-sizing: content-box;
+ box-sizing: content-box;
+ border-radius: 0;
}
.wiki, .named-wiki {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-12-01 16:07:33
|
Revision: 9398
http://sourceforge.net/p/phpwiki/code/9398
Author: vargenau
Date: 2014-12-01 16:07:25 +0000 (Mon, 01 Dec 2014)
Log Message:
-----------
Restrict "speak: none" to "@media aural"
Modified Paths:
--------------
trunk/themes/MonoBook/monobook.css
trunk/themes/Sidebar/sidebar.css
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css 2014-12-01 15:52:46 UTC (rev 9397)
+++ trunk/themes/MonoBook/monobook.css 2014-12-01 16:07:25 UTC (rev 9398)
@@ -601,9 +601,14 @@
.hiddenStructure {
display: none;
- speak: none;
}
+@media aural {
+ .hiddenStructure {
+ speak: none;
+ }
+}
+
img.tex {
vertical-align: middle;
}
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css 2014-12-01 15:52:46 UTC (rev 9397)
+++ trunk/themes/Sidebar/sidebar.css 2014-12-01 16:07:25 UTC (rev 9398)
@@ -624,9 +624,14 @@
.hiddenStructure {
display: none;
- speak: none;
}
+@media aural {
+ .hiddenStructure {
+ speak: none;
+ }
+}
+
img.tex {
vertical-align: middle;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2015-01-12 10:05:53
|
Revision: 9463
http://sourceforge.net/p/phpwiki/code/9463
Author: vargenau
Date: 2015-01-12 10:05:48 +0000 (Mon, 12 Jan 2015)
Log Message:
-----------
HTML::Button --> HTML::button
Modified Paths:
--------------
trunk/themes/default/templates/navbar.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl 2015-01-12 09:53:40 UTC (rev 9462)
+++ trunk/themes/default/templates/navbar.tmpl 2015-01-12 10:05:48 UTC (rev 9463)
@@ -12,7 +12,7 @@
<?php } ?>
<?php echo WikiLink(_("RecentChanges"), "button") ?>
<?php echo $SEP?><?php echo Template('search',
- array('SEARCH_BEFORE' => HTML::Button(_("FindPage"))))
+ 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"))
Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl 2015-01-12 09:53:40 UTC (rev 9462)
+++ trunk/themes/wikilens/templates/navbar.tmpl 2015-01-12 10:05:48 UTC (rev 9463)
@@ -15,7 +15,7 @@
<?php } ?>
<?php echo WikiLink(_("RecentChanges"), "button") ?>
<?php echo $NSEP?><?php echo Template('search',
- array('SEARCH_BEFORE' => HTML::Button(_("FindPage"))))
+ array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
?><?php if (!empty($revision)) { ?>
<?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages"))
?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks"))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2015-01-12 11:40:55
|
Revision: 9465
http://sourceforge.net/p/phpwiki/code/9465
Author: vargenau
Date: 2015-01-12 10:13:52 +0000 (Mon, 12 Jan 2015)
Log Message:
-----------
SUBPAGE_SEPARATOR --> /
Modified Paths:
--------------
trunk/themes/Crao/templates/navbar.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl 2015-01-12 10:09:13 UTC (rev 9464)
+++ trunk/themes/Crao/templates/navbar.tmpl 2015-01-12 10:13:52 UTC (rev 9465)
@@ -26,7 +26,7 @@
$UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?>
<?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?><?php echo $SEP?>
Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl 2015-01-12 10:09:13 UTC (rev 9464)
+++ trunk/themes/default/templates/navbar.tmpl 2015-01-12 10:13:52 UTC (rev 9465)
@@ -25,11 +25,11 @@
<?php } ?>
<?php if (!empty($user)) { ?>
<?php
- /* Today's calendar page for the user, if the Calender subpage is defined. */
- $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR . _("Calendar");
- $dbi = $request->getDbh();
- if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time());
+ /* Today's calendar page for the user, if the Calender subpage is defined. */
+ $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
+ $dbi = $request->getDbh();
+ if ($dbi->isWikiPage($UserCalPageTitle)) {
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?>
<?php echo $SEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl 2015-01-12 10:09:13 UTC (rev 9464)
+++ trunk/themes/wikilens/templates/navbar.tmpl 2015-01-12 10:13:52 UTC (rev 9465)
@@ -15,7 +15,7 @@
<?php } ?>
<?php echo WikiLink(_("RecentChanges"), "button") ?>
<?php echo $NSEP?><?php echo Template('search',
- array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
+ array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
?><?php if (!empty($revision)) { ?>
<?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages"))
?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks"))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2015-01-15 14:06:21
|
Revision: 9479
http://sourceforge.net/p/phpwiki/code/9479
Author: vargenau
Date: 2015-01-15 14:06:13 +0000 (Thu, 15 Jan 2015)
Log Message:
-----------
Change template syntax to please Template engine
Modified Paths:
--------------
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/fusionforge/templates/editpage.tmpl
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2015-01-14 16:37:46 UTC (rev 9478)
+++ trunk/themes/Crao/templates/editpage.tmpl 2015-01-15 14:06:13 UTC (rev 9479)
@@ -21,7 +21,12 @@
<?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
<br class="clear-floats" />
<table class="fullwidth">
- <tr><td><?php if (isset($EDIT_TOOLBAR)) echo $EDIT_TOOLBAR ?></td>
+ <tr>
+ <td>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
+ </td>
<td class="align-right"><div id="editarea-size">
<?php echo _("Size")._(":") ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2015-01-14 16:37:46 UTC (rev 9478)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2015-01-15 14:06:13 UTC (rev 9479)
@@ -22,7 +22,12 @@
</tr>
</table>
<table class="fullwidth">
- <tr><td><?php echo $EDIT_TOOLBAR ?></td>
+ <tr>
+ <td>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
+ </td>
<td class="align-right"><div id="editarea-size">
<?php echo _("Size")._(":") ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2015-01-14 16:37:46 UTC (rev 9478)
+++ trunk/themes/default/templates/editpage.tmpl 2015-01-15 14:06:13 UTC (rev 9479)
@@ -21,10 +21,11 @@
<?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
<br class="clear-floats" />
<table class="fullwidth">
- <tr><td>
- <?php if (isset($EDIT_TOOLBAR)) { ?>
- <?php echo $EDIT_TOOLBAR ?>
- <?php } ?>
+ <tr>
+ <td>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
</td>
<td class="align-right"><div id="editarea-size">
<?php echo _("Size")._(":") ?>
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl 2015-01-14 16:37:46 UTC (rev 9478)
+++ trunk/themes/fusionforge/templates/editpage.tmpl 2015-01-15 14:06:13 UTC (rev 9479)
@@ -64,7 +64,12 @@
<?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
<br class="clear-floats" />
<table class="fullwidth">
- <tr><td><?php if (isset($EDIT_TOOLBAR)) echo $EDIT_TOOLBAR ?></td>
+ <tr>
+ <td>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
+ </td>
<td class="align-right"><div id="editarea-size">
<?php echo _("Size")._(":") ?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2015-01-28 16:38:05
|
Revision: 9499
http://sourceforge.net/p/phpwiki/code/9499
Author: vargenau
Date: 2015-01-28 16:37:54 +0000 (Wed, 28 Jan 2015)
Log Message:
-----------
Use smart quotes
Modified Paths:
--------------
trunk/themes/default/templates/userprefs.tmpl
trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2015-01-28 16:36:33 UTC (rev 9498)
+++ trunk/themes/default/templates/userprefs.tmpl 2015-01-28 16:37:54 UTC (rev 9499)
@@ -343,7 +343,7 @@
<p>
<?php echo $RelativeDatesCB ?>
<label for="relativeDates">
- <?php echo _("Show relative dates using 'Today' and 'Yesterday'") ?>
+ <?php echo _("Show relative dates using “Today” and “Yesterday”") ?>
</label>
</p>
</td></tr>
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl 2015-01-28 16:36:33 UTC (rev 9498)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl 2015-01-28 16:37:54 UTC (rev 9499)
@@ -413,7 +413,7 @@
<p>
<?php echo $RelativeDatesCB ?>
<label for="relativeDates">
- <?php echo _("Show relative dates using 'Today' and 'Yesterday'") ?>
+ <?php echo _("Show relative dates using “Today” and “Yesterday”") ?>
</label>
</p>
</td></tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2015-02-11 15:40:07
|
Revision: 9523
http://sourceforge.net/p/phpwiki/code/9523
Author: vargenau
Date: 2015-02-11 15:39:59 +0000 (Wed, 11 Feb 2015)
Log Message:
-----------
Check EDIT_TOOLBAR; add <br />; add HTML 5 required
Modified Paths:
--------------
trunk/themes/blog/templates/blogform.tmpl
trunk/themes/default/templates/blogform.tmpl
trunk/themes/fusionforge/templates/blogform.tmpl
Modified: trunk/themes/blog/templates/blogform.tmpl
===================================================================
--- trunk/themes/blog/templates/blogform.tmpl 2015-02-11 14:54:51 UTC (rev 9522)
+++ trunk/themes/blog/templates/blogform.tmpl 2015-02-11 15:39:59 UTC (rev 9523)
@@ -5,11 +5,14 @@
<input type="hidden" name="mode" value="add" />
<div class="wikiblog-form">
<?php echo _("Headline")._(": ") ?><br />
- <input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
+ <input id="wikiblog-summary" required="required" class="wikitext" type="text" style="width:540px" size="60"
maxlength="256" name="edit[summary]" value="" />
- <?php echo $EDIT_TOOLBAR ?>
+ <br />
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
<a id="editarea"></a>
- <textarea id="edit-content" class="edit-content" rows="8" style="width:540px"
+ <textarea id="edit-content" required="required" class="edit-content" rows="8" style="width:540px"
name="edit[content]"></textarea>
<br />
<input id="wikiblog-submit" type="submit" value="<?php echo _("Add Entry")?>"
Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl 2015-02-11 14:54:51 UTC (rev 9522)
+++ trunk/themes/default/templates/blogform.tmpl 2015-02-11 15:39:59 UTC (rev 9523)
@@ -5,11 +5,14 @@
<input type="hidden" name="mode" value="add" />
<div class="wikiblog-form">
<?php echo _("Headline")._(": ") ?><br />
- <input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
+ <input id="wikiblog-summary" required="required" class="wikitext" type="text" style="width:540px" size="60"
maxlength="256" name="edit[summary]" value="" />
- <?php echo $EDIT_TOOLBAR ?>
+ <br />
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
<a id="editarea"></a>
- <textarea id="edit-content" class="edit-content" rows="8" style="width:540px"
+ <textarea id="edit-content" required="required" class="edit-content" rows="8" style="width:540px"
name="edit[content]"></textarea>
<br />
<input id="wikiblog-submit" type="submit" value="<?php echo _("Add Entry")?>"
Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl 2015-02-11 14:54:51 UTC (rev 9522)
+++ trunk/themes/fusionforge/templates/blogform.tmpl 2015-02-11 15:39:59 UTC (rev 9523)
@@ -5,11 +5,14 @@
<input type="hidden" name="mode" value="add" />
<div class="wikiblog-form">
<?php echo _("Headline")._(": ") ?><br />
- <input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
+ <input id="wikiblog-summary" required="required" class="wikitext" type="text" style="width:540px" size="60"
maxlength="256" name="edit[summary]" value="" />
- <?php echo $EDIT_TOOLBAR ?>
+ <br />
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
<a id="editarea"></a>
- <textarea id="edit-content" class="edit-content" rows="8" cols="68" style="width:540px"
+ <textarea id="edit-content" required="required" class="edit-content" rows="8" cols="68" style="width:540px"
name="edit[content]"></textarea>
<br />
<input id="wikiblog-submit" type="submit" value="<?php echo _("Add Entry")?>"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2015-04-01 13:52:56
|
Revision: 9637
http://sourceforge.net/p/phpwiki/code/9637
Author: vargenau
Date: 2015-04-01 13:52:48 +0000 (Wed, 01 Apr 2015)
Log Message:
-----------
Move jscalendar from Sidebar to blog theme
Modified Paths:
--------------
trunk/themes/blog/themeinfo.php
Added Paths:
-----------
trunk/themes/blog/jscalendar/
trunk/themes/blog/templates/calendar.tmpl
Removed Paths:
-------------
trunk/themes/Sidebar/jscalendar/
trunk/themes/Sidebar/templates/calendar.tmpl
Deleted: trunk/themes/Sidebar/templates/calendar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/calendar.tmpl 2015-04-01 13:44:45 UTC (rev 9636)
+++ trunk/themes/Sidebar/templates/calendar.tmpl 2015-04-01 13:52:48 UTC (rev 9637)
@@ -1,13 +0,0 @@
-<div id="calendar"></div>
-<?php echo JavaScript('
-function dateChanged(calendar) {
- if (calendar.dateClicked) {
- var y = calendar.date.getFullYear();
- var m = calendar.date.getMonth() + 1; // integer, 0..11
- 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;
- }
-};
-Calendar.setup({flat : "calendar", flatCallback : dateChanged, setDateStatusFunc : dateStatusFunc, weekNumbers : false})') ?>
Copied: trunk/themes/blog/templates/calendar.tmpl (from rev 9635, trunk/themes/Sidebar/templates/calendar.tmpl)
===================================================================
--- trunk/themes/blog/templates/calendar.tmpl (rev 0)
+++ trunk/themes/blog/templates/calendar.tmpl 2015-04-01 13:52:48 UTC (rev 9637)
@@ -0,0 +1,13 @@
+<div id="calendar"></div>
+<?php echo JavaScript('
+function dateChanged(calendar) {
+ if (calendar.dateClicked) {
+ var y = calendar.date.getFullYear();
+ var m = calendar.date.getMonth() + 1; // integer, 0..11
+ 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;
+ }
+};
+Calendar.setup({flat : "calendar", flatCallback : dateChanged, setDateStatusFunc : dateStatusFunc, weekNumbers : false})') ?>
Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php 2015-04-01 13:44:45 UTC (rev 9636)
+++ trunk/themes/blog/themeinfo.php 2015-04-01 13:52:48 UTC (rev 9637)
@@ -42,16 +42,6 @@
$this->calendarInit();
}
- /* overload to load from Sidebar */
- function _findFile($file, $missing_okay = false)
- {
- if (file_exists($this->_path . "themes/" . $this->_name . "/$file"))
- return "themes/" . $this->_name . "/$file";
- if (file_exists($this->_path . "themes/Sidebar/$file"))
- return "themes/Sidebar/$file";
- return parent::_findFile($file, $missing_okay);
- }
-
/* Display up/down button with persistent state */
/* persistent state per block in cookie for 30 days */
function folderArrow($id, $init = 'Open')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2015-04-09 08:15:49
|
Revision: 9646
http://sourceforge.net/p/phpwiki/code/9646
Author: vargenau
Date: 2015-04-09 08:15:42 +0000 (Thu, 09 Apr 2015)
Log Message:
-----------
cursor: pointer for toolbar
Modified Paths:
--------------
trunk/themes/Crao/crao.css
trunk/themes/Hawaiian/Hawaiian.css
trunk/themes/MacOSX/MacOSX.css
trunk/themes/MonoBook/monobook.css
trunk/themes/Portland/portland.css
trunk/themes/Sidebar/sidebar.css
trunk/themes/SpaceWiki/SpaceWiki.css
trunk/themes/Wordpress/Wordpress.css
trunk/themes/blog/Kubrick.css
trunk/themes/default/phpwiki-modern.css
trunk/themes/default/phpwiki.css
trunk/themes/fusionforge/fusionforge.css
trunk/themes/shamino_com/shamino_com.css
trunk/themes/wikilens/wikilens.css
Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/Crao/crao.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -377,6 +377,10 @@
margin: 0;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
.edit-toolbar {
padding: 0;
margin: 0;
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/Hawaiian/Hawaiian.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -296,6 +296,10 @@
margin: 0;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
/* Prevent buttons from overlapping when wrapped */
#navbar, #actionbar {
line-height: 140%;
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/MacOSX/MacOSX.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -1106,6 +1106,10 @@
margin: 0.5ex 0;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
/* Link icons */
img.linkicon {
vertical-align: middle;
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/MonoBook/monobook.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -1165,8 +1165,8 @@
}
/*
-** the personal toolbar
-*/
+ ** the personal toolbar
+ */
#p-personal {
position: absolute;
@@ -1686,6 +1686,10 @@
margin-right: 0.33em;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
#editform .editOptions {
display: inline;
}
Modified: trunk/themes/Portland/portland.css
===================================================================
--- trunk/themes/Portland/portland.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/Portland/portland.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -77,6 +77,10 @@
/* --------------------------------------------------------------- */
+img.toolbar:hover {
+ cursor: pointer;
+}
+
/*
* "DL tables"
*/
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/Sidebar/sidebar.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -1220,8 +1220,8 @@
}
/*
-** the personal toolbar
-*/
+ ** the personal toolbar
+ */
#p-personal {
width: 100%;
@@ -1717,6 +1717,10 @@
margin-right: 0.33em;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
#editform .editOptions {
display: inline;
}
Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/SpaceWiki/SpaceWiki.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -296,6 +296,10 @@
color: #5791ff;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
h2, h3, h4, h5, h6 {
display: inline;
padding-top: 0.25ex;
Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/Wordpress/Wordpress.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -328,6 +328,10 @@
margin: 0;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
.edit-toolbar {
padding: 0;
margin: 0;
Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/blog/Kubrick.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -930,6 +930,10 @@
font-size: 11px
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
.wikiwyg_toolbar {
background: #D3D3D3;
border: 1px outset;
Modified: trunk/themes/default/phpwiki-modern.css
===================================================================
--- trunk/themes/default/phpwiki-modern.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/default/phpwiki-modern.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -237,6 +237,10 @@
font-family: Arial, Helvetica, sans-serif;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
#navbuttons, #actionbar {
color: black;
background: #ddd; /* dark gray */
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/default/phpwiki.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -338,6 +338,10 @@
margin: 0;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
.edit-toolbar {
padding: 0;
margin: 0;
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/fusionforge/fusionforge.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -413,6 +413,11 @@
/**
* Toolbar
*/
+
+img.toolbar:hover {
+ cursor: pointer;
+}
+
input.button {
font-family: Verdana, Arial, Helvetica, sans-serif;
}
Modified: trunk/themes/shamino_com/shamino_com.css
===================================================================
--- trunk/themes/shamino_com/shamino_com.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/shamino_com/shamino_com.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -254,6 +254,10 @@
font-size: 8pt;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
.debug {
padding: 2px;
margin-left: 10px;
Modified: trunk/themes/wikilens/wikilens.css
===================================================================
--- trunk/themes/wikilens/wikilens.css 2015-04-03 16:14:20 UTC (rev 9645)
+++ trunk/themes/wikilens/wikilens.css 2015-04-09 08:15:42 UTC (rev 9646)
@@ -42,6 +42,10 @@
margin: 1.5ex 1em 0 1em;
}
+img.toolbar:hover {
+ cursor: pointer;
+}
+
table.sortable th.header {
background-image: url(../default/buttons/sort_none.gif);
cursor: pointer;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2015-04-10 15:59:35
|
Revision: 9657
http://sourceforge.net/p/phpwiki/code/9657
Author: vargenau
Date: 2015-04-10 15:59:32 +0000 (Fri, 10 Apr 2015)
Log Message:
-----------
Remove unused Javascript function addInfobox
Modified Paths:
--------------
trunk/themes/MonoBook/wikibits.js
trunk/themes/default/toolbar.js
Modified: trunk/themes/MonoBook/wikibits.js
===================================================================
--- trunk/themes/MonoBook/wikibits.js 2015-04-10 15:35:00 UTC (rev 9656)
+++ trunk/themes/MonoBook/wikibits.js 2015-04-10 15:59:32 UTC (rev 9657)
@@ -254,25 +254,6 @@
return;
}
-function addInfobox(infoText,text_alert) {
- alertText=text_alert;
- var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-
- var re=new RegExp("\\\\n","g");
- alertText=alertText.replace(re,"\n");
-
- // if no support for changing selection, add a small copy & paste field
- // document.selection is an IE-only property. The full toolbar works in IE and
- // Gecko-based browsers.
- if(!document.selection && !is_gecko) {
- infoText=escapeQuotesHTML(infoText);
- document.write("<form name='infoform' id='infoform'>"+
- "<input size=80 id='infobox' name='infobox' value=\""+
- infoText+"\" READONLY></form>");
- }
-
-}
-
function escapeQuotes(text) {
var re=new RegExp("'","g");
text=text.replace(re,"\\'");
Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js 2015-04-10 15:35:00 UTC (rev 9656)
+++ trunk/themes/default/toolbar.js 2015-04-10 15:59:32 UTC (rev 9657)
@@ -72,18 +72,6 @@
insertTags(text, '', '\n');
}
}
-function addInfobox(infoText) {
- // if no support for changing selection, add a small copy & paste field
- var clientPC = navigator.userAgent.toLowerCase(); // Get client info
- var is_nav = ((clientPC.indexOf('gecko')!=-1) && (clientPC.indexOf('spoofer')==-1)
- && (clientPC.indexOf('khtml') == -1));
- if(!document.selection && !is_nav) {
- infoText=escapeQuotesHTML(infoText);
- document.write("<form name='infoform' id='infoform'>"+
- "<input size=80 id='infobox' name='infobox' value=\""+
- infoText+"\" readonly=\"readonly\"></form>");
- }
-}
function escapeQuotes(text) {
var re=new RegExp("'","g");
text=text.replace(re,"\\'");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X