From b7d8f5d43fe5aee4d18fd61764ce34504458a67d Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Wed, 13 Nov 2013 11:50:32 -0500 Subject: [PATCH] Move groups (not just users) from right to left sidebar. When a user squishes the browser window enough to move users to the left sidebar, we need to move user groups as well. More importantly, when they widen again, we move both of them back in a way that users stay on top of groups. (imported from commit d80722b58190d42a2dfc5247bfffaa7708cde21a) --- static/js/ui.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/js/ui.js b/static/js/ui.js index 3383171c2e..2be00ced2c 100644 --- a/static/js/ui.js +++ b/static/js/ui.js @@ -436,8 +436,10 @@ exports.resize_page_components = function () { popovers.set_userlist_placement("left"); sidebar = $(".bottom_sidebar").expectOne(); sidebar.append($("#user-list").expectOne()); + sidebar.append($("#group-pm-list").expectOne()); sidebar.append($("#share-the-love").expectOne()); $("#user_presences").css("margin", "0px"); + $("#group-pms").css("margin", "0px"); $("#userlist-toggle").css("display", "none"); } else if (viewport.width() > 975 && feature_flags.left_side_userlist && narrow_window) { @@ -445,7 +447,9 @@ exports.resize_page_components = function () { popovers.set_userlist_placement("right"); sidebar = $("#right-sidebar").expectOne(); sidebar.append($("#user-list").expectOne()); + sidebar.append($("#group-pm-list").expectOne()); $("#user_presences").css("margin", ''); + $("#group-pms").css("margin", ''); $("#userlist-toggle").css("display", ''); }