diff options
author | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-11 12:28:45 -0400 |
---|---|---|
committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-11 12:28:45 -0400 |
commit | 14683ee6f1381004193621d00a4ece3737bc80a4 (patch) | |
tree | 7577e3c5e4ecea18ecf5585805d1deaa2eae2260 /templates | |
parent | 3443468538567c2cd23dc43b101b284c6af1a2e8 (diff) | |
parent | 07ae82b108e39efea7081d1e0a4160a85591a72b (diff) |
fix conflicts of merge
Diffstat (limited to 'templates')
-rw-r--r-- | templates/part.feeddialog.php | 2 | ||||
-rw-r--r-- | templates/part.folderdialog.php | 2 | ||||
-rw-r--r-- | templates/part.folderlist.php | 1 | ||||
-rw-r--r-- | templates/part.items.php | 2 |
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>'; |