Some minor changes
authorLuzifr <szekely@woltlab.com>
Tue, 13 Sep 2011 15:49:47 +0000 (17:49 +0200)
committerLuzifr <szekely@woltlab.com>
Tue, 13 Sep 2011 15:50:02 +0000 (17:50 +0200)
ID for the installer body (in case we need it); Replaced quote marks in
the CSS with single quotes; Removed class "smallFont", as it
does/should not exist in table context any more; Moved formatting of
special table-columns to a separate section in the CSS (there will have
to be a lot of changes with those).

wcfsetup/install/files/acp/style/testing.css
wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
wcfsetup/install/files/acp/templates/optionTypeCustomselect.tpl
wcfsetup/install/files/acp/templates/optionTypeDate.tpl
wcfsetup/install/files/acp/templates/packageList.tpl
wcfsetup/install/files/acp/templates/updateServerList.tpl
wcfsetup/install/files/acp/templates/userGroupList.tpl
wcfsetup/install/files/acp/templates/userList.tpl
wcfsetup/setup/template/header.tpl

index ffa92c5e97e6449a2ae16fee1c5a9bddf2fa1e8d..cf61c97640f845525b9067f3e2ebed8d1cab981e 100644 (file)
@@ -93,7 +93,7 @@ a:hover {
 }
 
 a.externalURL {
-       background-image: url("../../icon/externalURL.svg");
+       background-image: url('../../icon/externalURL.svg');
        background-position: right center;
        background-repeat: no-repeat;
        padding-right: 17px;
@@ -120,7 +120,7 @@ hr {
 header.pageHeader {
        /* Disabled, because the WoltLab header-image is not LGPL 
        Activate it if you want to test your own header image */
-       /* background-image: url("../images/header.png"); */
+       /* background-image: url('../images/header.png'); */
        background-position: left top;
        background-repeat: repeat-x;
        min-width: 800px;
@@ -130,6 +130,7 @@ header.pageHeader {
 /* Top Menu */
 
 header.pageHeader nav.topMenu {
+       border-bottom: 1px solid rgba(0, 0, 0, .1);
        background-color: rgba(0, 0, 0, .4);
        position: fixed;
        top: 0;
@@ -207,7 +208,7 @@ nav.mainMenu {
 }
 
 nav.mainMenu:after {
-       content: "";
+       content: '';
        display: block;
        clear: both;
 }
@@ -301,7 +302,7 @@ nav.headerNavigation {
 }
 
 nav.headerNavigation:after {
-       content: "";
+       content: '';
        display: block;
        clear: both;
 }
@@ -311,7 +312,7 @@ nav.headerNavigation > div {
 }
 
 nav.headerNavigation > div:after {
-       content: "";
+       content: '';
        display: block;
        clear: both;
 }
@@ -409,7 +410,7 @@ nav.sidebarMenu > div h1 {
        font-size: 130%;
        font-weight: bold;
        color: #369;
-       background-image: url("../../icon/closed.svg");
+       background-image: url('../../icon/closed.svg');
        background-position: 15px center;
        background-size: 16px;
        background-repeat: no-repeat;
@@ -419,7 +420,7 @@ nav.sidebarMenu > div h1 {
 }
 
 nav.sidebarMenu > div h1.activeMenuItem {
-       background-image: url("../../icon/opened.svg");
+       background-image: url('../../icon/opened.svg');
 }
 
 nav.sidebarMenu > div ul li {
@@ -463,7 +464,7 @@ footer.pageFooter {
 }
 
 footer.pageFooter:after {
-       content: "";
+       content: '';
        display: block;
        clear: both;
 }
@@ -478,7 +479,7 @@ footer.pageFooter > div {
 }
 
 footer.pageFooter > div:after {
-       content: "";
+       content: '';
        display: block;
        clear: both;
 }
@@ -588,7 +589,6 @@ fieldset.topLink {
        background-image: -o-linear-gradient(135deg, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0) 50px);
        background-image: -ms-linear-gradient(135deg, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0) 50px);
        background-image: linear-gradient(135deg, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0) 50px);
-       
 }
 */
 
@@ -1249,7 +1249,7 @@ input[disabled='disabled'],
        background-color: #369;
        /* Disabled, because the WoltLab header-image is not LGPL 
        Activate it if you want to test your own header image */
-       /* background-image: url("../images/header.png"); */
+       /* background-image: url('../images/header.png'); */
        background-position: left top;
        background-repeat: repeat-x;    
        
@@ -1303,7 +1303,7 @@ input[disabled='disabled'],
 }
 
 .tabMenu:after {
-       content: "";
+       content: '';
        display: block;
        clear: both;
 }
@@ -1600,7 +1600,7 @@ thead th.active:hover a {
        background-color: rgba(0, 0, 0, .3);
 }
 
-thead th input[type="checkbox"] {
+thead th input[type='checkbox'] {
        margin: -5px !important;
 }
 
@@ -1656,11 +1656,6 @@ tbody tr:hover td {
        background-color: #d8e7f5;
 }
 
-tbody tr .columnIcon img {
-       height: 16px;
-       width: 16px;
-}
-
 tbody tr .columnIcon img:not(.balloonTooltip):hover {
        cursor: not-allowed;
 }
@@ -1692,6 +1687,27 @@ tbody tr .columnIcon img:not(.balloonTooltip):hover {
        border-top-right-radius: 0 !important;
 }
 
+/* ToDo: Table Column Formats */
+
+tbody tr .columnIcon img {
+       height: 16px;
+       width: 16px;
+}
+
+.bigList tbody tr .columnIcon img {
+       height: 24px;
+       width: 24px;
+}
+
+tbody tr .columnName {
+       font-weight: bold;
+}
+
+tbody tr .columnDate,
+tbody tr .columnRegistrationDate {
+       font-size: 85%;
+}
+
 
 
 /* -- -- -- -- -- ToDo: Page Navigation -- -- -- -- -- */
@@ -1724,7 +1740,7 @@ tbody tr .columnIcon img:not(.balloonTooltip):hover {
 }
 
 .pageNavigation ul li:after {
-       content: "";
+       content: '';
        display: block;
        clear: both;
 }
@@ -1853,7 +1869,7 @@ p.info {
        color: #68b;
        border: 1px solid #9be;
        background-color: #def;
-       background-image: url("../../icon/systemInfo.svg");
+       background-image: url('../../icon/systemInfo.svg');
        background-size: 24px;
        background-position: 13px center;
        background-repeat: no-repeat;
@@ -1863,7 +1879,7 @@ p.success {
        color: #090;
        border: 1px solid #0c0;
        background-color: #efe;
-       background-image: url("../../icon/systemSuccess.svg");
+       background-image: url('../../icon/systemSuccess.svg');
        background-size: 24px;
        background-position: 13px center;
        background-repeat: no-repeat;
@@ -1873,7 +1889,7 @@ p.warning {
        color: #990;
        border: 1px solid #cc0;
        background-color: #ffd;
-       background-image: url("../../icon/systemWarning.svg");
+       background-image: url('../../icon/systemWarning.svg');
        background-size: 24px;
        background-position: 13px center;
        background-repeat: no-repeat;
@@ -1883,7 +1899,7 @@ p.error {
        color: #c00;
        border: 1px solid #f99;
        background-color: #fee;
-       background-image: url("../../icon/systemError.svg");
+       background-image: url('../../icon/systemError.svg');
        background-size: 24px;
        background-position: 13px center;
        background-repeat: no-repeat;
@@ -1962,7 +1978,7 @@ div.wcfDimensions {
 
 div.overlayLoading {
        background-color: #fff;
-       background-image: url("../../icon/spinner.svg");
+       background-image: url('../../icon/spinner.svg');
        background-position: center center;
        background-repeat: no-repeat;
 }
@@ -1993,7 +2009,7 @@ span.ui-dialog-title {
 }
 
 a.ui-dialog-titlebar-close {
-       background-image: url("../../icon/deleteM.png");
+       background-image: url('../../icon/deleteM.png');
        background-position: top left;
        background-repeat: no-repeat;
        position: absolute !important;
@@ -2053,7 +2069,6 @@ div.ui-widget-overlay {
        font-size: 85%;
        text-shadow: none;
        color: #666;
-       border: 1px solid #ccc;
        border-radius: 13px;
        background-color: #fff;
        margin-right: -3px;
@@ -2066,6 +2081,10 @@ div.ui-widget-overlay {
 
 /* Types */
 
+.badgeNote {
+       border: 1px solid #ccc;
+}
+
 .badgeInfo {
        color: #68b;
        border: 1px solid #9be;
@@ -2096,6 +2115,7 @@ div.ui-widget-overlay {
        text-decoration: none !important;
        text-shadow: 0 1px 0 #fff;
        color: #999;
+       cursor: pointer;
        
        border-width: 1px;
        border-style: solid;
index ff3190afd2ac2f9c82634802fd79ec7affdaa3c8..cd23c3473319a02d13d5626c32bbe4ddf17ba816 100644 (file)
@@ -40,7 +40,7 @@
                                        <td class="columnSessionLogID columnID"><p>{@$sessionLog->sessionLogID}</p></td>
                                        <td class="columnUsername columnText"><p>{if $__wcf->user->userID == $sessionLog->userID}<img src="{@RELATIVE_WCF_DIR}icon/user1.svg" alt="" />{/if} <a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLog->sessionLogID}{@SID_ARG_2ND}">{$sessionLog->username}</a></p></td>
                                        <td class="columnIpAddress columnText"><p><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLog->sessionLogID}{@SID_ARG_2ND}">{$sessionLog->ipAddress}</a><br /><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLog->sessionLogID}{@SID_ARG_2ND}">{$sessionLog->hostname}</a></p></td>
-                                       <td class="columnUserAgent columnText smallFont"><p><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLog->sessionLogID}{@SID_ARG_2ND}">{$sessionLog->userAgent}</a></p></td>
+                                       <td class="columnUserAgent columnText"><p><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLog->sessionLogID}{@SID_ARG_2ND}">{$sessionLog->userAgent}</a></p></td>
                                        <td class="columnTime columnText"><p>{@$sessionLog->time|time}</p></td>
                                        <td class="columnLastActivityTime columnText"><p>{@$sessionLog->lastActivityTime|time}</p></td>
                                        <td class="columnAccesses columnNumbers"><p>{#$sessionLog->accesses}</p></td>
index fb65ba2e12d7b7b592188afd4dd43217db11c1c5..90827ba55d4239e3857923502ae2ee43025740d0 100644 (file)
@@ -1,4 +1,4 @@
-<ul class="formOptionsLong smallFont">
+<ul class="formOptionsLong">
        {foreach from=$selectOptions key=key item=selectOption}
                <li>
                        <label><input type="radio" name="values[{$option->optionName}]"{if $value == $key} checked="checked"{/if} value="{$key}" /> {lang}{@$selectOption}{/lang}</label>
index 8770c94a70a1b9d4d5db3aa84f4d53be1a3cc4c1..8603146fe6c18ef558cada8bb59dc5e24d26052c 100644 (file)
                        {/if}
                        
                        {if $element == 'year'}
-                               <input type="text" id="{$optionData.optionName}Year" name="values[{$optionData.optionName}][year]" maxlength="4" value="{$year}" class="inputText fourDigitInput" />
+                               <input type="text" id="{$optionData.optionName}Year" name="values[{$optionData.optionName}][year]" maxlength="4" value="{$year}" class="short" />
                        {/if}
                </div>
        {/foreach}
 </div>
 {if !$yearRequired}
-       <p class="smallFont light">{lang}wcf.global.date.year.notRequired{/lang}</p>
+       <p class="light">{lang}wcf.global.date.year.notRequired{/lang}</p>
 {/if}
\ No newline at end of file
index aae3fc6230dd329717a5c0e5c016e7d188e3a03d..3c7d595d672e3fe529644642e579e281117ed5c8 100644 (file)
@@ -77,7 +77,7 @@
                                                                <img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.list.other{/lang}" />
                                                        {/if}
                                                </td>
-                                               <td id="packageName{@$package->packageID}" class="columnText" title="{$package->packageDescription}">
+                                               <td id="packageName{@$package->packageID}" class="columnName columnText" title="{$package->packageDescription}">
                                                        <a href="index.php?page=PackageView&amp;packageID={@$package->packageID}{@SID_ARG_2ND}"><span>{$package->getName()}{if $package->instanceNo > 1 && $package->instanceName == ''} (#{#$package->instanceNo}){/if}</span></a>
                                                </td>
                                                <td class="columnText"><p>{if $package->authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->authorURL|rawurlencode}" class="externalURL">{$package->author}</a>{else}{$package->author}{/if}</p></td>
index 987428dd1a7357e4bef0a59a144836c44bbf36bb..f74e701788be6f663ebe8254b62d500a5cd67dfd 100644 (file)
                        <h1>{lang}wcf.acp.updateServer.list{/lang} <span class="badge" title="{lang}wcf.acp.updateServer.list.count{/lang}">{#$items}</span></h1>
                </hgroup>
                
-               <table>
+               <table class="bigList">
                        <thead>
                                <tr>
                                        <th class="columnPackageUpdateServerID{if $sortField == 'packageUpdateServerID'} active{/if}" colspan="2"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=packageUpdateServerID&amp;sortOrder={if $sortField == 'packageUpdateServerID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.packageUpdateServerID{/lang}{if $sortField == 'packageUpdateServerID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnServer{if $sortField == 'serverURL'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=serverURL&amp;sortOrder={if $sortField == 'serverURL' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.serverURL{/lang}{if $sortField == 'serverURL'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnServer columnName{if $sortField == 'serverURL'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=serverURL&amp;sortOrder={if $sortField == 'serverURL' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.serverURL{/lang}{if $sortField == 'serverURL'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnPackages{if $sortField == 'packages'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=packages&amp;sortOrder={if $sortField == 'packages' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.packages{/lang}{if $sortField == 'packages'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnStatus{if $sortField == 'status'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=status&amp;sortOrder={if $sortField == 'status' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.status{/lang}{if $sortField == 'status'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        <th class="columnErrorText{if $sortField == 'errorMessage'} active{/if}"><a href="index.php?page=UpdateServerList&amp;pageNo={@$pageNo}&amp;sortField=errorMessage&amp;sortOrder={if $sortField == 'errorMessage' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.updateServer.errorMessage{/lang}{if $sortField == 'errorMessage'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                                        {if $additionalButtons[$updateServer->packageUpdateServerID]|isset}{@$additionalButtons[$updateServer->packageUpdateServerID]}{/if}
                                                </td>
                                                <td class="columnID"><p>{@$updateServer->packageUpdateServerID}</p></td>
-                                               <td class="columnText"><p><a href="index.php?form=UpdateServerEdit&amp;packageUpdateServerID={@$updateServer->packageUpdateServerID}{@SID_ARG_2ND}">{@$updateServer->serverURL}</a></p></td>
-                                               <td class="columnText smallFont"><p>{#$updateServer->packages}</p></td>
-                                               <td class="columnText smallFont"><p class="badge{if $updateServer->status == 'online'} badgeSuccess{else} badgeError{/if}">{@$updateServer->status}</p></td>
-                                               <td class="columnText smallFont"><p title="{@$updateServer->errorMessage}">{@$updateServer->errorMessage|truncate:"30"}</p></td>
-                                               <td class="columnDate smallFont"><p>{if $updateServer->lastUpdateTime}{@$updateServer->lastUpdateTime|time}{/if}</p></td>
+                                               <td class="columnText columnName"><p><a href="index.php?form=UpdateServerEdit&amp;packageUpdateServerID={@$updateServer->packageUpdateServerID}{@SID_ARG_2ND}">{@$updateServer->serverURL}</a></p></td>
+                                               <td class="columnText"><p>{#$updateServer->packages}</p></td>
+                                               <td class="columnText"><p class="badge{if $updateServer->status == 'online'} badgeSuccess{else} badgeError{/if}">{@$updateServer->status}</p></td>
+                                               <td class="columnText"><p title="{@$updateServer->errorMessage}">{@$updateServer->errorMessage|truncate:"30"}</p></td>
+                                               <td class="columnDate"><p>{if $updateServer->lastUpdateTime}{@$updateServer->lastUpdateTime|time}{/if}</p></td>
                                                
                                                {if $additionalColumns[$updateServer->packageUpdateServerID]|isset}{@$additionalColumns[$updateServer->packageUpdateServerID]}{/if}
                                        </tr>
index aed5bc4f100d334f5f74ab32751c8bafb532bf69..ae52b420decb2d4af7893e5d9c32ad0ee364010e 100644 (file)
@@ -43,7 +43,7 @@
                        <h1>{lang}wcf.acp.group.list{/lang} <span class="badge" title="{lang}wcf.acp.group.list.count{/lang}">{#$items}</span></h1>
                </hgroup>
                
-               <table>
+               <table class="bigList">
                        <thead>
                                <tr class="tableHead">
                                        <th class="columnGroupID{if $sortField == 'groupID'} active{/if}" colspan="2"><a href="index.php?page=UserGroupList&amp;pageNo={@$pageNo}&amp;sortField=groupID&amp;sortOrder={if $sortField == 'groupID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.group.groupID{/lang}{if $sortField == 'groupID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
@@ -79,7 +79,7 @@
                                                        {if $additionalButtons[$group->groupID]|isset}{@$additionalButtons[$group->groupID]}{/if}
                                                </td>
                                                <td class="columnGroupID columnID"><p>{@$group->groupID}</p></td>
-                                               <td class="columnGroupName columnText">{if $group->isEditable()}<p><a title="{lang}wcf.acp.group.edit{/lang}" href="index.php?form=UserGroupEdit&amp;groupID={@$group->groupID}{@SID_ARG_2ND}">{$group->groupName}</a>{else}{$group->groupName}</p>{/if}</td>
+                                               <td class="columnGroupName columnName columnText">{if $group->isEditable()}<p><a title="{lang}wcf.acp.group.edit{/lang}" href="index.php?form=UserGroupEdit&amp;groupID={@$group->groupID}{@SID_ARG_2ND}">{$group->groupName}</a>{else}{$group->groupName}</p>{/if}</td>
                                                <td class="columnMembers columnNumbers"><p><a title="{lang}wcf.acp.group.showMembers{/lang}" href="index.php?form=UserSearch&amp;groupID={@$group->groupID}{@SID_ARG_2ND}">{#$group->members}</p></a></td>
                                                
                                                {if $additionalColumns[$group->groupID]|isset}{@$additionalColumns[$group->groupID]}{/if}
index 26a59cf2a9de31a31aeed8f188e4f8c0962dcef0..a057f5a2ed166ddab37693618bed2a4a4c9ad9b6 100644 (file)
@@ -77,7 +77,7 @@
                                                                {if $additionalButtons[$user->userID]|isset}{@$additionalButtons[$user->userID]}{/if}
                                                        </td>
                                                        <td class="columnUserID columnID"><p>{@$user->userID}</p></td>
-                                                       <td class="columnUsername columnText"><p>{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user->username}</a>{else}{$user->username}{/if}</p></td>
+                                                       <td class="columnUsername columnName columnText"><p>{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user->username}</a>{else}{$user->username}{/if}</p></td>
                                        
                                                        {foreach from=$columnHeads key=column item=columnLanguageVariable}
                                                                <td class="column{$column|ucfirst}"><p>{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}</p></td>
index a4f2f5b8357a00625e58bf5d481594b4d33a2a97..c68fb5c7c84ba5b353a8dff16dc60f45bcab8411 100644 (file)
@@ -8,7 +8,7 @@
        <link rel="stylesheet" type="text/css" href="install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showCSS=testing.css" />
 </head>
 
-<body>
+<body id="tplWCFInstaller">
        <a id="top"></a>
        <!-- HEADER -->
        <header id="pageHeader" class="pageHeader">