Merge pull request #553 from Martii/Issue-262modalFlagging

Flagging UI modifications

Auto-merge

Author: Martii

views/includes/scriptModals.html

@@ -1,3 +1,22 @@
+<div class="modal fade" id="flagScriptModal">
+  <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">Flag {{script.fullName}}</h4>
+      </div>
+      <div class="modal-body">
+        <p>Are you sure you want to flag this script for inspection by a Moderator?</p>
+      </div>
+      <div class="modal-footer">
+        <form action="{{{flagUrl}}}" method="get">
+          <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-fw fa-close"></i> Close</button>
+          <button type="submit" class="btn btn-danger{{^canFlag}} disabled{{/canFlag}}"><i class="fa fa-fw fa-flag"></i> Flag</button>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
 {{#authorTools}}
 <div class="modal fade" id="deleteScriptModal">
   <div class="modal-dialog">

views/includes/scriptUserToolsPanel.html

@@ -13,8 +13,13 @@
     </div>
     <ul class="nav nav-pills nav-justified">
       <li><a rel="nofollow" href="{{{favoriteUrl}}}" class="{{^canFavorite}}disabled{{/canFavorite}}"><i class="fa fa-star{{^upvoted}}-o{{/upvoted}}"></i> Favorite</a></li>
-      <li><a rel="nofollow" href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag{{^flagged}}-o{{/flagged}}"></i> {{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}</a></li>
       <li><a rel="nofollow" href="{{forkUrl}}" class="{{^canFork}}disabled{{/canFork}}"><i class="fa fa-code-fork"></i> Fork</a></li>
+      {{#flagged}}
+        <li><a rel="nofollow" href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag"></i> Unflag</a></li>
+      {{/flagged}}
+      {{^flagged}}
+        <li><a rel="nofollow" href="#" data-toggle="modal" data-target="#flagScriptModal" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag-o"></i> Flag</a></li>
+      {{/flagged}}
     </ul>
   </div>
 </div>

views/includes/userModals.html

@@ -1,3 +1,22 @@
+<div class="modal fade" id="flagUserModal">
+  <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">Flag {{user.name}}</h4>
+      </div>
+      <div class="modal-body">
+        <p>Are you sure you want to flag this user for inspection by a Moderator?</p>
+      </div>
+      <div class="modal-footer">
+        <form action="{{{flagUrl}}}" method="get">
+          <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-fw fa-close"></i> Close</button>
+          <button type="submit" class="btn btn-danger{{^canFlag}} disabled{{/canFlag}}"><i class="fa fa-fw fa-flag"></i> Flag</button>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
 {{#modTools}}
 <div class="modal fade" id="removeUserModal">
   <div class="modal-dialog">

views/includes/userUserToolsPanel.html

@@ -1,7 +1,12 @@
 <div class="panel panel-default">
   <div class="panel-body">
     <ul class="nav nav-pills nav-justified">
-      <li><a rel="nofollow" href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag{{^flagged}}-o{{/flagged}}"></i> {{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}</a></li>
+      {{#flagged}}
+        <li><a rel="nofollow" href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag"></i> Unflag</a></li>
+      {{/flagged}}
+      {{^flagged}}
+        <li><a rel="nofollow" href="#" data-toggle="modal" data-target="#flagUserModal" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag-o"></i> Flag</a></li>
+      {{/flagged}}
     </ul>
   </div>
 </div>