Again more definition lists and CSS refinements
authorLuzifr <szekely@woltlab.com>
Sat, 6 Aug 2011 01:04:14 +0000 (03:04 +0200)
committerLuzifr <szekely@woltlab.com>
Sat, 6 Aug 2011 01:04:14 +0000 (03:04 +0200)
wcfsetup/install/files/acp/style/testing.css
wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
wcfsetup/install/files/acp/templates/option.tpl
wcfsetup/install/files/acp/templates/packageView.tpl
wcfsetup/install/files/acp/templates/updateServerAdd.tpl
wcfsetup/install/files/acp/templates/userAdd.tpl
wcfsetup/install/files/acp/templates/userGroupAdd.tpl
wcfsetup/install/files/acp/templates/usersMassProcessing.tpl

index 029972f0d962b841e42333ddf08f29fa78dd4da5..4aef80ab606281fd8bf53459af2c085200474acb 100644 (file)
@@ -492,7 +492,7 @@ dl small {
        color: #999;
        font-size: 85%;
        margin: 3px 0 7px;
-       display: inline-block;
+       display: block;
 }
 
 dl.disabled dt {
@@ -611,22 +611,25 @@ select {
        width: 100%;
 }
 
-input.tiny {
+.tiny {
        width: 100px;
 }
 
-input.small {
+.small {
        width: 10%;
 }
 
-input.medium {
+.medium {
        width: 50%;
 }
 
-input.long {
+.long {
        width: 95%;
 }
 
+.auto {
+       width: auto;
+}
 
 
 /* -- -- -- -- -- Large Buttons -- -- -- -- -- */
@@ -858,7 +861,15 @@ input[type='submit']:active,
        padding: 6px 7px;
 }
 
-.menu a {
+.menu ul {
+       text-align: center;
+}
+
+.menu ul li {
+       display: inline;
+}
+
+.menu ul li a {
        color: #eee !important;
        font-size: 85%;
        text-decoration: none;
@@ -875,13 +886,13 @@ input[type='submit']:active,
        transition: color .1s linear;
 }
 
-.menu a:hover {
+.menu ul li a:hover {
        color: #fff !important;
        border: 1px solid rgba(0, 0, 0, .3);
        background-color: rgba(0, 0, 0, .2);
 }
 
-.menu a:active, .menu a:focus, .menu a.active {
+.menu ul li a:active, .menu ul li a:focus, .menu ul li a.active {
        border: 1px solid rgba(0, 0, 0, .5);
        
        -webkit-box-shadow: inset 0 2px 15px rgba(0, 0, 0, .5);
index 88573817581ea586c5ac6c303539778edddde23c..aa0f798b7e1b260c5a343b4e617dbce0e3413d0c 100644 (file)
@@ -41,7 +41,6 @@
                                                {/if}
                                                <small id="masterPasswordHelpMessage">{lang}wcf.acp.masterPassword.init.description{/lang}</small>
                                        </dd>
-                                       
                                </dl>
                                
                                <dl{if $errorField == 'confirmMasterPassword'} class="formError"{/if}>
index 3eb21a3f83c7426c9e4f7806a1c64f8ac242d7e2..41ca027bbac107a10d1e4c76f16173955bc255bf 100644 (file)
        </div>
        
        <div class="formSubmit">
-               <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
+               <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SID_INPUT_TAG}
                <input type="hidden" id="activeTabMenuItem" name="activeTabMenuItem" value="{$activeTabMenuItem}" />
        </div>
 </form>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}
index 8bbb8bf4342d36791cfdac809c201c5ba5b3e429..bcdaa72fc69a92e59aa32f0fc289dabe4f9890f5 100644 (file)
                        <h1><a onclick="openList('dependentPackages')">{lang}wcf.acp.package.view.dependentPackages{/lang}</a></h1>
                        <h2>{lang}wcf.acp.package.view.dependentPackages.description{/lang}</h2>
                </hgroup>
+               
                <table id="dependentPackages">
                        <thead>
                                <tr class="tableHead">
index d6bf27f91c51aa8aad06ad5c713dd096650f671c..3e244fdbbe36e5a0d79e41469cad0192fb481056 100644 (file)
@@ -45,6 +45,7 @@
                                                <small id="serverURLHelpMessage">{lang}wcf.acp.updateServer.serverURL.description{/lang}</small>
                                        </dd>
                                </dl>
+                               
                                <dl id="loginUsernameDiv">
                                        <dt><label for="loginUsername">{lang}wcf.acp.updateServer.loginUsername{/lang}</label></dt>
                                        <dd>
@@ -52,6 +53,7 @@
                                                <small id="loginUsernameHelpMessage">{lang}wcf.acp.updateServer.loginUsername.description{/lang}</small>
                                        </dd>
                                </dl>
+                               
                                <dl id="loginPasswordDiv">
                                        <dt><label for="loginPassword">{lang}wcf.acp.updateServer.loginPassword{/lang}</label></dt>
                                        <dd>
index c9505003f3951b32fbdfe3df6df71e54aa9c05c2..baacbc93dca2e539bad9904fb404081669c1890e 100644 (file)
 <form method="post" action="index.php?form=User{@$action|ucfirst}">
        <div class="border content">
                <div class="container-1">
-                       <div class="formElement{if $errorType.username|isset} formError{/if}">
-                               <div class="formFieldLabel">
-                                       <label for="username">{lang}wcf.user.username{/lang}</label>
-                               </div>
-                               <div class="formField">
-                                       <input type="text" id="username" name="username" value="{$username}" class="inputText" />
+                       <dl{if $errorType.username|isset} class="formError"{/if}>
+                               <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="username" name="username" value="{$username}" class="medium" />
                                        {if $errorType.username|isset}
-                                               <p class="innerError">
+                                               <small class="innerError">
                                                        {if $errorType.username == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
                                                        {if $errorType.username == 'notValid'}{lang}wcf.user.error.username.notValid{/lang}{/if}
                                                        {if $errorType.username == 'notUnique'}{lang}wcf.user.error.username.notUnique{/lang}{/if}
-                                               </p>
+                                               </small>
                                        {/if}
-                               </div>
-                       </div>
+                               </dd>
+                       </dl>
                        
                        {if $availableGroups|count}
                                <div class="formGroup">
                        {if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditMailAddress')}
                                <fieldset>
                                        <legend>{lang}wcf.user.email{/lang}</legend>
-                                       <div class="formElement{if $errorType.email|isset} formError{/if}">
-                                               <div class="formFieldLabel">
-                                                       <label for="email">{lang}wcf.user.email{/lang}</label>
-                                               </div>
-                                               <div class="formField"> 
-                                                       <input type="email" id="email" name="email" value="{$email}" class="inputText" />
+                                       <dl{if $errorType.email|isset} class="formError"{/if}>
+                                               <dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
+                                               <dd>    
+                                                       <input type="email" id="email" name="email" value="{$email}" class="medium" />
                                                        {if $errorType.email|isset}
-                                                               <p class="innerError">
+                                                               <small class="innerError">
                                                                        {if $errorType.email == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
                                                                        {if $errorType.email == 'notValid'}{lang}wcf.user.error.email.notValid{/lang}{/if}
                                                                        {if $errorType.email == 'notUnique'}{lang}wcf.user.error.email.notUnique{/lang}{/if}
-                                                               </p>
+                                                               </small>
                                                        {/if}
-                                               </div>
-                                       </div>
+                                               </dd>
+                                       </dl>
                                        
-                                       <div class="formElement{if $errorType.confirmEmail|isset} formError{/if}">
-                                               <div class="formFieldLabel">
-                                                       <label for="confirmEmail">{lang}wcf.user.confirmEmail{/lang}</label>
-                                               </div>
-                                               <div class="formField">
-                                                       <input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" class="inputText" />
+                                       <dl{if $errorType.confirmEmail|isset} class="formError"{/if}>
+                                               <dt><label for="confirmEmail">{lang}wcf.user.confirmEmail{/lang}</label></dt>
+                                               <dd>
+                                                       <input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" class="medium" />
                                                        {if $errorType.confirmEmail|isset}
-                                                               <p class="innerError">
+                                                               <small class="innerError">
                                                                        {if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.error.confirmEmail.notEqual{/lang}{/if}
-                                                               </p>
+                                                               </small>
                                                        {/if}
-                                               </div>
-                                       </div>
+                                               </dd>
+                                       </dl>
                                </fieldset>
                        {/if}
                        
                        {if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditPassword')}
                                <fieldset>
                                        <legend>{lang}wcf.user.password{/lang}</legend>
-                                       <div class="formElement{if $errorType.password|isset} formError{/if}">
-                                               <div class="formFieldLabel">
-                                                       <label for="password">{lang}wcf.user.password{/lang}</label>
-                                               </div>
-                                               <div class="formField">
-                                                       <input type="password" id="password" name="password" value="{$password}" class="inputText" />
+                                       <dl{if $errorType.password|isset} class="formError"{/if}>
+                                               <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
+                                               <dd>
+                                                       <input type="password" id="password" name="password" value="{$password}" class="medium" />
                                                        {if $errorType.password|isset}
-                                                               <p class="innerError">
+                                                               <small class="innerError">
                                                                        {if $errorType.password == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                               </p>
+                                                               </small>
                                                        {/if}
-                                               </div>
-                                       </div>
+                                               </dd>
+                                       </dl>
                                        
-                                       <div class="formElement{if $errorType.confirmPassword|isset} formError{/if}">
-                                               <div class="formFieldLabel">
-                                                       <label for="confirmPassword">{lang}wcf.user.confirmPassword{/lang}</label>
-                                               </div>
-                                               <div class="formField">
-                                                       <input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}" class="inputText" />
+                                       <dl{if $errorType.confirmPassword|isset} class="formError"{/if}>
+                                               <dt><label for="confirmPassword">{lang}wcf.user.confirmPassword{/lang}</label></dt>
+                                               <dd>
+                                                       <input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}" class="medium" />
                                                        {if $errorType.confirmPassword|isset}
-                                                               <p class="innerError">
+                                                               <small class="innerError">
                                                                        {if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.error.confirmPassword.notEqual{/lang}{/if}
-                                                               </p>
+                                                               </small>
                                                        {/if}
-                                               </div>
-                                       </div>
+                                               </dd>
+                                       </dl>
                                </fieldset>
                        {/if}
                
index d8423d83389ab403e92bd391b59f8771782dff02..2c0a1f6149e7bd949d0e684884d3cffc83142bb9 100644 (file)
                        <fieldset>
                                <legend>{lang}wcf.acp.group.data{/lang}</legend>
                                
-                               <div id="groupNameDiv" class="formElement{if $errorType.groupName|isset} formError{/if}">
-                                       <div class="formFieldLabel">
-                                               <label for="groupName">{lang}wcf.acp.group.groupName{/lang}</label>
-                                       </div>
-                                       <div class="formField">
-                                               <input type="text" id="groupName" name="groupName" value="{$groupName}" class="inputText" />
+                               <dl id="groupNameDiv"{if $errorType.groupName|isset} class="formError"{/if}>
+                                       <dt><label for="groupName">{lang}wcf.acp.group.groupName{/lang}</label></dt>
+                                       <dd>
+                                               <input type="text" id="groupName" name="groupName" value="{$groupName}" class="medium" />
                                                {if $errorType.groupName|isset}
-                                                       <p class="innerError">
+                                                       <small class="innerError">
                                                                {if $errorType.groupName == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                       </p>
+                                                       </small>
                                                {/if}
-                                       </div>
-                                       <div id="groupNameHelpMessage" class="formFieldDesc hidden">
-                                               <p>{lang}wcf.acp.group.groupName.description{/lang}</p>
-                                       </div>
-                               </div>
-                               <script type="text/javascript">//<![CDATA[
-                                       inlineHelp.register('groupName');
-                               //]]></script>
+                                               <small id="groupNameHelpMessage">{lang}wcf.acp.group.groupName.description{/lang}</small>
+                                       </dd>
+                               </dl>
                                
                                {if $additionalFields|isset}{@$additionalFields}{/if}
                        </fieldset>
index 93e498367a7a4fae0d9b6d08d58c38d53e447287..835f657d17384f43565c3def9fc0cc847d9ccd6a 100644 (file)
                        <fieldset>
                                <legend>{lang}wcf.acp.user.search.conditions.general{/lang}</legend>
                                
-                               <div class="formElement">
-                                       <div class="formFieldLabel">
-                                               <label for="username">{lang}wcf.user.username{/lang}</label>
-                                       </div>
-                                       <div class="formField">
-                                               <input type="text" id="username" name="username" value="{$username}" class="inputText" />
+                               <dl>
+                                       <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                                       <dd>
+                                               <input type="text" id="username" name="username" value="{$username}" class="medium" />
                                                <script type="text/javascript">
                                                        //<![CDATA[
                                                        suggestion.enableMultiple(false);
                                                        suggestion.init('username');
                                                        //]]>
                                                </script>
-                                       </div>
-                               </div>
+                                       </dd>
+                               </dl>
                                
                                {if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
-                                       <div class="formElement">
-                                               <div class="formFieldLabel">
-                                                       <label for="email">{lang}wcf.user.email{/lang}</label>
-                                               </div>
-                                               <div class="formField"> 
-                                                       <input type="email" id="email" name="email" value="{$email}" class="inputText" />
-                                               </div>
-                                       </div>
+                                       <dl>
+                                               <dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
+                                               <dd>    
+                                                       <input type="email" id="email" name="email" value="{$email}" class="medium" />
+                                               </dd>
+                                       </dl>
                                {/if}
                                
                                {if $availableGroups|count}
                                        <legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
                                        
                                        <div>
-                                               <div id="subjectDiv" class="formElement{if $errorField == 'subject'} formError{/if}">
-                                                       <div class="formFieldLabel">
+                                               <dl id="subjectDiv"{if $errorField == 'subject'} class="formError"{/if}>
+                                                       <dt>
                                                                <label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label>
-                                                       </div>
-                                                       <div class="formField">
-                                                               <input type="text" id="subject" name="subject" value="{$subject}" class="inputText" />
+                                                       </dt>
+                                                       <dd>
+                                                               <input type="text" id="subject" name="subject" value="{$subject}" class="long" />
                                                                {if $errorField == 'subject'}
-                                                                       <p class="innerError">
+                                                                       <small class="innerError">
                                                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                                       </p>
+                                                                       </small>
                                                                {/if}
-                                                       </div>
-                                                       <div id="subjectHelpMessage" class="formFieldDesc hidden">
-                                                               <p>{lang}wcf.acp.user.sendMail.subject.description{/lang}</p>
-                                                       </div>
-                                               </div>
-                                               <script type="text/javascript">//<![CDATA[
-                                                       inlineHelp.register('subject');
-                                               //]]></script>
+                                                               <small id="subjectHelpMessage">{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
+                                                       </dd>
+                                               </dl>
                                                
-                                               <div id="fromDiv" class="formElement{if $errorField == 'from'} formError{/if}">
-                                                       <div class="formFieldLabel">
-                                                               <label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label>
-                                                       </div>
-                                                       <div class="formField">
-                                                               <input type="email" id="from" name="from" value="{$from}" class="inputText" />
+                                               <dl id="fromDiv"{if $errorField == 'from'} class="formError"{/if}>
+                                                       <dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
+                                                       <dd>
+                                                               <input type="email" id="from" name="from" value="{$from}" class="medium" />
                                                                {if $errorField == 'from'}
-                                                                       <p class="innerError">
+                                                                       <small class="innerError">
                                                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                                       </p>
+                                                                       </small>
                                                                {/if}
-                                                       </div>
-                                                       <div id="fromHelpMessage" class="formFieldDesc hidden">
-                                                               {lang}wcf.acp.user.sendMail.from.description{/lang}
-                                                       </div>
-                                               </div>
-                                               <script type="text/javascript">//<![CDATA[
-                                                       inlineHelp.register('from');
-                                               //]]></script>
-                                       
-                                               <div id="textDiv" class="formElement{if $errorField == 'text'} formError{/if}">
-                                                       <div class="formFieldLabel">
-                                                               <label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label>
-                                                       </div>
-                                                       <div class="formField">
+                                                               <small id="fromHelpMessage">{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
+                                                       </dd>
+                                               </dl>
+                                               
+                                               <dl id="textDiv"{if $errorField == 'text'} class="formError"{/if}>
+                                                       <dt><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
+                                                       <dd>
                                                                <textarea id="text" name="text" rows="15" cols="40">{$text}</textarea>
                                                                {if $errorField == 'text'}
-                                                                       <p class="innerError">
+                                                                       <small class="innerError" class="long">
                                                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                                       </p>
+                                                                       </small>
                                                                {/if}
-                                                       </div>
-                                                       <div id="textHelpMessage" class="formFieldDesc hidden">
-                                                               <p>{lang}wcf.acp.user.sendMail.text.description{/lang}</p>
-                                                       </div>
-                                               </div>
-                                               <script type="text/javascript">//<![CDATA[
-                                                       inlineHelp.register('text');
-                                               //]]></script>
+                                                               <small id="textHelpMessage">{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
+                                                       </dd>
+                                               </dl>
                                                
                                                <div class="formElement">
                                                        <div class="formField">
                                                        </div>
                                                </div>
                                        
-                                               <div id="separatorDiv" class="formElement">
-                                                       <div class="formFieldLabel">
-                                                               <label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label>
-                                                       </div>
-                                                       <div class="formField">
+                                               <dl id="separatorDiv">
+                                                       <dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
+                                                       <dd>
                                                                <textarea id="separator" name="separator" rows="2" cols="40">{$separator}</textarea>
-                                                       </div>
-                                               </div>
+                                                       </dd>
+                                               </dl>
                                                
-                                               <div id="textSeparatorDiv" class="formElement">
-                                                       <div class="formFieldLabel">
-                                                               <label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label>
-                                                       </div>
-                                                       <div class="formField">
-                                                               <input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="inputText" />
-                                                       </div>
-                                               </div>
+                                               <dl id="textSeparatorDiv">
+                                                       <dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
+                                                       <dd>
+                                                               <input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
+                                                       </dd>
+                                               </dl>
                                        </div>
                                </fieldset>
                        </div>
                                                <div class="formField{if $errorField == 'assignToGroupIDArray'} formError{/if}">
                                                        {htmlCheckboxes options=$availableGroups name=assignToGroupIDArray selected=$assignToGroupIDArray}
                                                        {if $errorField == 'assignToGroupIDArray'}
-                                                               <p class="innerError">
+                                                               <small class="innerError">
                                                                        {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-                                                               </p>
+                                                               </small>
                                                        {/if}
                                                </div>
                                        </div>
        </div>
        
        <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}" />
+               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
                {@SID_INPUT_TAG}
        </div>
 </form>