remember collapsed folders, simplyfied css and js

2 files changed, 25 insertions, 7 deletions

diff --git a/lib/folder.php b/lib/folder.php
index 6ed2103bb..93a37baa2 100644
--- a/lib/folder.php
+++ b/lib/folder.php
@@ -20,6 +20,7 @@ class Folder extends Collection {
 	private $name;
 	private $children;
 	private $parent;
+	private $opened;
 
 	public function __construct($name, $id = null, Collection $parent = null) {
 		$this->name = $name;
@@ -30,6 +31,9 @@ class Folder extends Collection {
 		if ($parent !== null) {
 			$this->parent = $parent;
 		}
+		if($this->opened === null){
+			$this->opened = true;
+		}
 	}
 
 	public function getName() {
@@ -40,6 +44,14 @@ class Folder extends Collection {
 		$this->name = $name;
 	}
 
+	public function getOpened() {
+		return $this->opened;
+	}
+
+	public function setOpened($opened) {
+		$this->opened = $opened;
+	}
+
 	public function getParentId() {
 		if ($this->parent === null) {
 			return 0;
@@ -59,4 +71,6 @@ class Folder extends Collection {
 		return $this->children;
 	}
 
+
+
 }
\ No newline at end of file
diff --git a/lib/foldermapper.php b/lib/foldermapper.php
index 431d80893..28abad0e6 100644
--- a/lib/foldermapper.php
+++ b/lib/foldermapper.php
@@ -43,6 +43,7 @@ class FolderMapper {
 		while( $row = $result->fetchRow()) {
 			$folderid = $row['id'];
 			$folder = new Folder($row['name'], $folderid);
+			$folder->setOpened($row['opened']);
 			$children = self::childrenOf($folderid);
 			$folder->addChildren($children);
 			$folderlist[] = $folder;
@@ -69,6 +70,7 @@ class FolderMapper {
 		while( $row = $result->fetchRow()) {
 			$folderid = $row['id'];
 			$folder = new Folder($row['name'], $folderid);
+			$folder->setOpened($row['opened']);
 			$children = self::childrenOfWithFeeds($folderid);
 			$folder->addChildren($children);
 			$collectionlist[] = $folder;
@@ -91,6 +93,7 @@ class FolderMapper {
 
 		$row = $result->fetchRow();
 		$folder = new Folder($row['name'], $row['id']);
+		$folder->setOpened($row['opened']);
 
 		return $folder;
 	}
@@ -103,8 +106,8 @@ class FolderMapper {
 	public function save(Folder $folder) {
 		$query = \OCP\DB::prepare('
 			INSERT INTO ' . self::tableName .
-			'(name, parent_id, user_id)
-			VALUES (?, ?, ?)
+			'(name, parent_id, user_id, opened)
+			VALUES (?, ?, ?, ?)
 			');
 
 		$name = $folder->getName();
@@ -117,9 +120,10 @@ class FolderMapper {
 		$parentid = $folder->getParentId();
 
 		$params=array(
-		$name,
-		$parentid,
-		$this->userid
+			$name,
+			$parentid,
+			$this->userid,
+			$folder->getOpened()
 		);
 		$query->execute($params);
 		$folderid = \OCP\DB::insertid(self::tableName);
@@ -135,9 +139,9 @@ class FolderMapper {
 	 */
 	public function update(Folder $folder) {
 		$query = \OCP\DB::prepare('UPDATE ' . self::tableName 
-			. ' SET name = ? ' . ' WHERE id = ?');
+			. ' SET name = ?, opened = ?' . ' WHERE id = ?');
 
-		$params = array($folder->getName(), $folder->getId());
+		$params = array($folder->getName(), $folder->getOpened(), $folder->getId());
 		$query->execute($params);
 		return true;
 	}