Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8826] trunk
|
From: <var...@us...> - 2013-07-04 14:49:35
|
Revision: 8826
http://sourceforge.net/p/phpwiki/code/8826
Author: vargenau
Date: 2013-07-04 14:49:32 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Clean up old markup
Modified Paths:
--------------
trunk/pgsrc/Help%2FPageList
trunk/pgsrc/PhpWikiAdministration
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/blog/templates/blogform.tmpl
trunk/themes/default/templates/blogform.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/fusionforge/templates/blogform.tmpl
Modified: trunk/pgsrc/Help%2FPageList
===================================================================
--- trunk/pgsrc/Help%2FPageList 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/pgsrc/Help%2FPageList 2013-07-04 14:49:32 UTC (rev 8826)
@@ -1,4 +1,4 @@
-Date: Fri, 11 Jan 2013 11:16:51 +0000
+Date: Fri, 28 Jun 2013 15:51:27 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FPageList;
@@ -103,7 +103,6 @@
|= locked | Locked
|= external | External
|= minor | Minor Edit
-|= markup | Markup
|= size | Size
|= creator | Creator
|= owner | Owner
Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/pgsrc/PhpWikiAdministration 2013-07-04 14:49:32 UTC (rev 8826)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Apr 2013 17:13:59 +0000
+Date: Fri, 28 Jun 2013 15:51:27 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiAdministration;
@@ -19,7 +19,7 @@
or call the available ~WikiAdmin actions directly:
-| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
+| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
== Global Access Rights ==
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/Crao/templates/editpage.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -54,7 +54,6 @@
<?php } ?>
<fieldset class="toolbar">
<?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label>
- <?php echo $OLD_MARKUP_CB?> <label for="useOldMarkup"><?php echo _("Use old markup")?></label> <?php echo $OLD_MARKUP_CONVERT?>
<?php if ($user->isAdmin()) { ?>
<?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
<?php } ?>
@@ -70,37 +69,10 @@
<label><?php echo Template('signin', array('FORMNAME' => 'editpage')) ?></label>
</fieldset>
<hr noshade="noshade" />
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
- if (document.getElementById) {
- if (!show) {
- document.getElementById('newMarkup').style.display="block";
- document.getElementById('oldMarkup').style.display="none";
- } else {
- document.getElementById('newMarkup').style.display="none";
- document.getElementById('oldMarkup').style.display="block";
- }
- }
-}
-// -->
-</script>
-<div id="oldMarkup" class="wiki-edithelp">
+<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>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" 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>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
- showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/Portland/templates/editpage.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -42,8 +42,6 @@
<?php echo _("Edit Area Size")?>: <b><?php echo _("H")?></b> <?php echo $HEIGHT_PREF?>
<b><?php echo _("W")?></b> <?php echo $WIDTH_PREF?>
<?php echo Button("submit:", _("Adjust"), 'wikiaction')?>
- <br />
- <?php echo $OLD_MARKUP_CB?> <?php echo _("Use old markup")?>
</p>
<?php if (isset($PREVIEW_CONTENT)) { ?>
@@ -53,41 +51,12 @@
<hr />
<?php } ?>
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
- if (document.getElementById) {
- if (!show) {
- document.getElementById('newMarkup').style.display="block";
- document.getElementById('oldMarkup').style.display="none";
- } else {
- document.getElementById('newMarkup').style.display="none";
- document.getElementById('oldMarkup').style.display="block";
- }
- }
-}
-// -->
-</script>
-
-<div id="oldMarkup" class="wiki-edithelp">
+<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>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" 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>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
- showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
-
<hr />
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -55,7 +55,6 @@
<?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
WikiLink(_("RecentEdits"))) ?></label>
<br />
-<?php echo $OLD_MARKUP_CB?> <label for="useOldMarkup"><?php echo _("Use old markup")?> </label> <?php echo $OLD_MARKUP_CONVERT?>
<?php if ($user->isAdmin()) { ?>
<?php echo $SEP?><?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
<?php } ?>
@@ -68,42 +67,13 @@
<hr />
<?php } ?>
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
- if (document.getElementById) {
- if (!show) {
- document.getElementById('newMarkup').style.display="block";
- document.getElementById('oldMarkup').style.display="none";
- } else {
- document.getElementById('newMarkup').style.display="none";
- document.getElementById('oldMarkup').style.display="block";
- }
- }
-}
-// -->
-</script>
-
-<div id="oldMarkup" class="wiki-edithelp">
+<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>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" 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>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
</div>
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
- showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
-
<hr />
Modified: trunk/themes/blog/templates/blogform.tmpl
===================================================================
--- trunk/themes/blog/templates/blogform.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/blog/templates/blogform.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -17,7 +17,7 @@
</div>
<hr noshade="noshade" />
-<div id="newMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/default/templates/blogform.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -17,7 +17,7 @@
</div>
<hr />
-<div id="newMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/default/templates/editpage.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -57,7 +57,6 @@
<tr class="middle">
<td>
<?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
- <?php echo $OLD_MARKUP_CB ?> <label for="useOldMarkup"><?php echo _("Use old markup")?></label> <?php echo $OLD_MARKUP_CONVERT?>
</td>
<td class="align-center">
<?php if (!empty($WYSIWYG_B)){ ?>
@@ -92,37 +91,8 @@
<hr />
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
- if (document.getElementById) {
- if (!show) {
- document.getElementById('newMarkup').style.display="block";
- document.getElementById('oldMarkup').style.display="none";
- } else {
- document.getElementById('newMarkup').style.display="none";
- document.getElementById('oldMarkup').style.display="block";
- }
- }
-}
-// -->
-</script>
-
-<div id="oldMarkup" class="wiki-edithelp">
+<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>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" 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>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
-
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
- showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/fusionforge/templates/blogform.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -17,7 +17,7 @@
</div>
<hr noshade="noshade" />
-<div id="newMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
<?plugin IncludePage page="TextFormattingRules" section="Synopsis" quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
