From aa86e5f20633d45a991104234fe75e16d2dfd0ec Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 15 Nov 2016 17:09:55 -0500
Subject: [PATCH] Remove admin modal views

---
 .../admin/routes/admin-backups.js.es6         |  2 +-
 .../admin/routes/admin-badges-show.js.es6     |  4 ++--
 .../admin/routes/admin-flags-list.js.es6      |  4 ++--
 .../admin/routes/admin-user-index.js.es6      |  2 +-
 .../templates/modal/admin-agree-flag.hbs      | 24 ++++++++++---------
 .../templates/modal/admin-badge-preview.hbs   |  4 ++--
 .../templates/modal/admin-delete-flag.hbs     | 12 ++++++----
 .../modal/admin-edit-badge-groupings.hbs      |  5 ++--
 .../templates/modal/admin-start-backup.hbs    |  8 ++++---
 .../templates/modal/admin-suspend-user.hbs    |  5 ++--
 .../views/modals/admin-agree-flag.js.es6      |  6 -----
 .../views/modals/admin-badge-preview.js.es6   |  6 -----
 .../views/modals/admin-delete-flag.js.es6     |  6 -----
 .../modals/admin-edit-badge-groupings.js.es6  |  6 -----
 .../views/modals/admin-start-backup.js.es6    |  6 -----
 .../views/modals/admin-suspend-user.js.es6    |  6 -----
 .../discourse/lib/show-modal.js.es6           | 10 +++++---
 17 files changed, 46 insertions(+), 70 deletions(-)
 delete mode 100644 app/assets/javascripts/admin/views/modals/admin-agree-flag.js.es6
 delete mode 100644 app/assets/javascripts/admin/views/modals/admin-badge-preview.js.es6
 delete mode 100644 app/assets/javascripts/admin/views/modals/admin-delete-flag.js.es6
 delete mode 100644 app/assets/javascripts/admin/views/modals/admin-edit-badge-groupings.js.es6
 delete mode 100644 app/assets/javascripts/admin/views/modals/admin-start-backup.js.es6
 delete mode 100644 app/assets/javascripts/admin/views/modals/admin-suspend-user.js.es6

diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index ad6f79a8cb3..95407e9ff30 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -49,7 +49,7 @@ export default Discourse.Route.extend({
 
   actions: {
     startBackup() {
-      showModal('modals/admin-start-backup');
+      showModal('admin-start-backup', { admin: true });
       this.controllerFor('modal').set('modalClass', 'start-backup-modal');
     },
 
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
index 537fdcfda8e..cc0155181f7 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
@@ -27,7 +27,7 @@ export default Ember.Route.extend({
 
     editGroupings() {
       const model = this.controllerFor('admin-badges').get('badgeGroupings');
-      showModal('modals/admin-edit-badge-groupings', { model });
+      showModal('admin-edit-badge-groupings', { model, admin: true });
     },
 
     preview(badge, explain) {
@@ -42,7 +42,7 @@ export default Ember.Route.extend({
         }
       }).then(function(model) {
         badge.set('preview_loading', false);
-        showModal('modals/admin-badge-preview', { model });
+        showModal('admin-badge-preview', { model, admin: true });
       }).catch(function(error) {
         badge.set('preview_loading', false);
         Em.Logger.error(error);
diff --git a/app/assets/javascripts/admin/routes/admin-flags-list.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-list.js.es6
index ebbc3e6d2bc..ba00186d90e 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-list.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-list.js.es6
@@ -14,12 +14,12 @@ export default Discourse.Route.extend({
 
   actions: {
     showAgreeFlagModal(model) {
-      showModal('modals/admin-agree-flag', { model });
+      showModal('admin-agree-flag', { model, admin: true });
       this.controllerFor('modal').set('modalClass', 'agree-flag-modal');
     },
 
     showDeleteFlagModal(model) {
-      showModal('modals/admin-delete-flag', { model });
+      showModal('admin-delete-flag', { model, admin: true });
       this.controllerFor('modal').set('modalClass', 'delete-flag-modal');
     }
 
diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
index 5a3afa10caa..c10e5957d5a 100644
--- a/app/assets/javascripts/admin/routes/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
@@ -26,7 +26,7 @@ export default Discourse.Route.extend({
 
   actions: {
     showSuspendModal(model) {
-      showModal('modals/admin-suspend-user', { model });
+      showModal('admin-suspend-user', { model, admin: true });
       this.controllerFor('modal').set('modalClass', 'suspend-user-modal');
     }
   }
diff --git a/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
index 6c494e0e2c3..6f845b22c80 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
@@ -1,11 +1,13 @@
-{{#if model.user_deleted}}
-  <button title="{{i18n 'admin.flags.agree_flag_restore_post_title'}}" {{action "agreeFlagRestorePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye"></i>{{i18n 'admin.flags.agree_flag_restore_post'}}</button>
-{{else}}
-  {{#unless model.postHidden}}
-    <button title="{{i18n 'admin.flags.agree_flag_hide_post_title'}}" {{action "agreeFlagHidePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye-slash"></i>{{i18n 'admin.flags.agree_flag_hide_post'}}</button>
-  {{/unless}}
-{{/if}}
-<button title="{{i18n 'admin.flags.agree_flag_title'}}" {{action "agreeFlagKeepPost"}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree_flag'}}</button>
-{{#if model.canDeleteAsSpammer}}
-  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
-{{/if}}
+{{#d-modal-body title="admin.flags.agree_flag_modal_title"}}
+  {{#if model.user_deleted}}
+    <button title="{{i18n 'admin.flags.agree_flag_restore_post_title'}}" {{action "agreeFlagRestorePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye"></i>{{i18n 'admin.flags.agree_flag_restore_post'}}</button>
+  {{else}}
+    {{#unless model.postHidden}}
+      <button title="{{i18n 'admin.flags.agree_flag_hide_post_title'}}" {{action "agreeFlagHidePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye-slash"></i>{{i18n 'admin.flags.agree_flag_hide_post'}}</button>
+    {{/unless}}
+  {{/if}}
+  <button title="{{i18n 'admin.flags.agree_flag_title'}}" {{action "agreeFlagKeepPost"}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree_flag'}}</button>
+  {{#if model.canDeleteAsSpammer}}
+    <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
+  {{/if}}
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index 14a475f5c57..c22bd9d99d2 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -1,4 +1,4 @@
-<div class="badge-query-preview">
+{{#d-modal-body title="admin.badges.preview.modal_title" class="badge-query-preview"}}
   {{#if errors}}
     <p class="error-header">{{i18n 'admin.badges.preview.sql_error_header'}}</p>
 
@@ -46,4 +46,4 @@
         </div>
     {{/if}}
   {{/if}}
-</div>
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
index 926f81bd21f..c2abeae36d7 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
@@ -1,5 +1,7 @@
-<button title="{{i18n 'admin.flags.delete_post_defer_flag_title'}}" {{action "deletePostDeferFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n 'admin.flags.delete_post_defer_flag'}}</button>
-<button title="{{i18n 'admin.flags.delete_post_agree_flag_title'}}" {{action "deletePostAgreeFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.delete_post_agree_flag'}}</button>
-{{#if model.canDeleteAsSpammer}}
-  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
-{{/if}}
+{{#d-modal-body title="admin.flags.delete_flag_modal_title"}}
+  <button title="{{i18n 'admin.flags.delete_post_defer_flag_title'}}" {{action "deletePostDeferFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n 'admin.flags.delete_post_defer_flag'}}</button>
+  <button title="{{i18n 'admin.flags.delete_post_agree_flag_title'}}" {{action "deletePostAgreeFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.delete_post_agree_flag'}}</button>
+  {{#if model.canDeleteAsSpammer}}
+    <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
+  {{/if}}
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
index 9d8daad53d6..80eb0844b30 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
@@ -1,4 +1,4 @@
-<div class="modal-body">
+{{#d-modal-body title="admin.badges.badge_groupings.modal_title"}}
   <div>
     <ul class='badge-groupings'>
     {{#each workingCopy as |wc|}}
@@ -20,7 +20,8 @@
     </ul>
   </div>
   <button class='btn' {{action "add"}}>{{i18n 'admin.badges.new'}}</button>
-</div>
+{{/d-modal-body}}
+
 <div class="modal-footer">
   <button class='btn btn-primary' {{action "saveAll"}} disabled={{submitDisabled}}>{{i18n 'admin.badges.save'}}</button>
   <a {{action "cancel"}}>{{i18n 'cancel'}}</a>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs b/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
index 93a3a96bc9d..250931599b9 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
@@ -1,3 +1,5 @@
-<button {{action "startBackup"}} class="btn btn-primary">{{i18n 'yes_value'}}</button>
-<button {{action "startBackupWithoutUpload"}} class="btn">{{i18n 'admin.backups.operations.backup.without_uploads'}}</button>
-<button {{action "cancel"}} class="btn">{{i18n 'no_value'}}</button>
+{{#d-modal-body title="admin.backups.operations.backup.confirm"}}
+  <button {{action "startBackup"}} class="btn btn-primary">{{i18n 'yes_value'}}</button>
+  <button {{action "startBackupWithoutUpload"}} class="btn">{{i18n 'admin.backups.operations.backup.without_uploads'}}</button>
+  <button {{action "cancel"}} class="btn">{{i18n 'no_value'}}</button>
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
index 1ba54ce67b7..9d9326ad3ee 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -1,4 +1,4 @@
-<div class="modal-body">
+{{#d-modal-body title="admin.user.suspend_modal_title"}}
   <form>
     {{i18n 'admin.user.suspend_duration'}}
     {{text-field value=duration maxlength="5" autofocus="autofocus"}}
@@ -8,7 +8,8 @@
     <br/>
     {{text-field value=reason class="span8"}}
   </form>
-</div>
+{{/d-modal-body}}
+
 <div class="modal-footer">
   <button class='btn btn-danger' {{action "suspend"}} disabled={{submitDisabled}}><i class='fa fa-ban'></i>{{i18n 'admin.user.suspend'}}</button>
   <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
diff --git a/app/assets/javascripts/admin/views/modals/admin-agree-flag.js.es6 b/app/assets/javascripts/admin/views/modals/admin-agree-flag.js.es6
deleted file mode 100644
index 0a4aba513f9..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-agree-flag.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: 'admin/templates/modal/admin_agree_flag',
-  title: I18n.t('admin.flags.agree_flag_modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-badge-preview.js.es6 b/app/assets/javascripts/admin/views/modals/admin-badge-preview.js.es6
deleted file mode 100644
index 6431ba9362b..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-badge-preview.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: 'admin/templates/modal/admin_badge_preview',
-  title: I18n.t('admin.badges.preview.modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-delete-flag.js.es6 b/app/assets/javascripts/admin/views/modals/admin-delete-flag.js.es6
deleted file mode 100644
index 379b2ef773f..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-delete-flag.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: 'admin/templates/modal/admin_delete_flag',
-  title: I18n.t('admin.flags.delete_flag_modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/views/modals/admin-edit-badge-groupings.js.es6
deleted file mode 100644
index ccc5f49a3b9..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-edit-badge-groupings.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: 'admin/templates/modal/admin_edit_badge_groupings',
-  title: I18n.t('admin.badges.badge_groupings.modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/views/modals/admin-start-backup.js.es6
deleted file mode 100644
index e363ee1a157..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-start-backup.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: 'admin/templates/modal/admin_start_backup',
-  title: I18n.t('admin.backups.operations.backup.confirm')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-suspend-user.js.es6 b/app/assets/javascripts/admin/views/modals/admin-suspend-user.js.es6
deleted file mode 100644
index 9f3dcb1635e..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-suspend-user.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: 'admin/templates/modal/admin_suspend_user',
-  title: I18n.t('admin.user.suspend_modal_title')
-});
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6
index 0306b001e0f..fc13b122d1d 100644
--- a/app/assets/javascripts/discourse/lib/show-modal.js.es6
+++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6
@@ -9,17 +9,21 @@ export default function(name, opts) {
 
   modalController.set('modalClass', null);
 
+  const controllerName = opts.admin ? `modals/${name}` : name;
+
   const viewClass = container.lookupFactory('view:' + name);
-  const controller = container.lookup('controller:' + name);
+  const controller = container.lookup('controller:' + controllerName);
   if (viewClass) {
     route.render(name, { into: 'modal', outlet: 'modalBody' });
   } else {
     const templateName = Ember.String.dasherize(name);
 
     const renderArgs = { into: 'modal', outlet: 'modalBody', view: 'modal-body'};
-    if (controller) { renderArgs.controller = name; }
+    if (controller) { renderArgs.controller = controllerName; }
 
-    route.render('modal/' + templateName, renderArgs);
+    const modalName = `modal/${templateName}`;
+    const fullName = opts.admin ? `admin/templates/${modalName}` : modalName;
+    route.render(fullName, renderArgs);
     if (opts.title) {
       modalController.set('title', I18n.t(opts.title));
     }