Changeset 21357


Ignore:
Timestamp:
Mar 8, 2013, 1:11:56 PM (7 years ago)
Author:
mistic100
Message:

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

Location:
branches/2.5/plugins/language_switch
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/plugins/language_switch/flags.tpl

    r20943 r21357  
    11<li id="languageSwitch">{strip}<a id="languageSwitchLink" title="{'Language'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
    2   <span class="pwg-icon flags langflag-{$lang_switch.Active.code}" >&nbsp;</span><span class="pwg-button-text">{'Language'|@translate}</span>
     2  <span class="pwg-icon flags langflag-{$lang_switch.Active.code}">&nbsp;</span><span class="pwg-button-text">{'Language'|@translate}</span>
    33</a>
    44<div id="languageSwitchBox" class="switchBox">
     
    2525{/literal}{/footer_script}
    2626
    27 {* <!-- switchBox structure for theme which don't include default style --> *}
    28 {if $themeconf.parent != 'default' or (isset($themeconf.load_parent_local_head) and $themeconf.load_parent_local_head == false) }
    29 {combine_css path=$LANGUAGE_SWITCH_PATH|@cat:"default.css"}
    30 {/if}
    31 
    32 {* <!-- stylish for non core themes (should be removed when all themes are updated) --> *}
    33 {if $themeconf.name != 'clear' and $themeconf.name != 'dark' and $themeconf.name != 'elegant' and $themeconf.name != 'Sylvia'}
     27{* <!-- stylish for themes missing .switchBox styles --> *
     28{if $LANGUAGE_SWITCH_LOAD_STYLE}
    3429{combine_css path=$LANGUAGE_SWITCH_PATH|@cat:"style.css"}
    3530{/if}
  • branches/2.5/plugins/language_switch/language_switch.inc.php

    r20587 r21357  
    125125  }
    126126 
    127   $template->set_filename('language_flags', dirname(__FILE__) . '/flags.tpl');
     127  $safe_themes = array('clear','dark','elegant','Sylvia','simple-grey','simple-black','simple-white','kardon','luciano','montblancxl'); // stripped (2.6)
    128128 
    129   $template->assign(
    130     array(
     129  $template->assign(array(
    131130      'lang_switch'=> $lsw,
    132131      'LANGUAGE_SWITCH_PATH' => LANGUAGE_SWITCH_PATH,
    133       )
    134     );
     132      'LANGUAGE_SWITCH_LOAD_STYLE' => !in_array($user['theme'], $safe_themes),
     133      ));
    135134 
     135  $template->set_filename('language_flags', dirname(__FILE__) . '/flags.tpl');
    136136  $template->concat('PLUGIN_INDEX_ACTIONS', $template->parse('language_flags', true) );
    137137  $template->clear_assign('lang_switch');
  • branches/2.5/plugins/language_switch/style.css

    r15923 r21357  
    11#languageSwitchBox {
     2        padding: 0.5em 5px;
     3        border-radius: 4px;
     4        z-index: 100;
     5        text-align:left;
     6        display: none;
     7        position: absolute;
     8        left: 0; top: 0; /*left, right set through js*/
    29  background-color: #555;
    310  border: 1px solid #000;
     
    512
    613#languageSwitchBox .switchBoxTitle {
     14  padding-bottom:5px;
     15  margin-bottom:5px;
    716  border-bottom: 1px solid #444;
    817}
Note: See TracChangeset for help on using the changeset viewer.