From 5a51858352ac30b99e38a082ec697119983a15df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 23 Aug 2010 11:05:12 +0200 Subject: [PATCH] [relations] Dropped WYSIWYG-PDF configuration variable. --- 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 0ddca1c33..6c7aa06b1 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 0b0a29b21..a05df4715 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2138,32 +2138,6 @@ setfacl -d -m "g:www-data:rwx" tmp any row counting. -
- $cfg['WYSIWYG-PDF'] boolean
-
Utilizes a WYSIWYG editing control to easily place elements of a - PDF - 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.
- 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.
- 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.
- 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.
- NOTE: 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.
-
$cfg['NaturalOrder'] boolean
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
phpMyAdmin with version
+

+ 6.28 How can I easily edit relational schema for export?

+ +

+ 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. +

+

+ 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. +

+

+ 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. +

+

+ 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. +

+

phpMyAdmin project

diff --git a/js/functions.js b/js/functions.js index 9702f3a18..f76d63030 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 9c5ea621d..b637e58a2 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2332,14 +2332,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 * diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 31aa6de43..3139b0a6c 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); ?>
@@ -280,10 +278,10 @@ class PMA_User_Schema . "\n" . ' ' . __('Delete'); echo "\n" . ' '; echo "\n" . ' ' - . "\n" . ' '; + . "\n" . ' '; echo "\n" . ' '; echo "\n" . ' ' - . "\n" . ' '; + . "\n" . ' '; echo "\n" . ' '; echo "\n" . ' '; $i++; @@ -319,7 +317,7 @@ class PMA_User_Schema echo "\n" . ' ' . "\n"; echo "\n" . ' '; - echo ($cfg['WYSIWYG-PDF'] ? "\n" . ' ' : ''); + echo "\n" . ' '; echo "\n" . ' ' . __('Column names') . '
'; echo "\n" . ' '; echo "\n" . '
' . "\n\n";