[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5_1-7858-g5a51858
Michal Čihař
nijel at users.sourceforge.net
Mon Aug 23 11:05:20 CEST 2010
The branch, master has been updated
via 5a51858352ac30b99e38a082ec697119983a15df (commit)
from 8a011f77b8c75edb5f5461a69de39bbea66596c5 (commit)
- Log -----------------------------------------------------------------
commit 5a51858352ac30b99e38a082ec697119983a15df
Author: Michal Čihař <mcihar at novell.com>
Date: Mon Aug 23 11:05:12 2010 +0200
[relations] Dropped WYSIWYG-PDF configuration variable.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
Documentation.html | 55 +++++++++++++++++---------------
js/functions.js | 6 ++--
libraries/config.default.php | 8 -----
libraries/schema/User_Schema.class.php | 16 ++++-----
5 files changed, 40 insertions(+), 46 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0ddca1c..6c7aa06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,6 +105,7 @@ $Id$
- patch #3038312 [export] JSON export,
thanks to Hauke Henningsen - blubberkeks152
- rfe #2973909 Users preferences
+- [relations] Dropped WYSIWYG-PDF configuration variable.
3.3.6.0 (not yet released)
- bug #3033063 [core] Navi gets wrong db name
diff --git a/Documentation.html b/Documentation.html
index 0b0a29b..a05df47 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2138,32 +2138,6 @@ setfacl -d -m "g:www-data:rwx" tmp
any row counting.
</dd>
- <dt id="wysiwyg">
- <span id="cfg_WYSIWYG-PDF">$cfg['WYSIWYG-PDF'] </span>boolean</dt>
- <dd>Utilizes a WYSIWYG editing control to easily place elements of a
- <abbr title="Portable Document Format">PDF</abbr>
- page. By clicking on the button 'toggle scratchboard' on the page
- where you edit x/y coordinates of those elements you can activate a
- scratchboard where all your elements are placed. By clicking on an
- element, you can move them around in the pre-defined area and the x/y
- coordinates will get updated dynamically. Likewise, when entering a
- new position directly into the input field, the new position in the
- scratchboard changes after your cursor leaves the input field.<br />
- You have to click on the 'OK'-button below the tables to save the new
- positions. If you want to place a new element, first add it to the
- table of elements and then you can drag the new element around.<br />
- By changing the paper size and the orientation you can change the size
- of the scratchboard as well. You can do so by just changing the
- dropdown field below, and the scratchboard will resize automatically,
- without interfering with the current placement of the elements.<br />
- If ever an element gets out of range you can either enlarge the paper
- size or click on the 'reset' button to place all elements below each
- other.<br />
- <b>NOTE:</b> You have to use a recent browser like IE6 or Mozilla to
- get this control to work. The basic Drag&Drop script functionality
- was kindly borrowed from www.youngpup.net and is underlying so
- specific license.</dd>
-
<dt id="cfg_NaturalOrder">$cfg['NaturalOrder'] boolean</dt>
<dd>Sorts database and table names according to natural order (for example,
t1, t2, t10). Currently implemented in the left panel (Light mode)
@@ -4362,6 +4336,35 @@ chmod o+rwx tmp
<dd>phpMyAdmin with version</dd>
</dl>
+<h4 id="wysiwyg">
+ <a href="#wysiwyg">6.28 How can I easily edit relational schema for export?</a></h4>
+
+ <p>
+ By clicking on the button 'toggle scratchboard' on the page
+ where you edit x/y coordinates of those elements you can activate a
+ scratchboard where all your elements are placed. By clicking on an
+ element, you can move them around in the pre-defined area and the x/y
+ coordinates will get updated dynamically. Likewise, when entering a
+ new position directly into the input field, the new position in the
+ scratchboard changes after your cursor leaves the input field.
+ </p>
+ <p>
+ You have to click on the 'OK'-button below the tables to save the new
+ positions. If you want to place a new element, first add it to the
+ table of elements and then you can drag the new element around.
+ </p>
+ <p>
+ By changing the paper size and the orientation you can change the size
+ of the scratchboard as well. You can do so by just changing the
+ dropdown field below, and the scratchboard will resize automatically,
+ without interfering with the current placement of the elements.
+ </p>
+ <p>
+ If ever an element gets out of range you can either enlarge the paper
+ size or click on the 'reset' button to place all elements below each
+ other.
+ <p>
+
<h3 id="faqproject">phpMyAdmin project</h3>
<h4 id="faq7_1">
diff --git a/js/functions.js b/js/functions.js
index 9702f3a..f76d630 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1421,7 +1421,7 @@ function getElement(e,f){
}
/**
- * Refresh the WYSIWYG-PDF scratchboard after changes have been made
+ * Refresh the WYSIWYG scratchboard after changes have been made
*/
function refreshDragOption(e) {
var elm = $('#' + e);
@@ -1431,7 +1431,7 @@ function refreshDragOption(e) {
}
/**
- * Refresh/resize the WYSIWYG-PDF scratchboard
+ * Refresh/resize the WYSIWYG scratchboard
*/
function refreshLayout() {
var elm = $('#pdflayout')
@@ -1453,7 +1453,7 @@ function refreshLayout() {
}
/**
- * Show/hide the WYSIWYG-PDF scratchboard
+ * Show/hide the WYSIWYG scratchboard
*/
function ToggleDragDrop(e) {
var elm = $('#' + e);
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 9c5ea62..b637e58 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2333,14 +2333,6 @@ $cfg['MaxExactCount'] = 20000;
$cfg['MaxExactCountViews'] = 0;
/**
- * Utilize DHTML/JS capabilities to allow WYSIWYG editing of
- * the PDF page editor. Requires an IE6/Gecko based browser.
- *
- * @global boolean $cfg['WYSIWYG-PDF']
- */
-$cfg['WYSIWYG-PDF'] = true;
-
-/**
* Sort table and database in natural order
*
* @global boolean $cfg['NaturalOrder']
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index 31aa6de..3139b0a 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -224,15 +224,13 @@ class PMA_User_Schema
$array_sh_page[] = $temp_sh_page;
}
/*
- * Display WYSIWYG-PDF parts?
+ * Display WYSIWYG parts
*/
- if ($cfg['WYSIWYG-PDF']) {
- if (!isset($_POST['with_field_names']) && !isset($_POST['showwysiwyg'])) {
- $with_field_names = TRUE;
- }
- $this->_displayScratchboardTables($array_sh_page,$draginit,$reset_draginit);
+ if (!isset($_POST['with_field_names']) && !isset($_POST['showwysiwyg'])) {
+ $with_field_names = TRUE;
}
+ $this->_displayScratchboardTables($array_sh_page,$draginit,$reset_draginit);
?>
<form method="post" action="schema_edit.php" name="edcoord">
@@ -280,10 +278,10 @@ class PMA_User_Schema
. "\n" . ' <input type="checkbox" name="c_table_' . $i . '[delete]" value="y" />' . __('Delete');
echo "\n" . ' </td>';
echo "\n" . ' <td>'
- . "\n" . ' <input type="text" ' . ($cfg['WYSIWYG-PDF'] ? 'onchange="dragPlace(' . $i . ', \'x\', this.value)"' : '') . ' name="c_table_' . $i . '[x]" value="' . $sh_page['x'] . '" />';
+ . "\n" . ' <input type="text" onchange="dragPlace(' . $i . ', \'x\', this.value)" name="c_table_' . $i . '[x]" value="' . $sh_page['x'] . '" />';
echo "\n" . ' </td>';
echo "\n" . ' <td>'
- . "\n" . ' <input type="text" ' . ($cfg['WYSIWYG-PDF'] ? 'onchange="dragPlace(' . $i . ', \'y\', this.value)"' : '') . ' name="c_table_' . $i . '[y]" value="' . $sh_page['y'] . '" />';
+ . "\n" . ' <input type="text" onchange="dragPlace(' . $i . ', \'y\', this.value)" name="c_table_' . $i . '[y]" value="' . $sh_page['y'] . '" />';
echo "\n" . ' </td>';
echo "\n" . ' </tr>';
$i++;
@@ -319,7 +317,7 @@ class PMA_User_Schema
echo "\n" . ' </table>' . "\n";
echo "\n" . ' <input type="hidden" name="c_table_rows" value="' . ($i + 1) . '" />';
- echo ($cfg['WYSIWYG-PDF'] ? "\n" . ' <input type="hidden" id="showwysiwyg" name="showwysiwyg" value="' . ((isset($showwysiwyg) && $showwysiwyg == '1') ? '1' : '0') . '" />' : '');
+ echo "\n" . ' <input type="hidden" id="showwysiwyg" name="showwysiwyg" value="' . ((isset($showwysiwyg) && $showwysiwyg == '1') ? '1' : '0') . '" />';
echo "\n" . ' <input type="checkbox" name="with_field_names" ' . (isset($with_field_names) ? 'checked="checked"' : ''). ' />' . __('Column names') . '<br />';
echo "\n" . ' <input type="submit" value="' . __('Save') . '" />';
echo "\n" . '</form>' . "\n\n";
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list