Merge branch 'subscribe-idn-feed' into 'master'

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index 36734619ffd457c300c47b61cffa8181b1a27c05..220fe27c1693536d5147b7d69b3207dc151f44f2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -118,7 +118,12 @@
 
                foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
                        if (method_exists($p, "get_js")) {
+                               echo "try {";
                                echo JShrink\Minifier::minify($p->get_js());
+                               echo "} catch (e) {
+                                       console.warn('failed to initialize plugin JS: $n');
+                                       console.warn(e);
+                               }";
                        }
                }
 
@@ -166,17 +171,18 @@
 <div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
        <div id="main-toolbar" dojoType="dijit.Toolbar">
 
+               <?php
+               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON) as $p) {
+                       echo $p->hook_main_toolbar_button();
+               }
+               ?>
+
                <form id="headlines-toolbar" action="" onsubmit='return false'>
 
                </form>
 
                <form id="main_toolbar_form" action="" onsubmit='return false'>
 
-               <button dojoType="dijit.form.Button" id="collapse_feeds_btn"
-                       onclick="collapse_feedlist()"
-                       title="<?php echo __('Collapse feedlist') ?>" style="display : none">
-                       &lt;&lt;</button>
-
                <select name="view_mode" title="<?php echo __('Show articles') ?>"
                        onchange="viewModeChanged()"
                        dojoType="dijit.form.Select">