Merge pull request #510 from Martii/Issue-261RemoveModals

Add missing basic modals for user/script removal Auto-merge
OpenUserJS · Jan 9, 2015 · 2fa206a · 2fa206a
2 parents 9b310f7 + e0929ca
commit 2fa206a
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 6 deletions.
diff --git a/routes.js b/routes.js
@@ -117,8 +117,7 @@ module.exports = function (aApp) {
   aApp.route('/flag/libs/:username/:scriptname/:unflag?').get(script.lib(script.flag));
 
   // Remove route
-  // TODO: Make POST route
-  aApp.route(/^\/remove\/(.+?)\/(.+)$/).get(remove.rm);
+  aApp.route(/^\/remove\/(.+?)\/(.+)$/).post(remove.rm);
 
   // Group routes
   aApp.route('/groups').get(group.list);

diff --git a/views/includes/scriptModToolsPanel.html b/views/includes/scriptModToolsPanel.html
@@ -11,7 +11,7 @@
     {{> includes/flagModelSnippet.html }}
     {{/script}}
     <ul class="nav nav-pills nav-justified">
-      <li><a href="{{{script.scriptRemovePageUrl}}}" class="{{^canRemove}}disabled{{/canRemove}}"><i class="fa fa-trash-o"></i> Remove Script</a></li>
+      <li><a href="#" data-toggle="modal" data-target="#removeScriptModal" class="{{^canRemove}}disabled{{/canRemove}}"><i class="fa fa-ban"></i> Remove Script</a></li>
     </ul>
   </div>
 </div>

diff --git a/views/includes/scriptModals.html b/views/includes/scriptModals.html
@@ -3,7 +3,7 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h4 class="modal-title">Delete {{script.fullName}}</h4>
       </div>
       <div class="modal-body">
@@ -20,3 +20,25 @@ <h4 class="modal-title">Delete {{script.fullName}}</h4>
   </div>
 </div>
 {{/authorTools}}
+{{#modTools}}
+<div class="modal fade" id="removeScriptModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Remove {{script.fullName}}</h4>
+      </div>
+      <div class="modal-body">
+        <p>Are you sure you want to remove this script? You cannot undo this.</p>
+      </div>
+      <div class="modal-footer">
+        <form action="{{{script.scriptRemovePageUrl}}}" method="post">
+          <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-fw fa-close"></i> Close</button>
+          <input type="hidden" name="remove" value="true">
+          <button type="submit" class="btn btn-danger"><i class="fa fa-fw fa-ban"></i> Remove</button>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+{{/modTools}}
diff --git a/views/includes/userModToolsPanel.html b/views/includes/userModToolsPanel.html
@@ -11,7 +11,7 @@
     {{> includes/flagModelSnippet.html }}
     {{/user}}
     <ul class="nav nav-pills nav-justified">
-      <li><a href="{{{user.userRemovePageUrl}}}" class="{{^canRemove}}disabled{{/canRemove}}"><i class="fa fa-trash-o"></i> Remove User</a></li>
+      <li><a href="#" data-toggle="modal" data-target="#removeUserModal" class="{{^canRemove}}disabled{{/canRemove}}"><i class="fa fa-ban"></i> Remove User</a></li>
     </ul>
   </div>
 </div>

diff --git a/views/includes/userModals.html b/views/includes/userModals.html
@@ -0,0 +1,22 @@
+{{#modTools}}
+<div class="modal fade" id="removeUserModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Remove {{user.name}}</h4>
+      </div>
+      <div class="modal-body">
+        <p>Are you sure you want to remove this user? You cannot undo this.</p>
+      </div>
+      <div class="modal-footer">
+        <form action="{{{user.userRemovePageUrl}}}" method="post">
+          <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-fw fa-close"></i> Close</button>
+          <input type="hidden" name="remove" value="true">
+          <button type="submit" class="btn btn-danger"><i class="fa fa-fw fa-ban"></i> Remove</button>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+{{/modTools}}
diff --git a/views/pages/modPage.html b/views/pages/modPage.html
@@ -25,7 +25,7 @@ <h3>Flagged Items</h3>
         <h3>Removed Items</h3>
         <div class="list-group">
           <a href="/mod/removed" class="list-group-item">
-            <i class="fa fa-fw fa-trash-o"></i> Graveyard (Removed Items)
+            <i class="fa fa-fw fa-ban"></i> Graveyard (Removed Items)
           </a>
         </div>
       </div>

diff --git a/views/pages/userPage.html b/views/pages/userPage.html
@@ -27,6 +27,7 @@
       </div>
     </div>
   </div>
+  {{> includes/userModals.html }}
   {{> includes/footer.html }}
 </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ @@
           </div>
         </div>
       </div>
+      {{> includes/userModals.html }}
       {{> includes/footer.html }}
     </body>
     </html>