From 04ef12068c64bbe61e24e9bc6db0e1fae37df12a Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 27 Jun 2016 22:09:04 +0200
Subject: [PATCH] Added some missing language variables (page management)

---
 .../files/acp/templates/articleAdd.tpl        |  6 +-
 .../install/files/acp/templates/boxAdd.tpl    | 14 ++--
 .../install/files/acp/templates/pageAdd.tpl   | 74 +++++++++----------
 .../files/acp/templates/pageAddDialog.tpl     |  6 +-
 .../install/files/acp/templates/pageList.tpl  | 16 ++--
 .../lib/acp/form/ArticleAddForm.class.php     |  1 -
 .../files/lib/acp/page/PageListPage.class.php | 11 +--
 wcfsetup/install/lang/de.xml                  | 38 +++++++++-
 wcfsetup/install/lang/en.xml                  | 36 +++++++++
 9 files changed, 139 insertions(+), 63 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index 1789658a3e..9c7594cfee 100644
--- a/wcfsetup/install/files/acp/templates/articleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -87,7 +87,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.acp.article.author{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" class="medium">
+				<input type="text" id="username" name="username" value="{$username}" class="medium" maxlength="255">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -179,7 +179,7 @@
 			<dl{if $errorField == 'title'} class="formError"{/if}>
 				<dt><label for="title0">{lang}wcf.global.title{/lang}</label></dt>
 				<dd>
-					<input type="text" id="title0" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long">
+					<input type="text" id="title0" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long" maxlength="255">
 					{if $errorField == 'title'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -293,7 +293,7 @@
 						<dl{if $errorField == 'title'|concat:$availableLanguage->languageID} class="formError"{/if}>
 							<dt><label for="title{@$availableLanguage->languageID}">{lang}wcf.global.title{/lang}</label></dt>
 							<dd>
-								<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long">
+								<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long" maxlength="255">
 								{if $errorField == 'title'|concat:$availableLanguage->languageID}
 									<small class="innerError">
 										{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index 81b3ff535c..aeaa1087d0 100644
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -36,7 +36,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{if $action == 'add'}{if $isMultilingual}{lang}wcf.acp.box.addMultilingual{/lang}{else}{lang}wcf.acp.box.add{/lang}{/if}{else}{lang}wcf.acp.box.edit{/lang}{/if}</h1>
+		<h1 class="contentTitle">{if $action == 'add'}{lang}wcf.acp.box.add{/lang}{else}{lang}wcf.acp.box.edit{/lang}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
@@ -58,7 +58,7 @@
 	<div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" id="pageTabMenuContainer">
 		<nav class="tabMenu">
 			<ul>
-				<li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.acp.box.general{/lang}</a></li>
+				<li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.global.form.data{/lang}</a></li>
 				<li><a href="{@$__wcf->getAnchor('contents')}">{lang}wcf.acp.box.contents{/lang}</a></li>
 				<li><a href="{@$__wcf->getAnchor('pages')}">{lang}wcf.acp.box.pages{/lang}</a></li>
 				<li><a href="{@$__wcf->getAnchor('acl')}">{lang}wcf.acp.box.acl{/lang}</a></li>
@@ -72,7 +72,7 @@
 				<dl{if $errorField == 'name'} class="formError"{/if}>
 					<dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
 					<dd>
-						<input type="text" id="name" name="name" value="{$name}" required autofocus class="long">
+						<input type="text" id="name" name="name" value="{$name}" required autofocus class="long" maxlength="255">
 						{if $errorField == 'name'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -158,7 +158,7 @@
 				<dl{if $errorField == 'cssClassName'} class="formError"{/if}>
 					<dt><label for="cssClassName">{lang}wcf.acp.box.cssClassName{/lang}</label></dt>
 					<dd>
-						<input type="text" id="cssClassName" name="cssClassName" value="{$cssClassName}" class="long">
+						<input type="text" id="cssClassName" name="cssClassName" value="{$cssClassName}" class="long" maxlength="255">
 						{if $errorField == 'cssClassName'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -235,7 +235,7 @@
 				<dl id="externalURLContainer"{if $errorField == 'externalURL'} class="formError"{/if}{if $linkType != 'external'} style="display: none;"{/if}>
 					<dt><label for="externalURL">{lang}wcf.acp.box.link.externalURL{/lang}</label></dt>
 					<dd>
-						<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long">
+						<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long" maxlength="255">
 						{if $errorField == 'externalURL'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -289,7 +289,7 @@
 					<dl{if $errorField == 'title'} class="formError"{/if}>
 						<dt><label for="title0">{lang}wcf.acp.box.title{/lang}</label></dt>
 						<dd>
-							<input type="text" id="title0" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long">
+							<input type="text" id="title0" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long" maxlength="255">
 							{if $errorField == 'title'}
 								<small class="innerError">
 									{if $errorType == 'empty'}
@@ -363,7 +363,7 @@
 								<dl{if $errorField == 'title'|concat:$availableLanguage->languageID} class="formError"{/if}>
 									<dt><label for="title{@$availableLanguage->languageID}">{lang}wcf.acp.box.title{/lang}</label></dt>
 									<dd>
-										<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long">
+										<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long" maxlength="255">
 										{if $errorField == 'title'|concat:$availableLanguage->languageID}
 											<small class="innerError">
 												{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/acp/templates/pageAdd.tpl b/wcfsetup/install/files/acp/templates/pageAdd.tpl
index 53a7ef4ad8..fa5747e590 100644
--- a/wcfsetup/install/files/acp/templates/pageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageAdd.tpl
@@ -28,7 +28,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{if $action == 'add'}{if $isMultilingual}{lang}wcf.acp.page.addMultilingual{/lang}{else}{lang}wcf.acp.page.add{/lang}{/if}{else}{lang}wcf.acp.page.edit{/lang}{/if}</h1>
+		<h1 class="contentTitle">{if $action == 'add'}{lang}wcf.acp.page.add{/lang}{else}{lang}wcf.acp.page.edit{/lang}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
@@ -53,12 +53,12 @@
 	<div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" id="pageTabMenuContainer">
 		<nav class="tabMenu">
 			<ul>
-				<li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.acp.page.general{/lang}</a></li>
+				<li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.global.form.data{/lang}</a></li>
 				<li><a href="{@$__wcf->getAnchor('contents')}">{lang}wcf.acp.page.contents{/lang}</a></li>
-				<li><a href="{@$__wcf->getAnchor('boxes')}">{lang}wcf.acp.page.boxes{/lang}</a></li>
+				<li><a href="{@$__wcf->getAnchor('boxes')}">{lang}wcf.acp.box.list{/lang}</a></li>
 				
 				{if $action != 'edit' || $page->pageType != 'system'}
-					<li><a href="{@$__wcf->getAnchor('acl')}">{lang}wcf.acp.page.acl{/lang}</a></li>
+					<li><a href="{@$__wcf->getAnchor('acl')}">{lang}wcf.acl.access{/lang}</a></li>
 				{/if}
 				
 				{event name='tabMenuTabs'}
@@ -70,7 +70,7 @@
 				<dl{if $errorField == 'name'} class="formError"{/if}>
 					<dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
 					<dd>
-						<input type="text" id="name" name="name" value="{$name}" required autofocus class="long">
+						<input type="text" id="name" name="name" value="{$name}" required autofocus class="long" maxlength="255">
 						{if $errorField == 'name'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -84,10 +84,10 @@
 				</dl>
 				
 				<dl{if $errorField == 'parentPageID'} class="formError"{/if}>
-					<dt><label for="parentPageID">{lang}wcf.acp.page.parentPageID{/lang}</label></dt>
+					<dt><label for="parentPageID">{lang}wcf.acp.page.parentPage{/lang}</label></dt>
 					<dd>
 						<select name="parentPageID" id="parentPageID"{if $action == 'edit' && $page->originIsSystem} disabled{/if}>
-							<option value="0">{lang}wcf.acp.page.parentPageID.noParentPage{/lang}</option>
+							<option value="0">{lang}wcf.acp.page.parentPage.none{/lang}</option>
 							
 							{foreach from=$pageNodeList item=pageNode}
 								<option value="{@$pageNode->pageID}"{if $pageNode->pageID == $parentPageID} selected{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
@@ -98,7 +98,7 @@
 								{if $errorType == 'empty'}
 									{lang}wcf.global.form.error.empty{/lang}
 								{else}
-									{lang}wcf.acp.page.parentPageID.error.{@$errorType}{/lang}
+									{lang}wcf.acp.page.parentPage.error.{@$errorType}{/lang}
 								{/if}
 							</small>
 						{/if}
@@ -106,7 +106,7 @@
 				</dl>
 				
 				<dl{if $errorField == 'applicationPackageID'} class="formError"{/if}>
-					<dt><label for="applicationPackageID">{lang}wcf.acp.page.applicationPackageID{/lang}</label></dt>
+					<dt><label for="applicationPackageID">{lang}wcf.acp.page.application{/lang}</label></dt>
 					<dd>
 						<select name="applicationPackageID" id="applicationPackageID"{if $action == 'edit' && $page->originIsSystem} disabled{/if}>
 							{foreach from=$availableApplications item=availableApplication}
@@ -118,7 +118,7 @@
 								{if $errorType == 'empty'}
 									{lang}wcf.global.form.error.empty{/lang}
 								{else}
-									{lang}wcf.acp.page.applicationPackageID.error.{@$errorType}{/lang}
+									{lang}wcf.acp.page.application.error.{@$errorType}{/lang}
 								{/if}
 							</small>
 						{/if}
@@ -129,7 +129,7 @@
 					<dl{if $errorField == 'customURL_0'} class="formError"{/if}>
 						<dt><label for="customURL">{lang}wcf.acp.page.customURL{/lang}</label></dt>
 						<dd>
-							<input type="text" id="customURL" name="customURL[0]" value="{if !$customURL[0]|empty}{$customURL[0]}{/if}" class="long">
+							<input type="text" id="customURL" name="customURL[0]" value="{if !$customURL[0]|empty}{$customURL[0]}{/if}" class="long" maxlength="255">
 							{if $errorField == 'customURL_0'}
 								<small class="innerError">
 									{if $errorType == 'empty'}
@@ -147,7 +147,7 @@
 						<dl{if $errorField == $__errorFieldName} class="formError"{/if}>
 							<dt><label for="customURL{@$availableLanguage->languageID}">{lang}wcf.acp.page.customURL{/lang} ({$availableLanguage->languageName})</label></dt>
 							<dd>
-								<input type="text" id="customURL{@$availableLanguage->languageID}" name="customURL[{@$availableLanguage->languageID}]" value="{if !$customURL[$availableLanguage->languageID]|empty}{$customURL[$availableLanguage->languageID]}{/if}" class="long">
+								<input type="text" id="customURL{@$availableLanguage->languageID}" name="customURL[{@$availableLanguage->languageID}]" value="{if !$customURL[$availableLanguage->languageID]|empty}{$customURL[$availableLanguage->languageID]}{/if}" class="long" maxlength="255">
 								{if $errorField == $__errorFieldName}
 									<small class="innerError">
 										{if $errorType == 'empty'}
@@ -188,9 +188,9 @@
 			{if !$isMultilingual && $pageType != 'system'}
 				<div class="section">
 					<dl{if $errorField == 'title'} class="formError"{/if}>
-						<dt><label for="title">{lang}wcf.acp.page.title{/lang}</label></dt>
+						<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
 						<dd>
-							<input type="text" id="title" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long">
+							<input type="text" id="title" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long" maxlength="255">
 							{if $errorField == 'title'}
 								<small class="innerError">
 									{if $errorType == 'empty'}
@@ -220,32 +220,32 @@
 						</dd>
 					</dl>
 					
-					<dl{if $errorField == 'metaKeywords'} class="formError"{/if}>
-						<dt><label for="metaKeywords">{lang}wcf.acp.page.metaKeywords{/lang}</label></dt>
+					<dl{if $errorField == 'metaDescription'} class="formError"{/if}>
+						<dt><label for="metaDescription">{lang}wcf.acp.page.metaDescription{/lang}</label></dt>
 						<dd>
-							<textarea name="metaKeywords[0]" id="metaKeywords">{if !$metaKeywords[0]|empty}{$metaKeywords[0]}{/if}</textarea>
-							{if $errorField == 'metaKeywords'}
+							<input type="text" class="long" name="metaDescription[0]" id="metaDescription" value="{if !$metaDescription[0]|empty}{$metaDescription[0]}{/if}">
+							{if $errorField == 'metaDescription'}
 								<small class="innerError">
 									{if $errorType == 'empty'}
 										{lang}wcf.global.form.error.empty{/lang}
 									{else}
-										{lang}wcf.acp.page.metaKeywords.error.{@$errorType}{/lang}
+										{lang}wcf.acp.page.metaDescription.error.{@$errorType}{/lang}
 									{/if}
 								</small>
 							{/if}
 						</dd>
 					</dl>
 					
-					<dl{if $errorField == 'metaDescription'} class="formError"{/if}>
-						<dt><label for="metaDescription">{lang}wcf.acp.page.metaDescription{/lang}</label></dt>
+					<dl{if $errorField == 'metaKeywords'} class="formError"{/if}>
+						<dt><label for="metaKeywords">{lang}wcf.acp.page.metaKeywords{/lang}</label></dt>
 						<dd>
-							<textarea name="metaDescription[0]" id="metaDescription">{if !$metaDescription[0]|empty}{$metaDescription[0]}{/if}</textarea>
-							{if $errorField == 'metaDescription'}
+							<input type="text" class="long" name="metaKeywords[0]" id="metaKeywords" value="{if !$metaKeywords[0]|empty}{$metaKeywords[0]}{/if}">
+							{if $errorField == 'metaKeywords'}
 								<small class="innerError">
 									{if $errorType == 'empty'}
 										{lang}wcf.global.form.error.empty{/lang}
 									{else}
-										{lang}wcf.acp.page.metaDescription.error.{@$errorType}{/lang}
+										{lang}wcf.acp.page.metaKeywords.error.{@$errorType}{/lang}
 									{/if}
 								</small>
 							{/if}
@@ -267,9 +267,9 @@
 						<div id="language{@$availableLanguage->languageID}" class="tabMenuContent">
 							<div class="section">
 								<dl{if $errorField == 'title'} class="formError"{/if}>
-									<dt><label for="title{@$availableLanguage->languageID}">{lang}wcf.acp.page.title{/lang}</label></dt>
+									<dt><label for="title{@$availableLanguage->languageID}">{lang}wcf.global.title{/lang}</label></dt>
 									<dd>
-										<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long">
+										<input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long" maxlength="255">
 										{if $errorField == 'title'}
 											<small class="innerError">
 												{if $errorType == 'empty'}
@@ -300,32 +300,32 @@
 										</dd>
 									</dl>
 									
-									<dl{if $errorField == 'metaKeywords'} class="formError"{/if}>
-										<dt><label for="metaKeywords{@$availableLanguage->languageID}">{lang}wcf.acp.page.metaKeywords{/lang}</label></dt>
+									<dl{if $errorField == 'metaDescription'} class="formError"{/if}>
+										<dt><label for="metaDescription{@$availableLanguage->languageID}">{lang}wcf.acp.page.metaDescription{/lang}</label></dt>
 										<dd>
-											<textarea name="metaKeywords[{@$availableLanguage->languageID}]" id="metaKeywords{@$availableLanguage->languageID}">{if !$metaKeywords[$availableLanguage->languageID]|empty}{$metaKeywords[$availableLanguage->languageID]}{/if}</textarea>
-											{if $errorField == 'metaKeywords'}
+											<input type="text" class="long" name="metaDescription[{@$availableLanguage->languageID}]" id="metaDescription{@$availableLanguage->languageID}" value="{if !$metaDescription[$availableLanguage->languageID]|empty}{$metaDescription[$availableLanguage->languageID]}{/if}">
+											{if $errorField == 'metaDescription'}
 												<small class="innerError">
 													{if $errorType == 'empty'}
 														{lang}wcf.global.form.error.empty{/lang}
 													{else}
-														{lang}wcf.acp.page.metaKeywords.error.{@$errorType}{/lang}
+														{lang}wcf.acp.page.metaDescription.error.{@$errorType}{/lang}
 													{/if}
 												</small>
 											{/if}
 										</dd>
 									</dl>
 									
-									<dl{if $errorField == 'metaDescription'} class="formError"{/if}>
-										<dt><label for="metaDescription{@$availableLanguage->languageID}">{lang}wcf.acp.page.metaDescription{/lang}</label></dt>
+									<dl{if $errorField == 'metaKeywords'} class="formError"{/if}>
+										<dt><label for="metaKeywords{@$availableLanguage->languageID}">{lang}wcf.acp.page.metaKeywords{/lang}</label></dt>
 										<dd>
-											<textarea name="metaDescription[{@$availableLanguage->languageID}]" id="metaDescription{@$availableLanguage->languageID}">{if !$metaDescription[$availableLanguage->languageID]|empty}{$metaDescription[$availableLanguage->languageID]}{/if}</textarea>
-											{if $errorField == 'metaDescription'}
+											<input type="text" class="long" name="metaKeywords[{@$availableLanguage->languageID}]" id="metaKeywords{@$availableLanguage->languageID}" value="{if !$metaKeywords[$availableLanguage->languageID]|empty}{$metaKeywords[$availableLanguage->languageID]}{/if}">
+											{if $errorField == 'metaKeywords'}
 												<small class="innerError">
 													{if $errorType == 'empty'}
 														{lang}wcf.global.form.error.empty{/lang}
 													{else}
-														{lang}wcf.acp.page.metaDescription.error.{@$errorType}{/lang}
+														{lang}wcf.acp.page.metaKeywords.error.{@$errorType}{/lang}
 													{/if}
 												</small>
 											{/if}
@@ -342,7 +342,7 @@
 		<div id="boxes" class="tabMenuContent">
 			<div class="section">
 				<dl{if $errorField == 'boxIDs'} class="formError"{/if}>
-					<dt>{lang}wcf.acp.page.boxIDs{/lang}</dt>
+					<dt>{lang}wcf.acp.page.boxes{/lang}</dt>
 					<dd>
 						<ul class="scrollableCheckboxList">
 							{foreach from=$availableBoxes item=availableBox}
diff --git a/wcfsetup/install/files/acp/templates/pageAddDialog.tpl b/wcfsetup/install/files/acp/templates/pageAddDialog.tpl
index 39dc3b1c20..122034276b 100644
--- a/wcfsetup/install/files/acp/templates/pageAddDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/pageAddDialog.tpl
@@ -28,7 +28,11 @@
 	</div>
 </div>
 <script data-relocate="true">
-	require(['WoltLab/WCF/Acp/Ui/Page/Add'], function(AcpUiPageAdd) {
+	require(['Language', 'WoltLab/WCF/Acp/Ui/Page/Add'], function(Language, AcpUiPageAdd) {
+		Language.addObject({
+			'wcf.acp.page.add': '{lang}wcf.acp.page.add{/lang}'
+		});
+		
 		AcpUiPageAdd.init('{link controller='PageAdd' encode=false}{literal}pageType={$pageType}&isMultilingual={$isMultilingual}{/literal}{/link}');
 		
 		{if $showPageAddDialog}
diff --git a/wcfsetup/install/files/acp/templates/pageList.tpl b/wcfsetup/install/files/acp/templates/pageList.tpl
index d1229bd5af..13a4d7cbf1 100644
--- a/wcfsetup/install/files/acp/templates/pageList.tpl
+++ b/wcfsetup/install/files/acp/templates/pageList.tpl
@@ -38,7 +38,7 @@
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="pageTitle" name="title" value="{$title}" placeholder="{lang}wcf.acp.page.title{/lang}" class="long">
+					<input type="text" id="pageTitle" name="title" value="{$title}" placeholder="{lang}wcf.global.title{/lang}" class="long">
 				</dd>
 			</dl>
 			
@@ -54,7 +54,7 @@
 				<dd>
 					<label class="selectDropdown">
 						<select name="applicationPackageID" id="applicationPackageID">
-							<option value="0">{lang}wcf.acp.page.applicationPackageID{/lang}</option>
+							<option value="0">{lang}wcf.acp.page.application{/lang}</option>
 							{foreach from=$availableApplications item=availableApplication}
 								<option value="{@$availableApplication->packageID}"{if $availableApplication->packageID == $applicationPackageID} selected{/if}>{$availableApplication->getAbbreviation()}: {$availableApplication->domainName}{$availableApplication->domainPath}</option>
 							{/foreach}
@@ -68,9 +68,11 @@
 				<dd>
 					<label class="selectDropdown">
 						<select name="pageType" id="pageType">
-							<option value="">{lang}wcf.acp.page.pageType{/lang}</option>
-							<option value="static"{if $pageType == 'static'} selected{/if}>{lang}wcf.acp.page.pageType.static{/lang}</option>
-							<option value="system"{if $pageType == 'system'} selected{/if}>{lang}wcf.acp.page.pageType.system{/lang}</option>
+							<option value="">{lang}wcf.acp.page.type{/lang}</option>
+							<option value="text"{if $pageType == 'text'} selected{/if}>{lang}wcf.acp.page.type.text{/lang}</option>
+							<option value="html"{if $pageType == 'html'} selected{/if}>{lang}wcf.acp.page.type.html{/lang}</option>
+							<option value="tpl"{if $pageType == 'tpl'} selected{/if}>{lang}wcf.acp.page.type.tpl{/lang}</option>
+							<option value="system"{if $pageType == 'system'} selected{/if}>{lang}wcf.acp.page.type.system{/lang}</option>
 						</select>
 					</label>
 				</dd>
@@ -109,6 +111,7 @@
 					<th class="columnPageID{if $sortField == 'pageID'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='PageList'}pageNo={@$pageNo}&sortField=pageID&sortOrder={if $sortField == 'pageID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
 					<th class="columnTitle columnName{if $sortField == 'name'} active {@$sortOrder}{/if}"><a href="{link controller='PageList'}pageNo={@$pageNo}&sortField=name&sortOrder={if $sortField == 'name' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.global.name{/lang}</a></th>
 					<th class="columnText columnURL" colspan="2">{lang}wcf.acp.page.url{/lang}</th>
+					<th class="columnText columnPageType{if $sortField == 'pageType'} active {@$sortOrder}{/if}"><a href="{link controller='PageList'}pageNo={@$pageNo}&sortField=pageType&sortOrder={if $sortField == 'pageType' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.acp.page.type{/lang}</a></th>
 					<th class="columnDate columnLastUpdateTime{if $sortField == 'lastUpdateTime'} active {@$sortOrder}{/if}"><a href="{link controller='PageList'}pageNo={@$pageNo}&sortField=lastUpdateTime&sortOrder={if $sortField == 'lastUpdateTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.acp.page.lastUpdateTime{/lang}</a></th>
 					
 					{event name='columnHeads'}
@@ -126,7 +129,7 @@
 							{/if}
 							<a href="{link controller='PageEdit' id=$page->pageID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
 							{if $page->canDelete()}
-								<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$page->pageID}" data-confirm-message="{lang}wcf.acp.page.delete.confirmMessage{/lang}"></span>
+								<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$page->pageID}" data-confirm-message-html="{lang __encode=true}wcf.acp.page.delete.confirmMessage{/lang}"></span>
 							{else}
 								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
 							{/if}
@@ -144,6 +147,7 @@
 						<td class="columnText columnURL">
 							{$page->getDisplayLink()}
 						</td>
+						<td class="columnText columnPageType">{lang}wcf.acp.page.type.{@$page->pageType}{/lang}</td>
 						<td class="columnDate columnLastUpdateTime">{@$page->lastUpdateTime|time}</td>
 						
 						{event name='columns'}
diff --git a/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
index 3040ea7dbc..b58082695b 100644
--- a/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
@@ -302,7 +302,6 @@ class ArticleAddForm extends AbstractForm {
 			$this->htmlInputProcessors[0] = new HtmlInputProcessor();
 			$this->htmlInputProcessors[0]->process($this->content[0], 'com.woltlab.wcf.article.content', 0);
 		}
-		
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/acp/page/PageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PageListPage.class.php
index 93163de08d..6d6f1d5da5 100644
--- a/wcfsetup/install/files/lib/acp/page/PageListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PageListPage.class.php
@@ -42,7 +42,7 @@ class PageListPage extends SortablePage {
 	/**
 	 * @inheritDoc
 	 */
-	public $validSortFields = ['pageID', 'name', 'lastUpdateTime'];
+	public $validSortFields = ['pageID', 'name', 'lastUpdateTime', 'pageType'];
 	
 	/**
 	 * name
@@ -72,7 +72,7 @@ class PageListPage extends SortablePage {
 	 * page type
 	 * @var string
 	 */
-	public $pageType = 'static';
+	public $pageType = '';
 	
 	/**
 	 * list of available applications
@@ -123,11 +123,8 @@ class PageListPage extends SortablePage {
 		if (!empty($this->applicationPackageID)) {
 			$this->objectList->getConditionBuilder()->add('page.applicationPackageID = ?', [$this->applicationPackageID]);
 		}
-		if ($this->pageType == 'static') {
-			$this->objectList->getConditionBuilder()->add('page.pageType IN (?, ?, ?)', ['text', 'html', 'tpl']);
-		}
-		else if ($this->pageType == 'system') {
-			$this->objectList->getConditionBuilder()->add('page.pageType IN (?)', ['system']);
+		if (!empty($this->pageType)) {
+			$this->objectList->getConditionBuilder()->add('page.pageType = (?)', [$this->pageType]);
 		}
 	}
 	
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7234407b28..abcc640084 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -73,7 +73,7 @@
 		<item name="wcf.acp.article.author"><![CDATA[Autor]]></item>
 		<item name="wcf.acp.article.button.viewArticle"><![CDATA[Vorschau anzeigen]]></item>
 		<item name="wcf.acp.article.category"><![CDATA[Kategorie]]></item>
-		<item name="wcf.acp.article.delete.confirmMessage"><![CDATA[Wollen Sie die den Artikel <span class="confirmationObject">{$article->getTitle()}</span> wirklich löschen?]]></item>
+		<item name="wcf.acp.article.delete.confirmMessage"><![CDATA[Wollen Sie den Artikel <span class="confirmationObject">{$article->getTitle()}</span> wirklich löschen?]]></item>
 		<item name="wcf.acp.article.enableComments"><![CDATA[Kommentare aktivieren]]></item>
 		<item name="wcf.acp.article.i18n"><![CDATA[Mehrsprachigkeit]]></item>
 		<item name="wcf.acp.article.i18n.none"><![CDATA[Einsprachiger Artikel]]></item>
@@ -141,6 +141,10 @@
 		<item name="wcf.acp.bbcode.wysiwygIcon.description"><![CDATA[Die Grafik muss sich im Verzeichnis wcf/icon/ befinden, alternativ kann ein <a href="{@$__wcf->getPath('wcf')}acp/dereferrer.php?url=http%3A%2F%2Ffontawesome.io%2Ficons%2F">FontAwesome</a>-Icon genutzt werden, z.B. „fa-caret-square-o-up“.]]></item>
 	</category>
 	
+	<category name="wcf.acp.box">
+		<item name="wcf.acp.box.list"><![CDATA[Boxen]]></item>
+	</category>
+	
 	<category name="wcf.acp.cache">
 		<item name="wcf.acp.cache.button.clear"><![CDATA[Cache leeren]]></item>
 		<item name="wcf.acp.cache.clear.sure"><![CDATA[Wollen Sie den Cache wirklich komplett leeren?]]></item>
@@ -1235,6 +1239,38 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.package.validation.failed"><![CDATA[Das hochgeladene Paket kann nicht installiert werden, bitte beachten Sie das unten stehende Prüfungsergebnis.]]></item>
 	</category>
 	
+	<category name="wcf.acp.page">
+		<item name="wcf.acp.page.add"><![CDATA[Seite hinzufügen]]></item>
+		<item name="wcf.acp.page.application"><![CDATA[App]]></item>
+		<item name="wcf.acp.page.boxes"><![CDATA[Ausgewählte Boxen auf dieser Seite anzeigen]]></item>
+		<item name="wcf.acp.page.button.viewPage"><![CDATA[Vorschau anzeigen]]></item>
+		<item name="wcf.acp.page.content"><![CDATA[Inhalt]]></item>
+		<item name="wcf.acp.page.contents"><![CDATA[Inhalte]]></item>
+		<item name="wcf.acp.page.customURL"><![CDATA[Individuelle URL]]></item>
+		<item name="wcf.acp.page.customURL.error.invalid"><![CDATA[Sie haben eine ungültige URL eingegeben. TODO: add description]]></item>
+		<item name="wcf.acp.page.customURL.error.notUnique"><![CDATA[Diese URL wird bereits von einer anderen Seite verwendet.]]></item>
+		<item name="wcf.acp.page.delete.confirmMessage"><![CDATA[Wollen Sie die Seite <span class="confirmationObject">{$page->name}</span> wirklich löschen?]]></item>
+		<item name="wcf.acp.page.edit"><![CDATA[Seite bearbeiten]]></item>
+		<item name="wcf.acp.page.i18n"><![CDATA[Mehrsprachigkeit]]></item>
+		<item name="wcf.acp.page.i18n.i18n"><![CDATA[Mehrsprachige Seite]]></item>
+		<item name="wcf.acp.page.i18n.none"><![CDATA[Einsprachige Seite]]></item>
+		<item name="wcf.acp.page.isLandingPage"><![CDATA[Seite ist Startseite]]></item>
+		<item name="wcf.acp.page.isDisabled"><![CDATA[Seite deaktivieren]]></item>
+		<item name="wcf.acp.page.lastUpdateTime"><![CDATA[Letzte Aktualisierung]]></item>
+		<item name="wcf.acp.page.list"><![CDATA[Seiten]]></item>
+		<item name="wcf.acp.page.metaDescription"><![CDATA[Meta Description]]></item>
+		<item name="wcf.acp.page.metaKeywords"><![CDATA[Meta Keywords]]></item>
+		<item name="wcf.acp.page.name.error.notUnique"><![CDATA[Dieser Name wird bereits von einer anderen Seite verwendet.]]></item>
+		<item name="wcf.acp.page.parentPage"><![CDATA[Übergeordnete Seite]]></item>
+		<item name="wcf.acp.page.parentPage.none"><![CDATA[Keine]]></item>
+		<item name="wcf.acp.page.type"><![CDATA[Seiten-Typ]]></item>
+		<item name="wcf.acp.page.type.html"><![CDATA[HTML]]></item>
+		<item name="wcf.acp.page.type.system"><![CDATA[System]]></item>
+		<item name="wcf.acp.page.type.text"><![CDATA[Text]]></item>
+		<item name="wcf.acp.page.type.tpl"><![CDATA[Template]]></item>
+		<item name="wcf.acp.page.url"><![CDATA[URL]]></item>
+	</category>
+	
 	<category name="wcf.acp.paidSubscription">
 		<item name="wcf.acp.paidSubscription.list"><![CDATA[Bezahlte Mitgliedschaften]]></item>
 		<item name="wcf.acp.paidSubscription.add"><![CDATA[Mitgliedschaft hinzufügen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 67cb42dcae..a5a1634239 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -140,6 +140,10 @@ Examples for medium ID detection:
 		<item name="wcf.acp.bbcode.wysiwygIcon.description"><![CDATA[The image must be placed inside the directory wcf/icon/ or use a <a href="{@$__wcf->getPath('wcf')}acp/dereferrer.php?url=http%3A%2F%2Ffontawesome.io%2Ficons%2F">FontAwesome</a>-icon, e.g. “fa-caret-square-o-up”.]]></item>
 	</category>
 	
+	<category name="wcf.acp.box">
+		<item name="wcf.acp.box.list"><![CDATA[Boxes]]></item>
+	</category>
+	
 	<category name="wcf.acp.cache">
 		<item name="wcf.acp.cache.button.clear"><![CDATA[Clear Cache]]></item>
 		<item name="wcf.acp.cache.clear.sure"><![CDATA[Do you really want to clear the cache?]]></item>
@@ -2666,6 +2670,38 @@ Errors are:
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[User profile of <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>
 	</category>
 	
+	<category name="wcf.acp.page">
+		<item name="wcf.acp.page.add"><![CDATA[Add Page]]></item>
+		<item name="wcf.acp.page.application"><![CDATA[App]]></item>
+		<item name="wcf.acp.page.boxes"><![CDATA[Display the Selected Boxes on This Page]]></item>
+		<item name="wcf.acp.page.button.viewPage"><![CDATA[Show Preview]]></item>
+		<item name="wcf.acp.page.content"><![CDATA[Content]]></item>
+		<item name="wcf.acp.page.contents"><![CDATA[Contents]]></item>
+		<item name="wcf.acp.page.customURL"><![CDATA[Custom URL]]></item>
+		<item name="wcf.acp.page.customURL.error.invalid"><![CDATA[URL is invalid. TODO: add description]]></item>
+		<item name="wcf.acp.page.customURL.error.notUnique"><![CDATA[URL is already in use.]]></item>
+		<item name="wcf.acp.page.delete.confirmMessage"><![CDATA[Do you really want to delete the page <span class="confirmationObject">{$page->name}</span>?]]></item>
+		<item name="wcf.acp.page.edit"><![CDATA[Edit Page]]></item>
+		<item name="wcf.acp.page.i18n"><![CDATA[Multilingualism]]></item>
+		<item name="wcf.acp.page.i18n.i18n"><![CDATA[Monolingual page]]></item>
+		<item name="wcf.acp.page.i18n.none"><![CDATA[Multilingual page]]></item>
+		<item name="wcf.acp.page.isLandingPage"><![CDATA[Landing page]]></item>
+		<item name="wcf.acp.page.isDisabled"><![CDATA[Disable page]]></item>
+		<item name="wcf.acp.page.lastUpdateTime"><![CDATA[Last Change]]></item>
+		<item name="wcf.acp.page.list"><![CDATA[Pages]]></item>
+		<item name="wcf.acp.page.metaDescription"><![CDATA[Meta Description]]></item>
+		<item name="wcf.acp.page.metaKeywords"><![CDATA[Meta Keywords]]></item>
+		<item name="wcf.acp.page.name.error.notUnique"><![CDATA[Name is already in use.]]></item>
+		<item name="wcf.acp.page.parentPage"><![CDATA[Parent Page]]></item>
+		<item name="wcf.acp.page.parentPage.none"><![CDATA[None]]></item>
+		<item name="wcf.acp.page.type"><![CDATA[Page Type]]></item>
+		<item name="wcf.acp.page.type.html"><![CDATA[HTML]]></item>
+		<item name="wcf.acp.page.type.system"><![CDATA[System]]></item>
+		<item name="wcf.acp.page.type.text"><![CDATA[Text]]></item>
+		<item name="wcf.acp.page.type.tpl"><![CDATA[Template]]></item>
+		<item name="wcf.acp.page.url"><![CDATA[URL]]></item>
+	</category>
+	
 	<category name="wcf.paidSubscription">
 		<item name="wcf.paidSubscription.availableSubscriptions"><![CDATA[Available Subscriptions]]></item>
 		<item name="wcf.paidSubscription.purchasedSubscriptions"><![CDATA[Purchased Subscriptions]]></item>
-- 
2.20.1