mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Fix iconfonts not working in the installer/upgrader. Again.

Browse Source 
First solution affected the backend of finished installations as
well, this one does not.

References #80
This commit is contained in:
Matthias Mees 2014-03-09 19:05:04 +01:00
parent f34134b215
commit 5d04730011
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/2k11/admin/config_template.tpl
View File

@ -20,14 +20,14 @@
{/if} {/if}
{/if} {/if}
<fieldset id="el{$category@index}" class="config_optiongroup{if $config_groupkeys@last} config_optiongroup_last{/if}{if $admin_vars.admin_installed} additional_info{/if} option_list"> <fieldset id="el{$category@index}" class="config_optiongroup{if $config_groupkeys@last} config_optiongroup_last{/if} additional_info option_list">
<legend class="visuallyhidden">{$category.description}</legend> <legend class="visuallyhidden">{$category.description}</legend>
{foreach $category.items as $item} {foreach $category.items as $item}
{cycle assign='zebra_class' values='odd,even'} {cycle assign='zebra_class' values='odd,even'}
{if $item.guessedInput} {if $item.guessedInput}
{if $item.type == 'bool'} {if $item.type == 'bool'}
<fieldset class="clearfix {$zebra_class}"> <fieldset class="clearfix {$zebra_class}">
<span class="wrap_legend"><legend>{$item.title}{if $item.description != ''} <button class="toggle_info button_link" type="button" data-href="#{$item.var}_info">{if $admin_vars.admin_installed} <span class="icon-info-circled"></span>{else}<b>i</b>{/if}<span class="visuallyhidden"> {$CONST.MORE}</span></button>{/if}</legend></span> <span class="wrap_legend"><legend>{$item.title}{if $item.description != ''} <button class="toggle_info button_link" type="button" data-href="#{$item.var}_info"><span class="icon-info-circled"></span><b>i</b><span class="visuallyhidden"> {$CONST.MORE}</span></button>{/if}</legend></span>
<div class="clearfix grouped"> <div class="clearfix grouped">
{$item.guessedInput} {$item.guessedInput}
</div> </div>
@ -37,7 +37,7 @@
</fieldset> </fieldset>
{else} {else}
<div class="clearfix {$zebra_class} form_{if $item.type == 'list'}select{elseif $item.type == 'multilist'}multiselect{elseif $item.type == 'textarea'}area{else}field{/if}"> <div class="clearfix {$zebra_class} form_{if $item.type == 'list'}select{elseif $item.type == 'multilist'}multiselect{elseif $item.type == 'textarea'}area{else}field{/if}">
<label for="{$item.var}">{$item.title}{if $item.description != ''} <button class="toggle_info button_link" type="button" data-href="#{$item.var}_info">{if $admin_vars.admin_installed} <span class="icon-info-circled"></span>{else}<b>i</b>{/if}<span class="visuallyhidden"> {$CONST.MORE}</span></button>{/if}</label> <label for="{$item.var}">{$item.title}{if $item.description != ''} <button class="toggle_info button_link" type="button" data-href="#{$item.var}_info"><span class="icon-info-circled"></span><b>i</b><span class="visuallyhidden"> {$CONST.MORE}</span></button>{/if}</label>
{$item.guessedInput} {$item.guessedInput}
{if $item.description != ''} {if $item.description != ''}
<span id="{$item.var}_info" class="field_info additional_info">{$item.description}</span> <span id="{$item.var}_info" class="field_info additional_info">{$item.description}</span>

8
templates/2k11/admin/style.css
View File

@ -2062,7 +2062,8 @@ label .perm_name,
} }
.nojs-controls, .nojs-controls,
.touch .pluginmanager_grablet { .touch .pluginmanager_grablet,
.toggle_info b {
display: none; display: none;
visibility: hidden; visibility: hidden;
} }
@ -2133,6 +2134,7 @@ label .perm_name,
.no-js .toggle_info, .no-js .toggle_info,
.no-js #category_list, .no-js #category_list,
.js .additional_info, .js .additional_info,
.js .installer .icon-info-circled,
.hidden, .hidden,
.msg_error > br, .msg_error > br,
.msg_success > br, .msg_success > br,
@ -2142,7 +2144,9 @@ label .perm_name,
visibility: hidden; visibility: hidden;
} }
.no-js .mfp-hide { .no-js .mfp-hide,
.js .installer .toggle_info b,
.installer .configuration_group > .additional_info {
display: block !important; display: block !important;
visibility: visible; visibility: visible;
} }