From 6c4fc4ccaeb606b3911c50d42ce585e38f0eec62 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 4 Jul 2013 14:49:32 +0000
Subject: [PATCH] Clean up old markup

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8826 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 pgsrc/Help%2FPageList                      |  3 +-
 pgsrc/PhpWikiAdministration                |  4 +--
 themes/Crao/templates/editpage.tmpl        | 30 +-------------------
 themes/Portland/templates/editpage.tmpl    | 33 +---------------------
 themes/Wordpress/templates/editpage.tmpl   | 32 +--------------------
 themes/blog/templates/blogform.tmpl        |  2 +-
 themes/default/templates/blogform.tmpl     |  2 +-
 themes/default/templates/editpage.tmpl     | 32 +--------------------
 themes/fusionforge/templates/blogform.tmpl |  2 +-
 9 files changed, 10 insertions(+), 130 deletions(-)

diff --git a/pgsrc/Help%2FPageList b/pgsrc/Help%2FPageList
index e75e42ba4..3418cd44e 100644
--- a/pgsrc/Help%2FPageList
+++ b/pgsrc/Help%2FPageList
@@ -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 @@ Column 'info=' arguments:
 |= locked    | Locked
 |= external  | External
 |= minor     | Minor Edit
-|= markup    | Markup
 |= size      | Size
 |= creator   | Creator
 |= owner     | Owner
diff --git a/pgsrc/PhpWikiAdministration b/pgsrc/PhpWikiAdministration
index 9ebedafbe..22b2737a8 100644
--- a/pgsrc/PhpWikiAdministration
+++ b/pgsrc/PhpWikiAdministration
@@ -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 @@ First select pages and then define the action:
 
 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 ==
 
diff --git a/themes/Crao/templates/editpage.tmpl b/themes/Crao/templates/editpage.tmpl
index 4871c4ca7..db4090f36 100644
--- a/themes/Crao/templates/editpage.tmpl
+++ b/themes/Crao/templates/editpage.tmpl
@@ -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>&nbsp;&nbsp;
-    <?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">
-<!-- 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">
+<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")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
 </div>
 <?php echo $HIDDEN_INPUTS?>
 </form>
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
-  showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
diff --git a/themes/Portland/templates/editpage.tmpl b/themes/Portland/templates/editpage.tmpl
index 2ae33c91c..6dc618de8 100644
--- a/themes/Portland/templates/editpage.tmpl
+++ b/themes/Portland/templates/editpage.tmpl
@@ -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,28 +51,7 @@
   <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">
-<!-- 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">
+<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")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
@@ -82,12 +59,4 @@ function showOldMarkupRules(show) {
 <?php echo $HIDDEN_INPUTS?>
 </form>
 
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
-  showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
-
 <hr />
diff --git a/themes/Wordpress/templates/editpage.tmpl b/themes/Wordpress/templates/editpage.tmpl
index 1b9ca5d63..0781a376b 100644
--- a/themes/Wordpress/templates/editpage.tmpl
+++ b/themes/Wordpress/templates/editpage.tmpl
@@ -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,28 +67,7 @@
   <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">
-<!-- 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">
+<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")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
@@ -98,12 +76,4 @@ function showOldMarkupRules(show) {
 </form>
 </div>
 
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
-  showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
-
 <hr />
diff --git a/themes/blog/templates/blogform.tmpl b/themes/blog/templates/blogform.tmpl
index 67473aa8e..5b4d65936 100644
--- a/themes/blog/templates/blogform.tmpl
+++ b/themes/blog/templates/blogform.tmpl
@@ -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>
diff --git a/themes/default/templates/blogform.tmpl b/themes/default/templates/blogform.tmpl
index aad698e55..86b5d2f25 100644
--- a/themes/default/templates/blogform.tmpl
+++ b/themes/default/templates/blogform.tmpl
@@ -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>
diff --git a/themes/default/templates/editpage.tmpl b/themes/default/templates/editpage.tmpl
index 762e8dbc1..20d40acb9 100644
--- a/themes/default/templates/editpage.tmpl
+++ b/themes/default/templates/editpage.tmpl
@@ -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">
-<!-- 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">
+<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")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
 </div>
-
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
-  showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
diff --git a/themes/fusionforge/templates/blogform.tmpl b/themes/fusionforge/templates/blogform.tmpl
index 7411ff30a..1f28afc2b 100644
--- a/themes/fusionforge/templates/blogform.tmpl
+++ b/themes/fusionforge/templates/blogform.tmpl
@@ -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?>
-- 
2.42.0