From 1f16ad6ee80143b7e5b60ffa1806d3252d723d48 Mon Sep 17 00:00:00 2001 From: Luzifr Date: Wed, 17 Aug 2011 21:08:54 +0200 Subject: [PATCH] Table sorting Icon now SVG, some new versions of images, deleted obsoletes --- .../files/acp/templates/acpSessionLog.tpl | 14 ++--- .../files/acp/templates/acpSessionLogList.tpl | 14 ++--- .../files/acp/templates/cronjobList.tpl | 16 +++--- .../files/acp/templates/cronjobLogList.tpl | 8 +-- .../files/acp/templates/optionImport.tpl | 2 +- .../files/acp/templates/packageList.tpl | 10 ++-- .../files/acp/templates/updateServerList.tpl | 12 ++-- .../files/acp/templates/userGroupList.tpl | 6 +- .../install/files/acp/templates/userList.tpl | 4 +- wcfsetup/install/files/icon/add1.svg | 28 ++++++---- wcfsetup/install/files/icon/delete1.svg | 52 ++++++++++-------- wcfsetup/install/files/icon/sortASC.svg | 25 +++++++++ wcfsetup/install/files/icon/sortASCS.png | Bin 147 -> 0 bytes wcfsetup/install/files/icon/sortDESC.svg | 25 +++++++++ wcfsetup/install/files/icon/sortDESCS.png | Bin 153 -> 0 bytes wcfsetup/install/files/icon/switch1.svg | 33 +++++++++++ 16 files changed, 173 insertions(+), 76 deletions(-) create mode 100644 wcfsetup/install/files/icon/sortASC.svg delete mode 100644 wcfsetup/install/files/icon/sortASCS.png create mode 100644 wcfsetup/install/files/icon/sortDESC.svg delete mode 100644 wcfsetup/install/files/icon/sortDESCS.png create mode 100644 wcfsetup/install/files/icon/switch1.svg diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl index 2f7af69574..5713303056 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl @@ -22,13 +22,13 @@ - - - - - - - + + + + + + + {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if} diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index c16a1723ba..c2912fb1c6 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl @@ -22,13 +22,13 @@

{lang}wcf.acp.sessionLog.sessionAccessLogID{/lang}{if $sortField == 'sessionAccessLogID'} {/if}

{lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} {/if}

{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} {/if}

{lang}wcf.acp.sessionLog.packageName{/lang}{if $sortField == 'packageName'} {/if}

{lang}wcf.acp.sessionLog.className{/lang}{if $sortField == 'className'} {/if}

{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} {/if}

{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} {/if}

{lang}wcf.acp.sessionLog.sessionAccessLogID{/lang}{if $sortField == 'sessionAccessLogID'} {/if}

{lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} {/if}

{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} {/if}

{lang}wcf.acp.sessionLog.packageName{/lang}{if $sortField == 'packageName'} {/if}

{lang}wcf.acp.sessionLog.className{/lang}{if $sortField == 'className'} {/if}

{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} {/if}

{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} {/if}

- - - - - - - + + + + + + + {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if} diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl index 3b59dc3462..1565da71f8 100644 --- a/wcfsetup/install/files/acp/templates/cronjobList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl @@ -61,14 +61,14 @@

{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.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}

- - - - - - - - + + + + + + + + {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if} diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl index ca331ce704..4271998323 100644 --- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl @@ -24,10 +24,10 @@

{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} {/if}

{lang}wcf.acp.cronjob.startMinuteShort{/lang}{if $sortField == 'startMinute'} {/if}

{lang}wcf.acp.cronjob.startHourShort{/lang}{if $sortField == 'startHour'} {/if}

{lang}wcf.acp.cronjob.startDomShort{/lang}{if $sortField == 'startDom'} {/if}

{lang}wcf.acp.cronjob.startMonthShort{/lang}{if $sortField == 'startMonth'} {/if}

{lang}wcf.acp.cronjob.startDowShort{/lang}{if $sortField == 'startDow'} {/if}

{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} {/if}

{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} {/if}

{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} {/if}

{lang}wcf.acp.cronjob.startMinuteShort{/lang}{if $sortField == 'startMinute'} {/if}

{lang}wcf.acp.cronjob.startHourShort{/lang}{if $sortField == 'startHour'} {/if}

{lang}wcf.acp.cronjob.startDomShort{/lang}{if $sortField == 'startDom'} {/if}

{lang}wcf.acp.cronjob.startMonthShort{/lang}{if $sortField == 'startMonth'} {/if}

{lang}wcf.acp.cronjob.startDowShort{/lang}{if $sortField == 'startDow'} {/if}

{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} {/if}

{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} {/if}

- - - - + + + + {if $additionalColumns|isset}{@$additionalColumns}{/if} diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl index 1d206772af..970776fb6a 100644 --- a/wcfsetup/install/files/acp/templates/optionImport.tpl +++ b/wcfsetup/install/files/acp/templates/optionImport.tpl @@ -1,7 +1,7 @@ {include file='header'}
- +

{lang}wcf.acp.option.importAndExport{/lang}

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl index 98817315af..b1151254b8 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}

- - -

{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}

+
+ +

{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}
diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl index d4b02fcec6..b60533abd5 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}

- - - - - - + + + + + + {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if} diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl index 9fdc2001fc..5be0bb2bd0 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.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.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}

- - - + + + {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if} diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index 3e576009e6..d0fe8237bb 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -77,10 +77,10 @@ - + {foreach from=$columnHeads key=column item=columnLanguageVariable} - + {/foreach} {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if} diff --git a/wcfsetup/install/files/icon/add1.svg b/wcfsetup/install/files/icon/add1.svg index 7855a20341..979f7053fc 100644 --- a/wcfsetup/install/files/icon/add1.svg +++ b/wcfsetup/install/files/icon/add1.svg @@ -3,8 +3,8 @@ - Plus - Plus Icon (outlined) + Add + Add Icon (outlined) + + + + Sorting Ascending + Sorting Ascending Icon + + + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/sortASCS.png b/wcfsetup/install/files/icon/sortASCS.png deleted file mode 100644 index b9bed771d25a081750cc33203b67548b1bf81431..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`QJyZ2Ar-gYPCCfRpvc3btGG0x zY3YrLsu7b^V>qW7xC!vF1nxYq$af|^@w;GBgTI`C0gHgC>Cra~5nmswUd`G1=8BK| w={IZM%zW(r^nleu`>>SxD^C4AV$UP8=HI51im}RvfwnMsy85}Sb4q9e0IDxEy#N3J diff --git a/wcfsetup/install/files/icon/sortDESC.svg b/wcfsetup/install/files/icon/sortDESC.svg new file mode 100644 index 0000000000..1533c86832 --- /dev/null +++ b/wcfsetup/install/files/icon/sortDESC.svg @@ -0,0 +1,25 @@ + + + + + + Sorting Ascending + Sorting Ascending Icon + + + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/sortDESCS.png b/wcfsetup/install/files/icon/sortDESCS.png deleted file mode 100644 index 5264109d34a4980f7a6a8581d4db3bfaeee1cb27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`37#&FAr-gYPTI(OK!Jy)o~3`1 zphRo0MB_vWMP-Ag&w+2wP3)O8Y4W-a5B6{13H|#-uY#+kEOvQt + + + + + Switch + Switch Icon (tilt) + + + + + + + + + + + + + + + + + + -- 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}

{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} {/if}

{lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if}

{lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if}

{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} {/if}

{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} {/if}