From: Luzifr Date: Mon, 19 Sep 2011 19:40:51 +0000 (+0200) Subject: Large Button Icons enabled (testing) X-Git-Tag: 2.0.0_Beta_1~1785^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b3cbfd07e51e9a35ab70a285881cd900373cab20;p=GitHub%2FWoltLab%2FWCF.git Large Button Icons enabled (testing) --- diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index 0c67366697..e7272db5bc 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -873,9 +873,13 @@ textarea { display: inline; } -.largeButtons ul li img { - /* Button Icons disabled for now, maybe we get rid oft them */ - display: none; +.largeButtons ul li a img { + /* ToDo: Button-icons disabled for now, maybe we get rid oft them + display: none; */ + margin: -5px 1px -5px -5px; + height: 24px; + width: 24px; + vertical-align: middle; } /* buttons normal */ @@ -1236,14 +1240,6 @@ input[type='button'][disabled='disabled'], border-color: #ccc #bbb #aaa; } -/* ToDo: Images deprecated? */ -.largeButtons ul li a img { - margin: 0; - height: 24px; - width: 24px; - vertical-align: middle; -} - /* -- -- -- -- -- Border -- -- -- -- -- */ @@ -1636,11 +1632,6 @@ tbody tr { border-bottom: 1px solid rgba(255, 255, 255, .3); } -tbody tr:first-child { - /* prevents line-breaks in icon-column */ - white-space: nowrap; -} - tbody tr:last-child { /* no border for the last table row */ border-bottom-width: 0; @@ -1710,6 +1701,7 @@ tr .columnMark, tr .columnStatus { text-align: center; width: 1% !important; + white-space: nowrap; } tr .columnStatus .badge { @@ -1721,11 +1713,13 @@ tr .columnDigits, tr .columnID { text-align: right; width: 1% !important; + white-space: nowrap; } tr .columnIcon { text-align: left; - width: 1% !important + width: 1% !important; + white-space: nowrap; } tr .columnIcon img:not(.balloonTooltip):hover { @@ -2267,7 +2261,7 @@ li > .badgeButton { #balloonTooltip { font-size: .85em; color: #fff; - border: 1px solid rgba(255, 255, 255, .7) !important; + border: 1px solid rgba(255, 255, 255, .7); border-radius: 5px; background-color: rgba(0, 0, 0, .7); padding: 5px 10px 7px; @@ -2301,8 +2295,11 @@ li > .badgeButton { /* Clipboard API - TESTING ONLY / TODO */ .clipboardEditor { - padding-top: 5px !important; + font-size: .85em; + margin: 7px 3px 0; + padding: 2px 5px 3px !important; position: relative; + float: left; } .clipboardEditor p { @@ -2314,10 +2311,10 @@ li > .badgeButton { } .clipboardEditor ol { - border: 1px solid rgba(0, 0, 0, .2); + border: 1px solid rgba(255, 255, 255, .7); border-radius: 5px; background-color: rgba(0, 0, 0, .7); - margin-top: 25px; + margin-top: 20px; position: absolute; top: 0; left: 0; @@ -2327,12 +2324,9 @@ li > .badgeButton { -ms-box-shadow: 0 1px 7px rgba(0, 0, 0, .5); -o-box-shadow: 0 1px 7px rgba(0, 0, 0, .5); box-shadow: 0 1px 7px rgba(0, 0, 0, .5); - - } .clipboardEditor li { - font-size: .85em; text-shadow: none; color: #ccc; cursor: pointer; @@ -2357,7 +2351,7 @@ li > .badgeButton { .clipboardEditor li:hover { color: #fff; - background-color: rgba(0, 0, 0, .1); + background-color: rgba(0, 0, 0, .5); } .clipboardEditor li:first-child { @@ -2368,6 +2362,8 @@ li > .badgeButton { +/* ToDo: Proxy Loading */ + .actionProxyLoading { } diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index d73db04dfe..9db4419f4f 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -51,7 +51,7 @@
@@ -99,7 +99,7 @@
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl index 9287c9b922..760ffb75f1 100644 --- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl @@ -21,8 +21,8 @@
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl index 7a5f1fb826..a9b8978166 100644 --- a/wcfsetup/install/files/acp/templates/cronjobList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl @@ -41,7 +41,7 @@ {if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')} {/if}
@@ -79,9 +79,9 @@ {if $__wcf->session->getPermission('admin.system.cronjob.canEditCronjob')} - + {else} - + {/if} {if $cronjob->canBeDisabled()} @@ -138,7 +138,7 @@ {if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')} {/if}
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl index 6db5cdcfaf..3a7e27e8f7 100644 --- a/wcfsetup/install/files/acp/templates/packageList.tpl +++ b/wcfsetup/install/files/acp/templates/packageList.tpl @@ -24,7 +24,7 @@ {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset} @@ -99,7 +99,7 @@ {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset} diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl index 45becc92e6..99352d2aed 100644 --- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl +++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl @@ -21,7 +21,7 @@
diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl index 1473140fe9..4a062eff0c 100644 --- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl +++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl @@ -9,7 +9,7 @@
- +

{lang}wcf.acp.package.uninstall{/lang}: {$packageObj->getName()}

{$packageObj->packageDescription}

@@ -93,14 +93,14 @@ {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} {if $package.additionalButtons|isset}{@$package.additionalButtons}{/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/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl index 6486042e30..0391c88c10 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl @@ -1,7 +1,7 @@ {include file='header'}
- +

{lang}wcf.acp.packageUpdate.auth{/lang}

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl index 8a8ec218bf..2b8527f7b7 100644 --- a/wcfsetup/install/files/acp/templates/packageView.tpl +++ b/wcfsetup/install/files/acp/templates/packageView.tpl @@ -97,10 +97,10 @@ @@ -117,11 +117,11 @@ - - - - - + + + + + {if $additionalColumns|isset}{@$additionalColumns}{/if} @@ -175,7 +175,7 @@ {if $dependentPackages|count > 0}
- +

{lang}wcf.acp.package.view.dependentPackages{/lang}

{lang}wcf.acp.package.view.dependentPackages.description{/lang}

diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl index f11cb61f8c..f64be565a3 100644 --- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl +++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl @@ -21,7 +21,7 @@
diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl index e4c0839333..1297124989 100644 --- a/wcfsetup/install/files/acp/templates/updateServerList.tpl +++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl @@ -22,7 +22,7 @@
@@ -77,7 +77,7 @@
{/if} diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl index b65fbb0f7f..ac565dbe87 100644 --- a/wcfsetup/install/files/acp/templates/userAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userAdd.tpl @@ -72,8 +72,8 @@
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl index 4acdf3cb8c..e5ebbed7ae 100644 --- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl @@ -30,7 +30,7 @@
diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl index 74e5aab7a4..465a451f55 100644 --- a/wcfsetup/install/files/acp/templates/userGroupList.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl @@ -31,7 +31,7 @@ {pages print=true assign=pagesLinks link="index.php?page=UserGroupList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"|concat:SID_ARG_2ND_NOT_ENCODED} @@ -95,7 +95,7 @@ {@$pagesLinks} diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index 5631f5c05d..7729d0ed83 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -25,9 +25,9 @@ @@ -100,9 +100,9 @@ diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl index 4014fe6d01..ff1fc6b8fc 100644 --- a/wcfsetup/install/files/acp/templates/userMail.tpl +++ b/wcfsetup/install/files/acp/templates/userMail.tpl @@ -34,8 +34,8 @@
diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl index dda6f469d5..6e7daf4019 100644 --- a/wcfsetup/install/files/acp/templates/userSearch.tpl +++ b/wcfsetup/install/files/acp/templates/userSearch.tpl @@ -29,9 +29,9 @@

{lang}wcf.acp.package.list.id{/lang}

{lang}wcf.acp.package.list.name{/lang}

{lang}wcf.acp.package.list.author{/lang}

{lang}wcf.acp.package.list.version{/lang}

{lang}wcf.acp.package.list.date{/lang}

{lang}wcf.acp.package.list.id{/lang}{lang}wcf.acp.package.list.name{/lang}{lang}wcf.acp.package.list.author{/lang}{lang}wcf.acp.package.list.version{/lang}{lang}wcf.acp.package.list.date{/lang}