Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve UI and Permissions on Dashboard

Browse Source
This commit is contained in:
Silversthorn 2021-08-22 01:41:25 +02:00
parent 6ecf6285b9
commit 1262d6708b
13 changed files with 267 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/classes/shared/models.py
View File

@ -373,7 +373,7 @@ class db_shortcuts:
for s in servers: for s in servers:
latest = Server_Stats.select().where(Server_Stats.server_id == s.get('server_id')).order_by(Server_Stats.created.desc()).limit(1) latest = Server_Stats.select().where(Server_Stats.server_id == s.get('server_id')).order_by(Server_Stats.created.desc()).limit(1)
server_data.append({'server_data': s, "stats": db_helper.return_rows(latest)[0]}) server_data.append({'server_data': s, "stats": db_helper.return_rows(latest)[0], "user_command_permission":True})
return server_data return server_data
@staticmethod @staticmethod
@ -407,7 +407,12 @@ class db_shortcuts:
for s in authorized_servers: for s in authorized_servers:
latest = Server_Stats.select().where(Server_Stats.server_id == s.get('server_id')).order_by( latest = Server_Stats.select().where(Server_Stats.server_id == s.get('server_id')).order_by(
Server_Stats.created.desc()).limit(1) Server_Stats.created.desc()).limit(1)
server_data.append({'server_data': s, "stats": db_helper.return_rows(latest)[0]}) user_permissions = db_helper.get_user_permissions_list(user_id, s.get('server_id'))
if Enum_Permissions.Commands in user_permissions:
user_command_permission = True
else:
user_command_permission = False
server_data.append({'server_data': s, "stats": db_helper.return_rows(latest)[0], "user_command_permission":user_command_permission})
return server_data return server_data
@staticmethod @staticmethod

2
app/classes/web/panel_handler.py
View File

@ -114,7 +114,7 @@ class PanelHandler(BaseHandler):
user_auth = db_helper.get_authorized_servers_stats(exec_user_id) user_auth = db_helper.get_authorized_servers_stats(exec_user_id)
logger.debug("ASFR: {}".format(user_auth)) logger.debug("ASFR: {}".format(user_auth))
page_data['servers'] = user_auth page_data['servers'] = user_auth
for s in page_data['servers']: for s in page_data['servers']:
try: try:
data = json.loads(s['int_ping_results']) data = json.loads(s['int_ping_results'])

4
app/frontend/templates/panel/credits.html
View File

@ -233,7 +233,7 @@
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Patreon Supporters</h4> <h4 class="card-title">Patreon Supporters</h4>
<p class="card-description"> A huge <code>thank you</code>&nbsp; to our Patreon supporters </p> <p class="card-description"> A huge <code>thank you</code>&nbsp; to our Patreon supporters </p>
<table class="table"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
@ -269,7 +269,7 @@
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Language Translation</h4> <h4 class="card-title">Language Translation</h4>
<p class="card-description"> A huge <code>thank you</code>&nbsp; to our community who translate! </p> <p class="card-description"> A huge <code>thank you</code>&nbsp; to our community who translate! </p>
<table class="table"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>

21
app/frontend/templates/panel/dashboard.html
View File

@ -101,7 +101,7 @@
<div class="card-body"> <div class="card-body">
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table table-hover">
<thead> <thead>
<tr class="rounded"> <tr class="rounded">
<th>{{ translate('dashboard', 'server') }}</th> <th>{{ translate('dashboard', 'server') }}</th>
@ -124,16 +124,17 @@
</td> </td>
<td id="controls{{server['server_data']['server_id']}}" class="actions_serverlist"> <td id="controls{{server['server_data']['server_id']}}" class="actions_serverlist">
{% if server['stats']['running'] %} {% if server['user_command_permission'] %}
<a class="stop_button" data-id="{{server['server_data']['server_id']}}"> <i class="fas fa-stop"></i></a> &nbsp; {% if server['stats']['running'] %}
<a class="restart_button" data-id="{{server['server_data']['server_id']}}"> <i class="fas fa-sync"></i></a> &nbsp; <a class="stop_button" data-id="{{server['server_data']['server_id']}}"> <i class="fas fa-stop"></i></a> &nbsp;
{% elif server['stats']['updating']%} <a class="restart_button" data-id="{{server['server_data']['server_id']}}"> <i class="fas fa-sync"></i></a> &nbsp;
<a data-id="{{server['server_data']['server_id']}}" class=""> UPDATING...</i></a> {% elif server['stats']['updating']%}
{% else %} <a data-id="{{server['server_data']['server_id']}}" class=""> UPDATING...</i></a>
<a data-id="{{server['server_data']['server_id']}}" class="play_button"><i class="fas fa-play"></i></a> &nbsp; {% else %}
<a data-id="{{server['server_data']['server_id']}}" class="clone_button"> <i class="fas fa-clone"></i></a>&nbsp; <a data-id="{{server['server_data']['server_id']}}" class="play_button"><i class="fas fa-play"></i></a> &nbsp;
<a data-id="{{server['server_data']['server_id']}}" class="clone_button"> <i class="fas fa-clone"></i></a>&nbsp;
{% end %}
{% end %} {% end %}
</td> </td>
<td> <td>

10
app/frontend/templates/panel/panel_config.html
View File

@ -30,7 +30,7 @@
<div class="col-md-12 col-lg-12 grid-margin stretch-card"> <div class="col-md-12 col-lg-12 grid-margin stretch-card">
<div class="card"> <div class="card">
<div class="card-header header-sm d-flex justify-content-between align-items-center"> <div class="card-header header-sm d-flex justify-content-between align-items-center">
<h4 class="card-title"><i class="fas fa-server"></i> Users</h4> <h4 class="card-title"><i class="fas fa-users"></i> Users</h4>
<div class="d-md-none"> <div class="d-md-none">
<small>Can't see everything on mobile?<br /> Try scrolling the table sideways.</small> <small>Can't see everything on mobile?<br /> Try scrolling the table sideways.</small>
</div> </div>
@ -38,7 +38,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table table-hover">
<thead> <thead>
<tr class="rounded"> <tr class="rounded">
<th>User</th> <th>User</th>
@ -52,7 +52,7 @@
<tbody> <tbody>
{% for user in data['users'] %} {% for user in data['users'] %}
<tr> <tr>
<td>{{ user.username }}</td> <td><i class="fas fa-user"></i> {{ user.username }}</td>
<td> <td>
{% if user.enabled %} {% if user.enabled %}
<span class="text-success"> <span class="text-success">
@ -92,7 +92,7 @@
<div class="col-md-12 col-lg-12 grid-margin stretch-card"> <div class="col-md-12 col-lg-12 grid-margin stretch-card">
<div class="card"> <div class="card">
<div class="card-header header-sm d-flex justify-content-between align-items-center"> <div class="card-header header-sm d-flex justify-content-between align-items-center">
<h4 class="card-title"><i class="fas fa-server"></i> Roles</h4> <h4 class="card-title"><i class="fas fa-user-tag"></i> Roles</h4>
<div class="d-md-none"> <div class="d-md-none">
<small>Can't see everything on mobile?<br /> Try scrolling the table sideways.</small> <small>Can't see everything on mobile?<br /> Try scrolling the table sideways.</small>
</div> </div>
@ -100,7 +100,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table table-hover">
<thead> <thead>
<tr class="rounded"> <tr class="rounded">
<th>Role</th> <th>Role</th>

226
app/frontend/templates/panel/panel_edit_role.html
View File

@ -43,10 +43,10 @@
<a class="nav-link active" href="/panel/edit_role?id={{ data['role']['role_id'] }}&subpage=config" role="tab" aria-selected="true"> <a class="nav-link active" href="/panel/edit_role?id={{ data['role']['role_id'] }}&subpage=config" role="tab" aria-selected="true">
<i class="fas fa-cogs"></i>Config</a> <i class="fas fa-cogs"></i>Config</a>
</li> </li>
<li class="nav-item"> <!-- <li class="nav-item">
<a class="nav-link" href="/panel/edit_role?id={{ data['role']['role_id'] }}&subpage=other" role="tab" aria-selected="false"> <a class="nav-link" href="/panel/edit_role?id={{ data['role']['role_id'] }}&subpage=other" role="tab" aria-selected="false">
<i class="fas fa-folder-tree"></i>Other</a> <i class="fas fa-folder-tree"></i>Other</a>
</li> </li> -->
</ul> </ul>
<div class="row"> <div class="row">
<div class="col-md-6 col-sm-12"> <div class="col-md-6 col-sm-12">
@ -58,115 +58,153 @@
{% raw xsrf_form_html() %} {% raw xsrf_form_html() %}
<input type="hidden" name="id" value="{{ data['role']['role_id'] }}"> <input type="hidden" name="id" value="{{ data['role']['role_id'] }}">
<input type="hidden" name="subpage" value="config"> <input type="hidden" name="subpage" value="config">
<div class="form-group"> <div class="card">
<label for="role_name">Role Name <small class="text-muted ml-1"> - What you wish to call this role</small> </label> <div class="card-header header-sm d-flex justify-content-between align-items-center">
<input type="text" class="form-control" name="role_name" id="role_name" value="{{ data['role']['role_name'] }}" placeholder="Role Name" > <h4 class="card-title"><i class="fas fa-user-tag"></i> Role Settings</h4>
</div>
<div class="card-body">
<div class="form-group">
<label for="role_name">Role Name <small class="text-muted ml-1"> - What you wish to call this role</small> </label>
<input type="text" class="form-control" name="role_name" id="role_name" value="{{ data['role']['role_name'] }}" placeholder="Role Name" >
</div>
</div>
</div> </div>
<div class="card">
<div class="card-header header-sm d-flex justify-content-between align-items-center">
<h4 class="card-title"><i class="fas fa-server"></i> Allowed Servers <small class="text-muted ml-1"> - servers this role is allowed to access </small> </h4>
</div>
<div class="card-body">
<div class="form-group">
<div class="table-responsive">
<table class="table table-hover">
<thead>
<tr class="rounded">
<th>Server Name</th>
<th>Access?</th>
</tr>
</thead>
<tbody>
{% for server in data['servers_all'] %}
<tr>
<td>{{ server['server_name'] }}</td>
<td>
{% if server['server_id'] in data['role']['servers'] %}
<input type="checkbox" class="" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" checked="" value="1">
{% else %}
<input type="checkbox" class="" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" value="1">
{% end %}
</td>
</tr>
{% end %}
<div class="form-group"> </tbody>
<label for="server_membership">Servers <small class="text-muted ml-1"> - servers this role is allowed to access </small> </label> </table>
<div class="table-responsive"> </div>
<table class="table"> </div>
<thead> </div>
<tr class="rounded"> </div>
<th>Server Name</th>
<th>Access?</th> <div class="card">
</tr> <div class="card-header header-sm d-flex justify-content-between align-items-center">
</thead> <h4 class="card-title"><i class="fas fa-user-lock"></i> Roles Permissions <small class="text-muted ml-1"> - permissions this role has on this/these servers </small></h4>
<tbody> </div>
{% for server in data['servers_all'] %} <div class="card-body">
<tr> <div class="form-group">
<td>{{ server['server_name'] }}</td> <div class="table-responsive">
<td> <table class="table table-hover">
{% if server['server_id'] in data['role']['servers'] %} <thead>
<input type="checkbox" class="form-check-input" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" checked="" value="1"> <tr class="rounded">
{% else %} <th>Permission Name</th>
<input type="checkbox" class="form-check-input" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" value="1"> <th>Authorized ?</th>
{% end %} </tr>
</td> </thead>
</tr> <tbody>
{% end %} {% for permission in data['permissions_all'] %}
<tr>
<td>{{ permission.name }}</td>
<td>
{% if permission in data['permissions_list'] %}
<input type="checkbox" class="" id="permission_{{ permission.name }}" name="permission_{{ permission.name }}" checked="" value="1">
{% else %}
<input type="checkbox" class="" id="permission_{{ permission.name }}" name="permission_{{ permission.name }}" value="1">
{% end %}
</td>
</tr>
{% end %}
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <button type="submit" class="btn btn-success mr-2"><i class="fas fa-save"></i> {{ translate('panelConfig', 'save') }}</button>
<label for="server_membership">Permissions <small class="text-muted ml-1"> - permissions this role has on this/these servers </small> </label> <button type="reset" onclick="location.href='/panel/panel_config'" class="btn btn-light"><i class="fas fa-undo-alt"></i> {{ translate('panelConfig', 'cancel') }}</button>
<div class="table-responsive">
<table class="table">
<thead>
<tr class="rounded">
<th>Permission Name</th>
<th>Authorized ?</th>
</tr>
</thead>
<tbody>
{% for permission in data['permissions_all'] %}
<tr>
<td>{{ permission.name }}</td>
<td>
{% if permission in data['permissions_list'] %}
<input type="checkbox" class="form-check-input" id="permission_{{ permission.name }}" name="permission_{{ permission.name }}" checked="" value="1">
{% else %}
<input type="checkbox" class="form-check-input" id="permission_{{ permission.name }}" name="permission_{{ permission.name }}" value="1">
{% end %}
</td>
</tr>
{% end %}
</tbody>
</table>
</div>
</div>
<button type="submit" class="btn btn-success mr-2">Save</button>
<button type="reset" onclick="location.href='/panel/panel_config'" class="btn btn-light">Cancel</button>
</form> </form>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<h6>Users Assigned to Role:</h6> <div class="card">
<ul> <div class="card-header header-sm d-flex justify-content-between align-items-center">
{% for user in data['users'] %} <h4 class="card-title"><i class="fas fa-users"></i> Users Assigned to Role:</h4>
{% for ruser in data['user-roles'][user.user_id] %} </div>
{% if ruser == data['role']['role_name'] %} <div class="card-body">
<li>{{ user.username }}</li> <div class="table-responsive">
{% end %} <table class="table table-hover">
{% end %} <thead>
<tr class="rounded">
<th>User Name</th>
<th></th>
</tr>
</thead>
<tbody>
{% for user in data['users'] %}
{% for ruser in data['user-roles'][user.user_id] %}
{% if ruser == data['role']['role_name'] %}
<tr>
<td>{{ user.username }}</td>
<td>
<a href="/panel/edit_user?id={{user.user_id}}"><i class="fas fa-user-edit"></i></a>
</td>
</tr>
{% end %} {% end %}
</ul> {% end %}
<br> {% end %}
</div> </tbody>
<div class="col-md-3 col-sm-12"> </table>
<div class="card">
<div class="card-body">
<h4 class="card-title">Role Config Area</h4>
<p class="card-description"> Here is where you can change the configuration of your role</p>
<blockquote class="blockquote">
<p class="mb-0">
Created: {{ str(data['role']['created']) }}
<br />
Last updated: {{ str(data['role']['last_update']) }}
<br />
</p>
</blockquote>
</div> </div>
</div> </div>
</div> </div>
</div> <br>
<div class="text-center"> </div>
<div class="col-md-3 col-sm-12">
<div class="card">
<div class="card-body">
<h4 class="card-title">Role Config Area</h4>
<p class="card-description"> Here is where you can change the configuration of your role</p>
<blockquote class="blockquote">
<p class="mb-0">
Created: {{ str(data['role']['created']) }}
<br />
Last updated: {{ str(data['role']['last_update']) }}
<br />
</p>
</blockquote>
<div class="text-center">
{% if data['new_role'] %} {% if data['new_role'] %}
<a class="btn btn-sm btn-danger disabled">Delete Role</a><br /> <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i> Delete Role</a><br />
<small>You cannot delete something that does not yet exist</small> <small>You cannot delete something that does not yet exist</small>
{% else %} {% else %}
<a href="/panel/remove_role?id={{ data['role']['role_id'] }}" class="btn btn-sm btn-danger">Delete Role</a> <a href="/panel/remove_role?id={{ data['role']['role_id'] }}" class="btn btn-sm btn-danger"><i class="fas fa-trash"></i> Delete Role</a>
{% end %} {% end %}
</div> </div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

166
app/frontend/templates/panel/panel_edit_user.html
View File

@ -62,79 +62,97 @@
<input type="hidden" name="id" value="{{ data['user']['user_id'] }}"> <input type="hidden" name="id" value="{{ data['user']['user_id'] }}">
<input type="hidden" name="subpage" value="config"> <input type="hidden" name="subpage" value="config">
<div class="form-group">
<label for="username">User Name <small class="text-muted ml-1"> - What you wish to call this user</small> </label> <div class="card">
<input type="text" class="form-control" name="username" id="username" value="{{ data['user']['username'] }}" placeholder="User Name" > <div class="card-header header-sm d-flex justify-content-between align-items-center">
</div> <h4 class="card-title"><i class="fas fa-user"></i> User Settings</h4>
</div>
<div class="form-group"> <div class="card-body">
<label for="password0">Password <small class="text-muted ml-1"></small> </label> <div class="form-group">
<input type="password" class="form-control" name="password0" id="password0" value="" placeholder="Password" > <label for="username">User Name <small class="text-muted ml-1"> - What you wish to call this user</small> </label>
</div> <input type="text" class="form-control" name="username" id="username" value="{{ data['user']['username'] }}" placeholder="User Name" >
</div>
<div class="form-group"> <div class="form-group">
<label for="password1">Repeat Password <small class="text-muted ml-1"></small> </label> <label for="password0">Password <small class="text-muted ml-1"> - leave blank to don't change</small> </label>
<input type="password" class="form-control" name="password1" id="password1" value="" placeholder="Repeat Password" > <input type="password" class="form-control" name="password0" id="password0" value="" placeholder="Password" >
</div> </div>
{% if len(data['servers_all']) > 0 %} <div class="form-group">
<div class="form-group"> <label for="password1">Repeat Password <small class="text-muted ml-1"> - leave blank to don't change</small> </label>
<label for="role_membership">Roles <small class="text-muted ml-1"> - the roles this user is a member of</small> </label> <input type="password" class="form-control" name="password1" id="password1" value="" placeholder="Repeat Password" >
<div class="table-responsive"> </div>
<table class="table">
<thead>
<tr class="rounded">
<th>Role Name</th>
<th>Member?</th>
</tr>
</thead>
<tbody>
{% for role in data['roles_all'] %}
<tr>
<td>{{ role.role_name }}</td>
<td>
{% if role.role_id in data['user']['roles'] %}
<input type="checkbox" class="form-check-input" id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership" checked="" value="1">
{% else %}
<input type="checkbox" class="form-check-input" id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership" value="1">
{% end %}
</td>
</tr>
{% end %}
</tbody>
</table>
</div> </div>
</div> </div>
<div class="form-group">
<label for="server_membership">Servers <small class="text-muted ml-1"> - servers this user is allowed to access </small> </label>
<div class="table-responsive"> {% if len(data['servers_all']) > 0 %}
<table class="table"> <div class="card">
<thead> <div class="card-header header-sm d-flex justify-content-between align-items-center">
<tr class="rounded"> <h4 class="card-title"><i class="fas fa-user-tag"></i> Roles <small class="text-muted ml-1"> - the roles this user is a member of</small></h4>
<th>Server Name</th> </div>
<th>Access?</th> <div class="card-body">
</tr> <div class="form-group">
</thead> <div class="table-responsive">
<tbody> <table class="table table-hover">
{% for server in data['servers_all'] %} <thead>
<tr> <tr class="rounded">
<td>{{ server['server_name'] }}</td> <th>Role Name</th>
<td> <th>Member?</th>
{% if server['server_id'] in data['role-servers'] %} </tr>
<input type="checkbox" class="form-check-input" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" checked="" value="" disabled> </thead>
{% else %} <tbody>
<input type="checkbox" class="form-check-input" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" value="1" disabled> {% for role in data['roles_all'] %}
{% end %} <tr>
</td> <td>{{ role.role_name }}</td>
</tr> <td>
{% end %} {% if role.role_id in data['user']['roles'] %}
<input type="checkbox" class="" id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership" checked="" value="1">
{% else %}
<input type="checkbox" class="" id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership" value="1">
{% end %}
</tbody> </td>
</table> </tr>
{% end %}
</tbody>
</table>
</div>
</div>
</div> </div>
</div> </div>
<div class="card">
<div class="card-header header-sm d-flex justify-content-between align-items-center">
<h4 class="card-title"><i class="fas fa-server"></i> Servers <small class="text-muted ml-1"> - servers this user is allowed to access </small></h4>
</div>
<div class="card-body">
<div class="form-group">
<div class="table-responsive">
<table class="table table-hover">
<thead>
<tr class="rounded">
<th>Server Name</th>
<th>Access?</th>
</tr>
</thead>
<tbody>
{% for server in data['servers_all'] %}
<tr>
<td>{{ server['server_name'] }}</td>
<td>
{% if server['server_id'] in data['role-servers'] %}
<input type="checkbox" class="" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" checked="" value="" disabled>
{% else %}
<input type="checkbox" class="" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" value="1" disabled>
{% end %}
</td>
</tr>
{% end %}
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="form-check-flat"> <div class="form-check-flat">
<label for="enabled" class="form-check-label ml-4 mb-4"> <label for="enabled" class="form-check-label ml-4 mb-4">
@ -163,15 +181,15 @@
</div> </div>
{% end %} {% end %}
<button type="submit" class="btn btn-success mr-2">Save</button> <button type="submit" class="btn btn-success mr-2"><i class="fas fa-save"></i> {{ translate('panelConfig', 'save') }}</button>
<button type="reset" onclick="location.href='/panel/panel_config'" class="btn btn-light">Cancel</button> <button type="reset" onclick="location.href='/panel/panel_config'" class="btn btn-light"><i class="fas fa-undo-alt"></i> {{ translate('panelConfig', 'cancel') }}</button>
</form> </form>
</div> </div>
<div class="col-md-6 col-sm-12"> <div class="col-md-6 col-sm-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h4 class="card-title">User Config Area</h4> <h4 class="card-title"><i class="fas fa-user-cog"></i> User Config Area</h4>
<p class="card-description"> Here is where you can change the configuration of your user</p> <p class="card-description"> Here is where you can change the configuration of your user</p>
<blockquote class="blockquote"> <blockquote class="blockquote">
<p class="mb-0"> <p class="mb-0">
@ -191,13 +209,13 @@
</div> </div>
<div class="text-center"> <div class="text-center">
{% if data['new_user'] %} {% if data['new_user'] %}
<a class="btn btn-sm btn-danger disabled">Delete User</a><br /> <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i> Delete User</a><br />
<small>You cannot delete something that does not yet exist</small> <small>You cannot delete something that does not yet exist</small>
{% elif data['user']['superuser'] %} {% elif data['user']['superuser'] %}
<a class="btn btn-sm btn-danger disabled">Delete User</a><br /> <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i> Delete User</a><br />
<small>You cannot delete a superuser</small> <small>You cannot delete a superuser</small>
{% else %} {% else %}
<a href="/panel/remove_user?id={{ data['user']['user_id'] }}" class="btn btn-sm btn-danger">Delete User</a> <a href="/panel/remove_user?id={{ data['user']['user_id'] }}" class="btn btn-sm btn-danger"><i class="fas fa-trash"></i> Delete User</a>
{% end %} {% end %}
</div> </div>

6
app/frontend/templates/panel/server_config.html
View File

@ -115,8 +115,8 @@
</div> </div>
<button type="submit" class="btn btn-success mr-2">{{ translate('serverConfig', 'save') }}</button> <button type="submit" class="btn btn-success mr-2"><i class="fas fa-save"></i> {{ translate('serverConfig', 'save') }}</button>
<button type="reset" class="btn btn-light">{{ translate('serverConfig', 'cancel') }}</button> <button type="reset" class="btn btn-light"><i class="fas fa-times"></i> {{ translate('serverConfig', 'cancel') }}</button>
</form> </form>
</div> </div>
@ -242,7 +242,7 @@ let server_id = '{{ data['server_stats']['server_id']['server_id'] }}';
className: 'btn-danger', className: 'btn-danger',
}, },
cancel: { cancel: {
label: "{{ translate('serverConfig', 'noDeleteFiles') }}", label: "<i class="fas fa-times"></i>{{ translate('serverConfig', 'noDeleteFiles') }}",
className: 'btn-link', className: 'btn-link',
} }
}, },

2
app/frontend/templates/panel/server_files.html
View File

@ -198,7 +198,7 @@
<button onclick="setKeyboard(event.target)" class="btn btn-secondary" data-handler-name="ace/keyboard/sublime">Sublime</button> <button onclick="setKeyboard(event.target)" class="btn btn-secondary" data-handler-name="ace/keyboard/sublime">Sublime</button>
</div> </div>
<h3 id="file_warn"></h3> <h3 id="file_warn"></h3>
<button class="btn btn-success" onclick="save()">{{ translate('serverFiles', 'save') }}</button> <button class="btn btn-success" onclick="save()"><i class="fas fa-save"></i> {{ translate('serverFiles', 'save') }}</button>
</div> </div>
</div> </div>

2
app/frontend/templates/panel/server_term.html
View File

@ -126,6 +126,7 @@
let restartBtn = document.querySelector('#restart-btn'); let restartBtn = document.querySelector('#restart-btn');
let stopBtn = document.querySelector('#stop-btn'); let stopBtn = document.querySelector('#stop-btn');
{% if data['permissions']['Commands'] in data['user_permissions'] %}
if (online) { if (online) {
startBtn.setAttribute('disabled', 'disabled'); startBtn.setAttribute('disabled', 'disabled');
restartBtn.removeAttribute('disabled'); restartBtn.removeAttribute('disabled');
@ -135,6 +136,7 @@
restartBtn.setAttribute('disabled', 'disabled'); restartBtn.setAttribute('disabled', 'disabled');
stopBtn.setAttribute('disabled', 'disabled'); stopBtn.setAttribute('disabled', 'disabled');
} }
{% end %}
let server_id = '{{ data['server_stats']['server_id']['server_id'] }}'; let server_id = '{{ data['server_stats']['server_id']['server_id'] }}';

2
app/frontend/templates/setup/setup1.html
View File

@ -56,7 +56,7 @@
<div class="form-group"> <div class="form-group">
<button class="btn btn-primary submit-btn btn-block">Save</button> <button class="btn btn-primary submit-btn btn-block"><i class="fas fa-save"></i> Save</button>
</div> </div>
</form> </form>

5
app/translations/en_EN.json
View File

@ -235,6 +235,11 @@
"</code>" "</code>"
] ]
}, },
"panelConfig": {
"save": "Save",
"cancel": "Cancel",
"delete": "Delete"
},
"datatables": { "datatables": {
"i18n": { "i18n": {
"decimal": "", "decimal": "",

5
app/translations/fi_FI.json
View File

@ -218,6 +218,11 @@
"</code>" "</code>"
] ]
}, },
"panelConfig": {
"save": "Tallenna",
"cancel": "Peruuta",
"delete": "Poista"
},
"datatables": { "datatables": {
"i18n": { "i18n": {
"decimal": "", "decimal": "",