[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20785-g021e022 - Git

11 Oct 2011

The branch, master has been updated
       via  021e0225cc9c0eca1b1e2f2cfc0e763c1a912140 (commit)
       via  4a5cb00df5cf14019842d4c4745079f204726c17 (commit)
      from  de64133959d929da177ae1357901d67c573fc9f4 (commit)
- Log -----------------------------------------------------------------
commit 021e0225cc9c0eca1b1e2f2cfc0e763c1a912140
Author: Piotr Przybylski piotrprz@gmail.com
Date:   Tue Oct 11 02:05:43 2011 +0200
jQueryUI: move style customizations to theme's CSS
    We have simple customizations, let's keep library's CSS clean
commit 4a5cb00df5cf14019842d4c4745079f204726c17
Author: Piotr Przybylski piotrprz@gmail.com
Date:   Tue Oct 11 02:00:45 2011 +0200
Fix jQuery UI version number
    It's 1.8.16, not 1.8.6
-----------------------------------------------------------------------
Summary of changes:
 db_create.php                                      |    2 +-
 db_events.php                                      |    2 +-
 db_operations.php                                  |    2 +-
 db_routines.php                                    |    2 +-
 db_structure.php                                   |    2 +-
 db_tracking.php                                    |    2 +-
 db_triggers.php                                    |    2 +-
 ...-1.8.6.custom.js => jquery-ui-1.8.16.custom.js} |    0
 libraries/common.inc.php                           |    2 +-
 main.php                                           |    2 +-
 navigation.php                                     |    2 +-
 server_plugins.php                                 |    2 +-
 server_privileges.php                              |    2 +-
 server_status.php                                  |    2 +-
 setup/index.php                                    |    2 +-
 sql.php                                            |    2 +-
 tbl_change.php                                     |    2 +-
 tbl_operations.php                                 |    2 +-
 tbl_replace.php                                    |    2 +-
 tbl_select.php                                     |    2 +-
 tbl_structure.php                                  |    2 +-
 tbl_zoom_select.php                                |    2 +-
 themes/original/css/theme_right.css.php            |    4 ++++
 themes/original/jquery/jquery-ui-1.8.16.custom.css |    2 +-
 themes/pmahomme/css/theme_right.css.php            |    4 ++++
 themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css |    2 +-
 26 files changed, 31 insertions(+), 23 deletions(-)
 rename js/jquery/{jquery-ui-1.8.6.custom.js => jquery-ui-1.8.16.custom.js} (100%)

diff --git a/db_create.php b/db_create.php
index c4465b0..fe86dc9 100644
--- a/db_create.php
+++ b/db_create.php
@@ -10,7 +10,7 @@
  */
 require_once './libraries/common.inc.php';
 $GLOBALS['js_include'][] = 'functions.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
require_once './libraries/mysql_charsets.lib.php';
 if (!PMA_DRIZZLE) {
diff --git a/db_events.php b/db_events.php
index e08663d..6d18641 100644
--- a/db_events.php
+++ b/db_events.php
@@ -15,7 +15,7 @@ require_once './libraries/common.lib.php';
 /**
  * Include JavaScript libraries
  */
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 $GLOBALS['js_include'][] = 'rte/common.js';
 $GLOBALS['js_include'][] = 'rte/events.js';
diff --git a/db_operations.php b/db_operations.php
index 9a4c7ff..6589587 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -23,7 +23,7 @@ require_once "./libraries/blobstreaming.lib.php";
// add a javascript file for jQuery functions to handle Ajax actions
 // also add jQueryUI
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'db_operations.js';
/**
diff --git a/db_routines.php b/db_routines.php
index 004d372..633a848 100644
--- a/db_routines.php
+++ b/db_routines.php
@@ -21,7 +21,7 @@ if (PMA_DRIZZLE) {
 /**
  * Include JavaScript libraries
  */
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 $GLOBALS['js_include'][] = 'rte/common.js';
 $GLOBALS['js_include'][] = 'rte/routines.js';
diff --git a/db_structure.php b/db_structure.php
index 897a664..e486ce8 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -10,7 +10,7 @@
  */
 require_once './libraries/common.inc.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'db_structure.js';
 $GLOBALS['js_include'][] = 'tbl_change.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
diff --git a/db_tracking.php b/db_tracking.php
index 89bcca2..d00d106 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -10,7 +10,7 @@
 require_once './libraries/common.inc.php';
//Get some js files needed for Ajax requests
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'db_structure.js';
/**
diff --git a/db_triggers.php b/db_triggers.php
index b9f3562..66a1085 100644
--- a/db_triggers.php
+++ b/db_triggers.php
@@ -15,7 +15,7 @@ require_once './libraries/common.lib.php';
 /**
  * Include JavaScript libraries
  */
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'rte/common.js';
 $GLOBALS['js_include'][] = 'rte/triggers.js';
 $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
diff --git a/js/jquery/jquery-ui-1.8.6.custom.js b/js/jquery/jquery-ui-1.8.16.custom.js
similarity index 100%
rename from js/jquery/jquery-ui-1.8.6.custom.js
rename to js/jquery/jquery-ui-1.8.16.custom.js
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 1a1dd23..65d63d4 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -555,7 +555,7 @@ $_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], '');
  */
 $GLOBALS['js_include'] = array();
 $GLOBALS['js_include'][] = 'jquery/jquery-1.6.2.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'update-location.js';
/**
diff --git a/main.php b/main.php
index 23e555f..30d9589 100644
--- a/main.php
+++ b/main.php
@@ -10,7 +10,7 @@
  */
 require_once './libraries/common.inc.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
// Handles some variables that may have been sent by the calling script
diff --git a/navigation.php b/navigation.php
index 4edf490..dffa557 100644
--- a/navigation.php
+++ b/navigation.php
@@ -106,7 +106,7 @@ require_once './libraries/header_http.inc.php';
         href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=left&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
     <?php
     echo PMA_includeJS('jquery/jquery-1.6.2.js');
-    echo PMA_includeJS('jquery/jquery-ui-1.8.6.custom.js');
+    echo PMA_includeJS('jquery/jquery-ui-1.8.16.custom.js');
     echo PMA_includeJS('jquery/jquery.qtip-1.0.0-rc3.js');
     echo PMA_includeJS('navigation.js');
     echo PMA_includeJS('functions.js');
diff --git a/server_plugins.php b/server_plugins.php
index 2b7650c..93a5f63 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -21,7 +21,7 @@ require_once './libraries/common.inc.php';
 /**
  * JS includes
  */
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.cookie.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js';
 $GLOBALS['js_include'][] = 'server_plugins.js';
diff --git a/server_privileges.php b/server_privileges.php
index 2dbcb3d..b626cae 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -15,7 +15,7 @@ require_once './libraries/common.inc.php';
  */
 $GLOBALS['js_include'][] = 'server_privileges.js';
 $GLOBALS['js_include'][] = 'functions.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $_add_user_error = false;
require './libraries/server_common.inc.php';
diff --git a/server_status.php b/server_status.php
index b314ef7..02e3a7f 100644
--- a/server_status.php
+++ b/server_status.php
@@ -413,7 +413,7 @@ if (PMA_DRIZZLE) {
  */
$GLOBALS['js_include'][] = 'server_status.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.cookie.js'; // For tab persistence
 // Charting
diff --git a/setup/index.php b/setup/index.php
index 115e9ed..14cf030 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -38,7 +38,7 @@ require './libraries/header_http.inc.php';
 <link href="../favicon.ico" rel="shortcut icon" type="image/x-icon" />
 <link href="styles.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../js/jquery/jquery-1.6.2.js"></script>
-<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.6.custom.js"></script>
+<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.16.custom.js"></script>
 <script type="text/javascript" src="../js/jquery/jquery.json-2.2.js"></script>
 <script type="text/javascript" src="../js/config.js"></script>
 <script type="text/javascript" src="scripts.js"></script>
diff --git a/sql.php b/sql.php
index 4d7e30e..05b80b6 100644
--- a/sql.php
+++ b/sql.php
@@ -14,7 +14,7 @@ require_once './libraries/Table.class.php';
 require_once './libraries/check_user_privileges.lib.php';
 require_once './libraries/bookmark.lib.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 $GLOBALS['js_include'][] = 'tbl_change.js';
 $GLOBALS['js_include'][] = 'gis_data_editor.js';
diff --git a/tbl_change.php b/tbl_change.php
index f2ad519..004c30a 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -120,7 +120,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) {
  */
 $GLOBALS['js_include'][] = 'functions.js';
 $GLOBALS['js_include'][] = 'tbl_change.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 $GLOBALS['js_include'][] = 'gis_data_editor.js';
diff --git a/tbl_operations.php b/tbl_operations.php
index 14c7873..1f44315 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -32,7 +32,7 @@ require_once './libraries/StorageEngine.class.php';
// add a javascript file for jQuery functions to handle Ajax actions
 // also add jQueryUI
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
/**
  * Class for partition management
diff --git a/tbl_replace.php b/tbl_replace.php
index 74edd00..79c21c3 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -568,7 +568,7 @@ if (isset($return_to_sql_query)) {
$GLOBALS['js_include'][] = 'tbl_change.js';
 // in case we call sql.php which needs those:
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$active_page = $goto_include;
diff --git a/tbl_select.php b/tbl_select.php
index 0aedc74..0762677 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -21,7 +21,7 @@ $GLOBALS['js_include'][] = 'makegrid.js';
 $GLOBALS['js_include'][] = 'sql.js';
 $GLOBALS['js_include'][] = 'tbl_select.js';
 $GLOBALS['js_include'][] = 'tbl_change.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 $GLOBALS['js_include'][] = 'gis_data_editor.js';
diff --git a/tbl_structure.php b/tbl_structure.php
index 24df77c..0385b26 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -12,7 +12,7 @@
 require_once './libraries/common.inc.php';
 require_once './libraries/mysql_charsets.lib.php';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'tbl_structure.js';
 $GLOBALS['js_include'][] = 'indexes.js';
 /**
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 3242fb2..739a509 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -26,7 +26,7 @@ $GLOBALS['js_include'][] = 'highcharts/highcharts.js';
 /* Files required for chart exporting */
 $GLOBALS['js_include'][] = 'highcharts/exporting.js';
 $GLOBALS['js_include'][] = 'canvg/canvg.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.6.custom.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index fba8c4d..be8d933 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -2917,6 +2917,10 @@ input.btn {
     background-color: #D0DCE0;
 }
+body .ui-widget {
+    font-size: 1em;
+}
+
 .ui-dialog fieldset legend a {
     color: #0000FF;
 }
diff --git a/themes/original/jquery/jquery-ui-1.8.16.custom.css b/themes/original/jquery/jquery-ui-1.8.16.custom.css
index 8295059..a712408 100644
--- a/themes/original/jquery/jquery-ui-1.8.16.custom.css
+++ b/themes/original/jquery/jquery-ui-1.8.16.custom.css
@@ -56,7 +56,7 @@
/* Component containers
 ----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
 .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 8f09feb..358b71b 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -3340,6 +3340,10 @@ input.btn {
     background-color: #D0DCE0;
 }
+body .ui-widget {
+    font-size: 1em;
+}
+
 .ui-dialog fieldset legend a {
     color: #235A81;
 }
diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css b/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
index 8295059..a712408 100644
--- a/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
+++ b/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
@@ -56,7 +56,7 @@
/* Component containers
 ----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
 .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
hooks/post-receive
-- 
phpMyAdmin


    