REFACTOR: More consistent user/group page layouts

REFACTOR: More consistent user/group page layouts

diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index a137183..583e827 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -1,3 +1,5 @@
+<section class="user-content">
+
 <div class="group-members-actions">
     {{text-field value=filterInput
         placeholderKey=filterPlaceholder
@@ -77,3 +79,4 @@
 
   <div>{{i18n "groups.empty.members"}}</div>
 {{/if}}
+</section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index bb59340..5ac0a81 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -53,16 +53,13 @@
       {{/if}}
     </div>
   </div>
-
-  <div class="list-controls">
+<div class="user-content-wrapper">
+  <section class="user-primary-navigation">
     <div class="container">
       {{group-navigation group=model currentPath=application.currentPath tabs=tabs}}
     </div>
-  </div>
+  </section>
 
-    <div class='user-table'>
-      <div class='wrapper'>
         {{outlet}}
-      </div>
-    </div>
 </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs
index ce6ec6d..ba0eaad 100644
--- a/app/assets/javascripts/discourse/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/group/activity.hbs
@@ -1,4 +1,4 @@
-<section class="user-navigation">
+  <section class="user-secondary-navigation">
   {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=application.currentPath}}
     {{group-activity-filter filter="posts" categoryId=category_id}}
     {{group-activity-filter filter="topics" categoryId=category_id}}
@@ -8,7 +8,6 @@
     {{plugin-outlet name="group-activity-bottom" tagName='' connectorTagName='li'}}
   {{/mobile-nav}}
 </section>
-
-<section class='user-right'>
+<section class="user-content">
   {{outlet}}
-</section>
+  </section>
diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/templates/group/manage.hbs
index 6357ae8..583edec 100644
--- a/app/assets/javascripts/discourse/templates/group/manage.hbs
+++ b/app/assets/javascripts/discourse/templates/group/manage.hbs
@@ -1,4 +1,4 @@
-<section class='user-navigation'>
+<section class='user-secondary-navigation'>
   {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=application.currentPath}}
     {{#each tabs as |tab|}}
       <li>
@@ -9,7 +9,6 @@
     {{/each}}
   {{/mobile-nav}}
 </section>
-
-<section class='user-right'>
+<section class="user-content">
   {{outlet}}
-</section>
+  </section>
diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs
index 78d73cc..fa98699 100644
--- a/app/assets/javascripts/discourse/templates/group/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/group/messages.hbs
@@ -1,4 +1,4 @@
-<section class="user-navigation">
+  <section class="user-secondary-navigation">
   {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=application.currentPath}}
 
     <li>
@@ -13,6 +13,6 @@
     </li>
   {{/mobile-nav}}
 </section>
-<section class='user-right messages'>
+<section class="user-content">
     {{outlet}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
index ed467fb..8bf3d52 100644
--- a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
@@ -1,3 +1,4 @@
+<section class="user-content">
 {{text-field value=filterInput
     placeholderKey=filterPlaceholder
     autocomplete="discourse"
@@ -56,3 +57,4 @@
 
   <div>{{i18n "groups.empty.members"}}</div>
 {{/if}}
+</section>
diff --git a/app/assets/javascripts/discourse/templates/preferences.hbs b/app/assets/javascripts/discourse/templates/preferences.hbs
index 82712f6..a7c88a5 100644
--- a/app/assets/javascripts/discourse/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences.hbs
@@ -1,4 +1,4 @@
-{{#d-section pageClass="user-preferences" class="user-navigation"}}
+{{#d-section pageClass="user-preferences" class="user-secondary-navigation"}}
   {{#mobile-nav class='preferences-nav' desktopClass='preferences-list action-list nav-stacked' currentPath=application.currentPath}}
     <li class='nav-account'>
       {{#link-to 'preferences.account'}}
@@ -53,7 +53,7 @@
   {{/mobile-nav}}
 {{/d-section}}
 
-<section class='user-right user-preferences'>
+<section class='user-content user-preferences'>
   {{plugin-outlet name="above-user-preferences"}}
 
   <form class="form-vertical">
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index 6c9740c..f76b48e 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -1,7 +1,7 @@
 <div class="control-group category-notifications">
   <label class="control-label">{{i18n 'user.categories_settings'}}</label>
 
-  <div class="controls category-controls">
+  <div class="controls tracking-controls">
     <label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
     {{category-selector categories=model.watchedCategories blacklist=selectedCategories}}
   </div>
@@ -12,7 +12,7 @@
     </div>
   {{/if}}
 
-  <div class="controls category-controls">
+  <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{category-selector categories=model.trackedCategories blacklist=selectedCategories}}
   </div>
@@ -23,13 +23,13 @@
     </div>
   {{/if}}
 
-  <div class="controls category-controls">
+  <div class="controls tracking-controls">
     <label>{{d-icon "d-watching-first"}} {{i18n 'user.watched_first_post_categories'}}</label>
     {{category-selector categories=model.watchedFirstPostCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n 'user.watched_first_post_categories_instructions'}}</div>
 
-  <div class="controls category-controls">
+  <div class="controls tracking-controls">
     <label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
     {{category-selector categories=model.mutedCategories blacklist=selectedCategories}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index 5c06984..e97b28d 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -1,4 +1,6 @@
 <div class="control-group notifications">
+      <label class="control-label">{{i18n 'user.notifications'}}</label>
+
   <div class="controls controls-dropdown">
     <label>{{i18n 'user.new_topic_duration.label'}}</label>
     {{combo-box class="duration" valueAttribute="value" content=considerNewTopicOptions value=model.user_option.new_topic_duration_minutes}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
index 6e7c273..1e7880f 100644
--- a/app/assets/javascripts/discourse/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
@@ -3,7 +3,7 @@
 
   <label class="control-label">{{i18n 'user.tag_settings'}}</label>
 
-  <div class="controls tag-controls">

[... diff too long, it was truncated ...]

GitHub sha: df279251

1 Like