diff options
author | Barak Korren <[email protected]> | 2013-04-02 20:38:07 +0300 |
---|---|---|
committer | Barak Korren <[email protected]> | 2013-04-02 20:38:07 +0300 |
commit | 58a2577d48790c79adfd44bcfd662c980ce6cfe4 (patch) | |
tree | 523d814ea0b7b6f617fe515b186099c6e83fed72 /index.php | |
parent | e470a273cf09562fb2f9c0c899002303f19c8d16 (diff) | |
parent | cc332603431102a682feda22b9cf0093a29f0176 (diff) |
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -104,6 +104,9 @@ <?php require 'lib/jshrink/Minifier.php'; + print get_minified_js(array("tt-rss", + "functions", "feedlist", "viewfeed", "FeedTree")); + global $pluginhost; foreach ($pluginhost->get_plugins() as $n => $p) { @@ -112,9 +115,6 @@ } } - print get_minified_js(array("tt-rss", - "functions", "feedlist", "viewfeed", "FeedTree")); - init_js_translations(); ?> </script> @@ -140,8 +140,6 @@ </div> </div> -<div style="display : none" onclick="Element.hide(this)" id="small_article_preview"></div> - <div id="notify" class="notify"><span id="notify_body"> </span></div> <div id="cmdline" style="display : none"></div> <div id="headlines-tmp" style="display : none"></div> @@ -190,7 +188,7 @@ </select> <select title="<?php echo __('Mark feed as read') ?>" - onchange="catchupCurrentFeed(event)" + onchange="catchupCurrentFeed(this)" dojoType="dijit.form.Select" name="catchup_feed"> <option selected="selected" value="default"><?php echo __('Mark as read') ?></option> <option value="all"><?php echo __('All articles') ?></option> @@ -201,15 +199,15 @@ </form> - <?php - global $pluginhost; - foreach ($pluginhost->get_hooks($pluginhost::HOOK_TOOLBAR_BUTTON) as $p) { - echo $p->hook_toolbar_button(); - } - ?> - <div class="actionChooser"> + <?php + global $pluginhost; + foreach ($pluginhost->get_hooks($pluginhost::HOOK_TOOLBAR_BUTTON) as $p) { + echo $p->hook_toolbar_button(); + } + ?> + <button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true" title="<?php echo __("Communication problem with server.") ?>"> <img |