Fixed some small issues

diff --git a/acptemplates/languageAdd.tpl b/acptemplates/languageAdd.tpl
index 93eadf5a3460ab919abc7d4fa74e242ac3eb1fb1..5a07a300d92ef0f4c24210b1ac5780bb3db6b825 100644 (file)
--- a/acptemplates/languageAdd.tpl
+++ b/acptemplates/languageAdd.tpl
@@ -33,20 +33,16 @@
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageAdd'}{/link}">
        <div class="container containerPadding marginTop shadow">
-               <dl>
-                       <dt><label for="import">{lang}wcf.acp.language.add.mode{/lang}</label></dt>
-                       <dd>
-                               <fieldset>
-                                       <dl>
-                                               <dd>
-                                                       <label><input type="radio" name="mode" value="import" id="import" {if $mode == 'import'}checked="checked" {/if}/> {lang}wcf.acp.language.add.mode.import{/lang}</label>
-                                               </dd>
-                                               <dd>
-                                                       <label><input type="radio" name="mode" value="copy" id="copy" {if $mode == 'copy'}checked="checked" {/if}/> {lang}wcf.acp.language.add.mode.copy{/lang}</label>
-                                               </dd>
-                               </fieldset>
-                       </dd>
-               </dl>
+               <fieldset>
+                       <legend>{lang}wcf.acp.language.add.mode{/lang}</legend>
+                       
+                       <dl>
+                                       <dd class="floated">
+                                               <label><input type="radio" name="mode" value="import" id="import" {if $mode == 'import'}checked="checked" {/if}/> {lang}wcf.acp.language.add.mode.import{/lang}</label>
+                                               <label><input type="radio" name="mode" value="copy" id="copy" {if $mode == 'copy'}checked="checked" {/if}/> {lang}wcf.acp.language.add.mode.copy{/lang}</label>
+                                       </dd>
+                       </dl>
+               </fieldset>
                
                <fieldset id="importDiv">
                        <legend>{lang}wcf.acp.language.import.source{/lang}</legend>

diff --git a/acptemplates/languageExport.tpl b/acptemplates/languageExport.tpl
index 28a7ed170d92f3562f3d1985b74ae74a1dacb520..18a463857a32122cdd94f5a018d91d2a1c5d653e 100644 (file)
--- a/acptemplates/languageExport.tpl
+++ b/acptemplates/languageExport.tpl
@@ -1,61 +1,63 @@
 {include file='header'}
 
-<header class="wcf-container wcf-mainHeading">
-       <img src="{@RELATIVE_WCF_DIR}icon/download1.svg" alt="" class="wcf-containerIcon" />
-       <hgroup class="wcf-containerContent">
+<header class="boxHeadline">
+       <hgroup>
                <h1>{lang}wcf.acp.language.export{/lang}</h1>
        </hgroup>
 </header>
 
 {if $errorField}
-       <p class="wcf-error">{lang}wcf.global.form.error{/lang}</p>
+       <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
 {if $success|isset}
-       <p class="wcf-success">{lang}wcf.acp.language.add.success{/lang}</p>    
+       <p class="success">{lang}wcf.acp.language.add.success{/lang}</p>        
 {/if}
 
-<div class="wcf-contentHeader">
+<div class="contentNavigation">
        <nav>
-               <ul class="wcf-largeButtons">
-                       <li><a href="{link controller='LanguageList'}{/link}" title="{lang}wcf.acp.menu.link.language.list{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/language1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
+               <ul>
+                       <li><a href="{link controller='LanguageList'}{/link}" title="{lang}wcf.acp.menu.link.language.list{/lang}" class="button"><img src="{@RELATIVE_WCF_DIR}icon/language1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
                </ul>
        </nav>
 </div>
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageExport' id=$languageID}{/link}">
-       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-shadow1">
-               <dl>
-                       <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
-                       <dd>
-                               {htmlOptions options=$languages selected=$languageID name='languageID' id='languageID'}
-                       </dd>
-               </dl>
+       <div class="container containerPadding marginTop shadow">
+               <fieldset>
+                       <legend>{lang}wcf.acp.language.export{/lang}</legend>
                
-               <dl>
-                       <dt><label for="selectedPackages">{lang}wcf.acp.language.export.selectPackages{/lang}</label></dt>
-                       <dd>
-                               <select id="selectedPackages" name="selectedPackages[]" multiple="multiple" size="20" class="long">
-                                       <option value="*"{if $selectAllPackages} selected="selected"{/if}>{lang}wcf.acp.language.export.allPackages{/lang}</option>
-                                       <option value="-">--------------------</option>
-                                       {foreach from=$packages item=package}
-                                               {assign var=loop value=$packageNameLength-$package->packageNameLength}
-                                               <option value="{@$package->packageID}"{if $selectedPackages[$package->packageID]|isset} selected="selected"{/if}>{$package->packageName} {section name=i loop=$loop}&nbsp;{/section}&nbsp;&nbsp;{$package->package}</option>
-                                       {/foreach}
-                               </select>
-                       </dd>
-               </dl>
-               
-               <dl>
-                       <dd>
-                               <label for="exportCustomValues"><input type="checkbox" name="exportCustomValues" id="exportCustomValues" value="1" /> {lang}wcf.acp.language.export.customValues{/lang}</label>
-                       </dd>
-               </dl>
+                       <dl>
+                               <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
+                               <dd>
+                                       {htmlOptions options=$languages selected=$languageID name='languageID' id='languageID'}
+                               </dd>
+                       </dl>
+                       
+                       <dl>
+                               <dt><label for="selectedPackages">{lang}wcf.acp.language.export.selectPackages{/lang}</label></dt>
+                               <dd>
+                                       <select id="selectedPackages" name="selectedPackages[]" multiple="multiple" size="20" class="long">
+                                               <option value="*"{if $selectAllPackages} selected="selected"{/if}>{lang}wcf.acp.language.export.allPackages{/lang}</option>
+                                               <option value="-">--------------------</option>
+                                               {foreach from=$packages item=package}
+                                                       {assign var=loop value=$packageNameLength-$package->packageNameLength}
+                                                       <option value="{@$package->packageID}"{if $selectedPackages[$package->packageID]|isset} selected="selected"{/if}>{$package->packageName} {section name=i loop=$loop}&nbsp;{/section}&nbsp;&nbsp;{$package->package}</option>
+                                               {/foreach}
+                                       </select>
+                               </dd>
+                       </dl>
+                       
+                       <dl>
+                               <dd>
+                                       <label for="exportCustomValues"><input type="checkbox" name="exportCustomValues" id="exportCustomValues" value="1" /> {lang}wcf.acp.language.export.customValues{/lang}</label>
+                               </dd>
+                       </dl>
+               </fieldset>
        </div>
        
-       <div class="wcf-formSubmit">
+       <div class="formSubmit">
                <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
-               <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
                {@SID_INPUT_TAG}
        </div>
 </form>

diff --git a/acptemplates/languageList.tpl b/acptemplates/languageList.tpl
index dd871c4d295dc030e73cbf197ea580fa29d2e432..63b6de24c41aee19dbb9a1f20fe7c1a06ba40ffb 100644 (file)
--- a/acptemplates/languageList.tpl
+++ b/acptemplates/languageList.tpl
@@ -51,7 +51,7 @@
 {if $objects|count}
        <div class="tabularBox tabularBoxTitle marginTop shadow">
                <hgroup>
-                       <h1>{lang}wcf.acp.language.list{/lang} <span class="badge" title="{lang}wcf.acp.language.list.count{/lang}">{#$items}</span></h1>
+                       <h1>{lang}wcf.acp.language.list{/lang} <span class="badge badgeInverse" title="{lang}wcf.acp.language.list.count{/lang}">{#$items}</span></h1>
                </hgroup>
        
                <table class="table">

diff --git a/acptemplates/languageMultilingualism.tpl b/acptemplates/languageMultilingualism.tpl
index 1e75250840257fc48288a7a6bd841d1af3ba7fa4..eafb1870ecdfc830db06a36933fa855c2e5325d7 100644 (file)
--- a/acptemplates/languageMultilingualism.tpl
+++ b/acptemplates/languageMultilingualism.tpl
@@ -26,34 +26,27 @@
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageMultilingualism'}{/link}">
        <div class="container containerPadding marginTop shadow">
-               <dl>
-                       <dt><input type="checkbox" id="enable" onclick="if (this.checked) $('#languageIDs').show(); else $('#languageIDs').hide();" name="enable" value="1" {if $enable == 1}checked="checked" {/if}/></dt>
-                       <dd>
-                               <label for="enable">{lang}wcf.acp.language.multilingualism.enable{/lang}</label>
-                               <small>{lang}wcf.acp.language.multilingualism.enable.description{/lang}</small>
-                       </dd>
-               </dl>
+               <fieldset>
+                       <legend><label><input type="checkbox" id="enable" onclick="if (this.checked) $('#languageIDs').show(); else $('#languageIDs').hide();" name="enable" value="1" {if $enable == 1}checked="checked" {/if}/> {lang}wcf.acp.language.multilingualism.enable{/lang}</label></legend>
+                       <small>{lang}wcf.acp.language.multilingualism.enable.description{/lang}</small>
                
-               <dl{if $errorField == 'languageFile'} class="formError"{/if} id="languageIDs">
-                       <dt><label for="languageIDs">{lang}wcf.acp.language.multilingualism.languages{/lang}</label></dt>
-                       <dd>
-                               <fieldset>
-                                       <legend>{lang}wcf.acp.language.multilingualism.languages{/lang}</legend>
+                       <dl{if $errorField == 'languageFile'} class="formError"{/if} id="languageIDs">
+                               <dt><label for="languageIDs">{lang}wcf.acp.language.multilingualism.languages{/lang}</label></dt>
+                               <dd class="floated">
+                                       {htmlCheckboxes options=$languages name=languageIDs selected=$languageIDs disableEncoding=true}
                                        
-                                       <dd>
-                                               {htmlCheckboxes options=$languages name=languageIDs selected=$languageIDs disableEncoding=true}
-                                       </dd>
-                               </fieldset>
-                               
-                               {if $errorField == 'languageIDs'}
-                                       <small class="innerError">
-                                               {if $errorType == 'empty'}{lang}wcf.acp.language.multilingualism.languages.error.empty{/lang}{/if}
-                                       </small>
-                               {/if}
-                       </dd>
-               </dl>
+                                       {if $errorField == 'languageIDs'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}{lang}wcf.acp.language.multilingualism.languages.error.empty{/lang}{/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       
+                       {event name='additionalFields'}
+               </fieldset>
+               
                
-               {event name='additionalFields'}
        </div>
        
        <div class="formSubmit">