Nested definition lists and preparation for special checkbox display (unfinished)

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 78aa03db5d7774cada5a7deac3f58e62664fe03e..6d2043c2d6773b651180ce4de9758c85a4395fdb 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -461,7 +461,7 @@ fieldset legend ~ p {
 }
 
 fieldset p.description {
-       color: #369;
+       color: #999;
        font-size: 90%;
 }
 
@@ -477,23 +477,18 @@ fieldset > ul li {
 
 /* -- -- -- -- -- Tabbed Content -- -- -- -- -- */
 
+/* Simple */
+
 dl {
        clear: both;
        margin-bottom: 7px;
 }
 
-dl small {
-       color: #999;
-       font-size: 85%;
-       margin: 3px 0 7px;
-       display: block;
-}
-
-dl.disabled dt {
+dl.disabled > dt {
        color: #777;
 }
 
-dl dt {
+dl > dt {
        color: #69c;
        float: left;
        text-align: right;
@@ -501,10 +496,67 @@ dl dt {
        margin-top: 5px; /* not so nice */
 }
 
-dl dd {
+dl > dd {
        margin-left: 250px;
 }
 
+dl > dd > small {
+       color: #999;
+       font-size: 85%;
+       margin: 3px 0 7px;
+       display: block;
+}
+
+/* Nested */
+
+dl > dd > fieldset {
+       
+}
+
+dl > dd > fieldset > legend {
+       display: none;
+}
+
+dl > dd > fieldset > dl {
+       
+}
+
+dl > dd > fieldset > dl > dt {
+       width: 150px;
+       margin-right: 20px;
+}
+
+dl > dd > fieldset > dl > dd {
+       margin-left: 0;
+}
+
+dl > dd > fieldset > dl > dd > label {
+       display: block;
+}
+
+dl > dd > fieldset > dl > dd > small {
+       
+}
+
+/* Reversed */
+
+.reversed dt {
+       margin-top: 0;
+       text-align: left;
+       position: relative;
+       left: 270px;
+       width: auto;
+}
+
+.reversed dd {
+       
+}
+
+.reversed dd input {
+       margin-left: -10px !important;
+       padding: 0;
+}
+
 
 
 /* -- -- -- -- -- Forms -- -- -- -- -- */
@@ -532,6 +584,7 @@ label {
 
 .formGroup .formGroupLabel {
        text-align: right;
+       margin-top: 7px;
        float: left;
        width: 233px;
 }

diff --git a/wcfsetup/install/files/acp/templates/optionTypeRadiobuttons.tpl b/wcfsetup/install/files/acp/templates/optionTypeRadiobuttons.tpl
index 99d35a25f26ba707be199a81a9803d6662184d48..5e83fa00cbec6ee4b51b8bdbf1330d5dd8a2ac4d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionTypeRadiobuttons.tpl
+++ b/wcfsetup/install/files/acp/templates/optionTypeRadiobuttons.tpl
@@ -1,10 +1,12 @@
-<ul class="formOptionsLong">
-       {foreach from=$selectOptions key=key item=selectOption}
-               <li>
-                       <label><input type="radio" {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="enablesOptions" data-disableOptions="[ {@$disableOptions[$key]}]" data-enableOptions="[ {@$enableOptions[$key]}]" {/if}
-                       name="values[{$option->optionName}]" value="{$key}"
-                       {if $value == $key} checked="checked"{/if} />
-                       {lang}{@$selectOption}{/lang}</label>
-               </li>
-       {/foreach}
-</ul>
+<fieldset>
+       <dl>
+               {foreach from=$selectOptions key=key item=selectOption}
+                       <dd>
+                               <label><input {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="enablesOptions" data-disableOptions="[ {@$disableOptions[$key]}]" data-enableOptions="[ {@$enableOptions[$key]}]" {/if}
+                               type="radio" name="values[{$option->optionName}]" value="{$key}"
+                               {if $value == $key} checked="checked"{/if} />
+                               {lang}{@$selectOption}{/lang}</label>
+                       </dd>
+               {/foreach}
+       </dl>
+</fieldset>
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/optionTypeText.tpl b/wcfsetup/install/files/acp/templates/optionTypeText.tpl
index 6bea39bfc8133bc03fb3854484f4b7c718a9ec3e..7052b00487752fb35f58397011c4d31750d4cf27 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionTypeText.tpl
+++ b/wcfsetup/install/files/acp/templates/optionTypeText.tpl
@@ -1 +1 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}" class="inputText" />
\ No newline at end of file
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" class="long" value="{$value}" />
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 383a96c9a24d7ee892dc747c84b530eb27778ba7..616f922f903069ed558d1f6f4e44ae66b7c2dbd0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -72,39 +72,39 @@
                                {/if}
                                
                                {if $availableGroups|count}
-                                       <div class="formGroup">
-                                               <div class="formGroupLabel">
+                                       <dl>
+                                               <dt>
                                                        <label>{lang}wcf.acp.user.groups{/lang}</label>
-                                               </div>
-                                               <div class="formGroupField">
+                                               </dt>
+                                               <dd>
                                                        <fieldset>
                                                                <legend>{lang}wcf.acp.user.groups{/lang}</legend>
                                                                
-                                                               <div class="formField">
-                                                                       {htmlCheckboxes options=$availableGroups name='groupIDs' selected=$groupIDs}
-                                                                       
-                                                                       <label style="margin-top: 10px"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
-                                                               </div>
+                                                               <dl>
+                                                                       <dd>{htmlCheckboxes options=$availableGroups name='groupIDs' selected=$groupIDs}</dd>
+                                                               </dl>
+                                                               
+                                                               <label style="margin-top: 10px"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
                                                        </fieldset>
-                                               </div>
-                                       </div>
+                                               </dd>
+                                       </dl>
                                {/if}
                                
                                {if $availableLanguages|count > 1}
-                                       <div class="formGroup">
-                                               <div class="formGroupLabel">
+                                       <dl>
+                                               <dt>
                                                        <label>{lang}wcf.user.language{/lang}</label>
-                                               </div>
-                                               <div class="formGroupField">
+                                               </dt>
+                                               <dd>
                                                        <fieldset>
                                                                <legend>{lang}wcf.acp.user.language{/lang}</legend>
                                                                
-                                                               <div class="formField">
-                                                                       {htmlCheckboxes options=$availableLanguages name='languageIDs' selected=$languageIDs disableEncoding=true}
-                                                               </div>
+                                                               <dl>
+                                                                       <dd>{htmlCheckboxes options=$availableLanguages name='languageIDs' selected=$languageIDs disableEncoding=true}</dd>
+                                                               </dl>
                                                        </fieldset>
-                                               </div>
-                                       </div>
+                                               </dd>
+                                       </dl>
                                {/if}
                        </fieldset>
                        
@@ -132,7 +132,7 @@
                        
                                <div id="resultOptions" class="border tabMenuContent hidden">
                                        <div class="container-1">
-                                               <h3 class="subHeading">{lang}wcf.acp.user.search.display{/lang}</h3>
+                                               <h1 class="subHeading">{lang}wcf.acp.user.search.display{/lang}</h1>
                                        
                                                <fieldset>
                                                        <legend>{lang}wcf.acp.user.search.display.general{/lang}</legend>
@@ -187,23 +187,23 @@
                                                                </div>
                                                        {/if}
                                                
-                                                       <div class="formGroup">
-                                                               <div class="formGroupLabel">
-                                                                       <label>{lang}wcf.acp.user.search.display.columns.other{/lang}</label>
-                                                               </div>
-                                                               <div class="formGroupField">
+                                                       <dl>
+                                                               <dt><label>{lang}wcf.acp.user.search.display.columns.other{/lang}</label></dt>
+                                                               <dd>
                                                                        <fieldset>
                                                                                <legend>{lang}wcf.acp.user.search.display.columns.other{/lang}</legend>
                                                                        
-                                                                               <div class="formField">
-                                                                                       <label><input type="checkbox" name="columns[]" value="email" {if "email"|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.email{/lang}</label>
-                                                                                       <label><input type="checkbox" name="columns[]" value="registrationDate" {if "registrationDate"|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.registrationDate{/lang}</label>
-                                                                               
+                                                                               <dl>
+                                                                                       <dd>
+                                                                                               <label><input type="checkbox" name="columns[]" value="email" {if "email"|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.email{/lang}</label></dd>
+                                                                                               <label><input type="checkbox" name="columns[]" value="registrationDate" {if "registrationDate"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.user.registrationDate{/lang}</label>
+                                                                                       </dd>
+                                                                                       
                                                                                        {if $additionalColumns|isset}{@$additionalColumns}{/if}
-                                                                               </div>
+                                                                               </dl>
                                                                        </fieldset>
-                                                               </div>
-                                                       </div>
+                                                               </dd>
+                                                       </dl>
                                                
                                                </fieldset>
                                        </div>