From ac77465228a26cf6e1d4140fa32fa86338dc0fe7 Mon Sep 17 00:00:00 2001 From: topilski Date: Mon, 3 Jun 2019 10:44:03 -0400 Subject: [PATCH] CSS --- app/templates/service/activate.html | 52 +- app/templates/user/dashboard.html | 824 ++++++++++++++-------------- app/templates/user/settings.html | 139 ++--- 3 files changed, 521 insertions(+), 494 deletions(-) diff --git a/app/templates/service/activate.html b/app/templates/service/activate.html index 4b20ed4..375c34c 100644 --- a/app/templates/service/activate.html +++ b/app/templates/service/activate.html @@ -5,32 +5,34 @@ Activate service | {{ config['PUBLIC_CONFIG'].site.title }} {% block content %} -
-
-
-

- {{ config['PUBLIC_CONFIG'].site.title }} -

-
-
-

{% trans %}License{% endtrans %}

-

{% trans %}Note: Please activate service.{% endtrans %}

- {{ util.flashed_messages(dismissible=True, container=False) }} -
- {{ form.hidden_tag() }} -
- - -
- {{ form_field(form.submit, class="btn") }} -
-
+
+
+

+ {{ config['PUBLIC_CONFIG'].site.title }} +

-
- - {% trans %}Dashboard{% endtrans %} - +
+
+
+

{% trans %}License{% endtrans %}

+

{% trans %}Note: Please activate service.{% endtrans %}

+ {{ util.flashed_messages(dismissible=True, container=False) }} +
+ {{ form.hidden_tag() }} +
+ + +
+ {{ form_field(form.submit, class="btn") }} +
+
+
+ + {% trans %}Dashboard{% endtrans %} + +
+
{%- endblock %} diff --git a/app/templates/user/dashboard.html b/app/templates/user/dashboard.html index 0f6cf17..6c0af67 100644 --- a/app/templates/user/dashboard.html +++ b/app/templates/user/dashboard.html @@ -44,425 +44,437 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} th.stream_actions { width: 25%; } + + {{super()}} {% endblock %} {% block content %} -
-
-
-
-

{% trans %}Welcome{% endtrans %} {{ current_user.email }}

-
-
- - {% trans %}Settings{% endtrans %} - -
-
- - {% trans %}Logout{% endtrans %} - -
- {% if (current_user.type != 0) %} -
- - {% trans %}Delete{% endtrans %} - -
- {% endif %} -
+
+
+

{{ config['PUBLIC_CONFIG'].site.title }}

-
-
-
- +
-
- {% if (service.status == service.status.INIT) %} - - {% trans %}Connect{% endtrans %} - - {% else %} - - {% trans %}Disconnect{% endtrans %} - - {% endif %} -
-
- - {% trans %}Activate{% endtrans %} - -
-
- - {% trans %}Sync{% endtrans %} - -
-
- - {% trans %}Playlist{% endtrans %} - -
-
- - {% trans %}Upload m3u{% endtrans %} - -
-
- - {% trans %}Ping{% endtrans %} - -
-
- - {% trans %}Stop{% endtrans %} - -
- {% if (role == 3) %} -
- - {% trans %}Get log{% endtrans %} - -
-
- - {% trans %}View log{% endtrans %} - -
- {% endif %} -
-
-
-
- {% trans %}ID:{% endtrans %} -

{{ service.id }}

-
-
- {% trans %}Timestamp:{% endtrans %} -

{{ service.timestamp }}

-
-
- {% trans %}Uptime:{% endtrans %} -

{{ service.uptime }}

-
-
- {% trans %}Load:{% endtrans %} -

{{ service.load_average }}

-
-
- {% trans %}State:{% endtrans %} -

{{ ['INIT', 'CONNECTED', 'ACTIVE'][service.status] }}

-
-
-
-
- {% trans %}CPU:{% endtrans %} -

{{ service.cpu }}

-
-
- {% trans %}GPU:{% endtrans %} -

{{ service.gpu }}

-
-
- {% trans %}Network in:{% endtrans %} -

{{ service.bandwidth_in }}

-
-
- {% trans %}Network out:{% endtrans %} -

{{ service.bandwidth_out }}

-
-
- {% trans %}Version:{% endtrans %} -

{{ service.version }}

-
-
-
-
- {% trans %}Memory total:{% endtrans %} -

{{ service.memory_total }}

-
-
- {% trans %}Memory free:{% endtrans %} -

{{ service.memory_free }}

-
-
- {% trans %}Memory available:{% endtrans %} -

{{ service.memory_available }}

-
-
- {% trans %}HDD total:{% endtrans %} -

{{ service.hdd_total }}

-
-
- {% trans %}HDD free:{% endtrans %} -

{{ service.memory_free }}

-
-
-
-
-
- -
-
-
-
-
- - - - - - - - - - - - - - - - - - - {% for rev in streams %} - {% if (rev.type != 6 and rev.type != 7) %} - - - - - - - - - - - - - - +
+
+
+
-
#{% trans %}Name{% endtrans %}{% trans %}Type{% endtrans %}{% trans %}Status{% endtrans %}{% trans %}Restarts{% endtrans %}{% trans %}CPU{% endtrans %}{% trans %}RSS{% endtrans %}{% trans %}In BPS{% endtrans %}{% trans %}Out BPS{% endtrans %}{% trans %}In work time{% endtrans %}{% trans %}Live time{% endtrans %}{% trans %}Actions{% endtrans %}
{{ loop.index }}{{ rev.name }} - {{ ['RELAY', 'ENCODE', 'TIMESHIFT_PLAYER', 'TIMESHIFT_RECORDER', 'CATCHUP', - 'TEST_LIFE', - 'VOD_RELAY', 'VOD_ENCODE'][rev.type] }} - {{ ['NEW', 'INIT', 'STARTED', 'READY', 'PLAYING', 'FROZEN', - 'WAITING'][rev.status] }} - {{ rev.restarts }}{{ rev.cpu }}{{ rev.rss }}{{ rev.input_streams|sum(attribute='bps') }}{{ rev.output_streams|sum(attribute='bps') }}{{ rev.timestamp - rev.start_time }}{{ rev.timestamp - rev.loop_start_time }} - - - - - - {% if (role == 3) %} - - - {% trans %}View log{% endtrans %} - - - - {% trans %}VPL{% endtrans %} - - {% endif %} -
+
-
- - - - - - +
+ {% if (service.status == service.status.INIT) %} + + {% trans %}Connect{% endtrans %} + + {% else %} + + {% trans %}Disconnect{% endtrans %} + + {% endif %} +
+
+ + {% trans %}Activate{% endtrans %} + +
+
+ + {% trans %}Sync{% endtrans %} + +
+
+ + {% trans %}Playlist{% endtrans %} + +
+
+ + {% trans %}Upload m3u{% endtrans %} + +
+
+ + {% trans %}Ping{% endtrans %} + +
+
+ + {% trans %}Stop{% endtrans %} + +
+ {% if (role == 3) %} +
+ + {% trans %}Get log{% endtrans %} + +
+
+ + {% trans %}View log{% endtrans %} + +
+ {% endif %} +
+
+
+
+ {% trans %}ID:{% endtrans %} +

{{ service.id }}

+
+
+ {% trans %}Timestamp:{% endtrans %} +

{{ service.timestamp }}

+
+
+ {% trans %}Uptime:{% endtrans %} +

{{ service.uptime }}

+
+
+ {% trans %}Load:{% endtrans %} +

{{ service.load_average }}

+
+
+ {% trans %}State:{% endtrans %} +

{{ ['INIT', 'CONNECTED', 'ACTIVE'][service.status] }}

-
-
- - - - - - - - - - - - - - - - - - - {% for vod in streams %} - {% if (vod.type == 6 or vod.type == 7) %} - - - - - - - - - - - - - - - {% endif %} - {% endfor %} - -
#{% trans %}Name{% endtrans %}{% trans %}Type{% endtrans %}{% trans %}Status{% endtrans %}{% trans %}Restarts{% endtrans %}{% trans %}CPU{% endtrans %}{% trans %}RSS{% endtrans %}{% trans %}In BPS{% endtrans %}{% trans %}Out BPS{% endtrans %}{% trans %}In work time{% endtrans %}{% trans %}Live time{% endtrans %}{% trans %}Actions{% endtrans %}
{{ loop.index }}{{ vod.name }} - {{ ['RELAY', 'ENCODE', 'TIMESHIFT_PLAYER', 'TIMESHIFT_RECORDER', 'CATCHUP', - 'TEST_LIFE', - 'VOD_RELAY', 'VOD_ENCODE'][vod.type] }} - {{ ['NEW', 'INIT', 'STARTED', 'READY', 'PLAYING', 'FROZEN', - 'WAITING'][vod.status] }} - {{ vod.restarts }}{{ vod.cpu }}{{ vod.rss }}{{ vod.input_streams|sum(attribute='bps') }}{{ vod.output_streams|sum(attribute='bps') }}{{ vod.timestamp - vod.start_time }}{{ vod.timestamp - vod.loop_start_time }} - - - - - {% trans %}View log{% endtrans %} - - -
+
+
+ {% trans %}CPU:{% endtrans %} +

{{ service.cpu }}

-
- - +
+ {% trans %}GPU:{% endtrans %} +

{{ service.gpu }}

+
+
+ {% trans %}Network in:{% endtrans %} +

{{ service.bandwidth_in }}

+
+
+ {% trans %}Network out:{% endtrans %} +

{{ service.bandwidth_out }}

+
+
+ {% trans %}Version:{% endtrans %} +

{{ service.version }}

+
+
+
+
+ {% trans %}Memory total:{% endtrans %} +

{{ service.memory_total }}

+
+
+ {% trans %}Memory free:{% endtrans %} +

{{ service.memory_free }}

+
+
+ {% trans %}Memory available:{% endtrans %} +

{{ service.memory_available }}

+
+
+ {% trans %}HDD total:{% endtrans %} +

{{ service.hdd_total }}

+
+
+ {% trans %}HDD free:{% endtrans %} +

{{ service.memory_free }}

+
+
+
+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + {% for rev in streams %} + {% if (rev.type != 6 and rev.type != 7) %} + + + + + + + + + + + + + + + {% endif %} + {% endfor %} + +
#{% trans %}Name{% endtrans %}{% trans %}Type{% endtrans %}{% trans %}Status{% endtrans %}{% trans %}Restarts{% endtrans %}{% trans %}CPU{% endtrans %}{% trans %}RSS{% endtrans %}{% trans %}In BPS{% endtrans %}{% trans %}Out BPS{% endtrans %}{% trans %}In work time{% endtrans %}{% trans %}Live time{% endtrans %}{% trans %}Actions{% endtrans %}
{{ loop.index }}{{ rev.name }} + {{ ['RELAY', 'ENCODE', 'TIMESHIFT_PLAYER', 'TIMESHIFT_RECORDER', 'CATCHUP', + 'TEST_LIFE', + 'VOD_RELAY', 'VOD_ENCODE'][rev.type] }} + {{ ['NEW', 'INIT', 'STARTED', 'READY', 'PLAYING', 'FROZEN', + 'WAITING'][rev.status] }} + {{ rev.restarts }}{{ rev.cpu }}{{ rev.rss }}{{ rev.input_streams|sum(attribute='bps') }}{{ rev.output_streams|sum(attribute='bps') }}{{ rev.timestamp - rev.start_time }}{{ rev.timestamp - rev.loop_start_time }} + + + + + + {% if (role == 3) %} + + + {% trans %}View log{% endtrans %} + + + + {% trans %}VPL{% endtrans %} + + {% endif %} +
+
+
+ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + {% for vod in streams %} + {% if (vod.type == 6 or vod.type == 7) %} + + + + + + + + + + + + + + + {% endif %} + {% endfor %} + +
#{% trans %}Name{% endtrans %}{% trans %}Type{% endtrans %}{% trans %}Status{% endtrans %}{% trans %}Restarts{% endtrans %}{% trans %}CPU{% endtrans %}{% trans %}RSS{% endtrans %}{% trans %}In BPS{% endtrans %}{% trans %}Out BPS{% endtrans %}{% trans %}In work time{% endtrans %}{% trans %}Live time{% endtrans %}{% trans %}Actions{% endtrans %}
{{ loop.index }}{{ vod.name }} + {{ ['RELAY', 'ENCODE', 'TIMESHIFT_PLAYER', 'TIMESHIFT_RECORDER', 'CATCHUP', + 'TEST_LIFE', + 'VOD_RELAY', 'VOD_ENCODE'][vod.type] }} + {{ ['NEW', 'INIT', 'STARTED', 'READY', 'PLAYING', 'FROZEN', + 'WAITING'][vod.status] }} + {{ vod.restarts }}{{ vod.cpu }}{{ vod.rss }}{{ vod.input_streams|sum(attribute='bps') }}{{ vod.output_streams|sum(attribute='bps') }}{{ vod.timestamp - vod.start_time }}{{ vod.timestamp - vod.loop_start_time }} + + + + + {% trans %}View log{% endtrans %} + + +
+
+
+ + +
+
@@ -788,5 +800,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} } }); } + + {% endblock %} diff --git a/app/templates/user/settings.html b/app/templates/user/settings.html index b67e6b1..b7628f6 100644 --- a/app/templates/user/settings.html +++ b/app/templates/user/settings.html @@ -17,71 +17,79 @@ Settings | {{ config['PUBLIC_CONFIG'].site.title }} {{super()}} {% endblock %} {% block content %} -
-
-
-

{% trans %}Settings{% endtrans %}

-
-
- - {% trans %}Dashboard{% endtrans %} - -
-
- - {% trans %}Logout{% endtrans %} - -
+
+
+

{{ config['PUBLIC_CONFIG'].site.title }}

-
-
- {{ form.hidden_tag() }} - {{ render_bootstrap_field(form.locale) }} - {{ form_field(form.submit, class="btn btn-success") }} -
-
-
- {% if servers|length == 0 %} -
To open dashboard you should have at least 1 server, please add it.
- {% endif %} -
-
-
- - - - - - - - - {% for server in servers %} - - - - - - {% endfor %} - -
#{% trans %}Name{% endtrans %}
{{ loop.index }}{{ server.name }} - - - -
-
-
-
-
- +
+
+
+
+

{% trans %}Settings{% endtrans %}

+
+
+ + {% trans %}Dashboard{% endtrans %} + +
+
+ + {% trans %}Logout{% endtrans %} + +
+
+
+
+ {{ form.hidden_tag() }} + {{ render_bootstrap_field(form.locale) }} + {{ form_field(form.submit, class="btn btn-success") }} +
+
+
+ {% if servers|length == 0 %} +
To open dashboard you should have at least 1 server, please add it.
+ {% endif %} +
+
+
+ + + + + + + + + {% for server in servers %} + + + + + + {% endfor %} + +
#{% trans %}Name{% endtrans %}
{{ loop.index }}{{ server.name }} + + + +
+
+
+
+ +
@@ -206,5 +214,8 @@ Settings | {{ config['PUBLIC_CONFIG'].site.title }} } }); } + + + {% endblock %}