diff options
Diffstat (limited to 'app/views/helpers')
| -rw-r--r-- | app/views/helpers/export/articles.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/extension/configure.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/feed/update.phtml | 7 | ||||
| -rw-r--r-- | app/views/helpers/index/normal/entry_bottom.phtml | 56 |
4 files changed, 45 insertions, 22 deletions
diff --git a/app/views/helpers/export/articles.phtml b/app/views/helpers/export/articles.phtml index 75651483a..b8958f527 100644 --- a/app/views/helpers/export/articles.phtml +++ b/app/views/helpers/export/articles.phtml @@ -34,7 +34,7 @@ foreach ($this->entriesRaw as $entryRaw) { 'id' => $entry->guid(), 'categories' => array_values($entry->tags()), 'title' => $entry->title(), - 'author' => $entry->author(), + 'author' => $entry->authors(true), //TODO: Make an array like tags? 'published' => $entry->date(true), 'updated' => $entry->date(true), 'alternate' => array(array( diff --git a/app/views/helpers/extension/configure.phtml b/app/views/helpers/extension/configure.phtml index 95d968aba..cde872aa0 100644 --- a/app/views/helpers/extension/configure.phtml +++ b/app/views/helpers/extension/configure.phtml @@ -5,7 +5,7 @@ : _t('admin.extensions.disabled'); ?> </h1> - <p class="alert alert-warn"><?php echo $this->extension->getDescription(); ?> — <?php echo _t('gen.short.by_author', $this->extension->getAuthor()); ?></p> + <p class="alert alert-warn"><?php echo $this->extension->getDescription(); ?> — <?php echo _t('gen.short.by_author'), ' ', $this->extension->getAuthor(); ?></p> <h2><?php echo _t('gen.action.manage'); ?></h2> <?php diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 7144aab46..4dbaacd04 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -205,6 +205,13 @@ </div> </div> + <div class="form-group"> + <label class="group-name" for="clear_cache"><?php echo _t('sub.feed.clear_cache'); ?></label> + <div class="group-controls"> + <input type="checkbox" name="clear_cache" id="clear_cache" value="1"<?php echo $this->feed->attributes('clear_cache') ? ' checked="checked"' : ''; ?> /> + </div> + </div> + <?php if (FreshRSS_Auth::hasAccess('admin')) { ?> <div class="form-group"> <label class="group-name" for="timeout"><?php echo _t('sub.feed.timeout'); ?></label> diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml index 6417da4cb..784a41e1f 100644 --- a/app/views/helpers/index/normal/entry_bottom.phtml +++ b/app/views/helpers/index/normal/entry_bottom.phtml @@ -7,6 +7,7 @@ $bottomline_read = FreshRSS_Context::$user_conf->bottomline_read; $bottomline_favorite = FreshRSS_Context::$user_conf->bottomline_favorite; $bottomline_sharing = FreshRSS_Context::$user_conf->bottomline_sharing && (count($sharing) > 0); + $bottomline_labels = true; //TODO $bottomline_tags = FreshRSS_Context::$user_conf->bottomline_tags; $bottomline_date = FreshRSS_Context::$user_conf->bottomline_date; $bottomline_link = FreshRSS_Context::$user_conf->bottomline_link; @@ -32,8 +33,41 @@ echo _i($this->entry->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php ?></li><?php } - } ?> - <li class="item"><?php + } + if ($bottomline_labels) { + ?><li class="item"> + <div class="dropdown dynamictags"> + <div id="dropdown-labels-<?php echo $this->entry->id();?>" class="dropdown-target"></div> + <?php echo FreshRSS_Themes::alt('label'); ?> + <a class="dropdown-toggle" href="#dropdown-labels-<?php echo $this->entry->id();?>"><?php + echo _t('index.menu.tags'); + ?></a> + <ul class="dropdown-menu"> + <li class="dropdown-close"><a href="#close">❌</a></li> + <!-- Ajax --> + </ul> + </div> + </li><?php + } + $tags = $bottomline_tags ? $this->entry->tags() : null; + if (!empty($tags)) { + ?><li class="item"> + <div class="dropdown"> + <div id="dropdown-tags-<?php echo $this->entry->id();?>" class="dropdown-target"></div> + <?php echo _i('tag'); ?> + <a class="dropdown-toggle" href="#dropdown-tags-<?php echo $this->entry->id();?>"><?php + echo _t('index.tag.related'); + ?></a> + <ul class="dropdown-menu"> + <li class="dropdown-close"><a href="#close">❌</a></li><?php + foreach ($tags as $tag) { + ?><li class="item"><a href="<?php echo _url('index', 'index', 'search', '#' . str_replace(' ', '+', htmlspecialchars_decode($tag, ENT_QUOTES))); ?>"><?php echo $tag; ?></a></li><?php + } ?> + </ul> + </div> + </li><?php + } + ?><li class="item"><?php if ($bottomline_sharing) { ?><div class="dropdown"> <div id="dropdown-share-<?php echo $this->entry->id();?>" class="dropdown-target"></div> @@ -69,24 +103,6 @@ </div> <?php } ?> </li><?php - $tags = $bottomline_tags ? $this->entry->tags() : null; - if (!empty($tags)) { - ?><li class="item"> - <div class="dropdown"> - <div id="dropdown-tags-<?php echo $this->entry->id();?>" class="dropdown-target"></div> - <?php echo _i('tag'); ?> - <a class="dropdown-toggle" href="#dropdown-tags-<?php echo $this->entry->id();?>"><?php - echo _t('index.tag.related'); - ?></a> - <ul class="dropdown-menu"> - <li class="dropdown-close"><a href="#close">❌</a></li><?php - foreach($tags as $tag) { - ?><li class="item"><a href="<?php echo _url('index', 'index', 'search', '#' . htmlspecialchars_decode($tag, ENT_QUOTES)); ?>"><?php echo $tag; ?></a></li><?php - } ?> - </ul> - </div> - </li><?php - } if ($bottomline_date) { ?><li class="item date"><?php echo $this->entry->date(); ?></li><?php } |