From: Luzifr Date: Fri, 5 Aug 2011 19:29:51 +0000 (+0200) Subject: More definition lists, some other improvements X-Git-Tag: 2.0.0_Beta_1~1902^2~8 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=323c03d662b48218e157fffd221a78c6df8c2d60;p=GitHub%2FWoltLab%2FWCF.git More definition lists, some other improvements Note that only simple definition lists are being implemented right now. Complex forms will be done later. --- diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index a3973a060d..029972f0d9 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -15,8 +15,7 @@ body { font-family: 'Trebuchet MS', Arial, sans-serif; - font-size: .8em; - + font-size: 80%; background-color: #29374a; } @@ -177,6 +176,10 @@ nav.mainMenu ul li { transition: all .2s linear; } +nav.mainMenu ul li:only-child { + cursor: resize !important; +} + nav.mainMenu ul li:hover { color: #fff; } @@ -241,7 +244,7 @@ div.main > div { /* -- -- -- -- -- Content -- -- -- -- -- */ -section#content { +section.content { background-color: #fff; display: table-cell; padding: 25px; @@ -250,7 +253,9 @@ section#content { z-index: 100; } - +div.main > div section:only-child { + display: block !important; +} /* -- -- -- -- -- Sidebar -- -- -- -- -- */ diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl index 176eda62e9..c2c1f48faf 100644 --- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl @@ -33,144 +33,96 @@
{lang}wcf.acp.cronjob.edit.data{/lang} -
-
- -
-
- +
+
+
+ {if $errorField == 'className'} -

+ {if $errorType == 'empty'}{lang}wcf.acp.cronjob.error.empty{/lang}{/if} {if $errorType == 'doesNotExist'}{lang}wcf.acp.cronjob.error.doesNotExist{/lang}{/if} -

+ {/if} -
- -
- + {lang}wcf.acp.cronjob.className.description{/lang} + + -
-
- -
-
- -
- -
- +
+
+
+ + {lang}wcf.acp.cronjob.description.description{/lang} +
+
{lang}wcf.acp.cronjob.edit.timing{/lang} -
-
- -
-
- + +
+
+
+ {if $errorField == 'startMinute'} -

+ {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if} -

+ {/if} -
- -
- +

{lang}wcf.acp.cronjob.startMinute.description{/lang} + + -

-
- -
-
- +
+
+
+ {if $errorField == 'startHour'} -

+ {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if} -

+ {/if} -
- -
- +

{lang}wcf.acp.cronjob.startHour.description{/lang} + + -

-
- -
-
- +
+
+
+ {if $errorField == 'startDom'} -

+ {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if} -

+ {/if} -
- -
- + {lang}wcf.acp.cronjob.startDom.description{/lang} + + -
-
- -
-
- +
+
+
+ {if $errorField == 'startMonth'} -

+ {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if} -

+ {/if} -
- -
- + {lang}wcf.acp.cronjob.startMonth.description{/lang} + + -
-
- -
-
- +
+
+
+ {if $errorField == 'startDow'} -

+ {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if} -

+ {/if} -
- -
- + {lang}wcf.acp.cronjob.startDow.description{/lang} + +
{if $additionalFields|isset}{@$additionalFields}{/if} diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index 7a90fd362a..5c4cd9b669 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -160,4 +160,4 @@ -
+
\ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl index 8a80e18c78..5486696bf1 100644 --- a/wcfsetup/install/files/acp/templates/masterPassword.tpl +++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl @@ -17,27 +17,19 @@
{lang}wcf.acp.masterPassword.enter{/lang} -
-
- -
-
- +
+
+
+ {if $errorField == 'masterPassword'} -

+ {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} {if $errorType == 'invalid'}{lang}wcf.acp.masterPassword.error.invalid{/lang}{/if} -

+ {/if} -
- -
- - + {lang}wcf.acp.masterPassword.enter.description{/lang} + +
{if $additionalFields|isset}{@$additionalFields}{/if} @@ -45,8 +37,8 @@
- - + + {@SID_INPUT_TAG}
diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl index b87f1bf65f..8857381758 100644 --- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl +++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl @@ -29,41 +29,33 @@
{lang}wcf.acp.masterPassword.init{/lang} -
-
- -
-
- +
+
+
+ {if $errorField == 'masterPassword'} -

+ {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} {if $errorType == 'notSecure'}{lang}wcf.acp.masterPassword.error.notSecure{/lang}{/if} -

+ {/if} -
- -
- + {lang}wcf.acp.masterPassword.init.description{/lang} + + + -
-
- -
-
- + +
+
+ {if $errorField == 'confirmMasterPassword'} -

+ {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} {if $errorType == 'notEqual'}{lang}wcf.acp.masterPassword.error.notEqual{/lang}{/if} -

+ {/if} -
-
+ +
diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl index 6e3c767716..c595de1d41 100644 --- a/wcfsetup/install/files/acp/templates/optionImport.tpl +++ b/wcfsetup/install/files/acp/templates/optionImport.tpl @@ -21,21 +21,20 @@
{lang}wcf.acp.option.import{/lang} -
+
-
- {if $errorField == 'optionImport'} - - {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} - {if $errorType == 'importFailed'}{lang}wcf.acp.option.import.error.importFailed{/lang}{/if} - {if $errorType == 'uploadFailed'}{lang}wcf.acp.option.import.error.uploadFailed{/lang}{/if} - - {/if} +
+ + {if $errorField == 'optionImport'} + + {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} + {if $errorType == 'importFailed'}{lang}wcf.acp.option.import.error.importFailed{/lang}{/if} + {if $errorType == 'uploadFailed'}{lang}wcf.acp.option.import.error.uploadFailed{/lang}{/if} + + {/if} +
{lang}wcf.acp.option.import.upload.description{/lang}
-
{if $additionalFields|isset}{@$additionalFields}{/if} @@ -54,14 +53,14 @@
{lang}wcf.acp.option.export{/lang} -
-
-

{lang}wcf.acp.option.export.download{/lang}

- {lang}wcf.acp.option.export.download.description{/lang} -
- +
+ +
+

{lang}wcf.acp.option.export.download.description{/lang}

+
+
{if $additionalFields|isset}{@$additionalFields}{/if} diff --git a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl index d7b2b24d06..3654f1fa2f 100644 --- a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl +++ b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl @@ -73,10 +73,10 @@ {/if} {if $availableUpdate.packageDescription} -
-
{lang}wcf.acp.package.description{/lang}
-
{$availableUpdate.packageDescription}
-
+
+

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

+

{$availableUpdate.packageDescription}

+
{/if}

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl index f867847300..27b4a4ac9f 100644 --- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl +++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl @@ -33,14 +33,12 @@
{lang}wcf.acp.package.startInstall.source{/lang} -
-
- -
-
+
+
+
{if $errorField == 'uploadPackage'} -

+ {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} {if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if} {if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if} @@ -48,41 +46,28 @@ {if $errorType == 'uploadFailed'}{lang}wcf.acp.package.startInstall.error.uploadFailed{/lang}{/if} {if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if} {if $errorType == 'phpRequirements'}

{$phpRequirements|print_r}
{/if} -

+
{/if} -
- -
- + {lang}wcf.acp.package.startInstall.source.upload.description{/lang} + + -
-
- -
-
- +
+
+
+ {if $errorField == 'downloadPackage'} -

+ {if $errorType == 'notFound'}{lang}wcf.acp.package.startInstall.error.notFound{/lang}{/if} {if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if} {if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if} {if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if} {if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if} -

+ {/if} -
- -
- - + {lang}wcf.acp.package.startInstall.source.download.description{/lang} + +
{if $additionalFields|isset}{@$additionalFields}{/if} @@ -92,7 +77,6 @@
- {@SID_INPUT_TAG} {if $packageID != 0}{/if} diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl index a99cfc8e4d..5b647f6619 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl @@ -38,52 +38,33 @@
{lang}wcf.acp.packageUpdate.auth.input{/lang} -
-
- -
-
- -
- -
- +
+
+
+ +

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

+
+
-
-
- -
-
- +
+
+
+ {if $errorField == 'loginPassword'} -

+ {if $errorType == 'invalid'}{lang}wcf.acp.packageUpdate.auth.error{/lang}{/if} -

+ {/if} -
- -
- + {lang}wcf.acp.packageUpdate.auth.loginPassword.description{/lang} + + -
-
+
+
-
- -
- + +
{lang}wcf.acp.packageUpdate.auth.save.description{/lang}
+
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl index 5a7b905461..5c156ddb3d 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl @@ -91,14 +91,12 @@
-
-
- -
-
- -
-
+
+
+
+ +
+