aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2013-03-08 12:09:06 +0000
committermistic100 <mistic@piwigo.org>2013-03-08 12:09:06 +0000
commit61ca0705dde33bd81b133d538c197c89ccf5caaf (patch)
tree69130646e2042dc93584aac0113891444015ff28
parentb7e2b0176890b1293a093d2bd6cceadf825b4f0e (diff)
update css overload
git-svn-id: http://piwigo.org/svn/trunk@21356 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--plugins/language_switch/default.css14
-rw-r--r--plugins/language_switch/flags.tpl11
-rw-r--r--plugins/language_switch/language_switch.inc.php10
-rw-r--r--plugins/language_switch/style.css9
4 files changed, 17 insertions, 27 deletions
diff --git a/plugins/language_switch/default.css b/plugins/language_switch/default.css
deleted file mode 100644
index a73c67366..000000000
--- a/plugins/language_switch/default.css
+++ /dev/null
@@ -1,14 +0,0 @@
-#languageSwitchBox {
- padding: 0.5em 5px;
- border-radius: 4px;
- z-index: 100;
- text-align:left;
- display: none;
- position: absolute;
- left: 0; top: 0; /*left, right set through js*/
-}
-
-#languageSwitchBox .switchBoxTitle {
- padding-bottom:5px;
- margin-bottom:5px;
-} \ No newline at end of file
diff --git a/plugins/language_switch/flags.tpl b/plugins/language_switch/flags.tpl
index 54063fd03..38cfc4818 100644
--- a/plugins/language_switch/flags.tpl
+++ b/plugins/language_switch/flags.tpl
@@ -1,5 +1,5 @@
<li id="languageSwitch">{strip}<a id="languageSwitchLink" title="{'Language'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
- <span class="pwg-icon flags langflag-{$lang_switch.Active.code}" >&nbsp;</span><span class="pwg-button-text">{'Language'|@translate}</span>
+ <span class="pwg-icon flags langflag-{$lang_switch.Active.code}">&nbsp;</span><span class="pwg-button-text">{'Language'|@translate}</span>
</a>
<div id="languageSwitchBox" class="switchBox">
<div class="switchBoxTitle">{'Language'|@translate}</div>
@@ -24,13 +24,8 @@ jQuery("#languageSwitchBox").on("mouseleave", function() {
});
{/literal}{/footer_script}
-{* <!-- switchBox structure for theme which don't include default style --> *}
-{if $themeconf.parent != 'default' or (isset($themeconf.load_parent_local_head) and $themeconf.load_parent_local_head == false) }
-{combine_css path=$LANGUAGE_SWITCH_PATH|@cat:"default.css"}
-{/if}
-
-{* <!-- stylish for non core themes (should be removed when all themes are updated) --> *}
-{if $themeconf.name != 'clear' and $themeconf.name != 'dark' and $themeconf.name != 'elegant' and $themeconf.name != 'Sylvia'}
+{* <!-- stylish for themes missing .switchBox styles --> *
+{if $LANGUAGE_SWITCH_LOAD_STYLE}
{combine_css path=$LANGUAGE_SWITCH_PATH|@cat:"style.css"}
{/if}
diff --git a/plugins/language_switch/language_switch.inc.php b/plugins/language_switch/language_switch.inc.php
index 63a3cca7e..333dddfdd 100644
--- a/plugins/language_switch/language_switch.inc.php
+++ b/plugins/language_switch/language_switch.inc.php
@@ -124,15 +124,15 @@ function language_controler_flags()
}
}
- $template->set_filename('language_flags', dirname(__FILE__) . '/flags.tpl');
+ $safe_themes = array('clear','dark','elegant','Sylvia','simple-grey','simple-black','simple-white','kardon','luciano','montblancxl'); // stripped (2.6)
- $template->assign(
- array(
+ $template->assign(array(
'lang_switch'=> $lsw,
'LANGUAGE_SWITCH_PATH' => LANGUAGE_SWITCH_PATH,
- )
- );
+ 'LANGUAGE_SWITCH_LOAD_STYLE' => !in_array($user['theme'], $safe_themes),
+ ));
+ $template->set_filename('language_flags', dirname(__FILE__) . '/flags.tpl');
$template->concat('PLUGIN_INDEX_ACTIONS', $template->parse('language_flags', true) );
$template->clear_assign('lang_switch');
}
diff --git a/plugins/language_switch/style.css b/plugins/language_switch/style.css
index 8b330272c..55992d349 100644
--- a/plugins/language_switch/style.css
+++ b/plugins/language_switch/style.css
@@ -1,9 +1,18 @@
#languageSwitchBox {
+ padding: 0.5em 5px;
+ border-radius: 4px;
+ z-index: 100;
+ text-align:left;
+ display: none;
+ position: absolute;
+ left: 0; top: 0; /*left, right set through js*/
background-color: #555;
border: 1px solid #000;
}
#languageSwitchBox .switchBoxTitle {
+ padding-bottom:5px;
+ margin-bottom:5px;
border-bottom: 1px solid #444;
}
#languageSwitchBox a {