[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13361-g51b54c9

[Michal Čihař]

The branch, master has been updated
       via  51b54c954c900058a141a7444f3ec53ce9fbfce8 (commit)
      from  44f007a87912cb1a1078ce0ec6820d67b43138bf (commit)


- Log -----------------------------------------------------------------
commit 51b54c954c900058a141a7444f3ec53ce9fbfce8
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Aug 8 12:04:23 2011 +0200

    Replace inline javascript

-----------------------------------------------------------------------

Summary of changes:
 js/functions.js                   |    9 +++++++++
 libraries/Theme_Manager.class.php |    4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index bb976ce..d531c24 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3112,3 +3112,12 @@ function PMA_createqTip($elements, content, options)
     $elements.qtip($.extend(true, o, options));
 }
 
+/**
+ * Theme selector.
+ */
+$(document).ready(function() {
+    $('a.themeselect').live('click',function(e) {
+        window.open(e.target + '?foo=bar', 'themes','left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes');
+        return false;
+    });
+});
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index 86ddc8d..8b60ef5 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -280,9 +280,7 @@ class PMA_Theme_Manager
 
         $theme_selected = false;
         $theme_preview_path= './themes.php';
-        $theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" onclick="'
-                            . "window.open('" . $theme_preview_path . "','themes','left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes');"
-                            . '">';
+        $theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" class="themeselect">';
         $select_box .=  $theme_preview_href . __('Theme') . '</a>:' . "\n";
 
         $select_box .=  '<select name="set_theme" xml:lang="en" dir="ltr"'


hooks/post-receive
-- 
phpMyAdmin