Split up addfeedfolder dialog into two dialogs.

5 files changed, 66 insertions, 56 deletions

diff --git a/templates/main.php b/templates/main.php
index faae31809..a52c4235e 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -5,15 +5,21 @@
 </div>
 
 <div id="bottomcontrols">
-	<form>
+<!-- 	<form> -->
 	<ul class="controls">
-		<li><button class="svg" id="addfeedfolder" title="<?php echo $l->t('Add Feed/Folder'); ?>"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>"   /></button></li>
-		<li><button class="svg" title="<?php echo $l->t('Change View'); ?>">Eye</button></li>
+		<li>
+			<button class="svg" id="addfeedfolder" title="<?php echo $l->t('Add Feed/Folder'); ?>" onclick="News.DropDownMenu.fade(this)"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>"   /></button>
+			<ul class="menu" id="fademenu">
+				<li class="menuItem" id="addfeed"><?php echo $l->t('Add Feed'); ?></li>
+				<li class="menuItem" id="addfolder"><?php echo $l->t('Add Folder'); ?></li>
+			</ul>
+		</li>
+		<li><button class="sv" title="<?php echo $l->t('Change View'); ?>">Eye</button></li>
 		<li><button class="svg" title="<?php echo $l->t('Settings'); ?>">Settings</button></li>
 	<ul>
-	</form>
+<!-- 	</form> -->
 </div>
-	
+
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>">
 	<?php
 		if ($_['feedid']){
diff --git a/templates/part.addfeed.php b/templates/part.addfeed.php
new file mode 100644
index 000000000..522d60b32
--- /dev/null
+++ b/templates/part.addfeed.php
@@ -0,0 +1,22 @@
+
+<div id="addfeed_dialog" title="<?php echo $l->t("Add Feed"); ?>">
+<table width="100%" style="border: 0;">
+<tr>
+	<td>Add new feed</td>
+	<td>
+		<div class="add_parentfolder">
+			<button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
+			    <?php echo $l->t('EVERYTHING'); ?>
+			</button>
+			<input type="hidden" name="folderid" value="0" />
+			<ul class="menu" id="dropdownmenu">
+				<?php echo $this->inc("part.folderlist"); ?>
+			</ul>
+		</div>
+	</td>
+</tr>
+<tr>
+	<td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('URL'); ?>" class="news_input" /></td>
+	<td><input type="submit" value="<?php echo $l->t('Add feed'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td>
+</tr>
+</table>
\ No newline at end of file
diff --git a/templates/part.addfeedfolder.php b/templates/part.addfeedfolder.php
deleted file mode 100644
index 919946225..000000000
--- a/templates/part.addfeedfolder.php
+++ /dev/null
@@ -1,51 +0,0 @@
-
-<?php
-	function print_folder(OC_News_Folder $folder, $depth){
-		echo '<li class="dropdown" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . strtoupper($folder->getName()) . '</li>';
-		$children = $folder->getChildren();
-		foreach($children as $child) {
-			if ($child instanceOf OC_News_Folder){
-				print_folder($child, $depth+1);
-			}
-		}
-	}
-?>
-
-<div id="addfeedfolder_dialog" title="<?php echo $l->t("Add Feed/Folder"); ?>">
-<table width="100%" style="border: 0;">
-<tr>
-	<td>Add new feed</td>
-	<td>
-		<div class="add_parentfolder">
-			<button id="dropdownBtn" onclick="News.DropDownMenu.show(this)">
-			    <?php echo $l->t('ALL FEEDS'); ?>
-			</button>
-			<input type="hidden" name="folderid" value="0" />
-			<ul class="dropdown">
-				<?php print_folder($_['allfeeds'], 0); ?>
-			</ul>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('URL'); ?>" class="news_input" /></td>
-	<td><input type="submit" value="<?php echo $l->t('Add feed'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td>
-</tr>
-	<td>Add new folder</td>
-	<td>
-		<div class="add_parentfolder">
-			<button id="dropdownBtn" onclick="News.DropDownMenu.show(this)">
-			    <?php echo $l->t('ALL FEEDS'); ?>
-			</button>
-			<input type="hidden" name="folderid" value="0" />
-			<ul class="dropdown">
-				<?php print_folder($_['allfeeds'], 0); ?>
-			</ul>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td><input type="text" id="folder_add_name" placeholder="<?php echo $l->t('Folder name'); ?>" class="news_input" /></td>
-	<td><input type="submit" value="<?php echo $l->t('Add folder'); ?>" onclick="News.Folder.submit(this)" id="folder_add_submit" /></td>
-</tr>
-</table>
\ No newline at end of file
diff --git a/templates/part.addfolder.php b/templates/part.addfolder.php
new file mode 100644
index 000000000..a4f6466ac
--- /dev/null
+++ b/templates/part.addfolder.php
@@ -0,0 +1,21 @@
+
+<div id="addfolder_dialog" title="<?php echo $l->t("Add Folder"); ?>">
+<table width="100%" style="border: 0;">
+	<td>Add new folder</td>
+	<td>
+		<div class="add_parentfolder">
+			<button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
+			    <?php echo $l->t('EVERYTHING'); ?>
+			</button>
+			<input type="hidden" name="folderid" value="0" />
+			<ul class="menu" id="dropdownmenu">
+				<?php echo $this->inc("part.folderlist"); ?>
+			</ul>
+		</div>
+	</td>
+</tr>
+<tr>
+	<td><input type="text" id="folder_add_name" placeholder="<?php echo $l->t('Folder name'); ?>" class="news_input" /></td>
+	<td><input type="submit" value="<?php echo $l->t('Add folder'); ?>" onclick="News.Folder.submit(this)" id="folder_add_submit" /></td>
+</tr>
+</table>
\ No newline at end of file
diff --git a/templates/part.folderlist.php b/templates/part.folderlist.php
new file mode 100644
index 000000000..670684fd4
--- /dev/null
+++ b/templates/part.folderlist.php
@@ -0,0 +1,12 @@
+<?php
+	function print_folder(OC_News_Folder $folder, $depth){
+		echo '<li class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . strtoupper($folder->getName()) . '</li>';
+		$children = $folder->getChildren();
+		foreach($children as $child) {
+			if ($child instanceOf OC_News_Folder){
+				print_folder($child, $depth+1);
+			}
+		}
+	}
+	print_folder($_['allfeeds'], 0);
+?>
\ No newline at end of file