From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 22 Oct 2012 15:18:24 +0000 (+0200)
Subject: Restricting collapsible sidebar to right sidebars
X-Git-Tag: 2.0.0_Beta_1~845
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b835cd78a1e5d3eb60c84e0d60741c840da74893;p=GitHub%2FWoltLab%2FWCF.git

Restricting collapsible sidebar to right sidebars
---

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index b2c3b19e2e..f3f26309ee 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -6,5 +6,10 @@
 			<definitionname>com.woltlab.wcf.clipboardItem</definitionname>
 			<listclassname>wcf\data\user\UserList</listclassname>
 		</type>
+		
+		<type>
+			<name>com.woltlab.wcf.collapsibleSidebar</name>
+			<definitionname>com.woltlab.wcf.collapsibleContent</definitionname>
+		</type>
 	</import>
 </data>
\ No newline at end of file
diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index 2bf8862ba3..f206a4793f 100644
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -39,9 +39,19 @@
 <div id="main" class="layoutFluid{if $sidebarOrientation|isset && $sidebar|isset} sidebarOrientation{@$sidebarOrientation|ucfirst} clearfix{/if}">
 	<div>
 		{if $sidebar|isset}
-			<aside class="sidebar">
+			<aside class="sidebar"{if $sidebarOrientation|isset && $sidebarOrientation == 'right'} data-is-open="{if $sidebarCollapsed}0{else}1{/if}" data-sidebar-name="{$sidebarName}"{/if}>
 				{@$sidebar}
 			</aside>
+			
+			{if $sidebarOrientation|isset && $sidebarOrientation == 'right'}
+				<script type="text/javascript">
+					//<![CDATA[
+					$(function() {
+						new WCF.Collapsible.Sidebar();
+					});
+					//]]>
+				</script>
+			{/if}
 		{/if}
 				
 		<section id="content" class="content clearfix">
diff --git a/wcfsetup/install/files/lib/system/user/collapsible/content/UserCollapsibleContentHandler.class.php b/wcfsetup/install/files/lib/system/user/collapsible/content/UserCollapsibleContentHandler.class.php
index fa0e4de513..a6736aaabf 100644
--- a/wcfsetup/install/files/lib/system/user/collapsible/content/UserCollapsibleContentHandler.class.php
+++ b/wcfsetup/install/files/lib/system/user/collapsible/content/UserCollapsibleContentHandler.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\user\collapsible\content;
 use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\exception\SystemException;
 use wcf\system\user\storage\UserStorageHandler;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
@@ -44,6 +45,22 @@ class UserCollapsibleContentHandler extends SingletonFactory {
 		}
 	}
 	
+	/**
+	 * Returns true if given object is collapsed.
+	 * 
+	 * @param	string		$objectType
+	 * @param	string		$objectID
+	 * @return	boolean
+	 */
+	public function isCollapsed($objectType, $objectID) {
+		$objectTypeID = $this->getObjectTypeID($objectType);
+		if ($objectTypeID === null) {
+			throw new SystemException("Unknown object type '".$objectType."' for definition 'com.woltlab.wcf.collapsibleContent'");
+		}
+		
+		return in_array($objectID, $this->getCollapsedContent($objectTypeID));
+	}
+	
 	/**
 	 * Returns the object type id based upon specified object type name. Returns
 	 * null, if object type is unknown.
@@ -115,7 +132,7 @@ class UserCollapsibleContentHandler extends SingletonFactory {
 	 * Marks content as collapsed.
 	 * 
 	 * @param	integer		$objectTypeID
-	 * @param	integer		$objectID
+	 * @param	string		$objectID
 	 */
 	public function markAsCollapsed($objectTypeID, $objectID) {
 		if (WCF::getUser()->userID) {
@@ -166,7 +183,7 @@ class UserCollapsibleContentHandler extends SingletonFactory {
 	 * Marks content as opened, thus removing the collapsed marking.
 	 * 
 	 * @param	integer		$objectTypeID
-	 * @param	integer		$objectID
+	 * @param	string		$objectID
 	 */
 	public function markAsOpened($objectTypeID, $objectID) {
 		if (WCF::getUser()->userID) {