summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/main.php26
-rw-r--r--templates/part.feeddialog.php4
-rw-r--r--templates/part.folderdialog.php6
-rw-r--r--templates/part.folderlist.php3
-rw-r--r--templates/part.items.header.php19
-rw-r--r--templates/part.items.php13
-rw-r--r--templates/part.listfeed.php2
-rw-r--r--templates/part.listfolder.php4
8 files changed, 42 insertions, 35 deletions
diff --git a/templates/main.php b/templates/main.php
index 4fb588aeb..d895e04fb 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -10,18 +10,23 @@ echo $this->inc("part.items.header");
?>
<div id="leftcontent" class="leftcontent">
- <ul id="feeds">
- <?php echo $this->inc("part.feeds"); ?>
- </ul>
+ <div id="feeds">
+ <ul data-id="0">
+ <li data-id="-2" class="subscriptions folder"><a href="#" ><?php echo $l->t('New articles'); ?></a></li>
+ <li data-id="-1" class="starred folder"><a href="#" ><?php echo $l->t('Starred'); ?></a></li>
+ <?php echo $this->inc("part.feeds"); ?>
+ </ul>
+ </div>
</div>
<div id="feed_settings">
<ul class="controls">
- <li>
- <button class="svg" id="addfeedfolder" title="$l->t('Change View');" onclick="News.DropDownMenu.fade('ul#feedfoldermenu')"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>" /></button>
- </li>
- <li>
- <button class="svg" title="$l->t('Change View');">Eye</button>
+ <li id="addfeedfolder" title="<?php echo $l->t('Add feed or folder'); ?>">
+ <button class="svg"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>" /></button>
+ <ul class="menu" id="feedfoldermenu">
+ <li id="addfeed"><?php echo $l->t('Feed'); ?></li>
+ <li id="addfolder"><?php echo $l->t('Folder'); ?></li>
+ </ul>
</li>
<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>
@@ -29,10 +34,7 @@ echo $this->inc("part.items.header");
</ul>
</div>
-<ul class="menu" id="feedfoldermenu">
- <li class="menuItem" id="addfeed"><?php echo $l->t('Feed'); ?></li>
- <li class="menuItem" id="addfolder"><?php echo $l->t('Folder'); ?></li>
-</ul>
+
<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>">
diff --git a/templates/part.feeddialog.php b/templates/part.feeddialog.php
index 8d67f2010..6df940164 100644
--- a/templates/part.feeddialog.php
+++ b/templates/part.feeddialog.php
@@ -1,5 +1,5 @@
-<div id="addfeed_dialog" title="<?php echo $l->t("Add Feed"); ?>">
+<div id="addfeed_dialog" title="<?php echo $l->t("Add Subscription"); ?>">
<table width="100%" style="border: 0;">
<tr>
<td>Add new feed</td>
@@ -8,7 +8,7 @@
<button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
<?php echo $l->t('Choose folder'); ?>
</button>
- <input id="inputfolderid" type="hidden" name="folderid" value="0" />
+ <input id="inputfolderid" type="hidden" placeholder="<?php echo $l->t("Link"); ?>" name="folderid" value="0" />
<ul class="menu" id="dropdownmenu">
<?php echo $this->inc("part.folderlist"); ?>
</ul>
diff --git a/templates/part.folderdialog.php b/templates/part.folderdialog.php
index 36a0d9633..e441e90a8 100644
--- a/templates/part.folderdialog.php
+++ b/templates/part.folderdialog.php
@@ -5,13 +5,7 @@
<td>Add new folder</td>
<td>
<div class="add_parentfolder">
- <button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
- <?php echo $l->t('Choose folder'); ?>
- </button>
<input id="inputfolderid" type="hidden" name="folderid" value="0" />
- <ul class="menu" id="dropdownmenu">
- <?php echo $this->inc("part.folderlist"); ?>
- </ul>
</div>
</td>
</tr>
diff --git a/templates/part.folderlist.php b/templates/part.folderlist.php
index 09b5f8e64..f2da64737 100644
--- a/templates/part.folderlist.php
+++ b/templates/part.folderlist.php
@@ -3,11 +3,8 @@
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_list($_['folderforest'], 0);
?> \ No newline at end of file
diff --git a/templates/part.items.header.php b/templates/part.items.header.php
index 68e0d9234..c54a2ae65 100644
--- a/templates/part.items.header.php
+++ b/templates/part.items.header.php
@@ -1,11 +1,20 @@
<?php
if(isset($_['feedid'])){
- $feedmapper = new OCA\News\FeedMapper();
- $feed = $feedmapper->findById($_['feedid']);
+ $feedMapper = new OCA\News\FeedMapper();
+ $feed = $feedMapper->findById($_['feedid']);
$feedTitle = $feed->getTitle();
+
+ $itemMapper = new OCA\News\ItemMapper();
+ $unreadItemsCount = $itemMapper->countAllStatus($_['feedid'], OCA\News\StatusFlag::UNREAD);
+ if($unreadItemsCount > 0){
+ $readClass = '';
+ } else {
+ $readClass = 'all_read';
+ }
} else {
$feedTitle = '';
+ $unreadItemsCount = 0;
}
// FIXME: get this setting from the database
@@ -14,12 +23,12 @@ $showOnlyUnread = true;
?>
<div class="feed_controls">
-
+ <span title="<?php echo $l->t('Unread items'); ?>" class="unreaditemcounter <?php echo $readClass; ?>"><?php echo $unreadItemsCount; ?></span>
<div class="feed_title">
- <h1><?php echo $feedTitle; ?></h1>
+ <h1 title="<?php echo $feedTitle; ?>"><?php echo $feedTitle; ?></h1>
</div>
<div class="controls">
- <input type="button" value="<?php echo $l->t('Mark all as read'); ?>" id="mark_all_as_read" />
+ <input type="button" value="<?php echo $l->t('Mark all read'); ?>" id="mark_all_as_read" />
<select id="feed_filter">
<option value="unread" <?php if($showOnlyUnread){ echo 'selected="selected"'; }; ?>><?php echo $l->t('Show only unread articles'); ?></option>
<option value="all" <?php if(!$showOnlyUnread){ echo 'selected="selected"'; }; ?>><?php echo $l->t('Show read/unread articles'); ?></option>
diff --git a/templates/part.items.php b/templates/part.items.php
index 16b7d5b67..3d9c366d6 100644
--- a/templates/part.items.php
+++ b/templates/part.items.php
@@ -40,13 +40,18 @@ foreach($items as $item) {
echo '</ul>';
echo '</div>';
- echo '<h1 class="item_title"><a target="_blank" href="' . $item->getUrl() . '">' . $item->getTitle() . '</a></h1>';
-
- echo '<h2 class="item_author">' . $l->t('from') . ' ' . parse_url($item->getUrl(), PHP_URL_HOST) . '</h2>';
-
echo '<h2 class="item_date"><time class="timeago" datetime="' .
date('c', $item->getDate()) . '">' . date('F j, Y, g:i a', $item->getDate()) . '</time>' . '</h2>';
+ echo '<h1 class="item_title"><a target="_blank" href="' . $item->getUrl() . '">' . $item->getTitle() . '</a></h1>';
+
+ if(trim($item->getAuthor()) == ''){
+ $from = $l->t('from') . ' ' . parse_url($item->getUrl(), PHP_URL_HOST);
+ } else {
+ $from = $l->t('from') . ' ' . $item->getAuthor();
+ }
+ echo '<h2 class="item_author">' . $from . '</h2>';
+
echo '<div class="body">' . $item->getBody() . '</div>';
echo '</li>';
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index 8b64a3846..d3008bc91 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -17,7 +17,7 @@ if($unreadItemsCount == 0){
}
echo '<li class="feed" data-id="' . $feed->getId() . '">';
-echo '<a href="#" style="background: url(' . $favicon . ') left center no-repeat; background-size:16px 16px;" class="' . $allReadClass . '">' . $feed->getTitle() .'</a>';
+echo '<a href="#" style="background-image: url(' . $favicon . '); " class="' . $allReadClass . '">' . $feed->getTitle() .'</a>';
echo '<span class="unreaditemcounter ' . $allReadClass . '">' . $unreadItemsCount . '</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(' . $feed->getId(). '))" title="' . $l->t('Delete feed') . '"></button>';
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index 26763090f..c24d9ae72 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -8,9 +8,9 @@ $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 action" title="' . $folder->getName() . '"></button>' .
- '<span class="collapsable_title">' .
+ '<a href="#" class="collapsable_title">' .
$folder->getName() .
- '</span>' .
+ '</a>' .
( ($is_root) ?
''
:
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-05 13:50:51 +0000