From: Luzifr Date: Tue, 26 Jul 2011 23:43:17 +0000 (+0200) Subject: Code-Format & Input Type "email" (unfinished!) X-Git-Tag: 2.0.0_Beta_1~1938 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c34456d1203cdad03d8772d6e92fd2bcd7f147d;p=GitHub%2FWoltLab%2FWCF.git Code-Format & Input Type "email" (unfinished!) --- diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index 756daa7129..0ce6b7dde7 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -68,8 +68,8 @@ - +

diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl index 5552e2c272..ca2f0a70c4 100644 --- a/wcfsetup/install/files/acp/templates/login.tpl +++ b/wcfsetup/install/files/acp/templates/login.tpl @@ -24,7 +24,7 @@

{lang}wcf.user.username{/lang} - + {if $errorField == 'username'}

@@ -36,7 +36,7 @@ {lang}wcf.user.password{/lang} - + {if $errorField == 'password'}

diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl index f3cb76b2ba..8a80e18c78 100644 --- a/wcfsetup/install/files/acp/templates/masterPassword.tpl +++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl @@ -22,7 +22,7 @@ {lang}wcf.acp.masterPassword{/lang}

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

{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl index f3127ea229..b87f1bf65f 100644 --- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl +++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl @@ -34,7 +34,7 @@ {lang}wcf.acp.masterPassword{/lang}

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

{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} @@ -42,7 +42,7 @@

{/if}

- @@ -55,7 +55,7 @@ {lang}wcf.acp.masterPassword.confirm{/lang}

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

{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl index ee638a9b8b..658ca314ed 100644 --- a/wcfsetup/install/files/acp/templates/option.tpl +++ b/wcfsetup/install/files/acp/templates/option.tpl @@ -1,4 +1,5 @@ {include file='header'} + -

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

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

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

{/if}

- @@ -73,11 +73,11 @@ inlineHelp.register('loginPassword'); //]]> -

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

- diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl index 906f411190..843743a8f7 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl @@ -86,7 +86,7 @@ {lang}wcf.acp.packageUpdate.search.packageName{/lang}

- + {lang}wcf.acp.packageUpdate.search.searchDescription{/lang}

@@ -96,7 +96,7 @@ {lang}wcf.acp.packageUpdate.search.author{/lang}

- +

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl index 65019a9a35..7488da6f62 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl @@ -1,4 +1,5 @@ {include file='header'} +

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl index 603f669982..dff08dfe71 100644 --- a/wcfsetup/install/files/acp/templates/packageView.tpl +++ b/wcfsetup/install/files/acp/templates/packageView.tpl @@ -103,22 +103,22 @@

- - - - - + + + + + {if $additionalColumns|isset}{@$additionalColumns}{/if} {foreach from=$requiredPackages item=$package} - +

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

{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}

@@ -176,18 +176,18 @@ - - - - - + + + + + {if $additionalColumns|isset}{@$additionalColumns}{/if} {foreach from=$dependentPackages item=$package} - +

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

{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}

diff --git a/wcfsetup/install/files/acp/templates/setupHeader.tpl b/wcfsetup/install/files/acp/templates/setupHeader.tpl index 95838514f7..a9f4576620 100644 --- a/wcfsetup/install/files/acp/templates/setupHeader.tpl +++ b/wcfsetup/install/files/acp/templates/setupHeader.tpl @@ -21,3 +21,4 @@

+ \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl index cae8fe617f..4b04f32ba5 100644 --- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl +++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl @@ -49,15 +49,15 @@

{lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}
{lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}
{lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}
{lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}

{lang}wcf.acp.user.exportEmailAddress.separator{/lang}

@@ -66,12 +66,12 @@

{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}

- +

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl index caa94463af..e3497c7574 100644 --- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl @@ -42,19 +42,19 @@

{lang}wcf.acp.group.data{/lang} -

{lang}wcf.acp.group.groupName{/lang}

- + {if $errorType.groupName|isset}

{if $errorType.groupName == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}

{/if}

- @@ -77,7 +77,7 @@

{foreach from=$optionTree item=categoryLevel1} -

{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}

{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}

{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}.description{/lang}

diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl index fcf7553ddf..52214b7940 100644 --- a/wcfsetup/install/files/acp/templates/userGroupList.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl @@ -45,16 +45,16 @@ - - - + + + {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if} {foreach from=$groups item=group} - +

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

{if $group->isEditable()}

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index ad982a1149..80c2ca7ec9 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -1,4 +1,5 @@ {include file='header'} + @@ -75,12 +76,12 @@ - - - + + + {foreach from=$columnHeads key=column item=columnLanguageVariable} - + {/foreach} {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if} @@ -89,7 +90,7 @@ {foreach from=$users item=user} - +

	{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} {/if}		{lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if}		{lang}wcf.user.userID{/lang}{if $sortField == 'userID'} {/if}		{lang}wcf.user.username{/lang}{if $sortField == 'username'} {/if}	{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} {/if}	{lang}{$columnLanguageVariable}{/lang}{if $sortField == $column} {/if}
		- + {lang}wcf.acp.user.sendMail.from{/lang} - + {if $errorField == 'from'} {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} {/if} - + {lang}wcf.acp.user.sendMail.from.description{/lang} @@ -258,7 +258,7 @@ inlineHelp.register('from'); //]]> - + {lang}wcf.acp.user.sendMail.text{/lang} @@ -270,7 +270,7 @@ {/if} - + {lang}wcf.acp.user.sendMail.text.description{/lang} @@ -280,7 +280,7 @@ - {lang}wcf.acp.user.sendMail.enableHTML{/lang} + {lang}wcf.acp.user.sendMail.enableHTML{/lang} @@ -302,15 +302,15 @@ - {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang} - {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang} + {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang} + {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang} - + {lang}wcf.acp.user.exportEmailAddress.separator{/lang} @@ -319,12 +319,12 @@ - + {lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang} - + @@ -359,4 +359,4 @@ -{include file='footer'} \ No newline at end of file +{include file='footer'}