The branch, master has been updated via b4d96e83df4bd4a1a7eb54199879b187f4f2cda9 (commit) via 55d70a7fe198ce9062d414fa7709b56955327f5c (commit) via d32bcb16c6ef836c1eb1cf34d389f4ac70321857 (commit) from 95e6e0b447333b888c7836d6e6cb773e3d73b092 (commit)
- Log ----------------------------------------------------------------- commit b4d96e83df4bd4a1a7eb54199879b187f4f2cda9 Author: Piotr Przybylski piotrprz@gmail.com Date: Tue Sep 20 13:07:09 2011 +0200
IE7 and IE8 used gradient background where they shouldn't
commit 55d70a7fe198ce9062d414fa7709b56955327f5c Author: Piotr Przybylski piotrprz@gmail.com Date: Tue Sep 20 13:02:54 2011 +0200
This should be escaped
commit d32bcb16c6ef836c1eb1cf34d389f4ac70321857 Author: Piotr Przybylski piotrprz@gmail.com Date: Tue Sep 20 13:02:30 2011 +0200
Better looking settings tabs in pmahomme
-----------------------------------------------------------------------
Summary of changes: js/config.js | 11 ++++--- libraries/config/FormDisplay.tpl.php | 2 +- setup/styles.css | 2 +- themes/original/css/theme_right.css.php | 2 +- themes/pmahomme/css/theme_right.css.php | 42 +++++++++++++++++------------- 5 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/js/config.js b/js/config.js index 53702e3..b965045 100644 --- a/js/config.js +++ b/js/config.js @@ -511,9 +511,9 @@ $(function() { */ function setTab(tab_id) { - $('.tabs a').removeClass('active').filter('[href=' + tab_id + ']').addClass('active'); - $('.tabs_contents fieldset').hide().filter(tab_id).show(); - location.hash = 'tab_' + tab_id.substr(1); + $('.tabs li').removeClass('active').find('a[href=#' + tab_id + ']').parent().addClass('active'); + $('.tabs_contents fieldset').hide().filter('#' + tab_id).show(); + location.hash = 'tab_' + tab_id; $('.config-form input[name=tab_hash]').val(location.hash); }
@@ -526,9 +526,10 @@ $(function() { tabs.find('a') .click(function(e) { e.preventDefault(); - setTab($(this).attr('href')); + setTab($(this).attr('href').substr(1)); }) .filter(':first') + .parent() .addClass('active'); $('.tabs_contents fieldset').hide().filter(':first').show();
@@ -539,7 +540,7 @@ $(function() { if (location.hash != prev_hash) { prev_hash = location.hash; if (location.hash.match(/^#tab_.+/) && $('#' + location.hash.substr(5)).length) { - setTab('#' + location.hash.substr(5)); + setTab(location.hash.substr(5)); } } }; diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php index be680d3..c4bdacc 100644 --- a/libraries/config/FormDisplay.tpl.php +++ b/libraries/config/FormDisplay.tpl.php @@ -49,7 +49,7 @@ function display_tabs_top($tabs) ?> <ul class="tabs"> <?php foreach ($tabs as $tab_id => $tab_name): ?> - <li><a href="#<?php echo $tab_id ?>"><?php echo $tab_name ?></a></li> + <li><a href="#<?php echo $tab_id ?>"><?php echo htmlspecialchars($tab_name); ?></a></li> <?php endforeach; ?> </ul> <br clear="right" /> diff --git a/setup/styles.css b/setup/styles.css index 5ec7b16..7616036 100644 --- a/setup/styles.css +++ b/setup/styles.css @@ -166,7 +166,7 @@ ul.tabs li a { border-bottom: none; }
-ul.tabs li a:hover, ul.tabs li a:active, ul.tabs li a.active { +ul.tabs li a:hover, ul.tabs li a:active, ul.tabs li.active a { margin: 0; padding: 2px 10px 4px; background: #F7FBFF; diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 987b559..55c5549 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1872,7 +1872,7 @@ iframe.IE_hack { padding: 0.1em 0.6em 0.2em; }
-.config-form ul.tabs li a.active { +.config-form ul.tabs li.active a { background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>; }
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 5278085..293f119 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2236,7 +2236,8 @@ iframe.IE_hack { }
.config-form ul.tabs li { - float: <?php echo $left; ?>; + float: <?php echo $left; ?>; + margin-bottom: -1px; }
.config-form ul.tabs li a { @@ -2245,36 +2246,40 @@ iframe.IE_hack { white-space: nowrap; text-decoration: none; border: 1px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>; - border-bottom: none; + border-bottom: 1px solid #aaa; }
.config-form ul.tabs li a { - padding:7px 10px; - -moz-border-radius:5px 5px 0 0; - -webkit-border-radius:5px 5px 0 0; - border-radius:5px 5px 0 0; - background:#f2f2f2; - color:#555; - text-shadow: 0 1px 0 #fff; + padding: 7px 10px; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; + background: #f2f2f2; + color: #555; + text-shadow: 0 1px 0 #fff; }
.config-form ul.tabs li a:hover, .config-form ul.tabs li a:active { - background:#e5e5e5; + background: #e5e5e5; }
-.config-form ul.tabs li a.active { +.config-form ul.tabs li.active a { background-color: #fff; - margin-top:1px; - color:#000; - text-shadow: none; + margin-top: 1px; + color: #000; + text-shadow: none; + border-color: #aaa; + border-bottom: 1px solid #fff; }
.config-form fieldset { - margin-top: 0; - padding: 0; - clear: both; - /*border-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;*/ + margin-top: 0; + padding: 0; + clear: both; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; }
.config-form legend { @@ -2313,6 +2318,7 @@ iframe.IE_hack { vertical-align: top; width: 40%; background: transparent; + filter: none; }
.config-form fieldset .doc, .config-form fieldset .disabled-notice {
hooks/post-receive
-
Piotr Przybylski