From 993e56a3ebded2dc49b3de7efdc776dea61d6ace Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Mon, 13 Aug 2012 23:09:48 +0200
Subject: further design improvements

---
 templates/main.php              | 10 ++++++----
 templates/part.items.header.php | 15 +++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'templates')

diff --git a/templates/main.php b/templates/main.php
index 5c066e599..4fb588aeb 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -4,6 +4,9 @@
 
 <?php
 if ($_['feedid']){
+
+echo $this->inc("part.items.header");
+
 ?>
 
 <div id="leftcontent" class="leftcontent">
@@ -12,13 +15,13 @@ if ($_['feedid']){
 	</ul>
 </div>
 
-<div id="feedcontrols">
+<div id="feed_settings">
 	<ul class="controls">
 		<li>
-			<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>
+			<button class="svg" id="addfeedfolder" title="$l->t('Change View');" 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="svg" title="<?php echo $l->t('Change View'); ?>">Eye</button>
+			<button class="svg" title="$l->t('Change View');">Eye</button>
 		</li>
 		<li style="float: right">
 			<button class="svg" id="settingsbtn" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/settings.png'); ?>" alt="<?php echo $l->t('Settings'); ?>"   /></button>
@@ -34,7 +37,6 @@ if ($_['feedid']){
 
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>">
 	<?php
-			echo $this->inc("part.items.header");
 			echo '<div id="feed_items">';
 				echo $this->inc("part.items");
 			echo '</div>';
diff --git a/templates/part.items.header.php b/templates/part.items.header.php
index ac2add0d4..5fdec1d46 100644
--- a/templates/part.items.header.php
+++ b/templates/part.items.header.php
@@ -11,12 +11,15 @@ if(isset($_['feedid'])){
 ?>
 
 <div class="feed_controls">
+   
     <div class="feed_title">
-        <h1>» <?php echo $feedTitle; ?></h1>
+        <h1><?php echo $feedTitle; ?></h1>
+    </div>
+    <div class="controls">
+        <input type="button" value="<?php echo $l->t('Mark all as read'); ?>" id="mark_all_as_read" />
+        <select id="feed_filter">
+            <option value="all"><?php echo $l->t('Show read/unread articles'); ?></option>
+            <option value="newest"><?php echo $l->t('Show only unread articles'); ?></option>
+        </select>
     </div>
-    <input type="button" value="<?php echo $l->t('Mark all as read'); ?>" id="mark_all_as_read" />
-    <select id="feed_filter">
-        <option value="all"><?php echo $l->t('Show all articles'); ?></option>
-        <option value="newest"><?php echo $l->t('Show only unread articles'); ?></option>
-    </select>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3