From cb45e1feb4033caac22ec2fa81fccbd9d99f4415 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Fri, 10 Apr 2015 09:42:17 +0000
Subject: [PATCH] Remove Width and Height preferences modification in Edit
 Toolbar

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@9648 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 pgsrc/ReleaseNotes                         |  3 ++-
 themes/Crao/templates/editpage.tmpl        | 16 +++-------------
 themes/Portland/templates/editpage.tmpl    |  6 ------
 themes/Wordpress/templates/editpage.tmpl   | 16 +++-------------
 themes/default/templates/editpage.tmpl     | 16 +++-------------
 themes/fusionforge/templates/editpage.tmpl | 16 +++-------------
 6 files changed, 14 insertions(+), 59 deletions(-)

diff --git a/pgsrc/ReleaseNotes b/pgsrc/ReleaseNotes
index de2950f6a..a433525a1 100644
--- a/pgsrc/ReleaseNotes
+++ b/pgsrc/ReleaseNotes
@@ -1,4 +1,4 @@
-Date: Wed,  1 Apr 2015 18:29:22 +0000
+Date: Wed, 10 Apr 2015 11:29:22 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -14,6 +14,7 @@ Content-Transfer-Encoding: binary
 * Remove ~WantedPagesOld (use ~WantedPages instead)
 * Add WebM format in Video plugin
 * Update jscalendar to 1.0
+* Remove Width and Height preferences modification in Edit Toolbar
 
 == 1.5.3 2015-03-04 Marc-Etienne Vargenau ==
 
diff --git a/themes/Crao/templates/editpage.tmpl b/themes/Crao/templates/editpage.tmpl
index 5f30cf72b..db09cbbb0 100644
--- a/themes/Crao/templates/editpage.tmpl
+++ b/themes/Crao/templates/editpage.tmpl
@@ -20,19 +20,9 @@
       accept-charset="UTF-8">
   <?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 } ?>
-        </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-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
-    <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
-  </div></td></tr></table>
+  <?php if (isset($EDIT_TOOLBAR)) { ?>
+      <?php echo $EDIT_TOOLBAR ?>
+  <?php } ?>
   <fieldset class="editarea">
   <legend><?php echo _("Page Content: ")?></legend>
   <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
diff --git a/themes/Portland/templates/editpage.tmpl b/themes/Portland/templates/editpage.tmpl
index ebdcd6612..1f066d0af 100644
--- a/themes/Portland/templates/editpage.tmpl
+++ b/themes/Portland/templates/editpage.tmpl
@@ -29,12 +29,6 @@
 <?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
         WikiLink(_("RecentEdits"))) ?>
 <br />
-<p>
-  <?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')?>
-</p>
-
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <hr />
   <p><strong><?php echo _("Preview only! Changes not saved.")?></strong></p>
diff --git a/themes/Wordpress/templates/editpage.tmpl b/themes/Wordpress/templates/editpage.tmpl
index 2732df284..7a4e23f16 100644
--- a/themes/Wordpress/templates/editpage.tmpl
+++ b/themes/Wordpress/templates/editpage.tmpl
@@ -21,19 +21,9 @@
   </td>
 </tr>
 </table>
-<table class="fullwidth">
-    <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?>
-    <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>
+<?php if (isset($EDIT_TOOLBAR)) { ?>
+    <?php echo $EDIT_TOOLBAR ?>
+<?php } ?>
 <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <br /><small>
 <?php echo _("Summary")._(":") ?><?php echo $SUMMARY_INPUT ?>
diff --git a/themes/default/templates/editpage.tmpl b/themes/default/templates/editpage.tmpl
index dd573f8c0..72eae70e3 100644
--- a/themes/default/templates/editpage.tmpl
+++ b/themes/default/templates/editpage.tmpl
@@ -20,19 +20,9 @@
       accept-charset="UTF-8">
   <?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 } ?>
-        </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-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
-    <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
-  </div></td></tr></table>
+  <?php if (isset($EDIT_TOOLBAR)) { ?>
+      <?php echo $EDIT_TOOLBAR ?>
+  <?php } ?>
 <?php if (!empty($WYSIWYG_B)) { ?>
   <br /><div class="hint"><strong>Warning:</strong> Switching to the Wysiwyg editor will not keep your changes.</div>
 <?php } ?>
diff --git a/themes/fusionforge/templates/editpage.tmpl b/themes/fusionforge/templates/editpage.tmpl
index f9a39f00d..4783dc982 100644
--- a/themes/fusionforge/templates/editpage.tmpl
+++ b/themes/fusionforge/templates/editpage.tmpl
@@ -63,19 +63,9 @@
       accept-charset="UTF-8">
   <?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 } ?>
-        </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-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
-    <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
-  </div></td></tr></table>
+  <?php if (isset($EDIT_TOOLBAR)) { ?>
+      <?php echo $EDIT_TOOLBAR ?>
+  <?php } ?>
   <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 ?>
-- 
2.45.0