diff options
| -rw-r--r-- | ajax/createfeed.php | 11 | ||||
| -rw-r--r-- | css/news.css | 2 | ||||
| -rw-r--r-- | js/news.js | 6 | ||||
| -rw-r--r-- | templates/part.items.deleted.php | 4 | ||||
| -rw-r--r-- | templates/part.items.new.php | 6 | ||||
| -rw-r--r-- | templates/part.listfeed.php | 5 | ||||
| -rw-r--r-- | templates/part.listfolder.php | 4 |
7 files changed, 29 insertions, 9 deletions
diff --git a/ajax/createfeed.php b/ajax/createfeed.php index 0b05f3ab4..1fe36f20a 100644 --- a/ajax/createfeed.php +++ b/ajax/createfeed.php @@ -44,13 +44,22 @@ if($feed == null || !$feedid) { exit(); } +// FIXME: assign counter $tmpl_listfeed = new OCP\Template("news", "part.listfeed"); $tmpl_listfeed->assign('child', $feed); $listfeed = $tmpl_listfeed->fetchPage(); +$tmpl_newfeed = new OCP\Template("news", "part.items.new"); +$tmpl_newfeed->assign('title', $feed->getTitle()); +$part_newfeed = $tmpl_newfeed->fetchPage(); + $tmpl_items = new OCP\Template("news", "part.items"); $tmpl_items->assign('feedid', $feedid); $part_items = $tmpl_items->fetchPage(); -OCP\JSON::success(array('data' => array( 'message' => $l->t('Feed added!'), 'listfeed' => $listfeed, 'part_items' => $part_items ))); +OCP\JSON::success(array('data' => array( 'message' => $l->t('Feed added!'), + 'feedid' => $feedid, + 'listfeed' => $listfeed, + 'part_items' => $part_items, + 'part_newfeed' => $part_newfeed ))); diff --git a/css/news.css b/css/news.css index d66baab22..a60eb04b8 100644 --- a/css/news.css +++ b/css/news.css @@ -72,6 +72,8 @@ div.collapsable:hover { background-color: rgb(221, 221, 221); } div.add_parentfolder { position: relative; } div.dialog { overflow: visible; } +div.rightcontentmsg { padding-left: 10px; background-color: yellow; } + #file_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1001; width:0; height:0;} diff --git a/js/news.js b/js/news.js index a71b07128..4cc0864f9 100644 --- a/js/news.js +++ b/js/news.js @@ -125,7 +125,9 @@ News={ $('#addfeed_dialog').dialog('destroy').remove(); var rightcontent = $('div.rightcontent'); rightcontent.empty(); + rightcontent.attr('data-id', jsondata.data.feedid); rightcontent.html(jsondata.data.part_items); + rightcontent.find('ul.accordion').before(jsondata.data.part_newfeed); setupRightContent(); } }); @@ -147,8 +149,8 @@ News={ $('li.feeds_list[data-id="'+jsondata.data.feedid+'"]').remove(); var rightcontent = $('div.rightcontent'); if(rightcontent.attr('data-id') == feedid) { - rightcontent.empty(); - rightcontent.html(jsondata.data.part_items); + rightcontent.find('div#feedadded').remove(); + rightcontent.find('ul.accordion').before(jsondata.data.part_items); } } else{ diff --git a/templates/part.items.deleted.php b/templates/part.items.deleted.php index 4d2ff0263..0bbe76ae6 100644 --- a/templates/part.items.deleted.php +++ b/templates/part.items.deleted.php @@ -1,4 +1,4 @@ -<div id="items_deleted"> +<div class="rightcontentmsg" id="feeddeleted"> <!-- TODO: this message is a stub, maybe mimic google reader etc... --> - <?php echo $l->t('You have just deleted this feed') ?> + <?php echo $l->t('You have just deleted this feed!') ?> </div>
\ No newline at end of file diff --git a/templates/part.items.new.php b/templates/part.items.new.php new file mode 100644 index 000000000..c2976dda9 --- /dev/null +++ b/templates/part.items.new.php @@ -0,0 +1,6 @@ +<?php +$title = isset($_['title']) ? $_['title'] : ''; + +echo '<div class="rightcontentmsg" id="feedadded">' . + 'You have subscribed to <b>"' . $title . '"</b>' . + '</div>'; diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index cd280c111..6aabe5d3c 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -9,13 +9,14 @@ if ($favicon == null) { $favicon = OCP\Util::imagePath('news', 'rss.svg'); } -echo '<li class="feeds_list" data-id="' . $child->getId() . '"><a href="' . OCP\Util::linkTo('news', 'index.php'). '?feedid=' . $child->getId() . '" style="background: url(' . $favicon . ') left center no-repeat; background-size:16px 16px;">' . $child->getTitle() .'</a>'; +echo '<li class="feeds_list" data-id="' . $child->getId() . '">'; +echo '<a href="' . OCP\Util::linkTo('news', 'index.php'). '?feedid=' . $child->getId() . '" 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>'; } else { echo '<span id="unreaditemcounter" class="zero"></span>'; } -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" 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 '</li>'; diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index 619518a3b..0ee5fa8c5 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -15,7 +15,7 @@ echo '<ul class="folders"' . (($is_root) ? 'style="margin-left: 0px !important;" ( ($is_root) ? '' : - '<button class="svg action" id="feeds_delete" onClick="(News.Folder.delete(' . $folder->getId(). '))" title="' . $l->t('Delete folder') . '"></button>' . - '<button class="svg action" id="feeds_edit" title="' . $l->t('Rename folder') . '"></button>' ) . + '<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>' ) . '</div>' . '<ul>';
\ No newline at end of file |