summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/configure/shortcut.phtml16
-rw-r--r--app/views/configure/system.phtml8
-rw-r--r--app/views/error/index.phtml2
-rw-r--r--app/views/helpers/export/articles.phtml18
-rw-r--r--app/views/helpers/feed/update.phtml2
-rw-r--r--app/views/helpers/index/normal/entry_bottom.phtml2
-rw-r--r--app/views/helpers/javascript_vars.phtml2
-rw-r--r--app/views/index/reader.phtml8
-rw-r--r--app/views/subscription/index.phtml17
9 files changed, 68 insertions, 7 deletions
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 66db6a5d4..70a274edd 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -65,6 +65,22 @@
</div>
</div>
+ <p class="alert alert-warn"><?php echo _t('conf.shortcut.navigation_no_mod_help');?></p>
+
+ <div class="form-group">
+ <label class="group-name" for="skip_next_entry"><?php echo _t('conf.shortcut.skip_next_article'); ?></label>
+ <div class="group-controls">
+ <input type="text" id="skip_next_entry" name="shortcuts[skip_next_entry]" list="keys" value="<?php echo $s['skip_next_entry']; ?>" data-leave-validation="<?php echo $s['skip_next_entry']; ?>"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="group-name" for="skip_prev_entry"><?php echo _t('conf.shortcut.skip_previous_article'); ?></label>
+ <div class="group-controls">
+ <input type="text" id="skip_prev_entry" name="shortcuts[skip_prev_entry]" list="keys" value="<?php echo $s['skip_prev_entry']; ?>" data-leave-validation="<?php echo $s['skip_prev_entry']; ?>"/>
+ </div>
+ </div>
+
<div class="form-group">
<label class="group-name" for="first_entry"><?php echo _t('conf.shortcut.first_article'); ?></label>
<div class="group-controls">
diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml
index 37b68c991..9af4cc2c9 100644
--- a/app/views/configure/system.phtml
+++ b/app/views/configure/system.phtml
@@ -51,6 +51,14 @@
<input type="number" id="max-categories" name="max-categories" value="<?php echo FreshRSS_Context::$system_conf->limits['max_categories']; ?>" min="1" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->limits['max_categories']; ?>"/>
</div>
</div>
+
+ <div class="form-group">
+ <label class="group-name" for="cookie-duration"><?php echo _t('admin.system.cookie-duration.number'); ?></label>
+ <div class="group-controls">
+ <input type="number" id="cookie-duration" name="cookie-duration" value="<?php echo FreshRSS_Context::$system_conf->limits['cookie_duration']; ?>" min="0" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->limits['cookie_duration']; ?>"/>
+ <?php echo _i('help'); ?> <?php echo _t('admin.system.cookie-duration.help'); ?>
+ </div>
+ </div>
<div class="form-group form-actions">
<div class="group-controls">
diff --git a/app/views/error/index.phtml b/app/views/error/index.phtml
index fe3abf8c4..8fd74e8bf 100644
--- a/app/views/error/index.phtml
+++ b/app/views/error/index.phtml
@@ -2,7 +2,7 @@
<div class="alert alert-error">
<h1 class="alert-head"><?php echo $this->code; ?></h1>
<p>
- <?php echo $this->errorMessage; ?><br />
+ <?php echo htmlspecialchars($this->errorMessage, ENT_NOQUOTES, 'UTF-8'); ?><br />
<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
</p>
</div>
diff --git a/app/views/helpers/export/articles.phtml b/app/views/helpers/export/articles.phtml
index b8958f527..59a2c7ad7 100644
--- a/app/views/helpers/export/articles.phtml
+++ b/app/views/helpers/export/articles.phtml
@@ -16,6 +16,12 @@ $articles = array(
echo rtrim(json_encode($articles, $options), " ]}\n\r\t"), "\n";
$first = true;
+$tagDAO = FreshRSS_Factory::createTagDao();
+$entryIdsTagNames = $tagDAO->getEntryIdsTagNames($this->entriesRaw);
+if ($entryIdsTagNames == false) {
+ $entryIdsTagNames = array();
+}
+
foreach ($this->entriesRaw as $entryRaw) {
if (empty($entryRaw)) {
continue;
@@ -32,13 +38,14 @@ foreach ($this->entriesRaw as $entryRaw) {
$article = array(
'id' => $entry->guid(),
+ 'timestampUsec' => '' . $entry->id(),
'categories' => array_values($entry->tags()),
'title' => $entry->title(),
- 'author' => $entry->authors(true), //TODO: Make an array like tags?
+ 'author' => $entry->authors(true),
'published' => $entry->date(true),
'updated' => $entry->date(true),
'alternate' => array(array(
- 'href' => $entry->link(),
+ 'href' => htmlspecialchars_decode($entry->link(), ENT_QUOTES),
'type' => 'text/html',
)),
'content' => array(
@@ -51,6 +58,13 @@ foreach ($this->entriesRaw as $entryRaw) {
'feedUrl' => $feed == null ? '' : $feed->url(),
)
);
+ if ($entry->isFavorite()) {
+ $article['categories'][] = 'user/-/state/com.google/starred';
+ }
+ $tagNames = isset($entryIdsTagNames['e_' . $entry->id()]) ? $entryIdsTagNames['e_' . $entry->id()] : array();
+ foreach ($tagNames as $tagName) {
+ $article['categories'][] = 'user/-/label/' . $tagName;
+ }
$line = json_encode($article, $options);
if ($line != '') {
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 4dbaacd04..bc90ba456 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -133,7 +133,7 @@
</div>
</div>
<div class="form-group">
- <label class="group-name" for="pubsubhubbub"><?php echo _t('sub.feed.pubsubhubbub'); ?></label>
+ <label class="group-name" for="pubsubhubbub"><?php echo _t('sub.feed.websub'); ?></label>
<div class="group-controls">
<label class="checkbox" for="pubsubhubbub">
<input type="checkbox" name="pubsubhubbub" id="pubsubhubbub" disabled="disabled" value="1"<?php echo $this->feed->pubSubHubbubEnabled() ? ' checked="checked"' : ''; ?> />
diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 784a41e1f..1f35318e3 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -42,7 +42,7 @@
<a class="dropdown-toggle" href="#dropdown-labels-<?php echo $this->entry->id();?>"><?php
echo _t('index.menu.tags');
?></a>
- <ul class="dropdown-menu">
+ <ul class="dropdown-menu dropdown-menu-scrollable">
<li class="dropdown-close"><a href="#close">❌</a></li>
<!-- Ajax -->
</ul>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index d7b3e4360..a434a04a3 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -26,6 +26,8 @@ echo htmlspecialchars(json_encode(array(
'go_website' => @$s['go_website'],
'prev_entry' => @$s['prev_entry'],
'next_entry' => @$s['next_entry'],
+ 'skip_prev_entry' => @$s['skip_prev_entry'],
+ 'skip_next_entry' => @$s['skip_next_entry'],
'first_entry' => @$s['first_entry'],
'last_entry' => @$s['last_entry'],
'collapse_entry' => @$s['collapse_entry'],
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index c15b936ee..1485a1997 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -1,4 +1,5 @@
<?php
+$this->partial('aside_feed');
$this->partial('nav_menu');
flush();
@@ -11,8 +12,11 @@ if (!empty($this->entries)) {
$content_width = FreshRSS_Context::$user_conf->content_width;
?>
-<div id="stream" class="reader"><?php
- foreach ($this->entries as $item) {
+<div id="stream" class="reader">
+ <div id="new-article">
+ <a href="<?php echo Minz_Url::display(Minz_Request::currentRequest()); ?>"><?php echo _t('gen.js.new_article'); /* TODO: move string in JS*/ ?></a>
+ </div>
+ <?php foreach ($this->entries as $item) {
$item = Minz_ExtensionManager::callHook('entry_before_display', $item);
if (is_null($item)) {
continue;
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 41dd8a7df..8b196cb00 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -52,6 +52,12 @@
<?php echo _t('sub.feed.moved_category_deleted', $this->default_category->name()); ?>
</p>
+ <?php if ($this->onlyFeedsWithError): ?>
+ <p class="alert alert-warn">
+ <?php echo _t('sub.feed.showing.error'); ?>
+ </p>
+ <?php endif; ?>
+
<div class="box">
<div class="box-title"><label for="new-category"><?php echo _t('sub.category.add'); ?></label></div>
@@ -122,6 +128,9 @@
<?php if (!empty($feeds)) { ?>
<?php
foreach ($feeds as $feed) {
+ if ($this->onlyFeedsWithError && !$feed->inError()) {
+ continue;
+ }
$error = $feed->inError() ? ' error' : '';
$empty = $feed->nbEntries() == 0 ? ' empty' : '';
?>
@@ -140,6 +149,14 @@
</ul>
</div>
<?php } ?>
+
+ <ul>
+ <?php if ($this->onlyFeedsWithError): ?>
+ <li><a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('sub.feed.show.all'); ?></a></li>
+ <?php else: ?>
+ <li><a href="<?php echo _url('subscription', 'index', 'error', 1); ?>"><?php echo _t('sub.feed.show.error'); ?></a></li>
+ <?php endif; ?>
+ </ul>
</div>
<?php $class = isset($this->feed) ? ' class="active"' : ''; ?>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 12:21:41 +0000