From 5d04730011d85d64e2bb6a212b07a2e6cb696b94 Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Sun, 9 Mar 2014 19:05:04 +0100
Subject: [PATCH] Fix iconfonts not working in the installer/upgrader. Again.

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

References #80
---
 templates/2k11/admin/config_template.tpl | 6 +++---
 templates/2k11/admin/style.css           | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/templates/2k11/admin/config_template.tpl b/templates/2k11/admin/config_template.tpl
index eaf9a7e5..0ea52872 100644
--- a/templates/2k11/admin/config_template.tpl
+++ b/templates/2k11/admin/config_template.tpl
@@ -20,14 +20,14 @@
             {/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>
         {foreach $category.items as $item}
             {cycle assign='zebra_class' values='odd,even'}
             {if $item.guessedInput}
                 {if $item.type == 'bool'}
                 <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">
                     {$item.guessedInput}
                     </div>
@@ -37,7 +37,7 @@
                 </fieldset>
                 {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}">
-                    <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}
                     {if $item.description != ''}
                     <span id="{$item.var}_info" class="field_info additional_info">{$item.description}</span>
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 889f4581..2076a3d3 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -2062,7 +2062,8 @@ label .perm_name,
 }
 
 .nojs-controls,
-.touch .pluginmanager_grablet {
+.touch .pluginmanager_grablet,
+.toggle_info b {
     display: none;
     visibility: hidden;
 }
@@ -2133,6 +2134,7 @@ label .perm_name,
 .no-js .toggle_info,
 .no-js #category_list,
 .js .additional_info,
+.js .installer .icon-info-circled,
 .hidden,
 .msg_error > br,
 .msg_success > br,
@@ -2142,7 +2144,9 @@ label .perm_name,
     visibility: hidden;
 }
 
-.no-js .mfp-hide {
+.no-js .mfp-hide,
+.js .installer .toggle_info b,
+.installer .configuration_group > .additional_info {
     display: block !important;
     visibility: visible;
 }