From 9cd9853b780b3862aa2e238b5b08a762858fed61 Mon Sep 17 00:00:00 2001 From: Luzifr Date: Thu, 22 Sep 2011 20:21:45 +0200 Subject: [PATCH] Form-error styling; Various bug-fixes; Deleted 2 obsolete templates. Front-end is not usable now ;-) --- wcfsetup/install/files/acp/style/style.css | 138 +++++++++--------- .../files/acp/templates/ajaxException.tpl | 2 +- .../files/acp/templates/cronjobAdd.tpl | 10 +- .../install/files/acp/templates/login.tpl | 8 +- .../files/acp/templates/masterPassword.tpl | 1 + .../acp/templates/masterPasswordInit.tpl | 2 + .../files/acp/templates/optionFieldList.tpl | 1 + .../files/acp/templates/optionImport.tpl | 1 + .../acp/templates/packageStartInstall.tpl | 2 + .../files/acp/templates/packageUpdateAuth.tpl | 3 +- .../files/acp/templates/setupWindowFooter.tpl | 3 - .../files/acp/templates/setupWindowHeader.tpl | 21 --- .../files/acp/templates/updateServerAdd.tpl | 3 +- .../install/files/acp/templates/userAdd.tpl | 5 + .../files/acp/templates/userAssignToGroup.tpl | 1 + .../files/acp/templates/userGroupAdd.tpl | 9 +- .../install/files/acp/templates/userMail.tpl | 16 +- .../acp/templates/usersMassProcessing.tpl | 5 + 18 files changed, 118 insertions(+), 113 deletions(-) delete mode 100644 wcfsetup/install/files/acp/templates/setupWindowFooter.tpl delete mode 100644 wcfsetup/install/files/acp/templates/setupWindowHeader.tpl diff --git a/wcfsetup/install/files/acp/style/style.css b/wcfsetup/install/files/acp/style/style.css index 87e82f16cf..ff739a2800 100644 --- a/wcfsetup/install/files/acp/style/style.css +++ b/wcfsetup/install/files/acp/style/style.css @@ -263,35 +263,12 @@ nav.topMenu ul li ul.dropdown > li:first-child { - - - /* Todo */ - - - - - - - - - - - - - - - - - - - - /* Logo */ @@ -997,6 +974,17 @@ textarea { width: auto; } +/* Form Errors */ + +.formError input[type='text'], +.formError input[type='search'], +.formError input[type='email'], +.formError input[type='password'], +.formError textarea { + border-color: #f00; + background-color: #fff6f6; +} + @@ -1174,54 +1162,6 @@ textarea { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* -- -- -- -- -- Large Buttons -- -- -- -- -- */ /* Colors are being taken from the global color styles */ @@ -1366,8 +1306,6 @@ input[type='button'], position: relative; bottom: -1px; z-index: 10; - max-width: 200px; - overflow: hidden; } .tabMenu li:not(.ui-state-active) a:hover { @@ -1936,10 +1874,64 @@ p.error { background-repeat: no-repeat; } +/* small error notifications */ +.innerError { + text-shadow: 0 1px 0 #fff; + line-height: 1.5; + color: #c00; + + border: 1px solid #ccc; + border-radius: 7px; + + background-color: #fff; + background-image: url('../../icon/systemError.svg'); + background-size: 16px; + background-position: 5px center; + background-repeat: no-repeat; + + margin-top: 5px; + padding: 2px 10px 2px 25px; + position: relative; + display: inline-block; + clear: both; + + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, .1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, .1); + -ms-box-shadow: 0 1px 3px rgba(0, 0, 0, .1); + -o-box-shadow: 0 1px 3px rgba(0, 0, 0, .1); + box-shadow: 0 1px 3px rgba(0, 0, 0, .1); + +} +/* small error notification arrows */ +.innerError .arrowOuter { + border-width: 0 7px 7px; + border-style: solid; + border-color: #ccc transparent; + display: inline-block !important; + width: 0; + position: absolute; + top: -7px !important; + left: 10%; +} +.innerError .arrowInner { + border-width: 0 5px 5px; + border-style: solid; + border-color: #fff transparent; + display: inline-block; + width: 0; + position: absolute; + top: 2px; + left: -5px; +} + +.preInput ~ .innerError .arrowOuter { + right: 10%; + left: auto; +} /* ToDo: Installation */ diff --git a/wcfsetup/install/files/acp/templates/ajaxException.tpl b/wcfsetup/install/files/acp/templates/ajaxException.tpl index 147a1de86c..b63ae1f64f 100644 --- a/wcfsetup/install/files/acp/templates/ajaxException.tpl +++ b/wcfsetup/install/files/acp/templates/ajaxException.tpl @@ -1,3 +1,3 @@

{$message}

- +
{$stacktrace}
\ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl index a0300c1d5e..20903dc849 100644 --- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl @@ -8,6 +8,8 @@ +

{lang}wcf.acp.cronjob.intro{/lang}

+ {if $errorField}

{lang}wcf.global.form.error{/lang}

{/if} @@ -16,8 +18,6 @@

{lang}wcf.global.form.{$action}.success{/lang}

{/if} -

{lang}wcf.acp.cronjob.intro{/lang}

-
- - \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/setupWindowHeader.tpl b/wcfsetup/install/files/acp/templates/setupWindowHeader.tpl deleted file mode 100644 index 8cd144dd4f..0000000000 --- a/wcfsetup/install/files/acp/templates/setupWindowHeader.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - -
- \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl index de83377904..467720a121 100644 --- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl +++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl @@ -34,9 +34,10 @@
- + {if $errorField == 'serverURL'} + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} {if $errorType == 'notValid'}{lang}wcf.acp.updateServer.serverURL.error.notValid{/lang}{/if} diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl index 1080d536b8..f72eb5f309 100644 --- a/wcfsetup/install/files/acp/templates/userAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userAdd.tpl @@ -87,6 +87,7 @@ {if $errorType.username|isset} + {if $errorType.username == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} {if $errorType.username == 'notValid'}{lang}wcf.user.error.username.notValid{/lang}{/if} {if $errorType.username == 'notUnique'}{lang}wcf.user.error.username.notUnique{/lang}{/if} @@ -124,6 +125,7 @@ {if $errorType.email|isset} + {if $errorType.email == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} {if $errorType.email == 'notValid'}{lang}wcf.user.error.email.notValid{/lang}{/if} {if $errorType.email == 'notUnique'}{lang}wcf.user.error.email.notUnique{/lang}{/if} @@ -138,6 +140,7 @@ {if $errorType.confirmEmail|isset} + {if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.error.confirmEmail.notEqual{/lang}{/if} {/if} @@ -156,6 +159,7 @@ {if $errorType.password|isset} + {if $errorType.password == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} {/if} @@ -168,6 +172,7 @@ {if $errorType.confirmPassword|isset} + {if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.error.confirmPassword.notEqual{/lang}{/if} {/if} diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl index dcd6e9be3f..7d8fa3ce58 100644 --- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl +++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl @@ -33,6 +33,7 @@ {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs} {if $errorField == 'groupIDs'} + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} {/if} diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl index 26a3f9548f..e113fcfe75 100644 --- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl @@ -19,14 +19,14 @@

{lang}wcf.global.form.error{/lang}

{/if} -{if $success|isset} -

{lang}wcf.global.form.{@$action}.success{/lang}

-{/if} - {if $warningSelfEdit|isset}

{lang}wcf.acp.group.edit.warning.selfIsMember{/lang}

{/if} +{if $success|isset} +

{lang}wcf.global.form.{@$action}.success{/lang}

+{/if} +