From: <var...@us...> - 2015-04-10 09:42:25
|
Revision: 9648 http://sourceforge.net/p/phpwiki/code/9648 Author: vargenau Date: 2015-04-10 09:42:17 +0000 (Fri, 10 Apr 2015) Log Message: ----------- Remove Width and Height preferences modification in Edit Toolbar Modified Paths: -------------- trunk/pgsrc/ReleaseNotes 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/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2015-04-09 09:16:25 UTC (rev 9647) +++ trunk/pgsrc/ReleaseNotes 2015-04-10 09:42:17 UTC (rev 9648) @@ -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 @@ * 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 == Modified: trunk/themes/Crao/templates/editpage.tmpl =================================================================== --- trunk/themes/Crao/templates/editpage.tmpl 2015-04-09 09:16:25 UTC (rev 9647) +++ trunk/themes/Crao/templates/editpage.tmpl 2015-04-10 09:42:17 UTC (rev 9648) @@ -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?> Modified: trunk/themes/Portland/templates/editpage.tmpl =================================================================== --- trunk/themes/Portland/templates/editpage.tmpl 2015-04-09 09:16:25 UTC (rev 9647) +++ trunk/themes/Portland/templates/editpage.tmpl 2015-04-10 09:42:17 UTC (rev 9648) @@ -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> Modified: trunk/themes/Wordpress/templates/editpage.tmpl =================================================================== --- trunk/themes/Wordpress/templates/editpage.tmpl 2015-04-09 09:16:25 UTC (rev 9647) +++ trunk/themes/Wordpress/templates/editpage.tmpl 2015-04-10 09:42:17 UTC (rev 9648) @@ -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 ?> Modified: trunk/themes/default/templates/editpage.tmpl =================================================================== --- trunk/themes/default/templates/editpage.tmpl 2015-04-09 09:16:25 UTC (rev 9647) +++ trunk/themes/default/templates/editpage.tmpl 2015-04-10 09:42:17 UTC (rev 9648) @@ -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 } ?> Modified: trunk/themes/fusionforge/templates/editpage.tmpl =================================================================== --- trunk/themes/fusionforge/templates/editpage.tmpl 2015-04-09 09:16:25 UTC (rev 9647) +++ trunk/themes/fusionforge/templates/editpage.tmpl 2015-04-10 09:42:17 UTC (rev 9648) @@ -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 ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |