[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1170-g12cbbe7

[Marc Delisle]

The branch, master has been updated
       via  12cbbe7ae98114f1e882d49e06e3c054a9ceb848 (commit)
       via  984cf6dbad3a358155b4a61e587b60717659fc52 (commit)
      from  eaba2ebd22298ee94b75ed4fcb2b6593450b5c55 (commit)


- Log -----------------------------------------------------------------
commit 12cbbe7ae98114f1e882d49e06e3c054a9ceb848
Merge: 984cf6dbad3a358155b4a61e587b60717659fc52 eaba2ebd22298ee94b75ed4fcb2b6593450b5c55
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Feb 24 06:06:29 2011 -0500

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 984cf6dbad3a358155b4a61e587b60717659fc52
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Feb 24 06:04:49 2011 -0500

    For bug 3168757:
    - Use jQuery to make the text look and behave like a link

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

Summary of changes:
 js/functions.js          |   14 ++++++++++++++
 libraries/common.lib.php |    2 +-
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 6233ce4..9d62ee8 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2512,5 +2512,19 @@ $(document).ready(function() {
      */
     PMA_init_slider();
 
+    /**
+     * Enables the text generated by PMA_linkOrButton() to be clickable
+     */
+    $('.clickprevimage')
+        .css('color', function(index) {
+            return $('a').css('color');
+        })
+        .css('cursor', function(index) {
+            return $('a').css('cursor');
+        }) //todo: hover effect
+        .live('click',function(e) {
+            $(this).parent().find('input:image').click();
+        });
+
 }) // end of $(document).ready()
 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 4023cb2..fd5da83 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1876,7 +1876,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
                 // but we can at least show the message.
                 // If PropertiesIconic is false or 'both'
                 if ($GLOBALS['cfg']['PropertiesIconic'] !== true) {
-                    $ret .= ' ' . $displayed_message;
+                    $ret .= ' <span class="clickprevimage">' . $displayed_message . '</span>';
                 }
             }
         } else {


hooks/post-receive
-- 
phpMyAdmin