diff options
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_feed.phtml | 35 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 34 |
2 files changed, 48 insertions, 21 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 97c0fb0d9..ce029cfa0 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -35,6 +35,30 @@ </li> <?php + $t_active = FreshRSS_Context::isCurrentGet('T'); + ?> + <li class="tree-folder category tags<?php echo $t_active ? ' active' : ''; ?>"> + <div class="tree-folder-title"> + <a class="dropdown-toggle" href="#"><?php echo _i($t_active ? 'up' : 'down'); ?></a> + <a class="title" data-unread="<?php echo format_number($this->nbUnreadTags); ?>" href="<?php echo _url('index', 'index', 'get', 'T'); ?>"><?php echo _t('index.menu.tags'); ?></a> + </div> + <ul class="tree-folder-items<?php echo $t_active ? ' active' : ''; ?>"> + <?php + foreach ($this->tags as $tag): + ?> + <li id="t_<?php echo $tag->id(); ?>" class="item feed<?php echo FreshRSS_Context::isCurrentGet('t_' . $tag->id()) ? ' active' : ''; ?>" data-unread="<?php echo $tag->nbUnread(); ?>"> + <div class="dropdown no-mobile"> + <div class="dropdown-target"></div> + <a class="dropdown-toggle"><?php echo _i('configure'); ?></a> + <?php /* tag_config_template */ ?> + </div> + <?php echo FreshRSS_Themes::alt('label'); ?> <a class="item-title" data-unread="<?php echo format_number($tag->nbUnread()); ?>" href="<?php echo _url('index', 'index', 'get', 't_' . $tag->id()); ?>"><?php echo $tag->name(); ?></a> + </li> + <?php endforeach; ?> + </ul> + </li> + + <?php foreach ($this->categories as $cat) { $feeds = $cat->feeds(); if (!empty($feeds)) { @@ -72,6 +96,17 @@ </form> </div> +<script id="tag_config_template" type="text/html"> + <ul class="dropdown-menu"> + <li class="dropdown-close"><a href="#close">❌</a></li> + <li class="item"> + <button class="as-link confirm" disabled="disabled" + form="mark-read-aside" formaction="<?php echo _url('tag', 'delete', 'id_tag', '------'); ?>" + type="submit"><?php echo _t('gen.action.remove'); ?></button> + </li> + </ul> +</script> + <script id="feed_config_template" type="text/html"> <ul class="dropdown-menu"> <li class="dropdown-close"><a href="#close">❌</a></li> diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 1f11e0af1..2e16672e6 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -11,10 +11,6 @@ <?php echo self::headScript(); ?> <link rel="shortcut icon" id="favicon" type="image/x-icon" sizes="16x16 64x64" href="<?php echo Minz_Url::display('/favicon.ico'); ?>" /> <link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?php echo Minz_Url::display('/themes/icons/favicon-256.png'); ?>" /> - <link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>" /> - <link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>" /> - <link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('read', true); ?>" /> - <link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('unread', true); ?>" /> <link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>" /> <meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" /> @@ -22,24 +18,11 @@ <meta name="msapplication-TileColor" content="#FFF" /> <?php if (!FreshRSS_Context::$system_conf->allow_referrer) { ?> <meta name="referrer" content="never" /> -<?php - } - flush(); - if (isset($this->callbackBeforeContent)) { - call_user_func($this->callbackBeforeContent, $this); - } -?> +<?php } ?> <?php echo self::headTitle(); ?> <?php $url_base = Minz_Request::currentRequest(); - if (FreshRSS_Context::$next_id !== '') { - $url_next = $url_base; - $url_next['params']['next'] = FreshRSS_Context::$next_id; - $url_next['params']['ajax'] = 1; -?> - <link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display($url_next); ?>" /> -<?php - } if (isset($this->rss_title)) { + if (isset($this->rss_title)) { $url_rss = $url_base; $url_rss['a'] = 'rss'; if (FreshRSS_Context::$user_conf->since_hours_posts_per_rss) { @@ -54,10 +37,19 @@ <?php } ?> </head> <body class="<?php echo Minz_Request::actionName(); ?>"> -<?php $this->partial('header'); ?> +<?php + flush(); + $this->partial('header'); +?> <div id="global"> - <?php $this->render(); ?> + <?php + flush(); + if (isset($this->callbackBeforeFeeds)) { + call_user_func($this->callbackBeforeFeeds, $this); + } + $this->render(); + ?> </div> <?php |