:s/moderator?/staff/g ... our naming was kind of crazy, renamed moderator? to staff

app/assets/javascripts/discourse/controllers/user_controller.js

@@ -13,7 +13,7 @@ Discourse.UserController = Discourse.ObjectController.extend({
   }).property('content.username', 'Discourse.currentUser.username'),
 
   canSeePrivateMessages: (function() {
-    return this.get('viewingSelf') || Discourse.get('currentUser.moderator');
+    return this.get('viewingSelf') || Discourse.get('currentUser.staff');
   }).property('viewingSelf', 'Discourse.currentUser')
 
 });

app/assets/javascripts/discourse/templates/header.js.handlebars

@@ -65,26 +65,18 @@
 
       <section class='d-dropdown' id='site-map-dropdown'>
       <ul>
-        {{#if Discourse.currentUser.moderator}}
-          <li><a href="/admin"><i class='icon-cog'></i>{{i18n admin_title}}</a></li>
-          <li><a href="/admin/flags/active"><i class='icon-flag'></i>{{i18n flags_title}}</a></li>
+        {{#if Discourse.currentUser.staff}}
+          <li><a href="/admin"><i class='icon icon-cog'></i>{{i18n admin_title}}</a></li>
+          <li><a href="/admin/flags/active"><i class='icon icon-flag'></i>{{i18n flags_title}}</a>
+          {{#if view.currentUser.site_flagged_posts_count}}
+            <a href='/admin/flags/active' title='{{i18n notifications.total_flagged}}' class='badge-notification flagged-posts'>{{view.currentUser.site_flagged_posts_count}}</a>
+          {{/if}}
+          </li>
         {{/if}}
         <li>
           {{#titledLinkTo "list.latest" titleKey="filters.latest.help"}}{{i18n filters.latest.title}}{{/titledLinkTo}}
         </li>
         <li>{{#linkTo 'faq'}}{{i18n faq}}{{/linkTo}}</li>
-        {{#if Discourse.currentUser.admin}}
-          <li title="{{i18n filters.favorited.help}}">
-            {{#linkTo "list.favorited"}}
-              <i class='icon-star'></i>{{i18n filters.favorited.title}}
-            {{/linkTo}}
-          </li>
-          <li title="{{i18n filters.read.help}}">
-            {{#linkTo "list.read"}}
-              <i class='icon-bookmark'></i>{{i18n filters.read.title}}
-            {{/linkTo}}
-          </li>
-        {{/if}}
         {{#if view.categories}}
           <li class='heading' title="{{i18n filters.categories.help}}">
             {{#linkTo "list.categories"}}{{i18n filters.categories.title}}{{/linkTo}}

app/assets/javascripts/discourse/templates/user/user.js.handlebars

@@ -7,7 +7,7 @@
       {{#if viewingSelf}}
         <button {{action "logout" target="Discourse"}} class='btn'>{{i18n user.log_out}}</button>
       {{/if}}
-      {{#if Discourse.currentUser.moderator}}
+      {{#if Discourse.currentUser.staff}}
         <a href="{{unbound content.adminPath}}" class='btn'><i class="icon-wrench"></i>&nbsp;{{i18n admin.user.show_admin_profile}}</a>
       {{/if}}
       <ul class="nav nav-pills">