The branch, master has been updated
via 2a54778c3a45b77f0efd72db872c11c2666e70b7 (commit)
via 3bcfb2602790fe13204111b0215e53a491b517f7 (commit)
via 32724b30773492dba6c1bc5fb3a30589042eca6c (commit)
via 63342fdf4a36b1c7282bcf3cc90f31ad61687953 (commit)
via 5bef74287dce3e09f072c441112dcc872c73752e (commit)
from 7d185b406a7bd3383b8edcd775da22a719ce63e0 (commit)
- Log -----------------------------------------------------------------
commit 2a54778c3a45b77f0efd72db872c11c2666e70b7
Author: Michal Čihař <[email protected]>
Date: Tue Aug 16 12:31:01 2011 +0200
Revert "Replace external advisory urls with url.php?url=sdf&token=..."
This reverts commit 32724b30773492dba6c1bc5fb3a30589042eca6c.
commit 3bcfb2602790fe13204111b0215e53a491b517f7
Merge: 7d185b4 32724b3
Author: Michal Čihař <[email protected]>
Date: Tue Aug 16 12:30:24 2011 +0200
Merge remote-tracking branch 'tyron/master'
commit 32724b30773492dba6c1bc5fb3a30589042eca6c
Author: Tyron Madlener <[email protected]>
Date: Tue Aug 16 13:14:48 2011 +0300
Replace external advisory urls with url.php?url=sdf&token=...
commit 63342fdf4a36b1c7282bcf3cc90f31ad61687953
Author: Tyron Madlener <[email protected]>
Date: Tue Aug 16 13:14:17 2011 +0300
Hide js feature elements when js is disabled
commit 5bef74287dce3e09f072c441112dcc872c73752e
Author: Tyron Madlener <[email protected]>
Date: Tue Aug 16 13:13:43 2011 +0300
Run monitor when tab is focused
-----------------------------------------------------------------------
Summary of changes:
js/server_status.js | 8 ++++----
js/server_status_monitor.js | 5 +++++
themes/original/css/theme_right.css.php | 3 +++
themes/pmahomme/css/theme_right.css.php | 3 +++
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/js/server_status.js b/js/server_status.js
index 870f9b1..bcb25b8 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -15,6 +15,9 @@
// Add a tablesorter parser to properly handle thousands seperated numbers and
SI prefixes
$(function() {
+ // Show all javascript related parts of the page
+ $('.jsfeature').show();
+
jQuery.tablesorter.addParser({
id: "fancyNumber",
is: function(s) {
@@ -110,7 +113,7 @@ $(function() {
menuResize();
// Load Server status monitor
if (ui.tab.hash == '#statustabs_charting' && ! monitorLoaded) {
- $('div#statustabs_charting').append(
+ $('div#statustabs_charting').append(
//PMA_messages['strLoadingMonitor'] + ' ' +
'<img class="ajaxIcon" id="loadingMonitorIcon" src="' +
pmaThemeImage + 'ajax_clock_small.gif" alt="">'
);
@@ -144,9 +147,6 @@ $(function() {
tabStatus[$(this).attr('id')] = 'static';
});
- // Display button links
- $('div.buttonlinks').show();
-
// Handles refresh rate changing
$('.buttonlinks select').change(function() {
var chart = tabChart[$(this).parents('div.ui-tabs-panel').attr('id')];
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index f8a179d..7ac2498 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -1869,4 +1869,9 @@ $(function() {
$('a[href="#clearMonitorConfig"]').show();
}
+});
+
+// Run the monitor once loaded
+$(function() {
+ $('a[href="#pauseCharts"]').trigger('click');
});
\ No newline at end of file
diff --git a/themes/original/css/theme_right.css.php
b/themes/original/css/theme_right.css.php
index 81d01de..83590f9 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1126,6 +1126,9 @@ img.sortableIcon {
.buttonlinks {
float: <?php echo $right; ?>;
white-space: nowrap;
+}
+
+.jsfeature {
display: none; /* Made visible with js */
}
diff --git a/themes/pmahomme/css/theme_right.css.php
b/themes/pmahomme/css/theme_right.css.php
index 3cd5dc2..8050419 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -1348,6 +1348,9 @@ img.sortableIcon {
.buttonlinks {
float: <?php echo $right; ?>;
white-space: nowrap;
+}
+
+.jsfeature {
display: none; /* Made visible with js */
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model
configuration take the hassle out of deploying and managing Subversion and
the tools developers use with it. Learn more about uberSVN and get a free
download at: http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
