The branch, master has been updated
via 85344d2bfe7444b7b6c91c86b006a31524cbee0d (commit)
from 75aa1aae8936e9ade5efbd7ab045292a41fd754f (commit)
- Log -----------------------------------------------------------------
commit 85344d2bfe7444b7b6c91c86b006a31524cbee0d
Author: Marc Delisle <[email protected]>
Date: Sat Dec 10 07:52:47 2011 -0500
rfe #3438266 [designer] Toggle for relation lines
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
js/pmd/move.js | 10 ++++++++++
pmd_general.php | 10 +++++-----
themes/original/img/pmd/toggle_lines.png | Bin 0 -> 630 bytes
themes/pmahomme/img/pmd/toggle_lines.png | Bin 0 -> 630 bytes
5 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 themes/original/img/pmd/toggle_lines.png
create mode 100644 themes/pmahomme/img/pmd/toggle_lines.png
diff --git a/ChangeLog b/ChangeLog
index 220da9c..fb00e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,7 @@ phpMyAdmin - ChangeLog
+ [interface] Improved index editor
+ View editing via a generated ALTER VIEW
- bug #3408377 [interface] Deleting table from the DB does not change the
table counter
++ rfe #3438266 [designer] Toggle for relation lines
3.4.9.0 (not yet released)
- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown
diff --git a/js/pmd/move.js b/js/pmd/move.js
index df692fd..10a6cf6 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -10,6 +10,7 @@
var _change = 0; // variable to track any change in designer layout.
var _staying = 0; // variable to check if the user stayed after seeing the
confirmation prompt.
+ var show_relation_lines = true;
// Below is the function to bind onbeforeunload events with the content_frame
as well as the top window.
@@ -344,6 +345,9 @@ function Line(x1, y1, x2, y2, color_line)
*/
function Line0(x1, y1, x2, y2, color_line)
{
+ if (! show_relation_lines) {
+ return;
+ }
Circle(x1, y1, 3, 3, color_line);
Rect(x2 - 1, y2 - 2, 4, 4, color_line);
@@ -636,6 +640,12 @@ function Small_tab_invert() // invert max/min all tables
Re_load();
}
+function Relation_lines_invert()
+{
+ show_relation_lines = ! show_relation_lines;
+ Re_load();
+}
+
function Small_tab_refresh()
{
for (key in j_tabs) {
diff --git a/pmd_general.php b/pmd_general.php
index aafc5fd..f6f16e2 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -94,11 +94,11 @@ echo $script_tabs . $script_contr . $script_display_field;
onclick="Small_tab_all(document.getElementById('key_SB_all'));
return false" class="M_butt" target="_self"
><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>"
alt="v"
src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png"
- /></a><a href="#" onclick="Small_tab_invert(); return false"
- class="M_butt" target="_self"
- ><img title="<?php echo __('Toggle small/big'); ?>" alt="key"
src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png"
- /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage']
?>pmd/bord.png" alt=""
- /><a href="#" onclick="PDF_save(); return false"
+ /></a>
+<a href="#" onclick="Small_tab_invert(); return false" class="M_butt"
target="_self" ><img title="<?php echo __('Toggle small/big'); ?>" alt="key"
src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png" /></a>
+<a href="#" onclick="Relation_lines_invert(); return false" class="M_butt"
target="_self" ><img title="<?php echo __('Toggle relation lines'); ?>"
alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/toggle_lines.png"
/></a>
+<img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png"
alt="" />
+<a href="#" onclick="PDF_save(); return false"
class="M_butt" target="_self"
><img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/pdf.png"
alt="key" width="20" height="20"
title="<?php echo __('Import/Export coordinates for PDF
schema'); ?>" /></a
diff --git a/themes/original/img/pmd/toggle_lines.png
b/themes/original/img/pmd/toggle_lines.png
new file mode 100644
index 0000000..9ab3764
Binary files /dev/null and b/themes/original/img/pmd/toggle_lines.png differ
diff --git a/themes/pmahomme/img/pmd/toggle_lines.png
b/themes/pmahomme/img/pmd/toggle_lines.png
new file mode 100644
index 0000000..9ab3764
Binary files /dev/null and b/themes/pmahomme/img/pmd/toggle_lines.png differ
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
