[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1221-g14d12d1

[Marc Delisle]

The branch, master has been updated
       via  14d12d1dedfd5b023e6385f3cbb0a2eb3a12b326 (commit)
       via  46eb3e47211f5b187291462f94541f1f440cadcf (commit)
      from  d9008701482252d3c8f35b8bcaafec4afa3b6310 (commit)


- Log -----------------------------------------------------------------
commit 14d12d1dedfd5b023e6385f3cbb0a2eb3a12b326
Merge: 46eb3e47211f5b187291462f94541f1f440cadcf d9008701482252d3c8f35b8bcaafec4afa3b6310
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Apr 1 10:30:59 2010 -0400

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

commit 46eb3e47211f5b187291462f94541f1f440cadcf
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Apr 1 10:30:26 2010 -0400

    inline edit: help seeing the buttons without scrolling; XHTML compliancy

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

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

diff --git a/js/functions.js b/js/functions.js
index 045e55a..99cc5c5 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1667,6 +1667,8 @@ $(document).ready(function(){
         $token=$("input[name='token']").val();
         $sql_query=$("input[name='sql_query']").val();
         $(".syntax").replaceWith("<textarea name=\"sql_query_edit\" id=\"sql_query_edit\">"+ $sql_query +"</textarea><input type=\"button\" id=\"btnSave\" value=\"" + PMA_messages['strGo'] + "\"><input type=\"button\" id=\"btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\">");
+        // to help seeing the buttons without scrolling
+        $('#sql_query_edit').css({height: '6em', width: '75%'});
         return false;
     });
 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 3a53d04..816bdbe 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1270,11 +1270,15 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         if (! empty($refresh_link)) {
             PMA_profilingCheckbox($sql_query);
         }
-        $inline_edit = "<script language=\"javascript\">document.write('[<a href=\"#\" title=\"" .
+        $inline_edit = "<script type=\"text/javascript\">\n" .
+            "//<![CDATA[\n" . 
+            "document.write('[<a href=\"#\" title=\"" .
             PMA_escapeJsString(__('Inline edit of this query')) .
             "\" id=\"inline_edit\">" .
             PMA_escapeJsString(__('Inline')) .
-            "</a>]');</script>";
+            "</a>]');\n" .
+            "//]]>\n" .
+            "</script>";
         echo $inline_edit . $edit_link . $explain_link . $php_link . $refresh_link . $validate_link;
         echo '</div>';
     }


hooks/post-receive
-- 
phpMyAdmin