Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing basic modals for user/script removal #510

Merged
merged 1 commit into from
Jan 9, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion views/includes/scriptModToolsPanel.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
24 changes: 23 additions & 1 deletion views/includes/scriptModals.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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}}
2 changes: 1 addition & 1 deletion views/includes/userModToolsPanel.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 22 additions & 0 deletions views/includes/userModals.html
Original file line number Diff line number Diff line change
@@ -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}}
2 changes: 1 addition & 1 deletion views/pages/modPage.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions views/pages/userPage.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
</div>
</div>
</div>
{{> includes/userModals.html }}
{{> includes/footer.html }}
</body>
</html>