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

Merge branch 'lukas-fixes-everywhere' into 'dev'

Browse Source 
Lukas fixes

See merge request crafty-controller/crafty-commander!83
This commit is contained in:
Iain Powrie 2021-11-05 16:41:09 +00:00
commit 126964dc30
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
# Crafty Controller 4.0.0-alpha.2
# Crafty Controller 4.0.0-alpha.3
> Python based Control Panel for your Minecraft Server
## What is Crafty Controller?

2
app/config/version.json
View File

@ -2,5 +2,5 @@
"major": 4,
"minor": 0,
"sub": 0,
"meta": "alpha.2"
"meta": "alpha.3"
}

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

@ -40,12 +40,12 @@
<div class="card-body pt-0">
<ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist">
<li class="nav-item">
<a class="nav-link active" href="/panel/edit_user?id={{ data['user']['user_id'] }}&subpage=config" role="tab" aria-selected="true">
<a class="nav-link active" href="/panel/{{ 'add_user' if data['new_user'] else 'edit_user' }}?id={{ data['user']['user_id'] }}&subpage=config" role="tab" aria-selected="true">
<i class="fas fa-cogs"></i>Config</a>
</li>
{% if data['new_user'] %}
{% if not data['new_user'] %}
<li class="nav-item">
<a class="nav-link" href="/panel/edit_user?id={{ data['user']['user_id'] }}&subpage=other" role="tab" aria-selected="false">
<a class="nav-link" href="/panel/add_user?id={{ data['user']['user_id'] }}&subpage=other" role="tab" aria-selected="false">
<i class="fas fa-folder-tree"></i>Other</a>
</li>
{% end %}

16
main.py
View File

@ -23,14 +23,14 @@ def do_intro():
version = helper.get_version_string()
intro = """
{lines}
#\t\tWelcome to Crafty Controller - v.{version}\t\t #
{lines}
# \tServer Manager / Web Portal for your Minecraft server \t #
# \t\tHomepage: www.craftycontrol.com\t\t\t #
{lines}
""".format(lines="/" * 75, version=version)
intro = f"""
{'/' * 75}
#{("Welcome to Crafty Controller - v." + version).center(73, " ")}#
{'/' * 75}
#{"Server Manager / Web Portal for your Minecraft server".center(73, " ")}#
#{"Homepage: www.craftycontrol.com".center(73, " ")}#
{'/' * 75}
"""
console.magenta(intro)