From ee8af7be0fccb82f748680003e7da045e5f021ec Mon Sep 17 00:00:00 2001 From: Luzifr Date: Fri, 16 Sep 2011 19:27:08 +0200 Subject: [PATCH] Again table-views & some minor stuff Unified table views (orientations & column CSS classes); Extended the set of standard-classes for different table-row designs, they are always the first declaration, please use those classes only (but note, that in some cases there are generic table-columns, which cannot be styled individually that way, we will have to add the generic classes to the matching CSS declaration from time to time); Changed the way elements on pages hold their distance to others. Note that we now use only margins to the top, but no margins to the bottom any more; Edited some cronjob texts; Edited the worker-template to reflect the changes in the other overlay-templates. --- com.woltlab.wcf/cronjob.xml | 6 +- wcfsetup/install/files/acp/style/testing.css | 95 ++++++++++++++----- .../files/acp/templates/acpSessionLogList.tpl | 26 ++--- .../install/files/acp/templates/cacheList.tpl | 14 +-- .../files/acp/templates/cronjobLogList.tpl | 20 ++-- .../files/acp/templates/packageList.tpl | 14 +-- .../files/acp/templates/updateServerList.tpl | 16 ++-- .../files/acp/templates/userGroupList.tpl | 12 +-- .../install/files/acp/templates/userList.tpl | 14 +-- .../install/files/acp/templates/worker.tpl | 4 +- 10 files changed, 136 insertions(+), 85 deletions(-) diff --git a/com.woltlab.wcf/cronjob.xml b/com.woltlab.wcf/cronjob.xml index 456414aea7..549c13d7da 100644 --- a/com.woltlab.wcf/cronjob.xml +++ b/com.woltlab.wcf/cronjob.xml @@ -29,7 +29,7 @@ wcf\system\cronjob\CleanUpCronjobLogCronjob - Deletes old entries from cronjob log. + Deletes old entries from cronjob log 0 12 * @@ -42,7 +42,7 @@ wcf\system\cronjob\CleanUpSessionLogCronjob - Deletes old entries from session log. + Deletes old entries from session log 0 10 * @@ -55,7 +55,7 @@ wcf\system\cronjob\CleanupListenerCronjob - Executes cleanup system. + Executes the cleanup system 5,20,35,50 * * diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index f91aa7dd13..8ecc5fe24d 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -369,6 +369,15 @@ div.main > div section:only-child { +/* -- -- -- -- -- Content Header & Footer -- -- -- -- -- */ + +.contentHeader, +.contentFooter { + margin-top: 15px; +} + + + /* -- -- -- -- -- Sidebar -- -- -- -- -- */ aside.sidebar { @@ -521,7 +530,6 @@ footer.pageFooter nav.footerNavigation ul li { /* Main Heading */ .mainHeading { - margin: 0 0 15px; position: relative; } @@ -534,9 +542,8 @@ footer.pageFooter nav.footerNavigation ul li { } .mainHeading > hgroup { - margin-bottom: 30px; padding-left: 60px; - min-height: 48px; + min-height: 56px; } .mainHeading > hgroup h1 { @@ -1250,7 +1257,7 @@ input[type='button'][disabled='disabled'], .border { border: 1px solid #ccc; border-radius: 5px; - margin: 15px 0 15px; + margin: 15px 0 0; } /* -- -- -- -- -- Box Title -- -- -- -- -- */ @@ -1553,8 +1560,6 @@ thead th { thead th:first-child { /* 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 { @@ -1611,11 +1616,10 @@ thead th.active:hover a { background-color: rgba(0, 0, 0, .3); } -thead th input[type='checkbox'] { - margin: -5px !important; -} - thead th a img { + /* sort-icon orientation does not work */ + text-align: right; + /* negative margins to prevent table-cells from expanding when ths sort-icon shows up */ margin-top: -5px !important; margin-bottom: -5px !important; } @@ -1667,10 +1671,6 @@ tbody tr:hover td { background-color: #d8e7f5; } -tbody tr .columnIcon img:not(.balloonTooltip):hover { - cursor: not-allowed; -} - /* ToDo: Table Specials */ /* @@ -1698,25 +1698,72 @@ tbody tr .columnIcon img:not(.balloonTooltip):hover { border-top-right-radius: 0 !important; } -/* ToDo: Table Column Formats */ +/* Table Column Formats */ + +tr .columnMark, +tr .columnStatus { + text-align: center; + width: 1% !important; +} + +tr .columnStatus .badge { + margin-right: 1px !important; + margin-left: 1px !important; +} + +tr .columnDigits, +tr .columnID { + text-align: right; + width: 1% !important; +} + +tr .columnIcon { + text-align: left; + width: 1% !important +} + +tr .columnIcon img:not(.balloonTooltip):hover { + cursor: not-allowed; +} -tbody tr .columnIcon img { +tr .columnIcon img { height: 16px; width: 16px; } -.bigList tbody tr .columnIcon img { +.bigList tr .columnIcon img { height: 24px; width: 24px; } -tbody tr .columnName { +tr .columnTitle { font-weight: bold; + text-align: left; +} + +tr .columnText { + font-weight: normal; + text-align: left; + max-width: 20%; } -tbody tr .columnDate, -tbody tr .columnRegistrationDate { +tr .columnDate, +tr .columnRegistrationDate { font-size: 85%; + text-align: right; + width: 1% !important; +} + +tr .columnURL { + font-size: 85%; + text-align: left; +} + +/* Table Checkboxes */ + +table input[type='checkbox'] { + margin-top: -5px !important; + margin-bottom: -5px !important; } @@ -1860,8 +1907,8 @@ p.warning { text-shadow: 0 1px 0 #fff; line-height: 1.5; border-radius: 7px; - margin-bottom: 14px; - padding: 7px 14px 7px 50px; + margin-top: 15px; + padding: 7px 15px 7px 50px; -webkit-box-shadow: 0 0 7px rgba(0, 0, 0, .1); -moz-box-shadow: 0 0 7px rgba(0, 0, 0, .1); @@ -2078,6 +2125,10 @@ div.ui-widget-overlay { /* Types */ +.badgeNote { + border: 1px solid #ccc; +} + .badgeInfo { color: #68b; border: 1px solid #9be; diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index cd23c34733..09ccd5699f 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl @@ -23,12 +23,12 @@ {lang}wcf.acp.sessionLog.sessionLogID{/lang}{if $sortField == 'sessionLogID'} {/if} - {lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if} - {lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} {/if} - {lang}wcf.acp.sessionLog.userAgent{/lang}{if $sortField == 'userAgent'} {/if} - {lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} {/if} - {lang}wcf.acp.sessionLog.lastActivityTime{/lang}{if $sortField == 'lastActivityTime'} {/if} - {lang}wcf.acp.sessionLog.accesses{/lang}{if $sortField == 'accesses'} {/if} + {lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if} + {lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} {/if} + {lang}wcf.acp.sessionLog.userAgent{/lang}{if $sortField == 'userAgent'} {/if} + {lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} {/if} + {lang}wcf.acp.sessionLog.lastActivityTime{/lang}{if $sortField == 'lastActivityTime'} {/if} + {lang}wcf.acp.sessionLog.accesses{/lang}{if $sortField == 'accesses'} {/if} {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if} @@ -37,13 +37,13 @@ {foreach from=$sessionLogs item=sessionLog} -

{@$sessionLog->sessionLogID}

-

{if $__wcf->user->userID == $sessionLog->userID}{/if} {$sessionLog->username}

-

{$sessionLog->ipAddress}
{$sessionLog->hostname}

-

{$sessionLog->userAgent}

-

{@$sessionLog->time|time}

-

{@$sessionLog->lastActivityTime|time}

-

{#$sessionLog->accesses}

+

{@$sessionLog->sessionLogID}

+

{if $__wcf->user->userID == $sessionLog->userID}{/if} {$sessionLog->username}

+

{$sessionLog->ipAddress}
{$sessionLog->hostname}

+

{$sessionLog->userAgent}

+

{@$sessionLog->time|time}

+

{@$sessionLog->lastActivityTime|time}

+

{#$sessionLog->accesses}

{if $additionalColumns.$sessionLog->sessionLogID|isset}{@$additionalColumns.$sessionLog->sessionLogID}{/if} diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index da1b4cdd90..d73db04dfe 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -69,11 +69,11 @@ - - - + + + {if $files.0.perm|isset} - + {/if} @@ -81,11 +81,11 @@ {foreach from=$files item=file} - - + + {if $file.perm|isset} - + {/if} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl index 5e1887df4c..2198248e87 100644 --- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl @@ -24,10 +24,10 @@
{lang}wcf.acp.cache.list.name{/lang}{lang}wcf.acp.cache.list.size{/lang}{lang}wcf.acp.cache.list.mtime{/lang}{lang}wcf.acp.cache.list.name{/lang}{lang}wcf.acp.cache.list.size{/lang}{lang}wcf.acp.cache.list.mtime{/lang}{lang}wcf.acp.cache.list.perm{/lang}{lang}wcf.acp.cache.list.perm{/lang}

{$file.filename}

{@$file.filesize|filesize}

{$file.filename}

{@$file.filesize|filesize}

 {if $file.mtime > 1}

{@$file.mtime|time}

{/if}		{@$file.perm}

{@$file.perm}

- - - - + + + + {if $additionalColumns|isset}{@$additionalColumns}{/if} @@ -37,18 +37,18 @@ {content} {foreach from=$cronjobLogs item=cronjobLog} - - - + + + {if $cronjobLog->success} - + {elseif $cronjobLog->error} - {else} - + {/if} {if $cronjobLog->additionalColumns|isset}{@$cronjobLog->additionalColumns}{/if} diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl index 3c7d595d67..7754a9d60b 100644 --- a/wcfsetup/install/files/acp/templates/packageList.tpl +++ b/wcfsetup/install/files/acp/templates/packageList.tpl @@ -40,11 +40,11 @@
{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} {/if}{lang}wcf.acp.cronjob.className{/lang}{if $sortField == 'className'} {/if}{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} {/if}{lang}wcf.acp.cronjob.log.execTime{/lang}{if $sortField == 'execTime'} {/if}{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} {/if}{lang}wcf.acp.cronjob.className{/lang}{if $sortField == 'className'} {/if}{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} {/if}{lang}wcf.acp.cronjob.log.execTime{/lang}{if $sortField == 'execTime'} {/if}

{@$cronjobLog->cronjobID}

{$cronjobLog->className}

{$cronjobLog->description}

{@$cronjobLog->cronjobID}

{$cronjobLog->className}

{$cronjobLog->description}

{@$cronjobLog->execTime|time} {lang}wcf.acp.cronjob.log.success{/lang}

{@$cronjobLog->execTime|time} {lang}wcf.acp.cronjob.log.success{/lang}

 +

{@$cronjobLog->execTime|time} {lang}wcf.acp.cronjob.log.error{/lang}
{@$cronjobLog->error}

- - - {lang}wcf.acp.package.list.author{/lang}{if $sortField == 'author'} {/if} - {lang}wcf.acp.package.list.version{/lang}{if $sortField == 'packageVersion'} {/if} - {lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} {/if} + + + + + {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if} @@ -77,10 +77,10 @@ {/if} - - + diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl index f74e701788..e4c0839333 100644 --- a/wcfsetup/install/files/acp/templates/updateServerList.tpl +++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl @@ -39,12 +39,12 @@
{lang}wcf.acp.package.list.id{/lang}{if $sortField == 'packageID'} {/if}{lang}wcf.acp.package.list.name{/lang}{if $sortField == 'packageName'} {/if} {lang}wcf.acp.package.list.id{/lang}{if $sortField == 'packageID'} {/if}{lang}wcf.acp.package.list.name{/lang}{if $sortField == 'packageName'} {/if}{lang}wcf.acp.package.list.author{/lang}{if $sortField == 'author'} {/if}{lang}wcf.acp.package.list.version{/lang}{if $sortField == 'packageVersion'} {/if}{lang}wcf.acp.package.updateDate{/lang}{if $sortField == 'updateDate'} {/if}
+ {$package->getName()}{if $package->instanceNo > 1 && $package->instanceName == ''} (#{#$package->instanceNo}){/if}

{if $package->authorURL}{$package->author}{else}{$package->author}{/if}

authorURL|rawurlencode}" class="externalURL">{$package->author}{else}{$package->author}{/if}

{$package->packageVersion}

{@$package->updateDate|time}

- - - + + + - - + + {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if} @@ -61,9 +61,9 @@ {if $additionalButtons[$updateServer->packageUpdateServerID]|isset}{@$additionalButtons[$updateServer->packageUpdateServerID]}{/if} - - - + + + diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl index ae52b420de..74e5aab7a4 100644 --- a/wcfsetup/install/files/acp/templates/userGroupList.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl @@ -46,9 +46,9 @@
{lang}wcf.acp.updateServer.packageUpdateServerID{/lang}{if $sortField == 'packageUpdateServerID'} {/if}{lang}wcf.acp.updateServer.serverURL{/lang}{if $sortField == 'serverURL'} {/if}{lang}wcf.acp.updateServer.packages{/lang}{if $sortField == 'packages'} {/if}{lang}wcf.acp.updateServer.packageUpdateServerID{/lang}{if $sortField == 'packageUpdateServerID'} {/if}{lang}wcf.acp.updateServer.serverURL{/lang}{if $sortField == 'serverURL'} {/if}{lang}wcf.acp.updateServer.packages{/lang}{if $sortField == 'packages'} {/if} {lang}wcf.acp.updateServer.status{/lang}{if $sortField == 'status'} {/if}{lang}wcf.acp.updateServer.errorMessage{/lang}{if $sortField == 'errorMessage'} {/if}{lang}wcf.acp.updateServer.lastUpdateTime{/lang}{if $sortField == 'lastUpdateTime'} {/if}{lang}wcf.acp.updateServer.errorMessage{/lang}{if $sortField == 'errorMessage'} {/if}{lang}wcf.acp.updateServer.lastUpdateTime{/lang}{if $sortField == 'lastUpdateTime'} {/if}

{@$updateServer->packageUpdateServerID}

{@$updateServer->serverURL}

{#$updateServer->packages}

{@$updateServer->status}

{@$updateServer->serverURL}

{#$updateServer->packages}

{@$updateServer->status}

{@$updateServer->errorMessage|truncate:"30"}

{if $updateServer->lastUpdateTime}{@$updateServer->lastUpdateTime|time}{/if}

- - - + + + {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if} @@ -78,9 +78,9 @@ {if $additionalButtons[$group->groupID]|isset}{@$additionalButtons[$group->groupID]}{/if} - - - + + + {if $additionalColumns[$group->groupID]|isset}{@$additionalColumns[$group->groupID]}{/if} diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index 2d6f27b474..e82897aac1 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -46,11 +46,11 @@ - - + + {foreach from=$columnHeads key=column item=columnLanguageVariable} - + {/foreach} {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if} @@ -61,7 +61,7 @@ {content} {foreach from=$users item=user} - + - - + + {foreach from=$columnHeads key=column item=columnLanguageVariable} - + {/foreach} {if $additionalColumns[$user->userID]|isset}{@$additionalColumns[$user->userID]}{/if} diff --git a/wcfsetup/install/files/acp/templates/worker.tpl b/wcfsetup/install/files/acp/templates/worker.tpl index be1668e295..8f01ac292e 100644 --- a/wcfsetup/install/files/acp/templates/worker.tpl +++ b/wcfsetup/install/files/acp/templates/worker.tpl @@ -8,7 +8,7 @@ - -- 2.20.1
{lang}wcf.acp.group.groupID{/lang}{if $sortField == 'groupID'} {/if}{lang}wcf.acp.group.groupName{/lang}{if $sortField == 'groupName'} {/if}{lang}wcf.acp.group.members{/lang}{if $sortField == 'members'} {/if}{lang}wcf.acp.group.groupID{/lang}{if $sortField == 'groupID'} {/if}{lang}wcf.acp.group.groupName{/lang}{if $sortField == 'groupName'} {/if}{lang}wcf.acp.group.members{/lang}{if $sortField == 'members'} {/if}

{@$group->groupID}

{if $group->isEditable()}

{$group->groupName}{else}{$group->groupName}

{/if}

{#$group->members}

{@$group->groupID}

{if $group->isEditable()}

{$group->groupName}{else}{$group->groupName}

{/if}

{#$group->members}
{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} {/if}{lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if}{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} {/if}{lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if}{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} {/if}{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} {/if}
{if $user->editable} @@ -76,11 +76,11 @@ {if $additionalButtons[$user->userID]|isset}{@$additionalButtons[$user->userID]}{/if}

{@$user->userID}

{if $user->editable}{$user->username}{else}{$user->username}{/if}

{@$user->userID}

{if $user->editable}{$user->username}{else}{$user->username}{/if}

{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}

{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}