Merge branch 'master' into 1236-database-changes

# Conflicts:
#	src/Forum/Controller/IndexController.php
#	src/User/UserMetadataUpdater.php

js/src/admin/AdminApplication.js

@@ -55,7 +55,7 @@ export default class AdminApplication extends Application {
       required.push('discussion.hide');
     }
     if (permission === 'discussion.deletePosts') {
-      required.push('discussion.editPosts');
+      required.push('discussion.hidePosts');
     }
 
     return required;

js/src/admin/components/PermissionGrid.js

@@ -206,10 +206,16 @@ export default class PermissionGrid extends Component {
 
     items.add('editPosts', {
       icon: 'fas fa-pencil-alt',
-      label: app.translator.trans('core.admin.permissions.edit_and_delete_posts_label'),
+      label: app.translator.trans('core.admin.permissions.edit_posts_label'),
       permission: 'discussion.editPosts'
     }, 70);
 
+    items.add('hidePosts', {
+      icon: 'far fa-trash-alt',
+      label: app.translator.trans('core.admin.permissions.delete_posts_label'),
+      permission: 'discussion.hidePosts'
+    }, 60);
+
     items.add('deletePosts', {
       icon: 'fas fa-times',
       label: app.translator.trans('core.admin.permissions.delete_posts_forever_label'),

js/src/common/Translator.js

@@ -1,6 +1,5 @@
 import User from './models/User';
 import username from './helpers/username';
-import extractText from './utils/extractText';
 import extract from './utils/extract';
 
 /**
@@ -23,6 +22,10 @@ export default class Translator {
     this.locale = null;
   }
 
+  addTranslations(translations) {
+    Object.assign(this.translations, translations);
+  }
+
   trans(id, parameters) {
     const translation = this.translations[id];
 

js/src/common/models/Post.js

@@ -24,5 +24,6 @@ Object.assign(Post.prototype, {
   isHidden: computed('hideTime', hideTime => !!hideTime),
 
   canEdit: Model.attribute('canEdit'),
+  canHide: Model.attribute('canHide'),
   canDelete: Model.attribute('canDelete')
 });

js/src/forum/components/IndexPage.js

@@ -71,15 +71,17 @@ export default class IndexPage extends Page {
       <div className="IndexPage">
         {this.hero()}
         <div className="container">
-          <nav className="IndexPage-nav sideNav">
-            <ul>{listItems(this.sidebarItems().toArray())}</ul>
-          </nav>
-          <div className="IndexPage-results sideNavOffset">
-            <div className="IndexPage-toolbar">
-              <ul className="IndexPage-toolbar-view">{listItems(this.viewItems().toArray())}</ul>
-              <ul className="IndexPage-toolbar-action">{listItems(this.actionItems().toArray())}</ul>
+          <div className="sideNavContainer">
+            <nav className="IndexPage-nav sideNav">
+              <ul>{listItems(this.sidebarItems().toArray())}</ul>
+            </nav>
+            <div className="IndexPage-results sideNavOffset">
+              <div className="IndexPage-toolbar">
+                <ul className="IndexPage-toolbar-view">{listItems(this.viewItems().toArray())}</ul>
+                <ul className="IndexPage-toolbar-action">{listItems(this.actionItems().toArray())}</ul>
+              </div>
+              {app.cache.discussionList.render()}
             </div>
-            {app.cache.discussionList.render()}
           </div>
         </div>
       </div>

js/src/forum/components/UserPage.js

@@ -40,11 +40,13 @@ export default class UserPage extends Page {
             controlsButtonClassName: 'Button'
           }),
           <div className="container">
-            <nav className="sideNav UserPage-nav" config={affixSidebar}>
-              <ul>{listItems(this.sidebarItems().toArray())}</ul>
-            </nav>
-            <div className="sideNavOffset UserPage-content">
-              {this.content()}
+            <div className="sideNavContainer">
+              <nav className="sideNav UserPage-nav" config={affixSidebar}>
+                <ul>{listItems(this.sidebarItems().toArray())}</ul>
+              </nav>
+              <div className="sideNavOffset UserPage-content">
+                {this.content()}
+              </div>
             </div>
           </div>
         ] : [

js/src/forum/utils/PostControls.js

@@ -82,7 +82,7 @@ export default {
     const items = new ItemList();
 
     if (post.contentType() === 'comment' && !post.isHidden()) {
-      if (post.canEdit()) {
+      if (post.canHide()) {
         items.add('hide', Button.component({
           icon: 'far fa-trash-alt',
           children: app.translator.trans('core.forum.post_controls.delete_button'),
@@ -90,7 +90,7 @@ export default {
         }));
       }
     } else {
-      if (post.contentType() === 'comment' && post.canEdit()) {
+      if (post.contentType() === 'comment' && post.canHide()) {
         items.add('restore', Button.component({
           icon: 'fas fa-reply',
           children: app.translator.trans('core.forum.post_controls.restore_button'),