From 3d058bce053920dafd05f53e0ce2bef5dcc5f309 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Wed, 22 Apr 2020 14:57:37 -0400
Subject: [PATCH] Switch to using outline button

---
 .../templates/challenges/challenges.html      | 42 +++++++--
 CTFd/themes/admin/templates/pages.html        | 41 ++++++--
 CTFd/themes/admin/templates/scoreboard.html   |  4 +-
 CTFd/themes/admin/templates/submissions.html  |  6 +-
 CTFd/themes/admin/templates/teams/teams.html  | 82 +++++++++-------
 CTFd/themes/admin/templates/users/users.html  | 93 +++++++++++--------
 6 files changed, 175 insertions(+), 93 deletions(-)

diff --git a/CTFd/themes/admin/templates/challenges/challenges.html b/CTFd/themes/admin/templates/challenges/challenges.html
index 66bb36a..baf6df3 100644
--- a/CTFd/themes/admin/templates/challenges/challenges.html
+++ b/CTFd/themes/admin/templates/challenges/challenges.html
@@ -18,28 +18,50 @@
 	</div>
 </div>
 <div class="container">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="float-right pb-3">
+				<div class="btn-group" role="group">
+					<button type="button" class="btn btn-outline-danger">
+						<i class="btn-fa fas fa-trash-alt"></i>
+					</button>
+				</div>
+			</div>
+		</div>
+	</div>
+
 	<div class="row">
 		<div class="col-md-12">
 			<div>
-				<table id="challenges" class="table table-striped">
+				<table id="challenges" class="table table-striped border">
 					<thead>
 					<tr>
-						<td><b>ID</b></td>
-						<td><b>Name</b></td>
-						<td class="d-none d-md-table-cell d-lg-table-cell"><b>Category</b></td>
-						<td class="d-none d-md-table-cell d-lg-table-cell"><b>Value</b></td>
-						<td class="d-none d-md-table-cell d-lg-table-cell"><b>Type</b></td>
-						<td class="d-none d-md-table-cell d-lg-table-cell text-center"><b>State</b></td>
+						<td class="d-block border-right border-bottom text-center" data-checkbox>
+							<div class="form-check">
+								<input type="checkbox" class="form-check-input" data-checkbox-all>&nbsp;
+							</div>
+						</td>
+						<th class="sort-col text-center"><b>ID</b></th>
+						<th class="sort-col"><b>Name</b></th>
+						<th class="d-none d-md-table-cell d-lg-table-cell sort-col"><b>Category</b></th>
+						<th class="d-none d-md-table-cell d-lg-table-cell sort-col text-center"><b>Value</b></th>
+						<th class="d-none d-md-table-cell d-lg-table-cell sort-col text-center"><b>Type</b></th>
+						<th class="d-none d-md-table-cell d-lg-table-cell sort-col text-center"><b>State</b></th>
 					</tr>
 					</thead>
 					<tbody>
 					{% for challenge in challenges %}
 						<tr data-href="{{ url_for('admin.challenges_detail', challenge_id=challenge.id) }}">
-							<td>{{ challenge.id }}</td>
+							<td class="d-block border-right text-center" data-checkbox>
+								<div class="form-check">
+									<input type="checkbox" class="form-check-input" value="{{ challenge.id }}" data-challenge-id="{{ challenge.id }}">&nbsp;
+								</div>
+							</td>
+							<td class="text-center">{{ challenge.id }}</td>
 							<td><a href="{{ url_for('admin.challenges_detail', challenge_id=challenge.id) }}">{{ challenge.name }}</a></td>
 							<td class="d-none d-md-table-cell d-lg-table-cell">{{ challenge.category }}</td>
-							<td class="d-none d-md-table-cell d-lg-table-cell">{{ challenge.value }}</td>
-							<td class="d-none d-md-table-cell d-lg-table-cell">{{ challenge.type }}</td>
+							<td class="d-none d-md-table-cell d-lg-table-cell text-center">{{ challenge.value }}</td>
+							<td class="d-none d-md-table-cell d-lg-table-cell text-center">{{ challenge.type }}</td>
 							<td class="d-none d-md-table-cell d-lg-table-cell text-center">
 								{% set badge_state = 'badge-danger' if challenge.state == 'hidden' else 'badge-success' %}
 								<span class="badge {{ badge_state }}">{{ challenge.state }}</span>
diff --git a/CTFd/themes/admin/templates/pages.html b/CTFd/themes/admin/templates/pages.html
index 2562ab9..87a0e7c 100644
--- a/CTFd/themes/admin/templates/pages.html
+++ b/CTFd/themes/admin/templates/pages.html
@@ -19,20 +19,41 @@
 <div class="container">
 	<div class="row">
 		<div class="col-md-12">
-			<table id="pages" class="table table-striped">
+			<div class="float-right pb-3">
+				<div class="btn-group" role="group">
+					<button type="button" class="btn btn-outline-danger">
+						<i class="btn-fa fas fa-trash-alt"></i>
+					</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-md-12">
+			<table id="pages" class="table table-striped border">
 				<thead>
 				<tr>
-					<td><b>Title</b></td>
-					<td><b>Route</b></td>
-					<td class="text-center"><b>Authentication</b></td>
-					<td class="text-center"><b>Hidden</b></td>
-					<td class="text-center"><b>Published</b></td>
-					<td class="text-center" width="10px"><b>Settings</b></td>
+					<td class="d-block border-right border-bottom text-center" data-checkbox>
+						<div class="form-check">
+							<input type="checkbox" class="form-check-input" id="scoreboard-bulk-select" data-checkbox-all>&nbsp;
+						</div>
+					</td>
+					<th class="sort-col text-center"><b>Title</b></th>
+					<th class="sort-col text-center"><b>Route</b></th>
+					<th class="sort-col text-center"><b>Authentication</b></th>
+					<th class="sort-col text-center"><b>Hidden</b></th>
+					<th class="sort-col text-center"><b>Published</b></th>
+					<!-- <th class="sort-col text-center" width="10px"><b>Settings</b></th> -->
 				</tr>
 				</thead>
 				<tbody>
 				{% for page in pages %}
-					<tr>
+					<tr data-href="{{ url_for('admin.pages_detail', page_id=page.id) }}">
+						<td class="d-block border-right text-center" data-checkbox>
+							<div class="form-check">
+								<input type="checkbox" class="form-check-input" value="{{ page.id }}" data-account-id="{{ page.id }}">&nbsp;
+							</div>
+						</td>
 						<td class="page-title">
 							{{ page.title }}
 						</td>
@@ -60,7 +81,7 @@
 								Published
 							{% endif %}
 						</td>
-						<td class="text-center">
+						<!-- <td class="text-center">
 							<span class="edit-page" data-toggle="tooltip" data-placement="top"
 								  title="Edit {{ page.route }}">
 								<a class="no-decoration" href="{{ url_for('admin.pages_detail', page_id=page.id) }}"><i class="btn-fa fas fa-edit"></i></a>
@@ -70,7 +91,7 @@
 								  title="Delete {{ page.route }}">
 								<i class="btn-fa fas fa-times"></i>
 							</span>
-						</td>
+						</td> -->
 					</tr>
 				{% endfor %}
 				</tbody>
diff --git a/CTFd/themes/admin/templates/scoreboard.html b/CTFd/themes/admin/templates/scoreboard.html
index 3a528c9..80fb24d 100644
--- a/CTFd/themes/admin/templates/scoreboard.html
+++ b/CTFd/themes/admin/templates/scoreboard.html
@@ -11,10 +11,10 @@
 		<div class="col-md-12">
 			<div class="float-right pb-3">
 				<div class="btn-group" role="group">
-					<button type="button" class="btn btn-danger" id="scoreboard-hide-button" data-toggle="tooltip" title="Hide Accounts">
+					<button type="button" class="btn btn-outline-danger" id="scoreboard-hide-button" data-toggle="tooltip" title="Hide Accounts">
 						<i class="btn-fa fas fa-eye-slash"></i>
 					</button>
-					<button type="button" class="btn btn-success" id="scoreboard-show-button" data-toggle="tooltip" title="Unhide Accounts">
+					<button type="button" class="btn btn-outline-success" id="scoreboard-show-button" data-toggle="tooltip" title="Unhide Accounts">
 						<i class="btn-fa fas fa-eye"></i>
 					</button>
 				</div>
diff --git a/CTFd/themes/admin/templates/submissions.html b/CTFd/themes/admin/templates/submissions.html
index f15aeb3..d92fd4c 100644
--- a/CTFd/themes/admin/templates/submissions.html
+++ b/CTFd/themes/admin/templates/submissions.html
@@ -16,7 +16,7 @@
 		<div class="col-md-12">
 			<div class="float-right pb-3">
 				<div class="btn-group" role="group">
-					<button type="button" class="btn btn-danger" id="submission-delete-button">
+					<button type="button" class="btn btn-outline-danger" id="submission-delete-button">
 						<i class="btn-fa fas fa-trash-alt"></i>
 					</button>
 				</div>
@@ -56,7 +56,9 @@
 							<a href="{{ generate_account_url(sub.account_id, admin=True) }}">{{ sub.team_name }}</a>
 						</td>
 						<td class="chal" id="{{ sub.challenge_id }}">
-							{{ sub.challenge_name }}
+							<a href="{{ url_for('admin.challenges_detail', challenge_id=sub.challenge_id) }}">
+								{{ sub.challenge_name }}
+							</a>
 						</td>
 						<td>
 							{{ sub.type }}
diff --git a/CTFd/themes/admin/templates/teams/teams.html b/CTFd/themes/admin/templates/teams/teams.html
index d29f5c9..6fc5d02 100644
--- a/CTFd/themes/admin/templates/teams/teams.html
+++ b/CTFd/themes/admin/templates/teams/teams.html
@@ -24,48 +24,68 @@
 			{% endif %}
 
 			<form method="GET" class="form-inline">
-					<div class="form-group col-md-2">
-						<label for="sel1" class="sr-only" >Search Field</label>
-						<select class="form-control custom-select w-100" id="sel1" name="field">
-							<option value="name" {% if field == 'name' %}selected{% endif %}>Name</option>
-							<option value="id" {% if field == 'id' %}selected{% endif %}>ID</option>
-							<option value="email" {% if field == 'email' %}selected{% endif %}>Email</option>
-							<option value="affiliation" {% if field == 'affiliation' %}selected{% endif %}>Affiliation</option>
-					  </select>
-					</div>
-					<div class="form-group col-md-8">
-						<label for="team-name-search" class="sr-only">Parameter</label>
-						<input type="text" class="form-control w-100" id="team-name-search" name="q" placeholder="Search for matching team names" {% if q %}value="{{q}}"{% endif %}>
-					</div>
-					<div class="form-group col-md-2">
-						<label for="team-name-search" class="sr-only">Search</label>
-						<button type="submit" class="btn btn-primary w-100"><i class="fas fa-search" aria-hidden="true"></i></button>
-					</div>
+				<div class="form-group col-md-2">
+					<label for="sel1" class="sr-only" >Search Field</label>
+					<select class="form-control custom-select w-100" id="sel1" name="field">
+						<option value="name" {% if field == 'name' %}selected{% endif %}>Name</option>
+						<option value="id" {% if field == 'id' %}selected{% endif %}>ID</option>
+						<option value="email" {% if field == 'email' %}selected{% endif %}>Email</option>
+						<option value="affiliation" {% if field == 'affiliation' %}selected{% endif %}>Affiliation</option>
+					</select>
+				</div>
+				<div class="form-group col-md-8">
+					<label for="team-name-search" class="sr-only">Parameter</label>
+					<input type="text" class="form-control w-100" id="team-name-search" name="q" placeholder="Search for matching team names" {% if q %}value="{{q}}"{% endif %}>
+				</div>
+				<div class="form-group col-md-2">
+					<label for="team-name-search" class="sr-only">Search</label>
+					<button type="submit" class="btn btn-primary w-100"><i class="fas fa-search" aria-hidden="true"></i></button>
+				</div>
 			</form>
+		</div>
+	</div>
 
-			<br>
+	<hr>
 
-			<table id="teamsboard" class="table table-striped">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="float-right pb-3">
+				<div class="btn-group" role="group">
+					<button type="button" class="btn btn-outline-danger">
+						<i class="btn-fa fas fa-trash-alt"></i>
+					</button>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
+		<div class="col-md-12">
+			<table id="teamsboard" class="table table-striped border">
 				<thead>
 					<tr>
-						<td width="10px" class="text-center"><b>ID</b>
-						</td>
-						<td class="text-left"><b>Team</b>
-						</td>
-						<td class="text-center"><b>Website</b>
-						</td>
-						<td class="text-center"><b>Country</b>
-						</td>
-						<td class="text-center"><b>Hidden</b>
-						</td>
-						<td class="text-center"><b>Banned</b>
+						<td class="d-block border-right border-bottom text-center" data-checkbox>
+							<div class="form-check">
+								<input type="checkbox" class="form-check-input" data-checkbox-all>&nbsp;
+							</div>
 						</td>
+						<th class="sort-col text-center"><b>ID</b></th>
+						<th class="sort-col text-left"><b>Team</b></th>
+						<th class="sort-col text-center"><b>Website</b></th>
+						<th class="sort-col text-center"><b>Country</b></th>
+						<th class="sort-col text-center"><b>Hidden</b></th>
+						<th class="sort-col text-center"><b>Banned</b></th>
 					</tr>
 				</thead>
 				<tbody>
 					{% for team in teams %}
 					<tr name="{{ team.id }}" data-href="{{ url_for('admin.teams_detail', team_id=team.id) }}">
-						<td class="team-id" value="{{ team.id }}">{{ team.id }}</td>
+						<td class="d-block border-right" data-checkbox>
+							<div class="form-check text-center">
+								<input type="checkbox" class="form-check-input" value="{{ team.id }}" data-submission-id="{{ team.id }}">&nbsp;
+							</div>
+						</td>
+						<td class="team-id text-center value="{{ team.id }}">{{ team.id }}</td>
 						<td class="team-name" value="{{ team.name }}">
 							<a href="{{ url_for('admin.teams_detail', team_id=team.id) }}">
 								{{ team.name | truncate(32) }}
diff --git a/CTFd/themes/admin/templates/users/users.html b/CTFd/themes/admin/templates/users/users.html
index 3de7ca9..ac96e6e 100644
--- a/CTFd/themes/admin/templates/users/users.html
+++ b/CTFd/themes/admin/templates/users/users.html
@@ -17,6 +17,7 @@
 </div>
 
 <div class="container">
+
 	<div class="row">
 		<div class="col-md-12">
 			{% if q and field %}
@@ -24,55 +25,71 @@
 			{% endif %}
 
 			<form method="GET" class="form-inline">
-					<div class="form-group col-md-2">
-						<label for="sel1" class="sr-only" >Search Field</label>
-						<select class="form-control custom-select w-100" id="sel1" name="field">
-							<option value="name" {% if field == 'name' %}selected{% endif %}>Name</option>
-							<option value="id" {% if field == 'id' %}selected{% endif %}>ID</option>
-							<option value="email" {% if field == 'email' %}selected{% endif %}>Email</option>
-							<option value="affiliation" {% if field == 'affiliation' %}selected{% endif %}>Affiliation</option>
-							<option value="ip" {% if field == 'ip' %}selected{% endif %}>IP Address</option>
-					  </select>
-					</div>
-					<div class="form-group col-md-8">
-						<label for="team-name-search" class="sr-only">Parameter</label>
-						<input type="text" class="form-control w-100" id="team-name-search" name="q" placeholder="Search for matching user" {% if q %}value="{{q}}"{% endif %}>
-					</div>
-					<div class="form-group col-md-2">
-						<label for="team-name-search" class="sr-only">Search</label>
-						<button type="submit" class="btn btn-primary w-100"><i class="fas fa-search" aria-hidden="true"></i></button>
-					</div>
+				<div class="form-group col-md-2">
+					<label for="sel1" class="sr-only" >Search Field</label>
+					<select class="form-control custom-select w-100" id="sel1" name="field">
+						<option value="name" {% if field == 'name' %}selected{% endif %}>Name</option>
+						<option value="id" {% if field == 'id' %}selected{% endif %}>ID</option>
+						<option value="email" {% if field == 'email' %}selected{% endif %}>Email</option>
+						<option value="affiliation" {% if field == 'affiliation' %}selected{% endif %}>Affiliation</option>
+						<option value="ip" {% if field == 'ip' %}selected{% endif %}>IP Address</option>
+					</select>
+				</div>
+				<div class="form-group col-md-8">
+					<label for="team-name-search" class="sr-only">Parameter</label>
+					<input type="text" class="form-control w-100" id="team-name-search" name="q" placeholder="Search for matching user" {% if q %}value="{{q}}"{% endif %}>
+				</div>
+				<div class="form-group col-md-2">
+					<label for="team-name-search" class="sr-only">Search</label>
+					<button type="submit" class="btn btn-primary w-100"><i class="fas fa-search" aria-hidden="true"></i></button>
+				</div>
 			</form>
+		</div>
+	</div>
 
-			<br>
+	<hr>
 
-			<table id="teamsboard" class="table table-striped">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="float-right pb-3">
+				<div class="btn-group" role="group">
+					<button type="button" class="btn btn-outline-danger">
+						<i class="btn-fa fas fa-trash-alt"></i>
+					</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-md-12">
+			<table id="teamsboard" class="table table-striped border">
 				<thead>
 					<tr>
-						<td width="10px" class="text-center"><b>ID</b>
-						</td>
-						<td class="text-center"><b>User</b>
-						</td>
-						<td class="d-md-table-cell d-lg-table-cell text-center"><b>Email</b>
-						</td>
-						<td class=""><b>Website</b>
-						</td>
-						<td class=""><b>Country</b>
-						</td>
-						<td class="text-center"><b>Admin</b>
-						</td>
-						<td class="text-center"><b>Verified</b>
-						</td>
-						<td class="text-center"><b>Hidden</b>
-						</td>
-						<td class="text-center"><b>Banned</b>
+						<td class="d-block border-right border-bottom text-center" data-checkbox>
+							<div class="form-check">
+								<input type="checkbox" class="form-check-input" data-checkbox-all>&nbsp;
+							</div>
 						</td>
+						<th class="sort-col text-center"><b>ID</b></td>
+						<th class="sort-col text-center"><b>User</b></th>
+						<th class="d-md-table-cell d-lg-table-cell sort-col text-center"><b>Email</b></th>
+						<th class="sort-col"><b>Website</b></th>
+						<th class="sort-col"><b>Country</b></th>
+						<th class="sort-col text-center"><b>Admin</b></th>
+						<th class="sort-col text-center"><b>Verified</b></th>
+						<th class="sort-col text-center"><b>Hidden</b></th>
+						<th class="sort-col text-center"><b>Banned</b></th>
 					</tr>
 				</thead>
 				<tbody>
 					{% for user in users %}
 					<tr name="{{ user.id }}" data-href="{{ url_for('admin.users_detail', user_id=user.id) }}">
-						<td class="team-id" value="{{ user.id }}">{{ user.id }}</td>
+						<td class="d-block border-right text-center" data-checkbox>
+							<div class="form-check">
+								<input type="checkbox" class="form-check-input" value="{{ user.id }}" data-account-id="{{ user.id }}">&nbsp;
+							</div>
+						</td>
+						<td class="team-id text-center" value="{{ user.id }}">{{ user.id }}</td>
 						<td class="team-name" value="{{ user.name }}">
 							<a href="{{ url_for('admin.users_detail', user_id=user.id) }}">
 								{{ user.name | truncate(32) }}