diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html index 0e981e22c5..936ef7d817 100644 --- a/templates/zephyr/index.html +++ b/templates/zephyr/index.html @@ -15,6 +15,10 @@ {% rawjstemplate "subscription" %} + + @@ -52,6 +56,7 @@ + {% if debug %} @@ -132,6 +137,12 @@ var people_list = [ Feedback +
').text(arr.msg)) + .append(error_list) + .show(); + invitee_emails_group.addClass('warning'); + + } + + } + }); +}; + +exports.set_all_streams = function (e, val) { + $('#streams_to_add :checkbox').attr('checked', val); + e.preventDefault(); +}; + +return exports; + +}()); diff --git a/zephyr/static/js/setup.js b/zephyr/static/js/setup.js index 7e42c8e4ca..2f9562c885 100644 --- a/zephyr/static/js/setup.js +++ b/zephyr/static/js/setup.js @@ -16,7 +16,7 @@ $(function () { // Compile Handlebars templates. $.each(['message', 'subscription', 'userinfo_popover_title', 'userinfo_popover_content', - 'timeinfo_popover_content'], + 'timeinfo_popover_content', 'invite_subscription'], function (index, name) { templates[name] = Handlebars.compile($('#template_'+name).html()); } diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js index e8ded192a7..bb7a56c99b 100644 --- a/zephyr/static/js/ui.js +++ b/zephyr/static/js/ui.js @@ -591,6 +591,7 @@ $(function () { search.initialize(); notifications.initialize(); hashchange.initialize(); + invite.initialize(); $("body").bind('click', function () { ui.hide_userinfo_popover(); diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css index 51d348f47f..c0e0d057c0 100644 --- a/zephyr/static/styles/zephyr.css +++ b/zephyr/static/styles/zephyr.css @@ -606,3 +606,20 @@ table.floating_recipient { width: 140px; float: right; } + +#invite_user_form { + margin-bottom: 0px; +} + +#invitee_emails { + min-height: 40px; + max-height: 300px; +} + +#invite_status { + display: none; +} + +hr.sidebar { + margin: 0px; +}