From d6def9b175d1a1a0bbd80ea686b9f4788e4388df Mon Sep 17 00:00:00 2001 From: Luzifr Date: Fri, 12 Aug 2011 19:38:57 +0200 Subject: [PATCH] Implemented more balloon tooltips, some style corrections, more SVG images, removed some dummy PNG images. --- wcfsetup/install/files/acp/style/testing.css | 9 ++++-- .../install/files/acp/templates/cacheList.tpl | 2 +- .../files/acp/templates/cronjobList.tpl | 8 +++--- .../install/files/acp/templates/footer.tpl | 2 +- .../install/files/acp/templates/header.tpl | 2 +- .../files/acp/templates/packageList.tpl | 2 +- .../packageUninstallationDependencies.tpl | 10 +++---- .../templates/packageUpdateSearchResult.tpl | 6 ++-- .../files/acp/templates/packageView.tpl | 10 +++---- .../files/acp/templates/setupFooter.tpl | 2 +- .../files/acp/templates/setupHeader.tpl | 2 +- .../files/acp/templates/userGroupList.tpl | 4 +-- .../install/files/acp/templates/userList.tpl | 6 ++-- .../acp/templates/usersMassProcessing.tpl | 4 +-- wcfsetup/install/files/icon/arrowDownS.png | Bin 257 -> 0 bytes wcfsetup/install/files/icon/arrowRightS.png | Bin 217 -> 0 bytes wcfsetup/install/files/icon/boxCloser.svg | 23 +++++++++++++++ wcfsetup/install/files/icon/boxOpener.svg | 23 +++++++++++++++ wcfsetup/install/files/icon/downS.png | Bin 286 -> 0 bytes wcfsetup/install/files/icon/toBottom.svg | 27 ++++++++++++++++++ wcfsetup/install/files/icon/toLeft.svg | 27 ++++++++++++++++++ wcfsetup/install/files/icon/toRight.svg | 27 ++++++++++++++++++ wcfsetup/install/files/icon/toTop.svg | 27 ++++++++++++++++++ wcfsetup/install/files/icon/upS.png | Bin 299 -> 0 bytes 24 files changed, 190 insertions(+), 33 deletions(-) delete mode 100644 wcfsetup/install/files/icon/arrowDownS.png delete mode 100644 wcfsetup/install/files/icon/arrowRightS.png create mode 100644 wcfsetup/install/files/icon/boxCloser.svg create mode 100644 wcfsetup/install/files/icon/boxOpener.svg delete mode 100644 wcfsetup/install/files/icon/downS.png create mode 100644 wcfsetup/install/files/icon/toBottom.svg create mode 100644 wcfsetup/install/files/icon/toLeft.svg create mode 100644 wcfsetup/install/files/icon/toRight.svg create mode 100644 wcfsetup/install/files/icon/toTop.svg delete mode 100644 wcfsetup/install/files/icon/upS.png diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index c174365fa3..17f7ec44c9 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -266,10 +266,11 @@ div.main > div section:only-child { aside.sidebar { display: table-cell; vertical-align: top; - border-right: 1ps solid #bcd; + border-right: 1px solid #bcd; background-color: #d8e7f5; margin: 0 !important; padding: 0 !important; + position: relative; -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, .1); -moz-box-shadow: inset 0 0 5px rgba(0, 0, 0, .1); @@ -297,8 +298,9 @@ nav.sidebarMenu > div a:hover { } nav.sidebarMenu > div h1 { - background-image: url("../../icon/arrowRightS.png"); + background-image: url("../../icon/boxOpener.svg"); background-position: 15px center; + background-size: 16px; background-repeat: no-repeat; color: #369; cursor: pointer; @@ -310,7 +312,7 @@ nav.sidebarMenu > div h1 { } nav.sidebarMenu > div h1.activeMenuItem { - background-image: url("../../icon/arrowDownS.png"); + background-image: url("../../icon/boxCloser.svg"); } nav.sidebarMenu > div ul li { @@ -327,6 +329,7 @@ nav.sidebarMenu > div ul li a { nav.sidebarMenu > div ul li.activeMenuItem { background-color: #fff; overflow: hidden; + margin-right: -1px; -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .1); -moz-box-shadow: 0 0 5px rgba(0, 0, 0, .1); diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index 0cc40fa1ff..8038d2aa37 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -48,7 +48,7 @@ {foreach from=$caches key=cache item=files} {if $files|count}
- +

{$cache} {#$files|count}

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl index 9d282af66f..75cfa7b758 100644 --- a/wcfsetup/install/files/acp/templates/cronjobList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl @@ -79,11 +79,11 @@ {if $__wcf->session->getPermission('admin.system.cronjobs.canEditCronjob')} - + {/if} {if $cronjob->canBeDisabled()} - + {else} {if $cronjob->active} @@ -93,12 +93,12 @@ {/if} {if $cronjob->isEditable()} - + {else} {/if} {if $cronjob->isDeletable()} - + {else} {/if} diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl index d03465ea75..909304ea57 100644 --- a/wcfsetup/install/files/acp/templates/footer.tpl +++ b/wcfsetup/install/files/acp/templates/footer.tpl @@ -9,7 +9,7 @@
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index 31fa7340c1..bb12dffe8a 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -121,7 +121,7 @@ diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl index c304c737e9..68ad50c7fa 100644 --- a/wcfsetup/install/files/acp/templates/packageList.tpl +++ b/wcfsetup/install/files/acp/templates/packageList.tpl @@ -70,7 +70,7 @@

{@$package->packageID}

{if $package->standalone} - + {elseif $package->isPlugin()} {else} diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl index 8f0e50105d..77f3011a7a 100644 --- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl +++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl @@ -93,12 +93,12 @@ {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} {/if} {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $package.package != 'com.woltlab.wcf' && $package.packageID != PACKAGE_ID} - + {else} {/if} @@ -108,11 +108,11 @@

{@$package.packageID}

{if $package.standalone} - + {elseif $package.parentPackageID} - + {else} - + {/if}

{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl index 9b951f827d..10eebdba68 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl @@ -20,11 +20,11 @@

{if $package.standalone == 1} - + {elseif $package.plugin != ''} - + {else} - + {/if} {$package.packageName}

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl index 841e65f7c2..2ebe8e150e 100644 --- a/wcfsetup/install/files/acp/templates/packageView.tpl +++ b/wcfsetup/install/files/acp/templates/packageView.tpl @@ -187,12 +187,12 @@ {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')} - + {else} {/if} {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $package.package != 'com.woltlab.wcf' && $package.packageID != PACKAGE_ID} - + {else} {/if} @@ -202,11 +202,11 @@

{@$package.packageID}

{if $package.standalone} - + {elseif $package.parentPackageID} - + {else} - + {/if}

{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}

diff --git a/wcfsetup/install/files/acp/templates/setupFooter.tpl b/wcfsetup/install/files/acp/templates/setupFooter.tpl index dd139d7fec..df4b9952ca 100644 --- a/wcfsetup/install/files/acp/templates/setupFooter.tpl +++ b/wcfsetup/install/files/acp/templates/setupFooter.tpl @@ -8,7 +8,7 @@
diff --git a/wcfsetup/install/files/acp/templates/setupHeader.tpl b/wcfsetup/install/files/acp/templates/setupHeader.tpl index 3d81099cd9..0898eac2c5 100644 --- a/wcfsetup/install/files/acp/templates/setupHeader.tpl +++ b/wcfsetup/install/files/acp/templates/setupHeader.tpl @@ -56,7 +56,7 @@ diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl index 43e320373d..9df60f9aac 100644 --- a/wcfsetup/install/files/acp/templates/userGroupList.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl @@ -59,12 +59,12 @@ {if $group->isEditable()} - + {else} {/if} {if $group->isDeletable()} - + {if $user->editable} - + {else} {/if} {if $user->deletable} - + {else} {/if} diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl index 95be3bb83d..374c6b83f3 100644 --- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl +++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl @@ -256,8 +256,8 @@ -
-
+
+
diff --git a/wcfsetup/install/files/icon/arrowDownS.png b/wcfsetup/install/files/icon/arrowDownS.png deleted file mode 100644 index 75dea71a8c995cb3c292302479ca4d6734a899c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Q-Dv1E0F$=0iM48^y1y;GdG^z zefrKgZRYa5m$#j`1yr^6;58uEK7YPX<={8aiRbK diff --git a/wcfsetup/install/files/icon/arrowRightS.png b/wcfsetup/install/files/icon/arrowRightS.png deleted file mode 100644 index 1aa447c06ddc3bbec5452b6c7542dc6ddb56a100..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3p`yMLn>}9y==?X>>$FDkpDoi zs6`}Bd4lqd%Jz^rhYjBtn!d&*XzzB2+TH4)#of#??J>uz)h&0QH}h|kO8c+GFkPlw zWwng0a=#__fn%3^)!W^pw8Bu?hTiPgS^X$s!_w)Q0 zU9l%?#x~~TK{ph`p6$K=;ZiaynQWXJw4tiJnUxliAg`JVZVfe+=>{cpyB P9M0hB>gTe~DWM4f&=FJu diff --git a/wcfsetup/install/files/icon/boxCloser.svg b/wcfsetup/install/files/icon/boxCloser.svg new file mode 100644 index 0000000000..079afe5a3e --- /dev/null +++ b/wcfsetup/install/files/icon/boxCloser.svg @@ -0,0 +1,23 @@ + + + + + + Box Closer + Box Closer Icon + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/boxOpener.svg b/wcfsetup/install/files/icon/boxOpener.svg new file mode 100644 index 0000000000..24eccf1048 --- /dev/null +++ b/wcfsetup/install/files/icon/boxOpener.svg @@ -0,0 +1,23 @@ + + + + + + Box Opener + Box Opener Icon + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/downS.png b/wcfsetup/install/files/icon/downS.png deleted file mode 100644 index 27740c039408656a219c8b9daf8647c243e818ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmV+(0pb3MP)xRc0R(F=U>jSjfTd09RH=fEm9>z@G7zwkbQ^>;rU+7 zK*H + + + + + To Bottom + To Bottom Of Page Icon + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/toLeft.svg b/wcfsetup/install/files/icon/toLeft.svg new file mode 100644 index 0000000000..59f9119a1e --- /dev/null +++ b/wcfsetup/install/files/icon/toLeft.svg @@ -0,0 +1,27 @@ + + + + + + To Left + To The Left Icon + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/toRight.svg b/wcfsetup/install/files/icon/toRight.svg new file mode 100644 index 0000000000..866bd4ab7f --- /dev/null +++ b/wcfsetup/install/files/icon/toRight.svg @@ -0,0 +1,27 @@ + + + + + + To Right + To The Right Icon + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/toTop.svg b/wcfsetup/install/files/icon/toTop.svg new file mode 100644 index 0000000000..6065fb2882 --- /dev/null +++ b/wcfsetup/install/files/icon/toTop.svg @@ -0,0 +1,27 @@ + + + + + + To Top + To Top Of Page Icon + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/upS.png b/wcfsetup/install/files/icon/upS.png deleted file mode 100644 index d5b2bc6533c95fc39ea926e14e3b7e39542f7977..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmV+`0o4A9P) zDIWZVT>ksWUDBE{rjlMC8uc(1R@%xCY2=BG0Z2K;LxcmMJ-7Q)b3EVXwBOU^o;7=kGZP0u>2jg+&S2K^1{Uo0 z2i=I|+s6RDD1hYu1VDdf0Ps5idu6%|0DcO9B251m0DSPXhm>C*ib5!W7Q@G1VsTYg xDp_sOqXWPidF;c-05po@X)mXd|MoLg(i6KE8iN`K`jG$t002ovPDHLkV1nTPf2{xj -- 2.20.1