From aa8ddaf6bd4f58b8b4f90ae9685bec502275e6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gregor=20T=C3=A4tzner?= <gregor@freenet.de>
Date: Thu, 12 Jul 2012 17:28:08 +0200
Subject: Rework design of addfeedfolder popup menu.

---
 templates/main.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'templates')

diff --git a/templates/main.php b/templates/main.php
index 3562518dc..6ab1bc64e 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -4,20 +4,19 @@
 	</ul>
 </div>
 
+<ul class="menu" id="feedfoldermenu">
+	<li class="menuItem" id="addfeed"><?php echo $l->t('Feed'); ?></li>
+	<li class="menuItem" id="addfolder"><?php echo $l->t('Folder'); ?></li>
+</ul>
+
 <div id="bottomcontrols">
-<!-- 	<form> -->
 	<ul class="controls">
 		<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('Feed'); ?></li>
-				<li class="menuItem" id="addfolder"><?php echo $l->t('Folder'); ?></li>
-			</ul>
+			<button class="svg" id="addfeedfolder" title="<?php echo $l->t('Add Feed/Folder'); ?>" onclick="News.DropDownMenu.fade('ul#feedfoldermenu')"><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="sv" title="<?php echo $l->t('Change View'); ?>">Eye</button></li>
+		<li><button class="svg" 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> -->
 </div>
 
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>">
-- 
cgit v1.2.3