Merge remote-tracking branch 'origin/branch-5.6'

2 files changed, 26 insertions, 2 deletions

diff --git a/server/sonar-web/src/main/js/apps/groups/list-view.js b/server/sonar-web/src/main/js/apps/groups/list-view.js
index 20280b7c7c4..cca2de036ae 100644
--- a/server/sonar-web/src/main/js/apps/groups/list-view.js
+++ b/server/sonar-web/src/main/js/apps/groups/list-view.js
@@ -19,10 +19,12 @@
  */
 import Marionette from 'backbone.marionette';
 import ListItemView from './list-item-view';
+import Template from './templates/groups-list.hbs';
 
-export default Marionette.CollectionView.extend({
-  tagName: 'ul',
+export default Marionette.CompositeView.extend({
   childView: ListItemView,
+  childViewContainer: '.js-list',
+  template: Template,
 
   collectionEvents: {
     'request': 'showLoading',
@@ -35,6 +37,10 @@ export default Marionette.CollectionView.extend({
 
   hideLoading () {
     this.$el.removeClass('new-loading');
+
+    const query = this.collection.q || '';
+    const shouldHideAnyone = !'anyone'.includes(query.toLowerCase());
+    this.$('.js-anyone').toggleClass('hidden', shouldHideAnyone);
   }
 });
 
diff --git a/server/sonar-web/src/main/js/apps/groups/templates/groups-list.hbs b/server/sonar-web/src/main/js/apps/groups/templates/groups-list.hbs
new file mode 100644
index 00000000000..71820036560
--- /dev/null
+++ b/server/sonar-web/src/main/js/apps/groups/templates/groups-list.hbs
@@ -0,0 +1,18 @@
+<div>
+  <div class="panel panel-vertical js-anyone">
+    <div class="display-inline-block text-top width-20">
+      <strong class="js-group-name">Anyone</strong>
+    </div>
+
+    <div class="display-inline-block text-top big-spacer-left width-25">
+
+    </div>
+
+    <div class="display-inline-block text-top big-spacer-left width-40">
+      <span class="js-group-description">{{t 'user_groups.anyone.description'}}</span>
+    </div>
+
+  </div>
+
+  <ul class="js-list"></ul>
+</div>