diff options
author | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-12 01:50:19 -0400 |
---|---|---|
committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-08-12 01:50:19 -0400 |
commit | 703e892b691fd98fccbbbeada3897ae0c018ac9d (patch) | |
tree | 85a02656b3e3ea592308dbb06bfb51161d615193 /templates | |
parent | fcaa16f2eafe87e0353d1be7ce4bde0d33c43e81 (diff) |
removes the Everything folder
Diffstat (limited to 'templates')
-rw-r--r-- | templates/main.php | 22 | ||||
-rw-r--r-- | templates/part.feeddialog.php | 2 | ||||
-rw-r--r-- | templates/part.feeds.php | 33 | ||||
-rw-r--r-- | templates/part.folderdialog.php | 2 | ||||
-rw-r--r-- | templates/part.folderlist.php | 16 | ||||
-rw-r--r-- | templates/part.listfeed.php | 10 | ||||
-rw-r--r-- | templates/part.nofeeds.php | 5 | ||||
-rw-r--r-- | templates/test.php | 19 |
8 files changed, 53 insertions, 56 deletions
diff --git a/templates/main.php b/templates/main.php index db3abe34a..57d87199f 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,3 +1,11 @@ +<!-- Dialogs --> +<div id="dialog_holder"></div> +<!-- End of Dialogs --> + +<?php +if ($_['feedid']){ +?> + <div id="leftcontent" class="leftcontent"> <ul id="feeds"> <?php echo $this->inc("part.feeds"); ?> @@ -25,20 +33,16 @@ <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>"> <?php - if ($_['feedid']){ echo $this->inc("part.items.header"); echo $this->inc("part.items"); - } - else { - echo $this->inc("part.nofeeds"); - } ?> <div id="appsettings" class="popup bottomleft hidden"></div> </div> -<!-- Dialogs --> -<div id="dialog_holder"></div> -<!-- End of Dialogs --> - +<?php + } else { + echo $this->inc("part.nofeeds"); + } +?>
\ No newline at end of file diff --git a/templates/part.feeddialog.php b/templates/part.feeddialog.php index 99332d421..8d67f2010 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('Subscriptions'); ?> + <?php echo $l->t('Choose folder'); ?> </button> <input id="inputfolderid" type="hidden" name="folderid" value="0" /> <ul class="menu" id="dropdownmenu"> diff --git a/templates/part.feeds.php b/templates/part.feeds.php index f78f641d8..044d954ab 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -1,26 +1,26 @@ <?php - function print_folder(OCA\News\Folder $folder){ - $tmpl_folder = new OCP\Template("news", "part.listfolder"); - $tmpl_folder->assign('folder', $folder); - $tmpl_folder->printpage(); - - $children = $folder->getChildren(); - foreach($children as $child) { - if ($child instanceOf OCA\News\Folder){ - print_folder($child); + function print_collection_list($list) { + + foreach($list as $collection) { + if ($collection instanceOf OCA\News\Folder){ + $tmpl_folder = new OCP\Template("news", "part.listfolder"); + $tmpl_folder->assign('folder', $collection); + $tmpl_folder->printpage(); + print_collection_list($collection->getChildren()); + echo '</ul></li>'; } - elseif ($child instanceOf OCA\News\Feed) { //onhover $(element).attr('id', 'newID'); + elseif ($collection instanceOf OCA\News\Feed) { //onhover $(element).attr('id', 'newID'); $itemmapper = new OCA\News\ItemMapper(); - $items = $itemmapper->findAll($child->getId()); + $items = $itemmapper->findAll($collection->getId()); $counter = 0; foreach($items as $item) { if(!$item->isRead()) ++$counter; } $tmpl_feed = new OCP\Template("news", "part.listfeed"); - $tmpl_feed->assign('child', $child); + $tmpl_feed->assign('feed', $collection); $tmpl_feed->assign('unreadItems',$counter); $tmpl_feed->printpage(); } @@ -28,12 +28,9 @@ //TODO:handle error in this case } } - echo '</ul></li>'; + } $allfeeds = isset($_['allfeeds']) ? $_['allfeeds'] : ''; -?> - -<?php -print_folder($allfeeds); -?>
\ No newline at end of file + + print_collection_list($allfeeds); diff --git a/templates/part.folderdialog.php b/templates/part.folderdialog.php index fb1a819af..36a0d9633 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('Subscriptions'); ?> + <?php echo $l->t('Choose folder'); ?> </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 11ed53bcb..09b5f8e64 100644 --- a/templates/part.folderlist.php +++ b/templates/part.folderlist.php @@ -1,13 +1,13 @@ <?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(); - foreach($children as $child) { - if ($child instanceOf OCA\News\Folder){ - print_folder($child, $depth+1); - } + function print_folder_list($folderlist, $depth) { + foreach($folderlist as $folder) { + echo '<li style="margin-left:' . 10*$depth . 'px;" class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . $folder->getName() . '</li>'; + $children = $folder->getChildren(); + print_folder_list($children, $depth+1); } } - print_folder($_['allfeeds'], 0); + + + print_folder_list($_['folderforest'], 0); ?>
\ No newline at end of file diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 530ab3ba8..0fba399ec 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -2,16 +2,16 @@ $l = new OC_l10n('news'); -$child = isset($_['child']) ? $_['child'] : null; +$feed = isset($_['feed']) ? $_['feed'] : null; $unreadItems = isset($_['unreadItems']) ? $_['unreadItems'] : null; -$favicon = $child->getFavicon(); +$favicon = $feed->getFavicon(); if ($favicon == null) { $favicon = OCP\Util::imagePath('news', 'rss.svg'); } -echo '<li class="feed" data-id="' . $child->getId() . '">'; +echo '<li class="feed" data-id="' . $feed->getId() . '">'; echo '<a href="#" style="background: url(' . $favicon . ') left center no-repeat; background-size:16px 16px;" class="' . - (($unreadItems > 0) ? 'nonzero' : 'zero') . '">' . $child->getTitle() .'</a>'; + (($unreadItems > 0) ? 'nonzero' : 'zero') . '">' . $feed->getTitle() .'</a>'; if ($unreadItems > 0) { echo '<span class="unreaditemcounter nonzero">' . $unreadItems . '</span>'; } @@ -19,5 +19,5 @@ else { echo '<span class="unreaditemcounter zero"></span>'; } 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 '<button class="svg action feeds_delete" onClick="(News.Feed.delete(' . $feed->getId(). '))" title="' . $l->t('Delete feed') . '"></button>'; echo '</li>'; diff --git a/templates/part.nofeeds.php b/templates/part.nofeeds.php index bb78dedbf..070c90c60 100644 --- a/templates/part.nofeeds.php +++ b/templates/part.nofeeds.php @@ -1,3 +1,8 @@ +<div id="appsettings" class="popup bottomleft hidden"></div> <div id="firstrun"> <?php echo $l->t('You have no feeds in your reader.') ?> + <div id="selections"> + <input type="button" id="addfeed" value="<?php echo $l->t('Add feed') ?>" /> + <input type="button" value="<?php echo $l->t('Import OPML') ?>" /> + </div> </div>
\ No newline at end of file diff --git a/templates/test.php b/templates/test.php index 6796a8cdc..35a1019ed 100644 --- a/templates/test.php +++ b/templates/test.php @@ -1,18 +1,9 @@ <?php -$content = file_get_contents('/tmp/occOrigzvXqKO'); +$itemmapper = new OCA\News\ItemMapper(); -require_once('news/opmlparser.php'); +$items = $itemmapper->findAllStatus(155, OCA\News\StatusFlag::Unread); -$parser = new OPMLParser($content); -$title = $parser->getTitle(); -$data = $parser->parse(); - -foreach ($data as $collection) { - if ($collection instanceof OCA\News\Feed) { - echo $collection->getTitle() . '\n'; - } else { - echo 'NO\n'; - } -} -echo $title; +foreach ($items as $item) { + echo $item->getTitle(); +}
\ No newline at end of file |