From b1a21267887a870d4e995c7525c14aa7fe0ddbe7 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 13 Apr 2016 15:30:17 +0200
Subject: [PATCH] Removed dashboard box system

---
 XSD/dashboardBox.xsd                          |  53 -----
 com.woltlab.wcf/objectType.xml                |   7 -
 com.woltlab.wcf/objectTypeDefinition.xml      |   4 -
 com.woltlab.wcf/option.xml                    |   7 +-
 com.woltlab.wcf/packageInstallationPlugin.xml |   1 -
 com.woltlab.wcf/page.xml                      |   1 -
 com.woltlab.wcf/templates/dashboard.tpl       |  71 ------
 .../templates/dashboardBoxContent.tpl         |   3 -
 .../templates/dashboardBoxSidebar.tpl         |   7 -
 com.woltlab.wcf/templates/membersList.tpl     |   2 -
 .../templates/recentActivityList.tpl          |   4 -
 com.woltlab.wcf/templates/team.tpl            |   4 -
 com.woltlab.wcf/templates/userSearch.tpl      |   4 -
 com.woltlab.wcf/templates/usersOnlineList.tpl |   2 -
 constants.php                                 |   1 -
 .../files/acp/templates/dashboardList.tpl     |  56 -----
 .../files/acp/templates/dashboardOption.tpl   | 141 ------------
 .../acp/form/DashboardOptionForm.class.php    | 190 ----------------
 .../lib/acp/page/DashboardListPage.class.php  |  55 -----
 .../data/dashboard/box/DashboardBox.class.php |  41 ----
 .../box/DashboardBoxAction.class.php          | 136 -----------
 .../box/DashboardBoxEditor.class.php          |  20 --
 .../dashboard/box/DashboardBoxList.class.php  |  15 --
 .../lib/form/AbstractModerationForm.class.php |   5 +-
 .../files/lib/form/UserSearchForm.class.php   |   8 +-
 .../files/lib/page/DashboardPage.class.php    |  42 ----
 .../files/lib/page/MembersListPage.class.php  |   6 -
 .../lib/page/RecentActivityListPage.class.php |   6 -
 .../install/files/lib/page/TeamPage.class.php |   6 -
 .../lib/page/UsersOnlineListPage.class.php    |   6 -
 .../DashboardBoxCacheBuilder.class.php        |  62 -----
 .../dashboard/DashboardHandler.class.php      | 211 ------------------
 .../box/AbstractContentDashboardBox.class.php |  80 -------
 .../box/AbstractSidebarDashboardBox.class.php |  44 ----
 .../dashboard/box/IDashboardBox.class.php     |  31 ---
 ...oardBoxPackageInstallationPlugin.class.php |  84 -------
 wcfsetup/install/lang/de.xml                  |  17 +-
 wcfsetup/install/lang/en.xml                  |  15 --
 wcfsetup/setup/db/install.sql                 |  22 --
 39 files changed, 4 insertions(+), 1466 deletions(-)
 delete mode 100644 XSD/dashboardBox.xsd
 delete mode 100644 com.woltlab.wcf/templates/dashboard.tpl
 delete mode 100644 com.woltlab.wcf/templates/dashboardBoxContent.tpl
 delete mode 100644 com.woltlab.wcf/templates/dashboardBoxSidebar.tpl
 delete mode 100644 wcfsetup/install/files/acp/templates/dashboardList.tpl
 delete mode 100644 wcfsetup/install/files/acp/templates/dashboardOption.tpl
 delete mode 100644 wcfsetup/install/files/lib/acp/form/DashboardOptionForm.class.php
 delete mode 100644 wcfsetup/install/files/lib/acp/page/DashboardListPage.class.php
 delete mode 100644 wcfsetup/install/files/lib/data/dashboard/box/DashboardBox.class.php
 delete mode 100644 wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxAction.class.php
 delete mode 100644 wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxEditor.class.php
 delete mode 100644 wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxList.class.php
 delete mode 100644 wcfsetup/install/files/lib/page/DashboardPage.class.php
 delete mode 100644 wcfsetup/install/files/lib/system/cache/builder/DashboardBoxCacheBuilder.class.php
 delete mode 100644 wcfsetup/install/files/lib/system/dashboard/DashboardHandler.class.php
 delete mode 100644 wcfsetup/install/files/lib/system/dashboard/box/AbstractContentDashboardBox.class.php
 delete mode 100644 wcfsetup/install/files/lib/system/dashboard/box/AbstractSidebarDashboardBox.class.php
 delete mode 100644 wcfsetup/install/files/lib/system/dashboard/box/IDashboardBox.class.php
 delete mode 100644 wcfsetup/install/files/lib/system/package/plugin/DashboardBoxPackageInstallationPlugin.class.php

diff --git a/XSD/dashboardBox.xsd b/XSD/dashboardBox.xsd
deleted file mode 100644
index 1e2461c799..0000000000
--- a/XSD/dashboardBox.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is used for xml files which install, update or delete user group options. -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-	<!-- include types -->
-	<xs:include schemaLocation="types.xsd" />
-
-	<!-- data element -->
-	<xs:element name="data">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="import" type="import" minOccurs="0" />
-				<xs:element name="delete" type="delete" minOccurs="0" />
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-
-	<!-- import element -->
-	<xs:complexType name="import">
-		<xs:sequence>
-			<xs:element name="dashboardbox" type="dashboardbox" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- delete element type -->
-	<xs:complexType name="delete">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="dashboardbox" type="dashboardbox" minOccurs="0" />
-		</xs:choice>
-	</xs:complexType>
-
-	<!-- dashboardbox import element type -->
-	<xs:complexType name="dashboardbox">
-		<xs:complexContent>
-			<xs:extension base="dashboardbox_basic">
-				<xs:all>
-					<xs:element name="classname" type="woltlab_varchar" minOccurs="1" />
-					<xs:element name="boxtype" type="woltlab_boxtype" minOccurs="1" />
-				</xs:all>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:simpleType name="woltlab_boxtype">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="sidebar" />
-			<xs:enumeration value="content" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="dashboardbox_basic">
-		<xs:attribute name="name" type="woltlab_varchar" />
-	</xs:complexType>
-</xs:schema>
\ No newline at end of file
diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index e25eef0851..ddb79aae23 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -498,13 +498,6 @@
 			<options>module_members_list</options>
 			<categoryname>com.woltlab.wcf.other</categoryname>
 		</type>
-		<type>
-			<name>com.woltlab.wcf.DashboardPage</name>
-			<definitionname>com.woltlab.wcf.page</definitionname>
-			<classname><![CDATA[wcf\page\DashboardPage]]></classname>
-			<options>module_dashboard_page</options>
-			<categoryname>com.woltlab.wcf.other</categoryname>
-		</type>
 		<type>
 			<name>com.woltlab.wcf.DeletedContentListPage</name>
 			<definitionname>com.woltlab.wcf.page</definitionname>
diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml
index 7f1bd2b69d..3902359b0a 100644
--- a/com.woltlab.wcf/objectTypeDefinition.xml
+++ b/com.woltlab.wcf/objectTypeDefinition.xml
@@ -51,10 +51,6 @@
 			<interfacename><![CDATA[wcf\system\user\notification\object\type\IUserNotificationObjectType]]></interfacename>
 		</definition>
 		
-		<definition>
-			<name>com.woltlab.wcf.user.dashboardContainer</name>
-		</definition>
-		
 		<definition>
 			<name>com.woltlab.wcf.user.objectWatch</name>
 			<interfacename><![CDATA[wcf\system\user\object\watch\IUserObjectWatch]]></interfacename>
diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 55d77cf867..2af2a7bab3 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -370,11 +370,6 @@
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
-			<option name="module_dashboard_page">
-				<categoryname>module.display</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>1</defaultvalue>
-			</option>
 			
 			<option name="module_like">
 				<categoryname>module.community</categoryname>
@@ -1353,7 +1348,7 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
 			</option>
 			<!-- /user.cleanup -->
 			
-			<!-- dashboard -->
+			<!-- dashboard TODO -->
 			<option name="recent_activity_items">
 				<categoryname>dashboard.content.recentActivities</categoryname>
 				<optiontype>integer</optiontype>
diff --git a/com.woltlab.wcf/packageInstallationPlugin.xml b/com.woltlab.wcf/packageInstallationPlugin.xml
index 77ef77192a..4fbb90a766 100644
--- a/com.woltlab.wcf/packageInstallationPlugin.xml
+++ b/com.woltlab.wcf/packageInstallationPlugin.xml
@@ -28,7 +28,6 @@
 		<pip name="userProfileMenu">wcf\system\package\plugin\UserProfileMenuPackageInstallationPlugin</pip>
 		<pip name="userMenu">wcf\system\package\plugin\UserMenuPackageInstallationPlugin</pip>
 		<pip name="userNotificationEvent">wcf\system\package\plugin\UserNotificationEventPackageInstallationPlugin</pip>
-		<pip name="dashboardBox">wcf\system\package\plugin\DashboardBoxPackageInstallationPlugin</pip>
 		<pip name="box">wcf\system\package\plugin\BoxPackageInstallationPlugin</pip>
 		<pip name="menu">wcf\system\package\plugin\MenuPackageInstallationPlugin</pip>
 		<pip name="menuItem">wcf\system\package\plugin\MenuItemPackageInstallationPlugin</pip>
diff --git a/com.woltlab.wcf/page.xml b/com.woltlab.wcf/page.xml
index f47d509941..6a789027a9 100644
--- a/com.woltlab.wcf/page.xml
+++ b/com.woltlab.wcf/page.xml
@@ -238,7 +238,6 @@
 			<pageType>text</pageType>
 			<name language="de"><![CDATA[Dashboard]]></name>
 			<name language="en"><![CDATA[Dashboard]]></name>
-			<options>module_dashboard_page</options>
 			
 			<content>
 				<title>Dashboard</title>
diff --git a/com.woltlab.wcf/templates/dashboard.tpl b/com.woltlab.wcf/templates/dashboard.tpl
deleted file mode 100644
index b25eea05e6..0000000000
--- a/com.woltlab.wcf/templates/dashboard.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-{include file='documentHeader'}
-
-<head>
-	<title>{if !$__wcf->isLandingPage()}{lang}wcf.user.dashboard{/lang} - {/if}{PAGE_TITLE|language}</title>
-	
-	{include file='headInclude'}
-	
-	<link rel="canonical" href="{link controller='Dashboard'}{/link}" />
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
-
-{if $__boxSidebar|isset && $__boxSidebar}
-	{capture assign='sidebarRight'}
-		{@$__boxSidebar}
-	{/capture}
-{/if}
-
-{include file='header'}
-
-{if $__wcf->isLandingPage()}
-	<header class="contentHeader">
-		<div class="contentHeaderTitle">
-			<h1 class="contentTitle">{PAGE_TITLE|language}</h1>
-			{hascontent}<p class="contentHeaderDescription">{content}{PAGE_DESCRIPTION|language}{/content}</p>{/hascontent}
-		</div>
-		
-		{hascontent}
-			<nav class="contentHeaderNavigation">
-				<ul>
-					{content}{event name='contentHeaderNavigation'}{/content}
-				</ul>
-			</nav>
-		{/hascontent}
-	</header>
-{else}
-	<header class="contentHeader">
-		<div class="contentHeaderTitle">
-			<h1 class="contentTitle">{lang}wcf.user.dashboard{/lang}</h1>
-		</div>
-		
-		{hascontent}
-			<nav class="contentHeaderNavigation">
-				<ul>
-					{content}{event name='contentHeaderNavigation'}{/content}
-				</ul>
-			</nav>
-		{/hascontent}
-	</header>
-{/if}
-
-{include file='userNotice'}
-
-<section id="dashboard">
-	{if $__boxContent|isset}{@$__boxContent}{/if}
-</section>
-
-<footer class="contentFooter">
-	{hascontent}
-		<nav class="contentFooterNavigation">
-			<ul>
-				{content}{event name='contentFooterNavigation'}{/content}
-			</ul>
-		</nav>
-	{/hascontent}
-</footer>
-
-{include file='footer'}
-
-</body>
-</html>
diff --git a/com.woltlab.wcf/templates/dashboardBoxContent.tpl b/com.woltlab.wcf/templates/dashboardBoxContent.tpl
deleted file mode 100644
index c8fbf55785..0000000000
--- a/com.woltlab.wcf/templates/dashboardBoxContent.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<section class="dashboardBox" data-box-name="{$box->boxName}">
-	{@$template}
-</section>
diff --git a/com.woltlab.wcf/templates/dashboardBoxSidebar.tpl b/com.woltlab.wcf/templates/dashboardBoxSidebar.tpl
deleted file mode 100644
index bfe9e0c0c6..0000000000
--- a/com.woltlab.wcf/templates/dashboardBoxSidebar.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<section class="dashboardBox" data-box-name="{$box->boxName}">
-	<h1>{if $titleLink}<a href="{$titleLink}">{lang}wcf.dashboard.box.{$box->boxName}{/lang}</a>{else}{lang}wcf.dashboard.box.{$box->boxName}{/lang}{/if}</h1>
-	
-	<div>
-		{@$template}
-	</div>
-</section>
\ No newline at end of file
diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index f31796edbf..59c10992b4 100644
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -100,8 +100,6 @@
 			</div>
 		</form>
 	</section>
-	
-	{@$__boxSidebar}
 {/capture}
 
 {include file='header'}
diff --git a/com.woltlab.wcf/templates/recentActivityList.tpl b/com.woltlab.wcf/templates/recentActivityList.tpl
index 18fe5fbca6..4ea90571c4 100644
--- a/com.woltlab.wcf/templates/recentActivityList.tpl
+++ b/com.woltlab.wcf/templates/recentActivityList.tpl
@@ -23,10 +23,6 @@
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebarRight'}
-	{@$__boxSidebar}
-{/capture}
-
 {include file='header'}
 
 <header class="contentHeader">
diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl
index 14d44ea3ee..8ef578f87b 100644
--- a/com.woltlab.wcf/templates/team.tpl
+++ b/com.woltlab.wcf/templates/team.tpl
@@ -26,10 +26,6 @@
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebarRight'}
-	{@$__boxSidebar}
-{/capture}
-
 {include file='header'}
 
 <header class="contentHeader">
diff --git a/com.woltlab.wcf/templates/userSearch.tpl b/com.woltlab.wcf/templates/userSearch.tpl
index b468c244b8..092eb30aa7 100644
--- a/com.woltlab.wcf/templates/userSearch.tpl
+++ b/com.woltlab.wcf/templates/userSearch.tpl
@@ -16,10 +16,6 @@
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebarRight'}
-	{@$__boxSidebar}
-{/capture}
-
 {include file='header'}
 
 <header class="contentHeader">
diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index 68861265df..9380ef411c 100644
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -88,8 +88,6 @@
 			</div>
 		{/if}
 	</section>
-	
-	{@$__boxSidebar}
 {/capture}
 
 {include file='header'}
diff --git a/constants.php b/constants.php
index 9d1b936b73..7f735f83ef 100644
--- a/constants.php
+++ b/constants.php
@@ -44,7 +44,6 @@ define('MODULE_USER_RANK', 1);
 define('MODULE_USER_SIGNATURE', 1);
 define('MODULE_MEMBERS_LIST', 1);
 define('MODULE_TEAM_PAGE', 1);
-define('MODULE_DASHBOARD_PAGE', 1);
 define('MODULE_LIKE', 1);
 define('MODULE_USER_PROFILE_WALL', 1);
 define('MODULE_TAGGING', 1);
diff --git a/wcfsetup/install/files/acp/templates/dashboardList.tpl b/wcfsetup/install/files/acp/templates/dashboardList.tpl
deleted file mode 100644
index 9f67b0ba8f..0000000000
--- a/wcfsetup/install/files/acp/templates/dashboardList.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{include file='header' pageTitle='wcf.acp.dashboard.list'}
-
-<header class="contentHeader">
-	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.dashboard.list{/lang}</h1>
-	</div>
-	
-	{hascontent}
-		<nav class="contentHeaderNavigation">
-			<ul>
-				{content}{event name='contentHeaderNavigation'}{/content}
-			</ul>
-		</nav>
-	{/hascontent}
-</header>
-
-<div class="section tabularBox">
-	<table class="table">
-		<thead>
-			<tr>
-				<th colspan="2" class="columnID">{lang}wcf.global.objectID{/lang}</th>
-				<th class="columnText">{lang}wcf.dashboard.objectType{/lang}</th>
-				
-				{event name='columnHeads'}
-			</tr>
-		</thead>
-		
-		<tbody>
-			{foreach from=$objectTypes item=$objectType}
-				<tr>
-					<td class="columnIcon">
-						<a href="{link controller='DashboardOption' id=$objectType->objectTypeID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-						
-						{event name='rowButtons'}
-					</td>
-					<td class="columnID">{#$objectType->objectTypeID}</td>
-					<td class="columnText"><a href="{link controller='DashboardOption' id=$objectType->objectTypeID}{/link}">{lang}wcf.dashboard.objectType.{$objectType->objectType}{/lang}</a></td>
-					
-					{event name='columns'}
-				</tr>
-			{/foreach}
-		</tbody>
-	</table>
-</div>
-
-<footer class="contentFooter">
-	{hascontent}
-		<nav class="contentFooterNavigation">
-			<ul>
-				{content}{event name='contentFooterNavigation'}{/content}
-			</ul>
-		</nav>
-	{/hascontent}
-</footer>
-
-{include file='footer'}
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/dashboardOption.tpl b/wcfsetup/install/files/acp/templates/dashboardOption.tpl
deleted file mode 100644
index e8b692a33a..0000000000
--- a/wcfsetup/install/files/acp/templates/dashboardOption.tpl
+++ /dev/null
@@ -1,141 +0,0 @@
-{include file='header' pageTitle='wcf.acp.dashboard.option'}
-
-<script data-relocate="true">
-	//<![CDATA[
-	$(function() {
-		WCF.TabMenu.init();
-	});
-	//]]>
-</script>
-
-<header class="contentHeader">
-	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.dashboard.option{/lang}</h1>
-		<p class="contentHeaderDescription">{lang}wcf.dashboard.objectType.{$objectType->objectType}{/lang}</p>
-	</div>
-	
-	<nav class="contentHeaderNavigation">
-		<ul>
-			<li><a href="{link controller='DashboardList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.dashboard.list{/lang}</span></a></li>
-			
-			{event name='contentHeaderNavigation'}
-		</ul>
-	</nav>
-</header>
-
-<p class="info">{lang}wcf.acp.dashboard.box.sort{/lang}</p>
-
-<div class="section tabMenuContainer">
-	<nav class="tabMenu">
-		<ul>
-			{if $objectType->allowcontent}
-				<li><a href="{@$__wcf->getAnchor('dashboard-content')}">{lang}wcf.dashboard.boxType.content{/lang}</a></li>
-			{/if}
-			{if $objectType->allowsidebar}
-				<li><a href="{@$__wcf->getAnchor('dashboard-sidebar')}">{lang}wcf.dashboard.boxType.sidebar{/lang}</a></li>
-			{/if}
-			
-			{event name='tabMenuTabs'}
-		</ul>
-	</nav>
-	
-	{if $objectType->allowcontent}
-		<div id="dashboard-content" class="tabMenuContent hidden">
-			<section class="section">
-				<h2 class="sectionTitle">{lang}wcf.dashboard.box.enabledBoxes{/lang}</h2>
-				
-				<div class="sortableListContainer">
-					<ol class="sortableList simpleSortableList" data-object-id="0">
-						{foreach from=$enabledBoxes item=boxID}
-							{if $boxes[$boxID]->boxType == 'content'}
-								<li class="sortableNode" data-object-id="{@$boxID}">
-									<span class="sortableNodeLabel">{lang}wcf.dashboard.box.{$boxes[$boxID]->boxName}{/lang}{if $boxes[$boxID]->packageID != 1} ({lang}{$boxes[$boxID]->getPackage()->packageName}{/lang}){/if}</span>
-								</li>
-							{/if}
-						{/foreach}
-					</ol>
-				</div>
-			</section>
-			
-			<section class="section">
-				<h2 class="sectionTitle">{lang}wcf.dashboard.box.availableBoxes{/lang}</h2>
-				
-				<div class="sortableListContainer">
-					<ol class="sortableList simpleSortableList">
-						{foreach from=$boxes item=box}
-							{if $box->boxType == 'content' && !$box->boxID|in_array:$enabledBoxes}
-								<li class="sortableNode" data-object-id="{@$box->boxID}">
-									<span class="sortableNodeLabel">{lang}wcf.dashboard.box.{$box->boxName}{/lang}{if $box->packageID != 1} ({lang}{$box->getPackage()->packageName}{/lang}){/if}</span>
-								</li>
-							{/if}
-						{/foreach}
-					</ol>
-				</div>
-			</section>
-			
-			<div class="formSubmit">
-				<button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
-			</div>
-			
-			<script data-relocate="true">
-				//<![CDATA[
-				$(function() {
-					new WCF.Sortable.List('dashboard-content', 'wcf\\data\\dashboard\\box\\DashboardBoxAction', 0, { }, true, { boxType: 'content', objectTypeID: {@$objectTypeID} });
-				});
-				//]]>
-			</script>
-		</div>
-	{/if}
-	
-	{if $objectType->allowsidebar}
-		<div id="dashboard-sidebar" class="tabMenuContent hidden">
-			<section class="section">
-				<h2 class="sectionTitle">{lang}wcf.dashboard.box.enabledBoxes{/lang}</h2>
-				
-				<div class="sortableListContainer">
-					<ol class="sortableList simpleSortableList" data-object-id="0">
-						{foreach from=$enabledBoxes item=boxID}
-							{if $boxes[$boxID]->boxType == 'sidebar'}
-								<li class="sortableNode" data-object-id="{@$boxID}">
-									<span class="sortableNodeLabel">{lang}wcf.dashboard.box.{$boxes[$boxID]->boxName}{/lang}{if $boxes[$boxID]->packageID != 1} ({lang}{$boxes[$boxID]->getPackage()->packageName}{/lang}){/if}</span>
-								</li>
-							{/if}
-						{/foreach}
-					</ol>
-				</div>
-			</section>
-			
-			<section class="section">
-				<h2 class="sectionTitle">{lang}wcf.dashboard.box.availableBoxes{/lang}</h2>
-				
-				<div id="dashboard-sidebar-enabled" class="sortableListContainer">
-					<ol class="sortableList simpleSortableList">
-						{foreach from=$boxes item=box}
-							{if $box->boxType == 'sidebar' && !$box->boxID|in_array:$enabledBoxes}
-								<li class="sortableNode" data-object-id="{@$box->boxID}">
-									<span class="sortableNodeLabel">{lang}wcf.dashboard.box.{$box->boxName}{/lang}{if $box->packageID != 1} ({lang}{$box->getPackage()->packageName}{/lang}){/if}</span>
-								</li>
-							{/if}
-						{/foreach}
-					</ol>
-				</div>
-			</section>
-			
-			<div class="formSubmit">
-				<button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
-			</div>
-			
-			<script data-relocate="true">
-				//<![CDATA[
-				$(function() {
-					new WCF.Sortable.List('dashboard-sidebar', 'wcf\\data\\dashboard\\box\\DashboardBoxAction', 0, { }, true, { boxType: 'sidebar', objectTypeID: {@$objectTypeID} });
-				});
-				//]]>
-			</script>
-		</div>
-	{/if}
-	
-	{event name='tabMenuContents'}
-</div>
-
-{include file='footer'}
\ No newline at end of file
diff --git a/wcfsetup/install/files/lib/acp/form/DashboardOptionForm.class.php b/wcfsetup/install/files/lib/acp/form/DashboardOptionForm.class.php
deleted file mode 100644
index 838147956d..0000000000
--- a/wcfsetup/install/files/lib/acp/form/DashboardOptionForm.class.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-namespace wcf\acp\form;
-use wcf\data\dashboard\box\DashboardBox;
-use wcf\data\dashboard\box\DashboardBoxList;
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\form\AbstractForm;
-use wcf\system\exception\IllegalLinkException;
-use wcf\system\WCF;
-use wcf\util\ArrayUtil;
-
-/**
- * Provides the dashboard option form.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	acp.form
- * @category	Community Framework
- */
-class DashboardOptionForm extends AbstractForm {
-	/**
-	 * @see	\wcf\page\AbstractPage::$activeMenuItem
-	 */
-	public $activeMenuItem = 'wcf.acp.menu.link.dashboard';
-	
-	/**
-	 * @see	\wcf\page\AbstractPage::$neededPermissions
-	 */
-	public $neededPermissions = array('admin.content.dashboard.canEditDashboard');
-	
-	/**
-	 * list of available dashboard boxes
-	 * @var	DashboardBox[]
-	 */
-	public $boxes = array();
-	
-	/**
-	 * list of enabled box ids
-	 * @var	integer[]
-	 */
-	public $enabledBoxes = array();
-	
-	/**
-	 * object type object
-	 * @var	\wcf\data\object\type\ObjectType
-	 */
-	public $objectType = null;
-	
-	/**
-	 * object type id
-	 * @var	integer
-	 */
-	public $objectTypeID = 0;
-	
-	/**
-	 * @see	\wcf\page\IPage::readParameters()
-	 */
-	public function readParameters() {
-		parent::readParameters();
-		
-		if (isset($_REQUEST['id'])) $this->objectTypeID = intval($_REQUEST['id']);
-		
-		// load object type
-		$objectTypeDefinition = ObjectTypeCache::getInstance()->getDefinitionByName('com.woltlab.wcf.user.dashboardContainer');
-		$this->objectType = ObjectTypeCache::getInstance()->getObjectType($this->objectTypeID);
-		if ($this->objectType === null || $this->objectType->definitionID != $objectTypeDefinition->definitionID) {
-			throw new IllegalLinkException();
-		}
-		
-		// load available boxes
-		$allowedBoxTypes = array();
-		if ($this->objectType->allowcontent) $allowedBoxTypes[] = 'content';
-		if ($this->objectType->allowsidebar) $allowedBoxTypes[] = 'sidebar';
-		if (empty($allowedBoxTypes)) {
-			// this should not happen unless you go full retard
-			throw new IllegalLinkException();
-		}
-		
-		$boxList = new DashboardBoxList();
-		$boxList->getConditionBuilder()->add("dashboard_box.boxType IN (?)", array($allowedBoxTypes));
-		$boxList->readObjects();
-		$this->boxes = $boxList->getObjects();
-	}
-	
-	/**
-	 * @see	\wcf\form\IForm::readFormParameters()
-	 */
-	public function readFormParameters() {
-		parent::readFormParameters();
-		
-		if (isset($_POST['enabledBoxes']) && is_array($_POST['enabledBoxes'])) $this->enabledBoxes = ArrayUtil::toIntegerArray($_POST['enabledBoxes']);
-	}
-	
-	/**
-	 * @see	\wcf\form\IForm::validate()
-	 */
-	public function validate() {
-		parent::validate();
-		
-		$this->validateEnabledBoxes();
-	}
-	
-	/**
-	 * Validates dashboard options.
-	 */
-	protected function validateEnabledBoxes() {
-		foreach ($this->enabledBoxes as $boxID) {
-			if (!isset($this->boxes[$boxID])) {
-				throw new IllegalLinkException();
-			}
-		}
-	}
-	
-	/**
-	 * @see	\wcf\page\IPage::readData()
-	 */
-	public function readData() {
-		parent::readData();
-		
-		if (empty($_POST)) {
-			// load settings
-			$sql = "SELECT		boxID
-				FROM		wcf".WCF_N."_dashboard_option
-				WHERE		objectTypeID = ?
-				ORDER BY	showOrder ASC";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute(array(
-				$this->objectTypeID
-			));
-			while ($row = $statement->fetchArray()) {
-				$this->enabledBoxes[] = $row['boxID'];
-			}
-		}
-	}
-	
-	/**
-	 * @see	\wcf\form\IForm::save()
-	 */
-	public function save() {
-		parent::save();
-		
-		// remove previous settings
-		$sql = "DELETE FROM	wcf".WCF_N."_dashboard_option
-			WHERE		objectTypeID = ?";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute(array(
-			$this->objectTypeID
-		));
-		
-		// insert new settings
-		if (!empty($this->enabledBoxes)) {
-			$sql = "INSERT INTO	wcf".WCF_N."_dashboard_option
-						(objectTypeID, boxID, showOrder)
-				VALUES		(?, ?, ?)";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			
-			WCF::getDB()->beginTransaction();
-			$showOrder = 1;
-			foreach ($this->enabledBoxes as $boxID) {
-				$statement->execute(array(
-					$this->objectTypeID,
-					$boxID,
-					$showOrder
-				));
-				
-				$showOrder++;
-			}
-			WCF::getDB()->commitTransaction();
-		}
-		
-		$this->saved();
-		
-		WCF::getTPL()->assign('success', true);
-	}
-	
-	/**
-	 * @see	\wcf\page\IPage::assignVariables()
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
-		
-		WCF::getTPL()->assign(array(
-			'boxes' => $this->boxes,
-			'enabledBoxes' => $this->enabledBoxes,
-			'objectType' => $this->objectType,
-			'objectTypeID' => $this->objectTypeID
-		));
-	}
-}
diff --git a/wcfsetup/install/files/lib/acp/page/DashboardListPage.class.php b/wcfsetup/install/files/lib/acp/page/DashboardListPage.class.php
deleted file mode 100644
index 59bda9435c..0000000000
--- a/wcfsetup/install/files/lib/acp/page/DashboardListPage.class.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-namespace wcf\acp\page;
-use wcf\data\object\type\ObjectType;
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\page\AbstractPage;
-use wcf\system\WCF;
-
-/**
- * Provides a list of registered dashboard pages.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	acp.page
- * @category	Community Framework
- */
-class DashboardListPage extends AbstractPage {
-	/**
-	 * @see	\wcf\page\AbstractPage::$activeMenuItem
-	 */
-	public $activeMenuItem = 'wcf.acp.menu.link.dashboard.list';
-	
-	/**
-	 * @see	\wcf\page\AbstractPage::$neededPermissions
-	 */
-	public $neededPermissions = array('admin.content.dashboard.canEditDashboard');
-	
-	/**
-	 * list of object types per package id
-	 * @var	ObjectType[]
-	 */
-	public $objectTypes = array();
-	
-	/**
-	 * @see	\wcf\page\IPage::readData()
-	 */
-	public function readData() {
-		parent::readData();
-		
-		// load object types
-		$this->objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.user.dashboardContainer');
-	}
-	
-	/**
-	 * @see	\wcf\page\IPage::assignVariables()
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
-		
-		WCF::getTPL()->assign(array(
-			'objectTypes' => $this->objectTypes
-		));
-	}
-}
diff --git a/wcfsetup/install/files/lib/data/dashboard/box/DashboardBox.class.php b/wcfsetup/install/files/lib/data/dashboard/box/DashboardBox.class.php
deleted file mode 100644
index 3d946bfd55..0000000000
--- a/wcfsetup/install/files/lib/data/dashboard/box/DashboardBox.class.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-namespace wcf\data\dashboard\box;
-use wcf\data\package\PackageCache;
-use wcf\data\DatabaseObject;
-
-/**
- * Represents a dashboard box.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	data.dashboard.box
- * @category	Community Framework
- *
- * @property-read	integer		$boxID
- * @property-read	integer		$packageID
- * @property-read	string		$boxName
- * @property-read	string		$boxType
- * @property-read	string		$className
- */
-class DashboardBox extends DatabaseObject {
-	/**
-	 * @see	\wcf\data\DatabaseObject::$databaseTableName
-	 */
-	protected static $databaseTableName = 'dashboard_box';
-	
-	/**
-	 * @see	\wcf\data\DatabaseObject::$databaseTableIndexName
-	 */
-	protected static $databaseTableIndexName = 'boxID';
-	
-	/**
-	 * Returns the owner of this dashboard box.
-	 * 
-	 * @return	\wcf\data\package\Package
-	 */
-	public function getPackage() {
-		return PackageCache::getInstance()->getPackage($this->packageID);
-	}
-}
diff --git a/wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxAction.class.php b/wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxAction.class.php
deleted file mode 100644
index c1e217ef34..0000000000
--- a/wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxAction.class.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-namespace wcf\data\dashboard\box;
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\data\AbstractDatabaseObjectAction;
-use wcf\data\ISortableAction;
-use wcf\system\dashboard\DashboardHandler;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\exception\UserInputException;
-use wcf\system\WCF;
-use wcf\util\ArrayUtil;
-
-/**
- * Executes dashboard box-related actions.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	data.dashboard.box
- * @category	Community Framework
- */
-class DashboardBoxAction extends AbstractDatabaseObjectAction implements ISortableAction {
-	/**
-	 * list of available dashboard boxes
-	 * @var	DashboardBox[]
-	 */
-	public $boxes = array();
-	
-	/**
-	 * box structure
-	 * @var	integer[]
-	 */
-	public $boxStructure = array();
-	
-	/**
-	 * object type object
-	 * @var	\wcf\data\object\type\ObjectType
-	 */
-	public $objectType = null;
-	
-	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
-	 */
-	protected $requireACP = array('updatePosition');
-	
-	/**
-	 * @see	\wcf\data\ISortableAction::validateUpdatePosition()
-	 */
-	public function validateUpdatePosition() {
-		// validate permissions
-		WCF::getSession()->checkPermissions(array('admin.content.dashboard.canEditDashboard'));
-		
-		$this->readString('boxType');
-		$this->readInteger('objectTypeID');
-		
-		// validate box type
-		if (!in_array($this->parameters['boxType'], array('content', 'sidebar'))) {
-			throw new UserInputException('boxType');
-		}
-		
-		// validate object type
-		$objectType = ObjectTypeCache::getInstance()->getObjectType($this->parameters['objectTypeID']);
-		if ($objectType !== null) {
-			$objectTypeDefinition = ObjectTypeCache::getInstance()->getDefinitionByName('com.woltlab.wcf.user.dashboardContainer');
-			if ($objectTypeDefinition !== null) {
-				if ($objectType->definitionID == $objectTypeDefinition->definitionID) {
-					$this->objectType = $objectType;
-				}
-			}
-		}
-		
-		if ($this->objectType === null) {
-			throw new UserInputException('objectTypeID');
-		}
-		
-		// read all dashboard boxes of the relevant box type
-		$boxList = new DashboardBoxList();
-		$boxList->getConditionBuilder()->add("dashboard_box.boxType = ?", array($this->parameters['boxType']));
-		$boxList->readObjects();
-		$this->boxes = $boxList->getObjects();
-		
-		// parse structure
-		if (isset($this->parameters['data']) & isset($this->parameters['data']['structure']) && isset($this->parameters['data']['structure'][0])) {
-			$this->boxStructure = ArrayUtil::toIntegerArray($this->parameters['data']['structure'][0]);
-			
-			// validate box ids
-			if (!empty($this->boxStructure)) {
-				foreach ($this->boxStructure as $boxID) {
-					if (!isset($this->boxes[$boxID])) {
-						throw new UserInputException('boxID');
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * @see	\wcf\data\ISortableAction::updatePosition()
-	 */
-	public function updatePosition() {
-		// remove previous settings
-		$conditions = new PreparedStatementConditionBuilder();
-		$conditions->add("objectTypeID = ?", array($this->objectType->objectTypeID));
-		if (!empty($this->boxes)) {
-			$conditions->add("boxID IN (?)", array(array_keys($this->boxes)));
-		}
-		
-		$sql = "DELETE FROM	wcf".WCF_N."_dashboard_option
-			".$conditions;
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute($conditions->getParameters());
-		
-		// update settings
-		if (!empty($this->boxStructure)) {
-			$sql = "INSERT INTO	wcf".WCF_N."_dashboard_option
-						(objectTypeID, boxID, showOrder)
-				VALUES		(?, ?, ?)";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			
-			WCF::getDB()->beginTransaction();
-			foreach ($this->boxStructure as $index => $boxID) {
-				$showOrder = $index + 1;
-				
-				$statement->execute(array(
-					$this->objectType->objectTypeID,
-					$boxID,
-					$showOrder
-				));
-			}
-			WCF::getDB()->commitTransaction();
-		}
-		
-		// reset cache
-		DashboardHandler::clearCache();
-	}
-}
diff --git a/wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxEditor.class.php b/wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxEditor.class.php
deleted file mode 100644
index 4aa52d139e..0000000000
--- a/wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxEditor.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-namespace wcf\data\dashboard\box;
-use wcf\data\DatabaseObjectEditor;
-
-/**
- * Provides functions to edit dashboard boxes.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	data.dashboard.box
- * @category	Community Framework
- */
-class DashboardBoxEditor extends DatabaseObjectEditor {
-	/**
-	 * @see	\wcf\data\DatabaseObjectDecorator::$baseClass
-	 */
-	protected static $baseClass = 'wcf\data\dashboard\box\DashboardBox';
-}
diff --git a/wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxList.class.php b/wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxList.class.php
deleted file mode 100644
index 1960e040ad..0000000000
--- a/wcfsetup/install/files/lib/data/dashboard/box/DashboardBoxList.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace wcf\data\dashboard\box;
-use wcf\data\DatabaseObjectList;
-
-/**
- * Represents a list of dashboard boxes.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	data.dashboard.box
- * @category	Community Framework
- */
-class DashboardBoxList extends DatabaseObjectList { }
diff --git a/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php b/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php
index f5fa8446e3..0ee986751d 100644
--- a/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php
+++ b/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php
@@ -10,7 +10,6 @@ use wcf\system\event\EventHandler;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\request\LinkHandler;
-use wcf\system\user\collapsible\content\UserCollapsibleContentHandler;
 use wcf\system\WCF;
 
 /**
@@ -134,9 +133,7 @@ abstract class AbstractModerationForm extends AbstractForm {
 			'commentCanAdd' => true,
 			'commentList' => $this->commentList,
 			'commentObjectTypeID' => $this->commentObjectTypeID,
-			'lastCommentTime' => ($this->commentList ? $this->commentList->getMinCommentTime() : 0),
-			'sidebarCollapsed' => UserCollapsibleContentHandler::getInstance()->isCollapsed('com.woltlab.wcf.collapsibleSidebar', 'com.woltlab.wcf.ModerationForm'),
-			'sidebarName' => 'com.woltlab.wcf.ModerationForm'
+			'lastCommentTime' => ($this->commentList ? $this->commentList->getMinCommentTime() : 0)
 		]);
 	}
 	
diff --git a/wcfsetup/install/files/lib/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/form/UserSearchForm.class.php
index 070dc757c3..63b96114c9 100644
--- a/wcfsetup/install/files/lib/form/UserSearchForm.class.php
+++ b/wcfsetup/install/files/lib/form/UserSearchForm.class.php
@@ -3,11 +3,9 @@ namespace wcf\form;
 use wcf\acp\form\UserOptionListForm;
 use wcf\data\search\SearchEditor;
 use wcf\system\breadcrumb\Breadcrumb;
-use wcf\system\dashboard\DashboardHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\UserInputException;
 use wcf\system\request\LinkHandler;
-use wcf\system\user\collapsible\content\UserCollapsibleContentHandler;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
 use wcf\util\StringUtil;
@@ -106,13 +104,9 @@ class UserSearchForm extends UserOptionListForm {
 	public function assignVariables() {
 		parent::assignVariables();
 		
-		DashboardHandler::getInstance()->loadBoxes('com.woltlab.wcf.user.MembersListPage', $this);
-		
 		WCF::getTPL()->assign([
 			'username' => $this->username,
-			'optionTree' => $this->optionTree,
-			'sidebarCollapsed' => UserCollapsibleContentHandler::getInstance()->isCollapsed('com.woltlab.wcf.collapsibleSidebar', 'com.woltlab.wcf.user.MembersListPage'),
-			'sidebarName' => 'com.woltlab.wcf.user.MembersListPage'
+			'optionTree' => $this->optionTree
 		]);
 	}
 	
diff --git a/wcfsetup/install/files/lib/page/DashboardPage.class.php b/wcfsetup/install/files/lib/page/DashboardPage.class.php
deleted file mode 100644
index ec4172f8b3..0000000000
--- a/wcfsetup/install/files/lib/page/DashboardPage.class.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-namespace wcf\page;
-use wcf\system\dashboard\DashboardHandler;
-use wcf\system\user\collapsible\content\UserCollapsibleContentHandler;
-use wcf\system\WCF;
-
-/**
- * Shows the dashboard page.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	page
- * @category	Community Framework
- */
-class DashboardPage extends AbstractPage {
-	/**
-	 * @see	\wcf\page\AbstractPage::$neededModules
-	 */
-	public $neededModules = array('MODULE_DASHBOARD_PAGE');
-	
-	/**
-	 * @see	\wcf\page\AbstractPage::$enableTracking
-	 */
-	public $enableTracking = true;
-	
-	/**
-	 * @see	\wcf\page\AbstractPage::assignVariables()
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
-		
-		DashboardHandler::getInstance()->loadBoxes('com.woltlab.wcf.user.DashboardPage', $this);
-		
-		WCF::getTPL()->assign(array(
-			'sidebarCollapsed' => UserCollapsibleContentHandler::getInstance()->isCollapsed('com.woltlab.wcf.collapsibleSidebar', 'com.woltlab.wcf.user.DashboardPage'),
-			'sidebarName' => 'com.woltlab.wcf.user.DashboardPage',
-			'allowSpidersToIndexThisPage' => true
-		));
-	}
-}
diff --git a/wcfsetup/install/files/lib/page/MembersListPage.class.php b/wcfsetup/install/files/lib/page/MembersListPage.class.php
index d20585fedc..c283e4c307 100644
--- a/wcfsetup/install/files/lib/page/MembersListPage.class.php
+++ b/wcfsetup/install/files/lib/page/MembersListPage.class.php
@@ -1,11 +1,9 @@
 <?php
 namespace wcf\page;
 use wcf\data\search\Search;
-use wcf\system\dashboard\DashboardHandler;
 use wcf\system\database\PostgreSQLDatabase;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\request\LinkHandler;
-use wcf\system\user\collapsible\content\UserCollapsibleContentHandler;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
 
@@ -145,14 +143,10 @@ class MembersListPage extends SortablePage {
 	public function assignVariables() {
 		parent::assignVariables();
 		
-		DashboardHandler::getInstance()->loadBoxes('com.woltlab.wcf.user.MembersListPage', $this);
-		
 		WCF::getTPL()->assign(array(
 			'letters' => str_split(self::$availableLetters),
 			'letter' => $this->letter,
 			'searchID' => $this->searchID,
-			'sidebarCollapsed' => UserCollapsibleContentHandler::getInstance()->isCollapsed('com.woltlab.wcf.collapsibleSidebar', 'com.woltlab.wcf.user.MembersListPage'),
-			'sidebarName' => 'com.woltlab.wcf.user.MembersListPage',
 			'allowSpidersToIndexThisPage' => true
 		));
 		
diff --git a/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php b/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
index 660b6b4710..e43f301be1 100644
--- a/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
+++ b/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
@@ -1,9 +1,7 @@
 <?php
 namespace wcf\page;
 use wcf\data\user\activity\event\ViewableUserActivityEventList;
-use wcf\system\user\collapsible\content\UserCollapsibleContentHandler;
 use wcf\system\breadcrumb\Breadcrumb;
-use wcf\system\dashboard\DashboardHandler;
 use wcf\system\request\LinkHandler;
 use wcf\system\user\activity\event\UserActivityEventHandler;
 use wcf\system\WCF;
@@ -49,13 +47,9 @@ class RecentActivityListPage extends AbstractPage {
 		// removes orphaned and non-accessable events
 		UserActivityEventHandler::validateEvents($this->eventList);
 		
-		DashboardHandler::getInstance()->loadBoxes('com.woltlab.wcf.user.MembersListPage', $this);
-		
 		WCF::getTPL()->assign(array(
 			'eventList' => $this->eventList,
 			'lastEventTime' => $lastEventTime,
-			'sidebarCollapsed' => UserCollapsibleContentHandler::getInstance()->isCollapsed('com.woltlab.wcf.collapsibleSidebar', 'com.woltlab.wcf.user.MembersListPage'),
-			'sidebarName' => 'com.woltlab.wcf.user.MembersListPage',
 			'allowSpidersToIndexThisPage' => true
 		));
 	}
diff --git a/wcfsetup/install/files/lib/page/TeamPage.class.php b/wcfsetup/install/files/lib/page/TeamPage.class.php
index 6c9d295927..84d357f37d 100644
--- a/wcfsetup/install/files/lib/page/TeamPage.class.php
+++ b/wcfsetup/install/files/lib/page/TeamPage.class.php
@@ -1,9 +1,7 @@
 <?php
 namespace wcf\page;
 use wcf\system\breadcrumb\Breadcrumb;
-use wcf\system\dashboard\DashboardHandler;
 use wcf\system\request\LinkHandler;
-use wcf\system\user\collapsible\content\UserCollapsibleContentHandler;
 use wcf\system\WCF;
 
 /**
@@ -68,11 +66,7 @@ class TeamPage extends MultipleLinkPage {
 	public function assignVariables() {
 		parent::assignVariables();
 		
-		DashboardHandler::getInstance()->loadBoxes('com.woltlab.wcf.user.MembersListPage', $this);
-		
 		WCF::getTPL()->assign(array(
-			'sidebarCollapsed' => UserCollapsibleContentHandler::getInstance()->isCollapsed('com.woltlab.wcf.collapsibleSidebar', 'com.woltlab.wcf.user.MembersListPage'),
-			'sidebarName' => 'com.woltlab.wcf.user.MembersListPage',
 			'allowSpidersToIndexThisPage' => true
 		));
 	}
diff --git a/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php b/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php
index 1e05f4b201..528ed7e7e4 100644
--- a/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php
+++ b/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php
@@ -4,10 +4,8 @@ use wcf\data\page\PageCache;
 use wcf\data\user\online\UserOnline;
 use wcf\data\user\online\UsersOnlineList;
 use wcf\system\breadcrumb\Breadcrumb;
-use wcf\system\dashboard\DashboardHandler;
 use wcf\system\page\handler\IOnlineLocationPageHandler;
 use wcf\system\request\LinkHandler;
-use wcf\system\user\collapsible\content\UserCollapsibleContentHandler;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
 
@@ -130,11 +128,7 @@ class UsersOnlineListPage extends SortablePage {
 	public function assignVariables() {
 		parent::assignVariables();
 		
-		DashboardHandler::getInstance()->loadBoxes('com.woltlab.wcf.user.MembersListPage', $this);
-		
 		WCF::getTPL()->assign([
-			'sidebarCollapsed' => UserCollapsibleContentHandler::getInstance()->isCollapsed('com.woltlab.wcf.collapsibleSidebar', 'com.woltlab.wcf.user.MembersListPage'),
-			'sidebarName' => 'com.woltlab.wcf.user.MembersListPage',
 			'allowSpidersToIndexThisPage' => true
 		]);
 	}
diff --git a/wcfsetup/install/files/lib/system/cache/builder/DashboardBoxCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/DashboardBoxCacheBuilder.class.php
deleted file mode 100644
index d3c775af4a..0000000000
--- a/wcfsetup/install/files/lib/system/cache/builder/DashboardBoxCacheBuilder.class.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-namespace wcf\system\cache\builder;
-use wcf\data\dashboard\box\DashboardBoxList;
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\WCF;
-
-/**
- * Caches user dashboard boxes.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	system.cache.builder
- * @category	Community Framework
- */
-class DashboardBoxCacheBuilder extends AbstractCacheBuilder {
-	/**
-	 * @see	\wcf\system\cache\builder\AbstractCacheBuilder::rebuild()
-	 */
-	protected function rebuild(array $parameters) {
-		$data = array(
-			'boxes' => array(),
-			'pages' => array()
-		);
-		
-		// load boxes
-		$boxList = new DashboardBoxList();
-		$boxList->readObjects();
-		
-		foreach ($boxList as $box) {
-			$data['boxes'][$box->boxID] = $box;
-		}
-		
-		// load settings
-		$objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.user.dashboardContainer');
-		$objectTypeIDs = array();
-		foreach ($objectTypes as $objectType) {
-			$objectTypeIDs[] = $objectType->objectTypeID;
-		}
-		
-		$conditions = new PreparedStatementConditionBuilder();
-		$conditions->add("objectTypeID IN (?)", array($objectTypeIDs));
-		
-		$sql = "SELECT		*
-			FROM		wcf".WCF_N."_dashboard_option
-			".$conditions."
-			ORDER BY	showOrder ASC";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute($conditions->getParameters());
-		while ($row = $statement->fetchArray()) {
-			if (!isset($data['pages'][$row['objectTypeID']])) {
-				$data['pages'][$row['objectTypeID']] = array();
-			}
-			
-			$data['pages'][$row['objectTypeID']][] = $row['boxID'];
-		}
-		
-		return $data;
-	}
-}
diff --git a/wcfsetup/install/files/lib/system/dashboard/DashboardHandler.class.php b/wcfsetup/install/files/lib/system/dashboard/DashboardHandler.class.php
deleted file mode 100644
index 55f45330a7..0000000000
--- a/wcfsetup/install/files/lib/system/dashboard/DashboardHandler.class.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-namespace wcf\system\dashboard;
-use wcf\data\dashboard\box\DashboardBox;
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\page\IPage;
-use wcf\system\cache\builder\DashboardBoxCacheBuilder;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\exception\SystemException;
-use wcf\system\SingletonFactory;
-use wcf\system\WCF;
-
-/**
- * Handles dashboard boxes.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	system.dashboard
- * @category	Community Framework
- */
-class DashboardHandler extends SingletonFactory {
-	/**
-	 * list of cached dashboard boxes
-	 * @var	DashboardBox[]
-	 */
-	protected $boxCache = null;
-	
-	/**
-	 * configuration options for pages
-	 * @var	integer[][]
-	 */
-	protected $pageCache = null;
-	
-	/**
-	 * @see	\wcf\system\SingletonFactory::init()
-	 */
-	protected function init() {
-		$this->boxCache = DashboardBoxCacheBuilder::getInstance()->getData(array(), 'boxes');
-		$this->pageCache = DashboardBoxCacheBuilder::getInstance()->getData(array(), 'pages');
-	}
-	
-	/**
-	 * Loads the active dashboard boxes for the given object type and page.
-	 * 
-	 * @param	string		$objectType
-	 * @param	IPage		$page
-	 * @throws	SystemException
-	 */
-	public function loadBoxes($objectType, IPage $page) {
-		$objectTypeObj = ObjectTypeCache::getInstance()->getObjectTypeByName('com.woltlab.wcf.user.dashboardContainer', $objectType);
-		if ($objectTypeObj === null) {
-			throw new SystemException("Unable to find object type '".$objectType."' for definition 'com.woltlab.wcf.user.dashboardContainer'");
-		}
-		
-		$boxIDs = array();
-		if (isset($this->pageCache[$objectTypeObj->objectTypeID]) && is_array($this->pageCache[$objectTypeObj->objectTypeID])) {
-			foreach ($this->pageCache[$objectTypeObj->objectTypeID] as $boxID) {
-				$boxIDs[] = $boxID;
-			}
-		}
-		
-		// 1. initialize all boxes first
-		$boxObjects = array(
-			'content' => array(),
-			'sidebar' => array()
-		);
-		foreach ($boxIDs as $boxID) {
-			$className = $this->boxCache[$boxID]->className;
-			if (!is_subclass_of($className, 'wcf\system\dashboard\box\IDashboardBox')) {
-				throw new SystemException("'".$className."' does not implement 'wcf\system\dashboard\box\IDashboardBox'");
-			}
-			
-			$boxObject = new $className();
-			$boxObject->init($this->boxCache[$boxID], $page);
-			
-			$boxObjects[$this->boxCache[$boxID]->boxType][] = $boxObject;
-		}
-		
-		// 2. fetch all templates
-		$contentTemplate = $sidebarTemplate = '';
-		foreach ($boxObjects['content'] as $box) {
-			$contentTemplate .= $box->getTemplate();
-		}
-		foreach ($boxObjects['sidebar'] as $box) {
-			$sidebarTemplate .= $box->getTemplate();
-		}
-		
-		WCF::getTPL()->assign(array(
-			'__boxContent' => $contentTemplate,
-			'__boxSidebar' => $sidebarTemplate
-		));
-	}
-	
-	/**
-	 * Sets default values upon installation, you should not call this method
-	 * under any other circumstances. If you do not specify a list of box names,
-	 * all boxes will be assigned as disabled for given object type.
-	 * 
-	 * @param	string		$objectType
-	 * @param	string[]	$enableBoxNames
-	 * @throws	SystemException
-	 */
-	public static function setDefaultValues($objectType, array $enableBoxNames = array()) {
-		$objectTypeID = 0;
-		
-		// no boxes given, aborting
-		if (empty($enableBoxNames)) {
-			return;
-		}
-		
-		// get object type id (cache might be outdated)
-		if (PACKAGE_ID && PACKAGE_ID != 1) {
-			// reset object type cache
-			ObjectTypeCache::getInstance()->resetCache();
-			
-			// get object type
-			$objectTypeObj = ObjectTypeCache::getInstance()->getObjectTypeByName('com.woltlab.wcf.user.dashboardContainer', $objectType);
-			if ($objectTypeObj === null) {
-				throw new SystemException("Object type '".$objectType."' is not valid for definition 'com.woltlab.wcf.user.dashboardContainer'");
-			}
-			
-			$objectTypeID = $objectTypeObj->objectTypeID;
-			
-			// select available box ids
-			$conditions = new PreparedStatementConditionBuilder();
-			$conditions->add("boxName IN (?)", array(array_keys($enableBoxNames)));
-			
-			$sql = "SELECT	boxID, boxName, boxType
-				FROM	wcf".WCF_N."_dashboard_box
-				".$conditions;
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute($conditions->getParameters());
-		}
-		else {
-			// work-around during WCFSetup
-			$conditions = new PreparedStatementConditionBuilder();
-			$conditions->add("object_type.objectType = ?", array($objectType));
-			$conditions->add("object_type_definition.definitionName = ?", array('com.woltlab.wcf.user.dashboardContainer'));
-			
-			$sql = "SELECT		object_type.objectTypeID
-				FROM		wcf".WCF_N."_object_type object_type
-				LEFT JOIN	wcf".WCF_N."_object_type_definition object_type_definition
-				ON		(object_type_definition.definitionID = object_type.definitionID)
-				".$conditions;
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute($conditions->getParameters());
-			$row = $statement->fetchArray();
-			if ($row) {
-				$objectTypeID = $row['objectTypeID'];
-			}
-			
-			if (!$objectTypeID) {
-				throw new SystemException("Object type '".$objectType."' is not valid for definition 'com.woltlab.wcf.user.dashboardContainer'");
-			}
-			
-			// select available box ids
-			$conditions = new PreparedStatementConditionBuilder();
-			$conditions->add("boxName IN (?)", array(array_keys($enableBoxNames)));
-			
-			$sql = "SELECT	boxID, boxName, boxType
-				FROM	wcf".WCF_N."_dashboard_box
-				".$conditions;
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute($conditions->getParameters());
-		}
-		
-		$boxes = array();
-		while ($row = $statement->fetchArray()) {
-			$boxes[$row['boxID']] = new DashboardBox(null, $row);
-		}
-		
-		if (!empty($boxes)) {
-			$sql = "UPDATE		wcf".WCF_N."_dashboard_option
-				SET		showOrder = showOrder + 1
-				WHERE		objectTypeID = ?
-						AND boxID IN (SELECT boxID FROM wcf".WCF_N."_dashboard_box WHERE boxType = ?)
-						AND showOrder >= ?";
-			$updateStatement = WCF::getDB()->prepareStatement($sql);
-			$sql = "INSERT INTO	wcf".WCF_N."_dashboard_option
-						(objectTypeID, boxID, showOrder)
-				VALUES		(?, ?, ?)";
-			$insertStatement = WCF::getDB()->prepareStatement($sql);
-			
-			WCF::getDB()->beginTransaction();
-			foreach ($boxes as $boxID => $box) {
-				// move other boxes
-				$updateStatement->execute(array(
-					$objectTypeID,
-					$box->boxType,
-					$enableBoxNames[$box->boxName]
-				));
-				
-				// insert associations
-				$insertStatement->execute(array(
-					$objectTypeID,
-					$boxID,
-					$enableBoxNames[$box->boxName]
-				));
-			}
-			WCF::getDB()->commitTransaction();
-		}
-	}
-	
-	/**
-	 * Clears dashboard box cache.
-	 */
-	public static function clearCache() {
-		DashboardBoxCacheBuilder::getInstance()->reset();
-	}
-}
diff --git a/wcfsetup/install/files/lib/system/dashboard/box/AbstractContentDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/AbstractContentDashboardBox.class.php
deleted file mode 100644
index ce3171b97e..0000000000
--- a/wcfsetup/install/files/lib/system/dashboard/box/AbstractContentDashboardBox.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-namespace wcf\system\dashboard\box;
-use wcf\data\dashboard\box\DashboardBox;
-use wcf\page\IPage;
-use wcf\system\event\EventHandler;
-use wcf\system\WCF;
-
-/**
- * Default implementation for dashboard boxes displayed within content container.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	system.dashboard.box
- * @category	Community Framework
- */
-abstract class AbstractContentDashboardBox implements IDashboardBox {
-	/**
-	 * dashboard box object
-	 * @var	\wcf\data\dashboard\box\DashboardBox
-	 */
-	public $box = null;
-	
-	/**
-	 * IPage object
-	 * @var	\wcf\page\IPage
-	 */
-	public $page = null;
-	
-	/**
-	 * template name
-	 * @var	string
-	 */
-	public $templateName = 'dashboardBoxContent';
-	
-	/**
-	 * @see	\wcf\system\dashboard\box\IDashboardBox::init()
-	 */
-	public function init(DashboardBox $box, IPage $page) {
-		$this->box = $box;
-		$this->page = $page;
-		
-		// fire event
-		EventHandler::getInstance()->fireAction($this, 'init');
-	}
-	
-	/**
-	 * @see	\wcf\system\dashboard\box\IDashboardBox::getTemplate()
-	 */
-	public function getTemplate() {
-		$template = $this->render();
-		if (empty($template)) {
-			return '';
-		}
-		
-		WCF::getTPL()->assign(array(
-			'box' => $this->box,
-			'template' => $template
-		));
-		
-		return WCF::getTPL()->fetch($this->templateName);
-	}
-	
-	/**
-	 * Calls the 'fetched' event after the successful call of the init method.
-	 * This functions won't called automatically. You must do this manually, if you inherit AbstractContentDashboardBox.
-	 */
-	protected function fetched() {
-		// fire event
-		EventHandler::getInstance()->fireAction($this, 'fetched');
-	}
-	
-	/**
-	 * Renders box view.
-	 * 
-	 * @return	string
-	 */
-	abstract protected function render();
-}
diff --git a/wcfsetup/install/files/lib/system/dashboard/box/AbstractSidebarDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/AbstractSidebarDashboardBox.class.php
deleted file mode 100644
index 574676e280..0000000000
--- a/wcfsetup/install/files/lib/system/dashboard/box/AbstractSidebarDashboardBox.class.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-namespace wcf\system\dashboard\box;
-use wcf\system\WCF;
-
-/**
- * Default implementation for dashboard boxes displayed within the sidebar container.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	system.dashboard.box
- * @category	Community Framework
- */
-abstract class AbstractSidebarDashboardBox extends AbstractContentDashboardBox {
-	/**
-	 * @see	\wcf\system\dashboard\box\AbstractDashboardBoxContent::$templateName
-	 */
-	public $templateName = 'dashboardBoxSidebar';
-	
-	/**
-	 * title link
-	 * @var	string
-	 */
-	public $titleLink = '';
-	
-	/**
-	 * @see	\wcf\system\dashboard\box\IDashboardBox::getTemplate()
-	 */
-	public function getTemplate() {
-		$template = $this->render();
-		if (empty($template)) {
-			return '';
-		}
-		
-		WCF::getTPL()->assign(array(
-			'box' => $this->box,
-			'template' => $template,
-			'titleLink' => $this->titleLink
-		));
-		
-		return WCF::getTPL()->fetch($this->templateName);
-	}
-}
diff --git a/wcfsetup/install/files/lib/system/dashboard/box/IDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/IDashboardBox.class.php
deleted file mode 100644
index db8488743e..0000000000
--- a/wcfsetup/install/files/lib/system/dashboard/box/IDashboardBox.class.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-namespace wcf\system\dashboard\box;
-use wcf\data\dashboard\box\DashboardBox;
-use wcf\page\IPage;
-
-/**
- * Default interface for dashboard boxes.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	system.dashboard.box
- * @category	Community Framework
- */
-interface IDashboardBox {
-	/**
-	 * Initializes this box.
-	 * 
-	 * @param	\wcf\data\dashboard\box\DashboardBox	$box
-	 * @param	\wcf\page\IPage				$page
-	 */
-	public function init(DashboardBox $box, IPage $page);
-	
-	/**
-	 * Returns parsed box template.
-	 * 
-	 * @return	string
-	 */
-	public function getTemplate();
-}
diff --git a/wcfsetup/install/files/lib/system/package/plugin/DashboardBoxPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/DashboardBoxPackageInstallationPlugin.class.php
deleted file mode 100644
index 37959ffa15..0000000000
--- a/wcfsetup/install/files/lib/system/package/plugin/DashboardBoxPackageInstallationPlugin.class.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-namespace wcf\system\package\plugin;
-use wcf\system\cache\builder\DashboardBoxCacheBuilder;
-use wcf\system\WCF;
-
-/**
- * Installs, updates and deletes dashboard boxes.
- * 
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	system.package.plugin
- * @category	Community Framework
- */
-class DashboardBoxPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin {
-	/**
-	 * @see	\wcf\system\package\plugin\AbstractXMLPackageInstallationPlugin::$className
-	 */
-	public $className = 'wcf\data\dashboard\box\DashboardBoxEditor';
-	
-	/**
-	 * @see	\wcf\system\package\plugin\AbstractPackageInstallationPlugin::$tableName
-	 */
-	public $tableName = 'dashboard_box';
-	
-	/**
-	 * @see	\wcf\system\package\plugin\AbstractXMLPackageInstallationPlugin::$tagName
-	 */
-	public $tagName = 'dashboardbox';
-	
-	/**
-	 * @see	\wcf\system\package\plugin\AbstractXMLPackageInstallationPlugin::handleDelete()
-	 */
-	protected function handleDelete(array $items) {
-		$sql = "DELETE FROM	wcf".WCF_N."_".$this->tableName."
-			WHERE		boxName = ?
-					AND packageID = ?";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		foreach ($items as $item) {
-			$statement->execute(array(
-				$item['attributes']['name'],
-				$this->installation->getPackageID()
-			));
-		}
-	}
-	
-	/**
-	 * @see	\wcf\system\package\plugin\AbstractXMLPackageInstallationPlugin::prepareImport()
-	 */
-	protected function prepareImport(array $data) {
-		return array(
-			'boxName' => $data['attributes']['name'],
-			'boxType' => ($data['elements']['boxtype'] == 'content') ? 'content' : 'sidebar',
-			'className' => $data['elements']['classname']
-		);
-	}
-	
-	/**
-	 * @see	\wcf\system\package\plugin\AbstractXMLPackageInstallationPlugin::findExistingItem()
-	 */
-	protected function findExistingItem(array $data) {
-		$sql = "SELECT	*
-			FROM	wcf".WCF_N."_".$this->tableName."
-			WHERE	boxName = ?
-				AND packageID = ?";
-		$parameters = array(
-			$data['boxName'],
-			$this->installation->getPackageID()
-		);
-		
-		return array(
-			'sql' => $sql,
-			'parameters' => $parameters
-		);
-	}
-	
-	/**
-	 * @see	\wcf\system\package\plugin\AbstractXMLPackageInstallationPlugin::cleanup()
-	 */
-	protected function cleanup() {
-		DashboardBoxCacheBuilder::getInstance()->reset();
-	}
-}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a90bb14427..d8432225d6 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -190,13 +190,7 @@
 		<item name="wcf.acp.cronjob.log.error.details"><![CDATA[Fehlermeldung]]></item>
 		<item name="wcf.acp.cronjob.log.noEntries"><![CDATA[Derzeit sind keine Einträge vorhanden.]]></item>
 	</category>
-	
-	<category name="wcf.acp.dashboard">
-		<item name="wcf.acp.dashboard.list"><![CDATA[Dashboard-Seiten konfigurieren]]></item>
-		<item name="wcf.acp.dashboard.option"><![CDATA[Dashboard-Boxen konfigurieren]]></item>
-		<item name="wcf.acp.dashboard.box.sort"><![CDATA[Sie können die Boxen durch Ziehen und Loslassen mit der Maus sortieren. Boxen können aktiviert bzw. deaktiviert werden, indem Sie die gewünschte Box in „Aktive Boxen“ bzw. „Deaktivierte Boxen“ verschieben.]]></item>
-	</category>
-	
+		
 	<category name="wcf.acp.dataImport">
 		<item name="wcf.acp.dataImport"><![CDATA[Datenimport]]></item>
 		<item name="wcf.acp.dataImport.cli.configure.data.alreadySelected"><![CDATA[Diese Daten werden bereits importiert.]]></item>
@@ -349,12 +343,10 @@
 		<item name="wcf.acp.group.option.user.message.canUseBBCodes"><![CDATA[Kann BBCodes benutzen]]></item>
 		<item name="wcf.acp.group.option.user.message.allowedBBCodes"><![CDATA[Erlaubte BBCodes]]></item>
 		<item name="wcf.acp.group.option.user.message.allowedBBCodes.description"><![CDATA[Die hier ausgewählten BBCodes dürfen von Mitgliedern dieser Benutzergruppe verwendet werden.]]></item>
-		<item name="wcf.acp.group.option.admin.content.dashboard.canEditDashboard"><![CDATA[Kann Dashboards konfigurieren]]></item>
 		<item name="wcf.acp.group.option.admin.user.rank.canManageRank"><![CDATA[Kann Benutzerränge verwalten]]></item>
 		<item name="wcf.acp.group.option.admin.user.canEditActivityPoints"><![CDATA[Kann Aktivitätspunkte bearbeiten]]></item>
 		<item name="wcf.acp.group.option.admin.user.canViewInvisible"><![CDATA[Kann unsichtbare Benutzer sehen]]></item>
 		<item name="wcf.acp.group.option.admin.user.canViewIpAddress"><![CDATA[Kann die IP-Adressen der Benutzer sehen]]></item>
-		<item name="wcf.acp.group.option.category.admin.content.dashboard"><![CDATA[Dashboard]]></item>
 		<item name="wcf.acp.group.option.category.user.profile"><![CDATA[Benutzerprofile]]></item>
 		<item name="wcf.acp.group.option.category.user.profile.avatar"><![CDATA[Avatare]]></item>
 		<item name="wcf.acp.group.option.category.admin.user.rank"><![CDATA[Benutzerränge]]></item>
@@ -617,8 +609,6 @@
 		<item name="wcf.acp.menu.link.smiley.list"><![CDATA[Smileys]]></item>
 		<item name="wcf.acp.menu.link.smiley.category.add"><![CDATA[Smiley-Kategorie hinzufügen]]></item>
 		<item name="wcf.acp.menu.link.smiley.category.list"><![CDATA[Smiley-Kategorien]]></item>
-		<item name="wcf.acp.menu.link.dashboard"><![CDATA[Dashboard]]></item>
-		<item name="wcf.acp.menu.link.dashboard.list"><![CDATA[Seiten konfigurieren]]></item>
 		<item name="wcf.acp.menu.link.activityPoint"><![CDATA[Aktivitätspunkte]]></item>
 		<item name="wcf.acp.menu.link.user.rank"><![CDATA[Benutzerränge]]></item>
 		<item name="wcf.acp.menu.link.user.rank.list"><![CDATA[Benutzerränge]]></item>
@@ -912,8 +902,6 @@
 		<item name="wcf.acp.option.module_user_rank"><![CDATA[Benutzerränge]]></item>
 		<item name="wcf.acp.option.module_user_signature"><![CDATA[Signaturen]]></item>
 		<item name="wcf.acp.option.module_team_page"><![CDATA[Team-Seite]]></item>
-		<item name="wcf.acp.option.module_dashboard_page"><![CDATA[Dashboard]]></item>
-		<item name="wcf.acp.option.module_dashboard_page.description"><![CDATA[Hinweis: Falls das Dashboard als Startseite definiert ist, muss bei Deaktivierung dieser Option zusätzlich eine neue Startseite in der <a href="{link controller='PageMenuItemList'}{/link}">Hauptmenüverwaltung</a> ausgewählt werden.]]></item>
 		<item name="wcf.acp.option.register_enable_password_security_check"><![CDATA[Sicherheitsüberprüfung aktivieren]]></item>
 		<item name="wcf.acp.option.register_enable_password_security_check.description"><![CDATA[Kennwörter werden auf ihre Sicherheit geprüft. Unsichere Kennwörter werden abgelehnt.]]></item>
 		<item name="wcf.acp.option.register_password_min_length"><![CDATA[Minimale Kennwortlänge]]></item>
@@ -2554,7 +2542,6 @@ Fehler sind beispielsweise:
 		<item name="wcf.page.com.woltlab.wcf.SettingsForm"><![CDATA[Einstellungen]]></item>
 		<item name="wcf.page.com.woltlab.wcf.SignatureEditForm"><![CDATA[Signatur-Verwaltung]]></item>
 		<item name="wcf.page.com.woltlab.wcf.UserSearchForm"><![CDATA[Mitgliedersuche]]></item>
-		<item name="wcf.page.com.woltlab.wcf.DashboardPage"><![CDATA[Dashboard]]></item>
 		<item name="wcf.page.com.woltlab.wcf.DeletedContentListPage"><![CDATA[Gelöschte Inhalte]]></item>
 		<item name="wcf.page.com.woltlab.wcf.FollowingPage"><![CDATA[Benutzer, denen Sie folgen]]></item>
 		<item name="wcf.page.com.woltlab.wcf.IgnoredUsersPage"><![CDATA[Blockierte Benutzer]]></item>
@@ -2572,7 +2559,6 @@ Fehler sind beispielsweise:
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.UsersOnlineList"><![CDATA[Benutzer-Online-Liste]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.MembersList"><![CDATA[Mitgliederliste]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Team"><![CDATA[Liste der Team-Mitglieder]]></item>
-		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Dashboard"><![CDATA[Dashboard]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Register"><![CDATA[Registrierung]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.LostPassword"><![CDATA[Kennwort vergessen]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Login"><![CDATA[Anmeldung]]></item>
@@ -2864,7 +2850,6 @@ Wenn Sie Probleme mit der Aktivierung haben, wenden Sie sich bitte an den Admini
 		<item name="wcf.user.birthday.age.to"><![CDATA[bis]]></item>
 		<item name="wcf.user.search"><![CDATA[Mitgliedersuche]]></item>
 		<item name="wcf.user.search.error.noMatches"><![CDATA[Zu den angegebenen Kriterien wurde kein Mitglied gefunden.]]></item>
-		<item name="wcf.user.dashboard"><![CDATA[Dashboard]]></item>
 		<item name="wcf.user.newestMember"><![CDATA[Neuestes Mitglied]]></item>
 		<item name="wcf.user.login.3rdParty"><![CDATA[Anmeldung über Drittanbieter]]></item>
 		<item name="wcf.user.search.results"><![CDATA[Suchergebnisse]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 62098d2dd6..b1f66c4d8c 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -190,12 +190,6 @@ Examples for medium ID detection:
 		<item name="wcf.acp.cronjob.log.noEntries"><![CDATA[There are no entries yet.]]></item>
 	</category>
 	
-	<category name="wcf.acp.dashboard">
-		<item name="wcf.acp.dashboard.list"><![CDATA[Configure Dashboard Pages]]></item>
-		<item name="wcf.acp.dashboard.option"><![CDATA[Configure Dashboard Boxes]]></item>
-		<item name="wcf.acp.dashboard.box.sort"><![CDATA[Sort boxes to determine show order. You can enable or disable boxes by moving them between the boxes “Active Boxes” and “Disabled Boxes”.]]></item>
-	</category>
-	
 	<category name="wcf.acp.dataImport">
 		<item name="wcf.acp.dataImport"><![CDATA[Data Import]]></item>
 		<item name="wcf.acp.dataImport.cli.configure.data.alreadySelected"><![CDATA[This data will already be imported.]]></item>
@@ -349,12 +343,10 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.option.user.message.canUseBBCodes"><![CDATA[Can use BBCodes]]></item>
 		<item name="wcf.acp.group.option.user.message.allowedBBCodes"><![CDATA[Allowed BBCodes]]></item>
 		<item name="wcf.acp.group.option.user.message.allowedBBCodes.description"><![CDATA[Selected BBCodes may be used by members of this group.]]></item>
-		<item name="wcf.acp.group.option.admin.content.dashboard.canEditDashboard"><![CDATA[Can manage dashboard boxes]]></item>
 		<item name="wcf.acp.group.option.admin.user.rank.canManageRank"><![CDATA[Can manage user ranks]]></item>
 		<item name="wcf.acp.group.option.admin.user.canEditActivityPoints"><![CDATA[Can manage activity points]]></item>
 		<item name="wcf.acp.group.option.admin.user.canViewInvisible"><![CDATA[Can see invisible users]]></item>
 		<item name="wcf.acp.group.option.admin.user.canViewIpAddress"><![CDATA[Can see IP addresses]]></item>
-		<item name="wcf.acp.group.option.category.admin.content.dashboard"><![CDATA[Dashboard]]></item>
 		<item name="wcf.acp.group.option.category.user.profile"><![CDATA[User Profiles]]></item>
 		<item name="wcf.acp.group.option.category.user.profile.avatar"><![CDATA[Avatars]]></item>
 		<item name="wcf.acp.group.option.category.admin.user.rank"><![CDATA[User Ranks]]></item>
@@ -615,8 +607,6 @@ Examples for medium ID detection:
 		<item name="wcf.acp.menu.link.smiley.list"><![CDATA[Smilies]]></item>
 		<item name="wcf.acp.menu.link.smiley.category.add"><![CDATA[Add Smiley Category]]></item>
 		<item name="wcf.acp.menu.link.smiley.category.list"><![CDATA[Smiley Categories]]></item>
-		<item name="wcf.acp.menu.link.dashboard"><![CDATA[Dashboard]]></item>
-		<item name="wcf.acp.menu.link.dashboard.list"><![CDATA[Configure Dashboard Pages]]></item>
 		<item name="wcf.acp.menu.link.activityPoint"><![CDATA[Activity Points]]></item>
 		<item name="wcf.acp.menu.link.user.rank"><![CDATA[User Ranks]]></item>
 		<item name="wcf.acp.menu.link.user.rank.list"><![CDATA[User Ranks]]></item>
@@ -910,8 +900,6 @@ Examples for medium ID detection:
 		<item name="wcf.acp.option.module_user_rank"><![CDATA[User ranks]]></item>
 		<item name="wcf.acp.option.module_user_signature"><![CDATA[Signatures]]></item>
 		<item name="wcf.acp.option.module_team_page"><![CDATA[Staff list]]></item>
-		<item name="wcf.acp.option.module_dashboard_page"><![CDATA[Dashboard]]></item>
-		<item name="wcf.acp.option.module_dashboard_page.description"><![CDATA[Notice: In case the Dashboard is currently defined as landing page, you must set a different landing page through the <a href="{link controller='PageMenuItemList'}{/link}">Page Menu</a> management afterwards.]]></item>
 		<item name="wcf.acp.option.register_enable_password_security_check"><![CDATA[Enable password validation]]></item>
 		<item name="wcf.acp.option.register_enable_password_security_check.description"><![CDATA[Password complexity will be validated, unsafe passwords will be rejected.]]></item>
 		<item name="wcf.acp.option.register_password_min_length"><![CDATA[Minimum Password Length]]></item>
@@ -2583,7 +2571,6 @@ Errors are:
 		<item name="wcf.page.com.woltlab.wcf.SettingsForm"><![CDATA[Settings]]></item>
 		<item name="wcf.page.com.woltlab.wcf.SignatureEditForm"><![CDATA[Signature Management]]></item>
 		<item name="wcf.page.com.woltlab.wcf.UserSearchForm"><![CDATA[Members Search]]></item>
-		<item name="wcf.page.com.woltlab.wcf.DashboardPage"><![CDATA[Dashboard]]></item>
 		<item name="wcf.page.com.woltlab.wcf.DeletedContentListPage"><![CDATA[Deleted Content]]></item>
 		<item name="wcf.page.com.woltlab.wcf.FollowingPage"><![CDATA[Followed Users]]></item>
 		<item name="wcf.page.com.woltlab.wcf.IgnoredUsersPage"><![CDATA[Blocked Users]]></item>
@@ -2601,7 +2588,6 @@ Errors are:
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.UsersOnlineList"><![CDATA[List of Users Online]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.MembersList"><![CDATA[Members List]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Team"><![CDATA[List of Staff Members]]></item>
-		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Dashboard"><![CDATA[Dashboard]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Register"><![CDATA[Registration]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.LostPassword"><![CDATA[Lost Password]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Login"><![CDATA[Login]]></item>
@@ -2890,7 +2876,6 @@ If you cannot activate your email address or have any troubles following the ins
 		<item name="wcf.user.birthday.age.to"><![CDATA[to]]></item>
 		<item name="wcf.user.search"><![CDATA[Search Members]]></item>
 		<item name="wcf.user.search.error.noMatches"><![CDATA[Your criteria did not match any member.]]></item>
-		<item name="wcf.user.dashboard"><![CDATA[Dashboard]]></item>
 		<item name="wcf.user.newestMember"><![CDATA[Newest Member]]></item>
 		<item name="wcf.user.login.3rdParty"><![CDATA[Third-Party Login]]></item>
 		<item name="wcf.user.search.results"><![CDATA[Search Results]]></item>
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 5ed7d56aff..bbf82f9bfe 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -395,23 +395,6 @@ CREATE TABLE wcf1_cronjob_log (
 	error TEXT
 );
 
-DROP TABLE IF EXISTS wcf1_dashboard_box;
-CREATE TABLE wcf1_dashboard_box (
-	boxID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-	packageID INT(10) NOT NULL,
-	boxName VARCHAR(255) NOT NULL DEFAULT '',
-	boxType VARCHAR(30) NOT NULL DEFAULT 'sidebar', -- can be 'content' or 'sidebar'
-	className VARCHAR(255) NOT NULL DEFAULT ''
-);
-
-DROP TABLE IF EXISTS wcf1_dashboard_option;
-CREATE TABLE wcf1_dashboard_option (
-	objectTypeID INT(10) NOT NULL,
-	boxID INT(10) NOT NULL,
-	showOrder INT(10) NOT NULL,
-	UNIQUE KEY dashboardOption (objectTypeID, boxID)
-);
-
 DROP TABLE IF EXISTS wcf1_edit_history_entry;
 CREATE TABLE wcf1_edit_history_entry (
 	entryID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -1815,11 +1798,6 @@ ALTER TABLE wcf1_user_to_group ADD FOREIGN KEY (groupID) REFERENCES wcf1_user_gr
 ALTER TABLE wcf1_user_to_language ADD FOREIGN KEY (userID) REFERENCES wcf1_user (userID) ON DELETE CASCADE;
 ALTER TABLE wcf1_user_to_language ADD FOREIGN KEY (languageID) REFERENCES wcf1_language (languageID) ON DELETE CASCADE;
 
-ALTER TABLE wcf1_dashboard_box ADD FOREIGN KEY (packageID) REFERENCES wcf1_package (packageID) ON DELETE CASCADE;
-
-ALTER TABLE wcf1_dashboard_option ADD FOREIGN KEY (objectTypeID) REFERENCES wcf1_object_type (objectTypeID) ON DELETE CASCADE;
-ALTER TABLE wcf1_dashboard_option ADD FOREIGN KEY (boxID) REFERENCES wcf1_dashboard_box (boxID) ON DELETE CASCADE;
-
 ALTER TABLE wcf1_import_mapping ADD FOREIGN KEY (objectTypeID) REFERENCES wcf1_object_type (objectTypeID) ON DELETE CASCADE;
 
 ALTER TABLE wcf1_tracked_visit ADD FOREIGN KEY (objectTypeID) REFERENCES wcf1_object_type (objectTypeID) ON DELETE CASCADE;
-- 
2.20.1