Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAris Feryanto <aris_feryanto@yahoo.com>2011-06-01 09:45:55 +0400
committerAris Feryanto <aris_feryanto@yahoo.com>2011-06-01 09:46:12 +0400
commit3b7f35d5c9f2c25c4fe5d7322fbe79c181637764 (patch)
tree44d873b59e8f749ef158974a11673fb4c6b1ee64
parentd174e8b41c6df7b8e38900e2fc4d8560b1501bd5 (diff)
Add makegrid triggering in other files
-rw-r--r--db_sql.php1
-rw-r--r--js/db_search.js1
-rw-r--r--js/tbl_select.js1
-rw-r--r--server_sql.php1
-rw-r--r--sql.php2
-rw-r--r--tbl_replace.php1
-rw-r--r--tbl_select.php1
-rw-r--r--tbl_sql.php1
-rw-r--r--themes/pmahomme/css/theme_right.css.php4
9 files changed, 10 insertions, 3 deletions
diff --git a/db_sql.php b/db_sql.php
index 2020dea7d5..3085808cfe 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -14,6 +14,7 @@ require_once './libraries/common.inc.php';
* Runs common work
*/
$GLOBALS['js_include'][] = 'functions.js';
+$GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
require './libraries/db_common.inc.php';
diff --git a/js/db_search.js b/js/db_search.js
index 6fff82dec8..32c5c13d80 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -174,6 +174,7 @@ $(document).ready(function() {
// found results
$("#searchresults").html(response);
$("#sqlqueryresults").trigger('appendAnchor');
+ $("#sqlqueryresults").trigger('makegrid');
$('#togglesearchresultlink')
// always start with the Show message
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 8115245cbc..8d3049a5a6 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -67,6 +67,7 @@ $(document).ready(function() {
// found results
$("#sqlqueryresults").html(response);
$("#sqlqueryresults").trigger('appendAnchor');
+ $("#sqlqueryresults").trigger('makegrid');
$('#tbl_search_form')
// work around for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome.
.slideToggle()
diff --git a/server_sql.php b/server_sql.php
index 243d0bf0db..f8609f49cb 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -14,6 +14,7 @@ require_once './libraries/common.inc.php';
* Does the common work
*/
$GLOBALS['js_include'][] = 'functions.js';
+$GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
require_once './libraries/server_common.inc.php';
diff --git a/sql.php b/sql.php
index 3a47018237..5d648e7b7f 100644
--- a/sql.php
+++ b/sql.php
@@ -814,8 +814,8 @@ else {
} else {
$GLOBALS['js_include'][] = 'functions.js';
- $GLOBALS['js_include'][] = 'sql.js';
$GLOBALS['js_include'][] = 'makegrid.js';
+ $GLOBALS['js_include'][] = 'sql.js';
unset($message);
diff --git a/tbl_replace.php b/tbl_replace.php
index 5b722c69c9..d23482e554 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -65,6 +65,7 @@ PMA_DBI_select_db($GLOBALS['db']);
*/
$goto_include = false;
+$GLOBALS['js_include'][] = 'makegrid.js';
// Needed for generation of Inline Edit anchors
$GLOBALS['js_include'][] = 'sql.js';
diff --git a/tbl_select.php b/tbl_select.php
index 681083a696..875182d71e 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -16,6 +16,7 @@
require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
+$GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
$GLOBALS['js_include'][] = 'tbl_select.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
diff --git a/tbl_sql.php b/tbl_sql.php
index 70fafc1d0c..0321395b94 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -14,6 +14,7 @@ require_once './libraries/common.inc.php';
* Runs common work
*/
$GLOBALS['js_include'][] = 'functions.js';
+$GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
require './libraries/tbl_common.php';
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 1f1002623b..0072cd01db 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -2127,9 +2127,9 @@ fieldset .disabled-field td {
}
.colborder {
- border-right: solid 2px #FFFFFF;
+ border-right: 1px solid #FFF;
cursor: col-resize;
- margin-left: -2px;
+ margin-left: -1px;
position: absolute;
width: 3px;
}