From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 8 Jul 2014 17:46:00 +0000 (+0200)
Subject: Add stat handler categories
X-Git-Tag: 2.1.0_Alpha_1~602^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5ee3e44830de5400084fb4d7a1a7eed82842f4a8;p=GitHub%2FWoltLab%2FWCF.git

Add stat handler categories
---

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 30c024b26d..be8a7221f0 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -339,26 +339,31 @@
 			<definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
 			<classname><![CDATA[wcf\system\stat\UserStatDailyHandler]]></classname>
 			<default>1</default>
+			<categoryname>com.woltlab.wcf.general</categoryname>
 		</type>
 		<type>
 			<name>com.woltlab.wcf.attachment</name>
 			<definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
 			<classname><![CDATA[wcf\system\stat\AttachmentStatDailyHandler]]></classname>
+			<categoryname>com.woltlab.wcf.general</categoryname>
 		</type>
 		<type>
 			<name>com.woltlab.wcf.attachment.diskUsage</name>
 			<definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
 			<classname><![CDATA[wcf\system\stat\AttachmentDiskUsageStatDailyHandler]]></classname>
+			<categoryname>com.woltlab.wcf.general</categoryname>
 		</type>
 		<type>
 			<name>com.woltlab.wcf.like</name>
 			<definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
 			<classname><![CDATA[wcf\system\stat\LikeStatDailyHandler]]></classname>
+			<categoryname>com.woltlab.wcf.general</categoryname>
 		</type>
 		<type>
 			<name>com.woltlab.wcf.dislike</name>
 			<definitionname>com.woltlab.wcf.statDailyHandler</definitionname>
 			<classname><![CDATA[wcf\system\stat\DislikeStatDailyHandler]]></classname>
+			<categoryname>com.woltlab.wcf.general</categoryname>
 		</type>
 		<!-- /stat handlers -->
 		
diff --git a/wcfsetup/install/files/acp/templates/stat.tpl b/wcfsetup/install/files/acp/templates/stat.tpl
index f74ae45e52..71ba2ea6d9 100644
--- a/wcfsetup/install/files/acp/templates/stat.tpl
+++ b/wcfsetup/install/files/acp/templates/stat.tpl
@@ -15,7 +15,7 @@
 		new WCF.ACP.Stat.Chart();
 	});
 </script>
-	
+
 <header class="boxHeadline">
 	<h1>{lang}wcf.acp.stat{/lang}</h1>
 </header>
@@ -56,15 +56,21 @@
 				<label><input type="radio" name="value" value="total" /> {lang}wcf.acp.stat.value.total{/lang}</label>
 			</dd>
 		</dl>
+	</fieldset>
+	
+	<fieldset>
+		<legend>{lang}wcf.acp.stat.types{/lang}</legend>
 		
-		<dl>
-			<dt><label>{lang}wcf.acp.stat.types{/lang}</label></dt>
-			<dd>
-				{foreach from=$availableObjectTypes item=objectType}
-					<label><input type="checkbox" name="objectTypeID" value="{@$objectType->objectTypeID}" {if $objectType->default}checked="checked" {/if}/> {lang}wcf.acp.stat.{@$objectType->objectType}{/lang}</label>
-				{/foreach}
-			</dd>
-		</dl>
+		{foreach from=$availableObjectTypes key=categoryName item=objectTypes}
+			<dl>
+				<dt><label>{lang}wcf.acp.stat.category.{@$categoryName}{/lang}</label></dt>
+				<dd>
+					{foreach from=$objectTypes item=objectType}
+						<label><input type="checkbox" name="objectTypeID" value="{@$objectType->objectTypeID}" {if $objectType->default}checked="checked" {/if}/> {lang}wcf.acp.stat.{@$objectType->objectType}{/lang}</label>
+					{/foreach}
+				</dd>
+			</dl>
+		{/foreach}
 	</fieldset>
 </div>
 
diff --git a/wcfsetup/install/files/lib/acp/page/StatPage.class.php b/wcfsetup/install/files/lib/acp/page/StatPage.class.php
index 6c80448aaa..82ec3c4bdb 100644
--- a/wcfsetup/install/files/lib/acp/page/StatPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/StatPage.class.php
@@ -58,7 +58,14 @@ class StatPage extends AbstractPage {
 		$this->startDate = $d->format('Y-m-d');
 		
 		// get object types
-		$this->availableObjectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.statDailyHandler');
+		$objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.statDailyHandler');
+		foreach ($objectTypes as $objectType) {
+			if (!isset($this->availableObjectTypes[$objectType->categoryname])) {
+				$this->availableObjectTypes[$objectType->categoryname] = array();
+			}
+			
+			$this->availableObjectTypes[$objectType->categoryname][] = $objectType;
+		}
 	}
 	
 	/**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index c7e491c3dc..5295415872 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1234,6 +1234,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.stat.dateGrouping.weekly"><![CDATA[Woche]]></item>
 		<item name="wcf.acp.stat.dateGrouping.monthly"><![CDATA[Monat]]></item>
 		<item name="wcf.acp.stat.dateGrouping.yearly"><![CDATA[Jahr]]></item>
+		<item name="wcf.acp.stat.category.com.woltlab.wcf.general"><![CDATA[Allgemeine Daten]]></item>
 	</category>
 	
 	<category name="wcf.acp.updateServer">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 170636d033..1585a523bc 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1182,27 +1182,28 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 	</category>
 	
 	<category name="wcf.acp.stat">
-		<item name="wcf.acp.stat"><![CDATA[TODO: Statistiken]]></item>
-		<item name="wcf.acp.stat.settings"><![CDATA[TODO: Einstellungen]]></item>
-		<item name="wcf.acp.stat.period"><![CDATA[TODO: Zeitraum]]></item>
-		<item name="wcf.acp.stat.value"><![CDATA[TODO: Werte]]></item>
+		<item name="wcf.acp.stat"><![CDATA[Statistics]]></item>
+		<item name="wcf.acp.stat.settings"><![CDATA[Settings]]></item>
+		<item name="wcf.acp.stat.period"><![CDATA[Period]]></item>
+		<item name="wcf.acp.stat.value"><![CDATA[Values]]></item>
 		<item name="wcf.acp.stat.value.counter"><![CDATA[TODO: Veränderung]]></item>
 		<item name="wcf.acp.stat.value.total"><![CDATA[TODO: Gesamtanzahl]]></item>
-		<item name="wcf.acp.stat.types"><![CDATA[TODO: Daten]]></item>
+		<item name="wcf.acp.stat.types"><![CDATA[Data]]></item>
 		<item name="wcf.acp.stat.timeFormat.daily"><![CDATA[TODO: %d.%m.%y]]></item>
 		<item name="wcf.acp.stat.timeFormat.weekly"><![CDATA[TODO: %d.%m.%y]]></item>
 		<item name="wcf.acp.stat.timeFormat.monthly"><![CDATA[TODO: %b %Y]]></item>
 		<item name="wcf.acp.stat.timeFormat.yearly"><![CDATA[TODO: %Y]]></item>
-		<item name="wcf.acp.stat.com.woltlab.wcf.user"><![CDATA[TODO: Benutzer]]></item>
-		<item name="wcf.acp.stat.com.woltlab.wcf.attachment"><![CDATA[TODO: Dateianhänge]]></item>
+		<item name="wcf.acp.stat.com.woltlab.wcf.user"><![CDATA[Users]]></item>
+		<item name="wcf.acp.stat.com.woltlab.wcf.attachment"><![CDATA[Attachments]]></item>
 		<item name="wcf.acp.stat.com.woltlab.wcf.attachment.diskUsage"><![CDATA[TODO: Dateianhänge-Speicherbedarf (MB)]]></item>
 		<item name="wcf.acp.stat.com.woltlab.wcf.like"><![CDATA[Likes]]></item>
 		<item name="wcf.acp.stat.com.woltlab.wcf.dislike"><![CDATA[Dislikes]]></item>
-		<item name="wcf.acp.stat.dateGrouping"><![CDATA[TODO: Zeiteinheit]]></item>
-		<item name="wcf.acp.stat.dateGrouping.daily"><![CDATA[TODO: Tag]]></item>
-		<item name="wcf.acp.stat.dateGrouping.weekly"><![CDATA[TODO: Woche]]></item>
-		<item name="wcf.acp.stat.dateGrouping.monthly"><![CDATA[TODO: Monat]]></item>
-		<item name="wcf.acp.stat.dateGrouping.yearly"><![CDATA[TODO: Jahr]]></item>
+		<item name="wcf.acp.stat.dateGrouping"><![CDATA[Time Unit]]></item>
+		<item name="wcf.acp.stat.dateGrouping.daily"><![CDATA[Day]]></item>
+		<item name="wcf.acp.stat.dateGrouping.weekly"><![CDATA[Week]]></item>
+		<item name="wcf.acp.stat.dateGrouping.monthly"><![CDATA[Month]]></item>
+		<item name="wcf.acp.stat.dateGrouping.yearly"><![CDATA[Year]]></item>
+		<item name="wcf.acp.stat.category.com.woltlab.wcf.general"><![CDATA[General Data]]></item>
 	</category>
 	
 	<category name="wcf.acp.updateServer">