Skip to content

Commit fe46c74

Browse files
COMTOP1COMTOP1
committed
Adding better formatting to the listing pages
1 parent 03b240d commit fe46c74

6 files changed

+127
-77
lines changed

‎templates/officers.tmpl

+20-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
{{define "title"}}Internal: Officers{{end}}
22
{{define "content"}}
33
<div class="column is-10" style="min-height: 88vh">
4+
<section class="hero is-info welcome is-small">
5+
<div class="hero-body">
6+
<div class="container">
7+
<h1 class="title">Officers</h1>
8+
</div>
9+
</div>
10+
</section>
11+
<br>
12+
<div class="columns box" style="height: fit-content">
13+
<div class="column">
14+
<p>Here you can manage YSTV's officers.<br>
15+
If you are not part of Computing or Admin Team, please do not make any changes without consulting
16+
the Computing and Admin Team.<br>
17+
<strong>Be warned,
18+
these changes will be shown on the public site and can affect multiple other areas
19+
- they can be very powerful!</strong></p>
20+
<br>
21+
<a onclick="addOfficerModal()" class="button is-info"><span class="mdi mdi-account-plus"></span>&ensp;Add Officer</a>
22+
</div>
23+
</div>
424
<div class="card">
525
<form method="post" action="">
626
<div class="column">
@@ -42,18 +62,6 @@
4262
</div>
4363
</div>
4464
</form>
45-
</div>
46-
<div class="card events-card">
47-
<header class="card-header">
48-
<p class="card-header-title">Officers</p>
49-
</header>
50-
<div class="card" style="margin-bottom: 0">
51-
<div class="column">
52-
<div class="field">
53-
<a onclick="addOfficerModal()" class="button is-info"><span class="mdi mdi-account-plus"></span>&ensp;Add Officer</a>
54-
</div>
55-
</div>
56-
</div>
5765
<div class="card-table" style="max-height: 100em;">
5866
<div class="content">
5967
<table class="table is-fullwidth is-hoverable">

‎templates/officershipTeams.tmpl

+19-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
{{define "title"}}Internal: Officership Teams{{end}}
22
{{define "content"}}
33
<div class="column is-10" style="min-height: 88vh">
4-
<div class="card events-card">
5-
<header class="card-header">
6-
<p class="card-header-title">Officership Teams</p>
7-
</header>
8-
<div class="card" style="margin-bottom: 0">
9-
<div class="column">
10-
<div class="field">
11-
<a onclick="addOfficershipTeamModal()" class="button is-info"><span class="mdi mdi-account-multiple-plus"></span>&ensp;Add Officership Team</a>
12-
</div>
4+
<section class="hero is-info welcome is-small">
5+
<div class="hero-body">
6+
<div class="container">
7+
<h1 class="title">Officership Teams</h1>
138
</div>
149
</div>
10+
</section>
11+
<br>
12+
<div class="columns box" style="height: fit-content">
13+
<div class="column">
14+
<p>Here you can manage YSTV's officership teams.<br>
15+
If you are not part of Computing Team,
16+
please do not make any changes without consulting the Computing Team.<br>
17+
<strong>Be warned,
18+
these changes will be shown on the public site and can affect multiple other areas
19+
- they can be very powerful!</strong></p>
20+
<br>
21+
<a onclick="addOfficershipTeamModal()" class="button is-info"><span class="mdi mdi-account-multiple-plus"></span>&ensp;Add Officership Team</a>
22+
</div>
23+
</div>
24+
<div class="card events-card">
1525
<div class="card-table" style="max-height: 100em;">
1626
<div class="content">
1727
<table class="table is-fullwidth is-hoverable">

‎templates/officerships.tmpl

+19-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
{{define "title"}}Internal: Officerships{{end}}
22
{{define "content"}}
33
<div class="column is-10" style="min-height: 88vh">
4+
<section class="hero is-info welcome is-small">
5+
<div class="hero-body">
6+
<div class="container">
7+
<h1 class="title">Officers</h1>
8+
</div>
9+
</div>
10+
</section>
11+
<br>
12+
<div class="columns box" style="height: fit-content">
13+
<div class="column">
14+
<p>Here you can manage YSTV's officerships.<br>
15+
If you are not part of Computing or Admin Team, please do not make any changes without consulting
16+
the Computing and Admin Team.<br>
17+
<strong>Be warned, these changes will be shown on the public site and can affect multiple other areas
18+
- they can be very powerful!</strong></p>
19+
<br>
20+
<a onclick="addOfficershipModal()" class="button is-info"><span class="mdi mdi-account-plus"></span>&ensp;Add Officership</a>
21+
</div>
22+
</div>
423
<div class="card">
524
<form method="post" action="">
625
<div class="column">
@@ -28,19 +47,6 @@
2847
</div>
2948
</div>
3049
</form>
31-
</div>
32-
<div class="card events-card">
33-
<header class="card-header">
34-
<p class="card-header-title">Officerships</p>
35-
</header>
36-
{{if gt (len .Error) 0}}<p id="error" style="color: red">{{.Error}}</p>{{end}}
37-
<div class="card" style="margin-bottom: 0">
38-
<div class="column">
39-
<div class="field">
40-
<a onclick="addOfficershipModal()" class="button is-info"><span class="mdi mdi-account-plus"></span>&ensp;Add Officership</a>
41-
</div>
42-
</div>
43-
</div>
4450
<div class="card-table" style="max-height: 100em;">
4551
<div class="content">
4652
<table class="table is-fullwidth is-hoverable">

‎templates/permissions.tmpl

+17-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
{{define "title"}}Internal: Permissions{{end}}
22
{{define "content"}}
33
<div class="column is-10" style="min-height: 88vh">
4-
<div class="card events-card">
5-
<header class="card-header">
6-
<p class="card-header-title">Permissions</p>
7-
</header>
8-
<div class="card" style="margin-bottom: 0">
9-
<div class="column">
10-
<div class="field">
11-
<a onclick="addPermissionModal()" class="button is-info"><span class="mdi mdi-key-plus"></span>&ensp;Add Permission</a>
12-
</div>
4+
<section class="hero is-info welcome is-small">
5+
<div class="hero-body">
6+
<div class="container">
7+
<h1 class="title">Permissions</h1>
138
</div>
149
</div>
10+
</section>
11+
<br>
12+
<div class="columns box" style="height: fit-content">
13+
<div class="column">
14+
<p>Here you can manage YSTV's permissions.<br>
15+
If you are not part of Computing Team, please do not make any changes without consulting
16+
the Computing Team.<br>
17+
<strong>Be warned, these changes can break may areas - they can be very powerful!</strong></p>
18+
<br>
19+
<a onclick="addPermissionModal()" class="button is-info"><span class="mdi mdi-key-plus"></span>&ensp;Add Permission</a>
20+
</div>
21+
</div>
22+
<div class="card events-card">
1523
<div class="card-table">
1624
<div class="content">
1725
<table class="table is-fullwidth is-hoverable" style="max-height: 90%">

‎templates/roles.tmpl

+17-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
{{define "title"}}Internal: Roles{{end}}
22
{{define "content"}}
33
<div class="column is-10" style="min-height: 88vh">
4-
<div class="card events-card">
5-
<header class="card-header">
6-
<p class="card-header-title">Roles</p>
7-
</header>
8-
<div class="card" style="margin-bottom: 0">
9-
<div class="column">
10-
<div class="field">
11-
<a onclick="addRoleModal()" class="button is-info"><span class="mdi mdi-shield-plus"></span>&ensp;Add Role</a>
12-
</div>
4+
<section class="hero is-info welcome is-small">
5+
<div class="hero-body">
6+
<div class="container">
7+
<h1 class="title">Roles</h1>
138
</div>
149
</div>
10+
</section>
11+
<br>
12+
<div class="columns box" style="height: fit-content">
13+
<div class="column">
14+
<p>Here you can manage YSTV's roles.<br>
15+
If you are not part of Computing Team, please do not make any changes without consulting
16+
the Computing Team.<br>
17+
<strong>Be warned, these changes can break may areas - they can be very powerful!</strong></p>
18+
<br>
19+
<a onclick="addRoleModal()" class="button is-info"><span class="mdi mdi-shield-plus"></span>&ensp;Add Role</a>
20+
</div>
21+
</div>
22+
<div class="card events-card">
1523
<div class="card-table">
1624
<div class="content">
1725
<table class="table is-fullwidth is-hoverable">

‎templates/users.tmpl

+35-25
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,40 @@
44
{{template "_pagination" .}}
55
{{end}}
66
<div class="column is-10" style="min-height: 88vh">
7+
<section class="hero is-info welcome is-small">
8+
<div class="hero-body">
9+
<div class="container">
10+
<h1 class="title">Users</h1>
11+
</div>
12+
</div>
13+
</section>
14+
<br>
15+
<div class="columns box" style="height: fit-content">
16+
<div class="column">
17+
<p>Here you can manage YSTV's users.<br>
18+
If you are not part of Computing or Admin Team, please do not make any changes without consulting
19+
the Computing and Admin Team.<br>
20+
<strong>Be warned, these changes can break user access - they can be very powerful!</strong></p>
21+
<br>
22+
{{$userAdmin := checkPermission $.UserPermissions "ManageMembers.Members.Admin"}}
23+
{{if (checkPermission .UserPermissions "ManageMembers.Members.Add")}}
24+
<p id="message" style="color: green"></p>
25+
<p id="error" style="color: red"></p>
26+
<div class="column" style="padding: 0;">
27+
<div class="field">
28+
<a onclick="addUserModal()" class="button is-info">
29+
<i class="fa-solid fa-user-plus"></i>&ensp;
30+
Add User</a>
31+
</div>
32+
<div class="field">
33+
<a href="/internal/user/add" class="button is-info">
34+
<i class="mdi mdi-account-multiple-plus"></i>&ensp;
35+
Add bulk Users</a>
36+
</div>
37+
</div>
38+
{{end}}
39+
</div>
40+
</div>
741
<div class="card">
842
<form method="post" action="">
943
<div class="column">
@@ -96,35 +130,11 @@
96130
</div>
97131
</div>
98132
</form>
99-
</div>
100133
{{if gt .Sort.Pages 1}}
101-
<div class="card" style="width: 100%; text-align: center">
134+
<div class="content" style="width: 100%; text-align: center">
102135
<div id="pagination"></div>
103136
</div>
104137
{{end}}
105-
<div class="card events-card">
106-
<header class="card-header">
107-
<p class="card-header-title">Users</p>
108-
</header>
109-
{{$userAdmin := checkPermission $.UserPermissions "ManageMembers.Members.Admin"}}
110-
{{if (checkPermission .UserPermissions "ManageMembers.Members.Add")}}
111-
<p id="message" style="color: green"></p>
112-
<p id="error" style="color: red"></p>
113-
<div class="card" style="margin-bottom: 0">
114-
<div class="column">
115-
<div class="field">
116-
<a onclick="addUserModal()" class="button is-info">
117-
<i class="fa-solid fa-user-plus"></i>&ensp;
118-
Add User</a>
119-
</div>
120-
<div class="field">
121-
<a href="/internal/user/add" class="button is-info">
122-
<i class="mdi mdi-account-multiple-plus"></i>&ensp;
123-
Add bulk Users</a>
124-
</div>
125-
</div>
126-
</div>
127-
{{end}}
128138
<div class="card-table">
129139
<div class="content">
130140
<table class="table is-fullwidth is-hoverable">

0 commit comments

Comments
 (0)