fix conflicts of merge

4 files changed, 5 insertions, 2 deletions

diff --git a/templates/part.feeddialog.php b/templates/part.feeddialog.php
index 6807f3c5b..99332d421 100644
--- a/templates/part.feeddialog.php
+++ b/templates/part.feeddialog.php
@@ -6,7 +6,7 @@
 	<td>
 		<div class="add_parentfolder">
 			<button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
-			    <?php echo $l->t('EVERYTHING'); ?>
+			    <?php echo $l->t('Subscriptions'); ?>
 			</button>
 			<input id="inputfolderid" type="hidden" name="folderid" value="0" />
 			<ul class="menu" id="dropdownmenu">
diff --git a/templates/part.folderdialog.php b/templates/part.folderdialog.php
index e1217160c..fb1a819af 100644
--- a/templates/part.folderdialog.php
+++ b/templates/part.folderdialog.php
@@ -6,7 +6,7 @@
 	<td>
 		<div class="add_parentfolder">
 			<button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
-			    <?php echo $l->t('EVERYTHING'); ?>
+			    <?php echo $l->t('Subscriptions'); ?>
 			</button>
 			<input id="inputfolderid" type="hidden" name="folderid" value="0" />
 			<ul class="menu" id="dropdownmenu">
diff --git a/templates/part.folderlist.php b/templates/part.folderlist.php
index 972b60143..11ed53bcb 100644
--- a/templates/part.folderlist.php
+++ b/templates/part.folderlist.php
@@ -1,4 +1,5 @@
 <?php
+
 	function print_folder(OCA\News\Folder $folder, $depth){
 		echo '<li style="margin-left:' . 10*$depth . 'px;" class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . $folder->getName() . '</li>';
 		$children = $folder->getChildren();
diff --git a/templates/part.items.php b/templates/part.items.php
index 20701fff9..ff372fafb 100644
--- a/templates/part.items.php
+++ b/templates/part.items.php
@@ -5,6 +5,7 @@ $feedid = isset($_['feedid']) ? $_['feedid'] : '';
 $itemmapper = new OCA\News\ItemMapper();
 $items = $itemmapper->findAll($feedid);
 
+echo '<div id="feed_items">';
 echo '<ul>';
 foreach($items as $item) {
 	if($item->isRead()){
@@ -20,3 +21,4 @@ foreach($items as $item) {
 
 	}
 echo '</ul>';
+echo '</div>';