diff --git a/zephyr/static/js/subs.js b/zephyr/static/js/subs.js index 36aefc60c4..f5f8da2301 100644 --- a/zephyr/static/js/subs.js +++ b/zephyr/static/js/subs.js @@ -283,6 +283,10 @@ function settings_for_sub(sub) { return $("#subscription_settings_" + id); } +exports.show_settings_for = function (stream_name) { + settings_for_sub(get_sub(stream_name)).collapse('show'); +}; + function add_sub_to_table(sub) { $('#create_stream_row').after( templates.render('subscription', {subscriptions: [sub]})); diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js index d60a44b741..026a6d958b 100644 --- a/zephyr/static/js/ui.js +++ b/zephyr/static/js/ui.js @@ -1533,6 +1533,13 @@ $(function () { e.stopPropagation(); }); + $('body').on('click', '.open_stream_settings', function (e) { + var stream = $(e.currentTarget).parents('ul').attr('data-name'); + ui.hide_stream_sidebar_popover(); + ui.change_tab_to('#subscriptions'); + setTimeout(function () { subs.show_settings_for(stream); }, 100); + }); + $("body").on('click', function (e) { // Dismiss the popover if the user has clicked outside it if ($('.popover-inner').has(e.target).length === 0) { diff --git a/zephyr/static/templates/stream_sidebar_actions.handlebars b/zephyr/static/templates/stream_sidebar_actions.handlebars index 138cb5cdb6..18f62d679a 100644 --- a/zephyr/static/templates/stream_sidebar_actions.handlebars +++ b/zephyr/static/templates/stream_sidebar_actions.handlebars @@ -23,6 +23,12 @@ Compose a message to stream {{stream.name}} +
  • + + + Stream settings + +
  • Choose custom color