diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-26 16:03:29 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-01-26 16:03:29 +0100 |
| commit | 8dcdde6251ae4dfc690b1a014488df125c5e5cdc (patch) | |
| tree | f5762ac9c76acf708a50534f081e558489ccad86 /app/views | |
| parent | f0a359619fa2936d66a2b96dd086d4686e7405fa (diff) | |
| parent | 38e8e265e0f2ead830aa12e7ef81de12599405b5 (diff) | |
Merge pull request #2220 from FreshRSS/dev1.13.1
FreshRSS 1.13.1
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/display.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/export/articles.phtml | 11 | ||||
| -rw-r--r-- | app/views/importExport/index.phtml | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index c6c08e3bc..58c4e219a 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -72,7 +72,7 @@ </div> <div class="form-group"> - <label class="group-name" for="theme"><?php echo _t('conf.display.icon.entry'); ?></label> + <label class="group-name"><?php echo _t('conf.display.icon.entry'); ?></label> <table> <thead> <tr> diff --git a/app/views/helpers/export/articles.phtml b/app/views/helpers/export/articles.phtml index 59a2c7ad7..2d1fcd133 100644 --- a/app/views/helpers/export/articles.phtml +++ b/app/views/helpers/export/articles.phtml @@ -16,14 +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(); +if (empty($this->entryIdsTagNames)) { + $this->entryIdsTagNames = array(); } foreach ($this->entriesRaw as $entryRaw) { - if (empty($entryRaw)) { + if ($entryRaw == null) { continue; } $entry = FreshRSS_EntryDAO::daoToEntry($entryRaw); @@ -58,10 +56,11 @@ foreach ($this->entriesRaw as $entryRaw) { 'feedUrl' => $feed == null ? '' : $feed->url(), ) ); + $article['categories'][] = $entry->isRead() ? 'user/-/state/com.google/read' : 'user/-/state/com.google/unread'; if ($entry->isFavorite()) { $article['categories'][] = 'user/-/state/com.google/starred'; } - $tagNames = isset($entryIdsTagNames['e_' . $entry->id()]) ? $entryIdsTagNames['e_' . $entry->id()] : array(); + $tagNames = isset($this->entryIdsTagNames['e_' . $entry->id()]) ? $this->entryIdsTagNames['e_' . $entry->id()] : array(); foreach ($tagNames as $tagName) { $article['categories'][] = 'user/-/label/' . $tagName; } diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml index c5049e3ea..139e715c5 100644 --- a/app/views/importExport/index.phtml +++ b/app/views/importExport/index.phtml @@ -33,6 +33,11 @@ <?php echo _t('sub.import_export.export_opml'); ?> </label> + <label class="checkbox" for="export_labelled"> + <input type="checkbox" name="export_labelled" id="export_labelled" value="1" <?php echo extension_loaded('zip') ? 'checked="checked"' : ''; ?> /> + <?php echo _t('sub.import_export.export_labelled'); ?> + </label> + <label class="checkbox" for="export_starred"> <input type="checkbox" name="export_starred" id="export_starred" value="1" <?php echo extension_loaded('zip') ? 'checked="checked"' : ''; ?> /> <?php echo _t('sub.import_export.export_starred'); ?> |