different order for the delete icon, disable export button if there are no feeds

4 files changed, 23 insertions, 22 deletions

diff --git a/templates/part.addnew.php b/templates/part.addnew.php
index 82127ff21..8dadc947b 100644
--- a/templates/part.addnew.php
+++ b/templates/part.addnew.php
@@ -1,4 +1,4 @@
-<li class="add-new" ng-controller="AddNewController">
+<li class="add-new">
 	<a class="list-title list-title-with-icon" ng-click="showAdd=!showAdd" 
 			click-slide-toggle="{
 				selector: '.add-new-popup',
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index ed75bc0a6..dcf26508d 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -12,6 +12,9 @@
 	</a>
 	
 	<span class="utils">
+		<button ng-click="delete(feedType.Feed, feed.id)"
+			class="svg action delete-icon" 
+			title="<?php p($l->t('Delete feed')); ?>"></button>
 
 		<button class="svg action mark-read-icon" 
 			ng-click="markAllRead(feedType.Feed, feed.id)"
@@ -21,9 +24,6 @@
 			{{ getUnreadCount(feedType.Feed, feed.id) }}
 		</span>
 
-		<button ng-click="delete(feedType.Feed, feed.id)"
-			class="svg action delete-icon" 
-			title="<?php p($l->t('Delete feed')); ?>"></button>
 
 	</span>
 </li>
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index 79e4120c1..836f80116 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -19,6 +19,13 @@
 	</a>
 
 	<span class="utils">
+		<button class="svg action edit-icon" 
+				ng-click="renameFolder(folder.id)"
+				title="<?php p($l->t('Rename folder')); ?>"></button>
+
+		<button ng-click="delete(feedType.Folder, folder.id)"
+				class="svg action delete-icon" 
+				title="<?php p($l->t('Delete folder')); ?>"></button>
 
 		<button class="svg action mark-read-icon" 
 				ng-click="markAllRead(feedType.Folder, folder.id)"
@@ -28,13 +35,6 @@
 			{{ getUnreadCount(feedType.Folder, folder.id) }}
 		</span>
 
-		<button ng-click="delete(feedType.Folder, folder.id)"
-				class="svg action delete-icon" 
-				title="<?php p($l->t('Delete folder')); ?>"></button>
-
-		<button class="svg action edit-icon" 
-				ng-click="renameFolder(folder.id)"
-				title="<?php p($l->t('Rename folder')); ?>"></button>
 	</span>
 	<ul>
 		<?php print_unescaped($this->inc('part.listfeed', array('folderId' => 'folder.id'))); ?>
diff --git a/templates/part.settings.php b/templates/part.settings.php
index 5dac1f05a..b5860124d 100644
--- a/templates/part.settings.php
+++ b/templates/part.settings.php
@@ -1,15 +1,16 @@
 <fieldset class="personalblock">
-        <legend><strong><?php p($l->t('Import / Export OPML')); ?></strong></legend>
-        <input type="file" id="opml-upload" name="files[]" read-file/>
-        <button title="<?php p($l->t('Import')); ?>" forward-click="{selector:'#opml-upload'}">
-                <?php p($l->t('Import')); ?>
-        </button>
-        <a class="button"
-                href="<?php print_unescaped(\OC_Helper::linkToRoute('news_export_opml')) ?>"
-                title="<?php p($l->t('Export')); ?>"><?php p($l->t('Export')); ?></a>
+	<legend><strong><?php p($l->t('Import / Export OPML')); ?></strong></legend>
+	<input type="file" id="opml-upload" name="files[]" read-file/>
+	<button title="<?php p($l->t('Import')); ?>" forward-click="{selector:'#opml-upload'}">
+		<?php p($l->t('Import')); ?>
+	</button>
+	<button ng-disabled="feeds.length==0" title="<?php p($l->t('Export')); ?>"
+		ng-click="export()">
+		<?php p($l->t('Export')); ?>
+	</button>
 </fieldset>
 <fieldset class="personalblock">
-        <legend><strong><?php p($l->t('Subscribelet')); ?></strong></legend>
-        <p><?php print_unescaped($this->inc('part.subscribelet'));?>
-        </p>
+	<legend><strong><?php p($l->t('Subscribelet')); ?></strong></legend>
+	<p><?php print_unescaped($this->inc('part.subscribelet'));?>
+	</p>
 </fieldset>