Even more corrections and updates
authorLuzifr <szekely@woltlab.com>
Mon, 8 Aug 2011 00:32:28 +0000 (02:32 +0200)
committerLuzifr <szekely@woltlab.com>
Mon, 8 Aug 2011 00:32:38 +0000 (02:32 +0200)
Experimental Log-In page, corrected display: table layout for all pages,
more definition lists.

12 files changed:
wcfsetup/install/files/acp/style/testing.css
wcfsetup/install/files/acp/templates/footer.tpl
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/acp/templates/login.tpl
wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
wcfsetup/install/files/acp/templates/setupFooter.tpl
wcfsetup/install/files/acp/templates/setupHeader.tpl
wcfsetup/install/files/acp/templates/userGroupAdd.tpl
wcfsetup/install/files/acp/templates/usersMassProcessing.tpl

index 4aef80ab606281fd8bf53459af2c085200474acb..951d8752c0889c6ad71e66099792931ecae2e3f6 100644 (file)
@@ -231,36 +231,30 @@ nav.headerNavigation ul li {
 
 div.main {
        margin: 0 23px 0;
-       border-collapse: collapse;
-       display: table;
-       table-layout: fixed;
-}
-
-div.main > div {
-       display: table-row;
 }
 
-
-
 /* -- -- -- -- -- Content -- -- -- -- -- */
 
 section.content {
        background-color: #fff;
        display: table-cell;
+       vertical-align: top;
        padding: 25px;
-       width: 100%;
        position: relative;
+       width: 100%;
        z-index: 100;
 }
 
 div.main > div section:only-child {
        display: block !important;
+       width: auto;
 }
 
 /* -- -- -- -- -- Sidebar -- -- -- -- -- */
 
 aside.sidebar {
        display: table-cell;
+       vertical-align: top;
        background-color: #d8e7f5;
        margin: 0 !important;
        padding: 0 !important;
@@ -500,6 +494,7 @@ dl.disabled dt {
 }
 
 dl dt {
+       color: #69c;
        float: left;
        text-align: right;
        width: 230px;
@@ -725,7 +720,7 @@ input[type='submit'],
        border: 1px solid #bcd;
        color: #69c;
        
-       background-color: #69c;
+       background-color: #e7f2fd;
        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#d8e7f5));
        background-image: -moz-linear-gradient(0% 0% 270deg, #fff, #d8e7f5);
        background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#d8e7f5));
@@ -784,7 +779,7 @@ input[type='submit']:active,
        color: #036;
        text-decoration: none;
        
-       background-color: #69c;
+       background-color: #d8e7f5;
        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#d8e7f5), to(#fff));
        background-image: -moz-linear-gradient(0% 0% 270deg, #d8e7f5, #fff);
        background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#d8e7f5), to(#fff));
@@ -920,10 +915,14 @@ thead th {
 }
 
 thead th:first-child {
-       border-top-left-radius: 5px;    
+       /* rounded corners for the first table header cell to the left */
+       border-top-left-radius: 5px;
+       /* keeps the first column of tables narrow */
+       width: 1%;
 }
 
 thead th:last-child {
+       /* rounded corners for the last table header cell to the left */
        border-top-right-radius: 5px;   
 }
 
@@ -990,6 +989,11 @@ tbody tr {
        border-bottom: 1px solid rgba(255, 255, 255, .3);
 }
 
+tbody tr:first-child {
+       /* prevents icon-column from wrapping */
+       white-space: nowrap;
+}
+
 tbody tr:last-child {
        /* no border for the last tables row */
        border-bottom-width: 0;
index 42b25de64a763ed245e98e0ca73886707404fd86..893aff667481f270822f14bd493b280269900733 100644 (file)
@@ -1,10 +1,11 @@
                        </section>
+                       <!-- CONTENT -->
                </div>
        </div>
-       <!-- /CONTENT -->
+       <!-- /MAIN -->
        
        <!-- FOOTER -->
-       <footer>
+       <footer id="footer" class="pageFooter">
                <div>
                        <nav id="footerNavigation" class="footerNavigation">
                                <ul>
index 3a0840223380c9710f2eb478612292d95a575b51..51a4f910c0dd33f2b2e1bcc450ef0460bb5051d4 100644 (file)
        </header>
        <!-- /HEADER -->
        
-       <!-- CONTENT -->
+       <!-- MAIN -->
        <div id="main" class="main">
                <div>
+                       <!-- SIDEBAR -->
                        <aside class="sidebar">
                                <!-- sidebar menu -->
                                <nav id="sidebarMenu" class="sidebarMenu">
                                </nav>
                                <!-- /sidebar menu -->
                        </aside>
+                       <!-- /SIDEBAR -->
                        
+                       <!-- CONTENT -->
                        <section id="content" class="content">
\ No newline at end of file
index ca2f0a70c4837f2fe6556c946241cd3d7e43f151..bab9d17ac8b0174f96fb5f674776022fcf29d587 100644 (file)
@@ -7,51 +7,52 @@
        //]]>
 </script>
 
-<img class="icon" src="{@RELATIVE_WCF_DIR}icon/loginXL.png" alt="" />
-
-<h1>{@$pageTitle}</h1>
-
-<hr />
+<header class="mainHeading setup">
+       <img src="{@RELATIVE_WCF_DIR}icon/logInXL.png" alt="" />
+       <hgroup>
+               <h1>{@$pageTitle}</h1>
+       </hgroup>
+</header>
 
 {if $errorField != ''}
-<p class="error">{lang}wcf.global.form.error{/lang}</p>
+       <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
 <form method="post" action="index.php?form=Login">
        <fieldset>
                <legend>{lang}wcf.acp.login.data{/lang}</legend>
                
-               <div class="inner">
-                       <div{if $errorField == 'username'} class="errorField"{/if}>
-                               <label for="username">{lang}wcf.user.username{/lang}</label>
-                               <input type="text" id="username" name="username" value="{$username}" class="inputText" />
+               <dl{if $errorField == 'username'} class="errorField"{/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 $errorField == 'username'}
-                                       <p>
-                                               <img src="{@RELATIVE_WCF_DIR}icon/errorS.png" alt="" />
+                                       <small>
                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
                                                {if $errorType == 'notFound'}{lang}wcf.user.error.username.notFound{/lang}{/if}
-                                       </p>
+                                       </small>
                                {/if}
-                       </div>
-                       
-                       <div{if $errorField == 'password'} class="errorField"{/if}>
-                               <label for="password">{lang}wcf.user.password{/lang}</label>
-                               <input type="password" id="password" name="password" value="" class="inputText" />
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'password'} class="errorField"{/if}>
+                       <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
+                       <dd><input type="password" id="password" name="password" value="" class="medium" />
                                {if $errorField == 'password'}
-                                       <p>
+                                       <small>
                                                <img src="{@RELATIVE_WCF_DIR}icon/errorS.png" alt="" />
                                                {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
                                                {if $errorType == 'false'}{lang}wcf.user.error.password.false{/lang}{/if}
-                                       </p>
+                                       </small>
                                {/if}
-                       </div>
-                       
-                       {if $additionalFields|isset}{@$additionalFields}{/if}
-               </div>
+                       </dd>
+               </dl>
+               
+               {if $additionalFields|isset}{@$additionalFields}{/if}
        </fieldset>
        
-       <div class="nextButton">
-               <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
+       <div class="formSubmit">
+               <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="url" value="{$url}" />
                {@SID_INPUT_TAG}
        </div>
index aa0f798b7e1b260c5a343b4e617dbce0e3413d0c..9ad97a2f490590ac73370d9d5caed2d31da8fa91 100644 (file)
        </div>
 
        <div class="formSubmit">
-               <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
-               <input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />
+               <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+               <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SID_INPUT_TAG}
                <input type="hidden" name="url" value="{$url}" />
        </div>
 </form>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}
index 3654f1fa2fc2f1dbc9761845725fea89fcb5d000..663b71539c46b957db921f3657a2524ff9c2fe65 100644 (file)
@@ -57,7 +57,8 @@
                                                
                                                <dl id="version-{@$availableUpdate.packageID}Div">
                                                        <dt><label for="version-{@$availableUpdate.packageID}">{lang}wcf.acp.packageUpdate.updateVersion{/lang}</label></dt>
-                                                       <dd><select id="version-{@$availableUpdate.packageID}" name="updates[{@$availableUpdate.packageID}]" disabled="disabled">
+                                                       <dd>
+                                                               <select id="version-{@$availableUpdate.packageID}" name="updates[{@$availableUpdate.packageID}]" disabled="disabled">
                                                                        {foreach from=$availableUpdate.versions item=$version}
                                                                                <option value="{$version.packageVersion}"{if $version.packageVersion == $availableUpdate.version.packageVersion} selected="selected"{/if}>{$version.packageVersion}</option>
                                                                        {/foreach}
                                                {/if}
                                                
                                                {if $availableUpdate.packageDescription}
-                                                       <div class="formElement">
-                                                               <p class="formFieldLabel">{lang}wcf.acp.package.description{/lang}</p>
-                                                               <p class="formField">{$availableUpdate.packageDescription}</p>
-                                                       </div>
+                                                       <dl>
+                                                               <dt>{lang}wcf.acp.package.description{/lang}</dt>
+                                                               <dd>{$availableUpdate.packageDescription}</dd>
+                                                       </dl>
                                                {/if}
                                        </div>
                                        <hr />
index 5b647f6619256dcf281bef3b12248f632e711485..e114cfcbce112f210f46bc5203bec8e96a4745b8 100644 (file)
                        <fieldset>
                                <legend>{lang}wcf.acp.packageUpdate.auth.data{/lang}</legend>
                                
-                               <div class="formElement">
-                                       <p class="formFieldLabel">{lang}wcf.acp.packageUpdate.auth.url{/lang}</p>
-                                       <p class="formField">{$url}</p>
-                               </div>
+                               <dl>
+                                       <dt>{lang}wcf.acp.packageUpdate.auth.url{/lang}</dt>
+                                       <dd>{$url}</dd>
+                               </dl>
                                {if $realm}
-                                       <div class="formElement">
-                                               <p class="formFieldLabel">{lang}wcf.acp.packageUpdate.auth.realm{/lang}</p>
-                                               <p class="formField">{$realm}</p>
-                                       </div>
+                                       <dl>
+                                               <dt>{lang}wcf.acp.packageUpdate.auth.realm{/lang}</dt>
+                                               <dd>{$realm}</dd>
+                                       </dl>
                                {/if}
                                {if $message}
-                                       <div class="formElement">
-                                               <p class="formFieldLabel">{lang}wcf.acp.packageUpdate.auth.message{/lang}</p>
-                                               <p class="formField">{@$message}</p>
-                                       </div>
+                                       <dl>
+                                               <dt>{lang}wcf.acp.packageUpdate.auth.message{/lang}</dt>
+                                               <dd>{@$message}</dd>
+                                       </dl>
                                {/if}
                        </fieldset>
                        
@@ -71,8 +71,8 @@
        </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" />
                <input type="hidden" name="form" value="PackageUpdateAuth" />
                {@SID_INPUT_TAG}
                <input type="hidden" name="packageUpdateServerID" value="{@$packageUpdateServerID}" />
index 9f6b53bfad36c32ef380bc08f86dae02ab195361..db9c67dbd4c73d975e714a5cf1e7775485d9275b 100644 (file)
                                        
                                        <div>
                                                <dl>
-                                                       <dt>
-                                                               <label for="packageName">{lang}wcf.acp.packageUpdate.search.packageName{/lang}</label>
-                                                       </dt>
+                                                       <dt><label for="packageName">{lang}wcf.acp.packageUpdate.search.packageName{/lang}</label></dt>
+                                                       <dd>
+                                                               <input type="text" id="packageName" name="packageName" value="{$packageName}" class="long" />
+                                                       </dd>
                                                        <dd>
-                                                               <input type="text" id="packageName" name="packageName" value="{$packageName}" class="large" />
                                                                <label><input type="checkbox" name="searchDescription" value="1" {if $searchDescription == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.searchDescription{/lang}</label>
                                                        </dd>
                                                </dl>
                                                        </dd>
                                                </dl>
                                                
-                                               <div class="formElement">
-                                                       <div class="formFieldLabel">
-                                                               <label>{lang}wcf.acp.packageUpdate.search.type{/lang}</label>
-                                                       </div>
-                                                       
-                                                       <div class="formField">
+                                               <dl>
+                                                       <dt>{lang}wcf.acp.packageUpdate.search.type{/lang}</dt>
+                                                       <dd>
                                                                <label><input type="checkbox" name="standalone" value="1" {if $standalone == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.standalone{/lang}</label> 
-                                                       </div>
-                                                       <div class="formField">
+                                                       </dd>
+                                                       <dd>
                                                                <label><input type="checkbox" name="plugin" value="1" {if $plugin == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.plugin{/lang}</label> 
-                                                       </div>
-                                                       <div class="formField">
+                                                       </dd>
+                                                       <dd>
                                                                <label><input type="checkbox" name="other" value="1" {if $other == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.other{/lang}</label> 
-                                                       </div>
-                                               </div>
-                                               <div class="formElement">
-                                                       <div class="formField">
-                                                               <label><input type="checkbox" name="ignoreUniques" value="1" {if $ignoreUniques == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.ignoreUniques{/lang}</label> 
-                                                       </div>
-                                               </div>
+                                                       </dd>
+                                               </dl>
+                                               
+                                               <dl>
+                                                       <dt></dt>
+                                                       <dd>
+                                                               <label><input type="checkbox" name="ignoreUniques" value="1" {if $ignoreUniques == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.ignoreUniques{/lang}</label>
+                                                       </dd>
+                                               </dl>
                                        </div>
                                </fieldset>
                        </div>
index 92f65329d5a153aa99cfeeb8fe767534ad255916..dd139d7fec5df99ac8e44b4dd658636f08876c6d 100644 (file)
@@ -1,3 +1,20 @@
+                       </section>
+               </div>
        </div>
+       <!-- /CONTENT -->
+       
+       <!-- FOOTER -->
+       <footer id="footer" class="pageFooter">
+               <div>
+                       <nav id="footerNavigation" class="footerNavigation">
+                               <ul>
+                                       <li id="toTopLink" class="toTopLink"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/upS.png" alt="{lang}wcf.global.scrollUp{/lang}" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
+                               </ul>
+                       </nav>
+               </div>
+               <small class="copyright"><a href="http://www.woltlab.com" title="Go to the WoltLab website">Copyright &copy; 2001-2011 WoltLab&reg; GmbH</a></small>
+       </footer>
+       <!-- /FOOTER -->
+       <a id="bottom"></a>
 </body>
-</html>
\ No newline at end of file
+</html>
index a9f4576620fbf70cdc1e093ea8f1771796b587f7..3d81099cd9897c9e9a163bf99127cf9dc3ada147 100644 (file)
        <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/default.js"></script>
        <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/AjaxRequest.class.js"></script>
        <script type="text/javascript" src="{@RELATIVE_WCF_DIR}acp/js/default.js"></script>
+       
+       <!-- Testing stylesheets -->
+       <link rel="stylesheet" type="text/css" href="{@RELATIVE_WCF_DIR}acp/style/testing-reset.css" />
+       <link rel="stylesheet" type="text/css" href="{@RELATIVE_WCF_DIR}acp/style/testing.css" />
+       <!-- /Testing stylesheets -->
+       
+       {*
        <style type="text/css">
                @import url("{@RELATIVE_WCF_DIR}acp/style/extra/setupStyle{if $__wcf->getLanguage()->getPageDirection() == 'rtl'}-rtl{/if}.css");
        </style>
+       *}
 </head>
 
-<body>
-       <div class="page">
-               
\ No newline at end of file
+<body id="tpl{$templateName|ucfirst}">
+       <a id="top"></a>
+       <!-- HEADER -->
+       <header class="pageHeader">
+               <div>
+                       <!-- logo -->
+                       <div id="logo" class="logo">
+                               <!-- clickable area -->
+                               <a href="index.php{@SID_ARG_1ST}">
+                                       <h1>WoltLab Community Framework 2.0 Pre-Alpha 1</h1>
+                                       <img src="{@RELATIVE_WCF_DIR}acp/images/wcfLogoWhite.svg" width="300" height="58" alt="Product-logo" title="WoltLab Community Framework 2.0 Pre-Alpha 1" />
+                               </a>
+                               <!-- /clickable area -->
+                               
+                               <!-- no search area -->
+                       </div>
+                       <!-- /logo -->
+                       
+                       <!-- main menu -->
+                       <nav id="mainMenu" class="mainMenu">
+                               <ul>
+                                       <li class="activeMenuItem">Log-In</li>
+                               </ul>
+                       </nav>
+                       <!-- /main menu -->
+                       
+                       <!-- header navigation -->
+                       <nav class="headerNavigation">
+                               <ul>
+                                       <li id="toBottomLink" class="toBottomLink"><a href="#bottom" title="{lang}wcf.global.scrollDown{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/downS.png" alt="{lang}wcf.global.scrollDown{/lang}" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
+                               </ul>
+                       </nav>
+                       <!-- /header navigation -->
+               </div>
+       </header>
+       <!-- /HEADER -->
+       
+       <!-- CONTENT -->
+       <div id="main" class="main">
+               <div>
+                       <section id="content" class="content">
\ No newline at end of file
index 2c0a1f6149e7bd949d0e684884d3cffc83142bb9..ff05a841b7f91dcbd3ebfcc606b7b0a726d688e3 100644 (file)
                        </fieldset>
                
                        {if $additionalFieldSets|isset}{@$additionalFieldSets}{/if}
-               
-                       <div class="tabMenu">
-                               <ul>
+                       
+                       <nav>
+                               <ul class="tabMenu">
                                        {foreach from=$optionTree item=categoryLevel1}
                                                <li id="{@$categoryLevel1[object]->categoryName}"><a onclick="tabMenu.showSubTabMenu('{@$categoryLevel1[object]->categoryName}');"><span>{lang}wcf.acp.group.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</span></a></li>
                                        {/foreach}
                                </ul>
-                       </div>
+                       </nav>
+                       
                        <nav class="menu"><!-- ToDo: Border missing -->
                                {foreach from=$optionTree item=categoryLevel1}
                                        <ul id="{@$categoryLevel1[object]->categoryName}-categories" class="hidden">
                                {foreach from=$categoryLevel1[categories] item=categoryLevel2}
                                        <div id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}-content" class="border tabMenuContent hidden">
                                                <div class="container-1">
-                                                       <h3 class="subHeading">{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h3>
-                                                       <p class="description">{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}.description{/lang}</p>
+                                                       <hgroup class="subHeading">
+                                                               <h1>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h1>
+                                                               <h2>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}.description{/lang}</h2>
+                                                       </hgroup>
                                                        
                                                        {if $categoryLevel2[options]|count}
                                                                {include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.acp.group.option.'}
index 835f657d17384f43565c3def9fc0cc847d9ccd6a..0eec19f856cd2edc33608edbd9826f97425c13a0 100644 (file)
                                <div class="formGroupField">
                                        <fieldset>
                                                <legend>{lang}wcf.acp.user.massProcessing.action{/lang}</legend>
+                                               
                                                <div class="formField">
                                                        <ul class="formOptionsLong">
                                                                {if $__wcf->session->getPermission('admin.user.canMailUser')}