diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 93ec83a9..4530378a 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -322,9 +322,12 @@ class PanelHandler(BaseHandler): filetype_extension=False, use_ssl=True, ) # + "?d=404" - if requests.head(url).status_code != 404: - profile_url = url - else: + try: + if requests.head(url).status_code != 404: + profile_url = url + else: + profile_url = "/static/assets/images/faces-clipart/pic-3.png" + except: profile_url = "/static/assets/images/faces-clipart/pic-3.png" else: profile_url = "/static/assets/images/faces-clipart/pic-3.png" diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py index d6507c24..293f2838 100644 --- a/app/classes/web/server_handler.py +++ b/app/classes/web/server_handler.py @@ -110,9 +110,12 @@ class ServerHandler(BaseHandler): filetype_extension=False, use_ssl=True, ) # + "?d=404" - if requests.head(url).status_code != 404: - profile_url = url - else: + try: + if requests.head(url).status_code != 404: + profile_url = url + else: + profile_url = "/static/assets/images/faces-clipart/pic-3.png" + except: profile_url = "/static/assets/images/faces-clipart/pic-3.png" else: profile_url = "/static/assets/images/faces-clipart/pic-3.png" @@ -131,6 +134,7 @@ class ServerHandler(BaseHandler): ) return + page_data["online"] = helper.check_internet() page_data["server_types"] = server_jar_obj.get_serverjar_data() page_data["js_server_types"] = json.dumps( server_jar_obj.get_serverjar_data() diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html index 6d299fd1..113ba2f1 100644 --- a/app/frontend/templates/server/wizard.html +++ b/app/frontend/templates/server/wizard.html @@ -8,16 +8,17 @@
-
+ +
+ {% if data['online'] %}
@@ -26,95 +27,112 @@

-

- {% raw xsrf_form_html() %} -
-
-
- - -
+ + {% raw xsrf_form_html() %} +
+
+
+ +
- -
-
- - -
-
- -
-
- - -
-
-
-
-

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}

-
-
-
-
- - -
+
+
+ +
+
-
-
- - -
+
+
+ +
+
-
-
- - -
+
+
+

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', + data['lang']) }}

+
+
+ +
+
+ +
-
-
-
-
-
-

- {{ translate('serverWizard', 'addRole', data['lang']) }} - {{ translate('serverWizard', 'autoCreate', data['lang']) }} -

-
-
-
-
- {% for r in data['roles'] %} -
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+
+
+
+
+

+ {{ translate('serverWizard', 'addRole', data['lang']) }} + - {{ translate('serverWizard', 'autoCreate', + data['lang']) }} +

+
+
+
+
+ {% for r in data['roles'] %} + - {% end %} -
+ {% end %}
-
- - - +
+ + + +

+ {% end %}
@@ -125,75 +143,217 @@

-

- {% raw xsrf_form_html() %} - -
+ + {% raw xsrf_form_html() %} + +
-
-
- - -
+
+
+ +
- -
-
- - -
-
- -
-
- - -
-
- - -
-
-

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}

+ +
+
+ + +
+
+ +
+
+ + +
+
+ + + +
+
+

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', + data['lang']) }}

+
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+
+
+
+
+

+ {{ translate('serverWizard', 'addRole', data['lang']) }} + - {{ translate('serverWizard', 'autoCreate', + data['lang']) }} +

+
+
+
+
+ {% for r in data['roles'] %} + + {% end %} +
+
+
+
+
+
+
+
+ + + + +

+
+
+
+
+
+
+
+ +

{{ translate('serverWizard', 'importZip', data['lang']) }}

+
+

+ +

+ {% raw xsrf_form_html() %} + + +
+
+
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ +
+ +
+
+ + +
+
+ + +
+
+
+ + + +
+

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', + data['lang']) }}


-
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
-
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+
-
-

- {{ translate('serverWizard', 'addRole', data['lang']) }} - {{ translate('serverWizard', 'autoCreate', data['lang']) }} +

+

+ {{ translate('serverWizard', 'addRole', data['lang']) + }} - {{ translate('serverWizard', 'autoCreate', + data['lang']) }}

-
+
{% for r in data['roles'] %} - + {% end %}
@@ -202,302 +362,211 @@
+ +
- - - - -

-
+ + +
+
+ +

-
-
-
- -

{{ translate('serverWizard', 'importZip', data['lang']) }}

-
-

- -

- {% raw xsrf_form_html() %} - - -
-
-
-
- - -
-
- -
-
- - -
-
- -
-
- -
- -
-
- - -
-
- - -
-
-
- - - -
-

{{ translate('serverWizard', 'quickSettings', data['lang']) }} - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}

-
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
-
-
-
-

- {{ translate('serverWizard', 'addRole', data['lang']) }} - {{ translate('serverWizard', 'autoCreate', data['lang']) }} -

-
-
-
-
- {% for r in data['roles'] %} - - {% end %} -
-
-
-
-
-
-
- - -
- - -
-
-
-

-
-
-
-
- - - -{% end %} - -{% block js%} - - - + + - + -{% end %} + + {% end %} \ No newline at end of file