Changeset 21357

Timestamp:

Mar 8, 2013, 1:11:56 PM (11 years ago)

Author:

mistic100

Message:

Merged revision(s) 21356 from trunk:
[language_switch] update css overload

Location:

branches/2.5/plugins/language_switch

Files:

• default.css (deleted)
• flags.tpl (modified) (2 diffs)
• language_switch.inc.php (modified) (1 diff)
• style.css (modified) (2 diffs)

branches/2.5/plugins/language_switch/flags.tpl

@@ -1 +1 @@
 <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">
@@ -25 +25 @@
 {/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}

branches/2.5/plugins/language_switch/language_switch.inc.php

@@ -125 +125 @@
   }
   
-  $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');

branches/2.5/plugins/language_switch/style.css

@@ -1 +1 @@
 #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;
@@ -5 +12 @@
 
 #languageSwitchBox .switchBoxTitle {
+  padding-bottom:5px;
+  margin-bottom:5px;
   border-bottom: 1px solid #444;
 }