Fix some html errors and align feed buttons to the center

5 files changed, 26 insertions, 26 deletions

diff --git a/css/news.css b/css/news.css
index d0aa50889..582ed37df 100644
--- a/css/news.css
+++ b/css/news.css
@@ -11,7 +11,7 @@ div.add_parentfolder { position: relative; }
 #feeds { background: #fff; width: 19.7em; left: 12.5em; top: 3.7em; bottom:3em; position: fixed; overflow: auto; padding: 0; margin: 0 0 0 0.3em;}
 
 li { padding: 0px !important; }
-li.feed { margin-left: 16px !important; text-align: right; border-radius: 5px; padding-left: 5px !important; background-color: rgb(255,255,255) !important; }
+li.feed { position: relative; margin-left: 16px !important; text-align: right; border-radius: 5px; padding-left: 5px !important; background-color: rgb(255,255,255) !important; }
 li.feed a { padding: 0 0 0 20px !important; overflow: hidden; text-overflow: ellipsis; text-align: left; width: 65%; }
 li#selected_feed { background-color: #FF9933 !important; }
 li.feed:hover { background-color: rgb(221, 221, 221) !important; }
@@ -21,15 +21,15 @@ li.collapsable_container:hover { color: rgb(0, 0, 0) !important; background-colo
 li.collapsable_container > ul { margin-bottom: 0.1em; }
 
 div.collapsable { position: relative; border-radius: 5px; }
-.collapsable_trigger { border: none ; margin: 0 0 0 5px; padding: 0; border-radius: 0; box-shadow: none; vertical-align: middle !important; background: url('%webroot%/core/img/places/folder.svg') no-repeat; height:16px; width:16px; }
+.collapsable_trigger { border: none ; margin: 0 0 0 5px; padding: 0; border-radius: 0; box-shadow: none; vertical-align: middle !important; background: url('%webroot%/core/img/places/folder.svg') no-repeat; opacity: 1; }
 .collapsable_title { padding-left: 0.2em; text-transform: uppercase; }
 div.collapsable:hover { background-color: rgb(221, 221, 221); }
 
-#feeds_delete { position: absolute; right: 0px; background: url('%webroot%/core/img/actions/delete.svg') no-repeat center; display: none; }
-#feeds_edit { position: absolute; right: 1.6em; background: url('%webroot%/core/img/actions/rename.svg') no-repeat center; display: none; }
+.feeds_delete { position: absolute; right: 0.1em; background: url('%webroot%/core/img/actions/delete.svg') no-repeat center; display: none; padding: 0; margin: -8px 0 0 0; top: 50%; }
+.feeds_edit { position: absolute; right: 1.6em; background: url('%webroot%/core/img/actions/rename.svg') no-repeat center; display: none; padding: 0; margin: -8px 0 0 0; top: 50%; }
 
-#unreaditemcounter.nonzero { position: relative; background: #5E5E5E; border-radius: 5px; padding: 0 5px; color: white; text-align: center; margin: 0 0.3em 0 0.3em;}
-#unreaditemcounter.zero { position: relative; margin: 0 0.3em 0 0; }
+.unreaditemcounter.nonzero { position: relative; background: #5E5E5E; border-radius: 5px; padding: 0 5px; color: white; text-align: center; margin: 0 0.3em 0 0.3em;}
+.unreaditemcounter.zero { position: relative; margin: 0 0.3em 0 0; }
 
 
 /* feed controls */
diff --git a/js/news.js b/js/news.js
index 733cb67f2..c583683f6 100644
--- a/js/news.js
+++ b/js/news.js
@@ -79,7 +79,7 @@ News={
 			});
 		},
 		'delete':function(folderid) {
-			$('#feeds_delete').tipsy('hide');
+			$('.feeds_delete').tipsy('hide');
 			OC.dialogs.confirm(t('news', 'Are you sure you want to delete this folder and all its feeds?'), t('news', 'Warning'), function(answer) {
 				if(answer == true) {
 					var rightcontent = $('div.rightcontent');
@@ -151,7 +151,7 @@ News={
 			});
 		},
 		'delete':function(feedid) {
-			$('#feeds_delete').tipsy('hide');
+			$('.feeds_delete').tipsy('hide');
 			OC.dialogs.confirm(t('news', 'Are you sure you want to delete this feed?'), t('news', 'Warning'), function(answer) {
 				if(answer == true) {
 					$.post(OC.filePath('news', 'ajax', 'deletefeed.php'),{'feedid':feedid},function(jsondata){
@@ -181,7 +181,7 @@ News={
 						currentitem.addClass('title_read');
 
 						// decrement counter
-						var counterplace = $('.feed[data-id="'+feedid+'"]').find('#unreaditemcounter');
+						var counterplace = $('.feed[data-id="'+feedid+'"]').find('.unreaditemcounter');
 						var oldcount = counterplace.html();
 						counterplace.empty();
 						if (oldcount <= 1) {
@@ -231,9 +231,9 @@ News={
 			});
 		},
 		update:function(feedid, feedurl, folderid) {
-			var counterplace = $('.feed[data-id="'+feedid+'"]').find('#unreaditemcounter');
+			var counterplace = $('.feed[data-id="'+feedid+'"]').find('.unreaditemcounter');
 			var oldcount = counterplace.html();
-			counterplace.removeClass();
+			counterplace.removeClass('zero nonzero');
 			counterplace.html('<img style="vertical-align: middle;" src="' + OC.imagePath('core','loader.gif') + '" alt="refresh" />');
 			$.post(OC.filePath('news', 'ajax', 'updatefeed.php'),{'feedid':feedid, 'feedurl':feedurl, 'folderid':folderid},function(jsondata){
 				if(jsondata.status == 'success'){
@@ -295,17 +295,17 @@ function transformCollapsableTrigger() {
 function setupFeedList() {
 	var list = $('.collapsable,.feed').hover(
 		function() {
-			$(this).find('#feeds_delete,#feeds_edit').css('display', 'inline');
-			$(this).find('#unreaditemcounter').css('display', 'none');
+			$(this).find('.feeds_delete,.feeds_edit').css('display', 'inline');
+			$(this).find('.unreaditemcounter').css('display', 'none');
 		},
 		function() {
-			$(this).find('#feeds_delete,#feeds_edit').css('display', 'none');
-			$(this).find('#unreaditemcounter').css('display', 'inline');
+			$(this).find('.feeds_delete,.feeds_edit').css('display', 'none');
+			$(this).find('.unreaditemcounter').css('display', 'inline');
 		}
 	);
-	list.find('#feeds_delete').hide();
-	list.find('#feeds_edit').hide();
-	list.find('#unreaditemcounter').show();
+	list.find('.feeds_delete').hide();
+	list.find('.feeds_edit').hide();
+	list.find('.unreaditemcounter').show();
 
 	$('.feed').click(function() {
 		News.Feed.load($(this).attr('data-id'));
diff --git a/templates/main.php b/templates/main.php
index fc74193f0..c014a4a11 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -20,7 +20,7 @@
 		<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>
 		</li>
-	<ul>
+	</ul>
 </div>
 
 <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>">
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index 070a32dd9..6e988f4df 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -12,11 +12,11 @@ if ($favicon == null) {
 echo '<li class="feed" data-id="' . $child->getId() . '">';
 echo '<a href="#" style="background: url(' . $favicon . ') left center no-repeat; background-size:16px 16px;">' . $child->getTitle() .'</a>';
 if ($unreadItems > 0) {
-	echo '<span id="unreaditemcounter" class="nonzero">' . $unreadItems . '</span>';
+	echo '<span class="unreaditemcounter nonzero">' . $unreadItems . '</span>';
 }
 else {
-	echo '<span id="unreaditemcounter" class="zero"></span>';
+	echo '<span class="unreaditemcounter zero"></span>';
 }
-echo '<button class="svg action" id="feeds_edit" title="' . $l->t('Edit feed') . '"></button>';
-echo '<button class="svg action" id="feeds_delete" onClick="(News.Feed.delete(' . $child->getId(). '))" title="' . $l->t('Delete feed') . '"></button>';
+echo '<button class="svg action feeds_edit" title="' . $l->t('Edit feed') . '"></button>';
+echo '<button class="svg action feeds_delete" onClick="(News.Feed.delete(' . $child->getId(). '))" title="' . $l->t('Delete feed') . '"></button>';
 echo '</li>';
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index fb1cd6991..26763090f 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -7,14 +7,14 @@ $l = new OC_l10n('news');
 
 echo '<li class="collapsable_container" data-id="' . $folder->getId() . '"' . (($is_root) ? 'style="margin-left: 0px !important;"' : '') . '>' .
 		'<div class="collapsable" >' .
-			'<button class="collapsable_trigger" title="' . $folder->getName() . '"></button>' .
+			'<button class="collapsable_trigger action" title="' . $folder->getName() . '"></button>' .
 			'<span class="collapsable_title">' .
 				$folder->getName() .
 			'</span>' .
 			( ($is_root) ?
 			''
 			:
-			'<button class="svg action" id="feeds_edit" title="' . $l->t('Rename folder') . '"></button>' .
-			'<button class="svg action" id="feeds_delete" onClick="(News.Folder.delete(' . $folder->getId(). '))" title="' . $l->t('Delete folder') . '"></button>' ) .
+			'<button class="svg action feeds_edit" title="' . $l->t('Rename folder') . '"></button>' .
+			'<button class="svg action feeds_delete" onClick="(News.Folder.delete(' . $folder->getId(). '))" title="' . $l->t('Delete folder') . '"></button>' ) .
 		'</div>' .
 		'<ul>';
\ No newline at end of file