diff --git a/data/www/css/manage.css b/data/www/css/main.css similarity index 100% rename from data/www/css/manage.css rename to data/www/css/main.css diff --git a/lang/en.json b/lang/en.json index 357992b..7794e12 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1,7 +1,5 @@ { "manage_page_title": "Schedule Overview", - "settings_page_title": "Settings", - "sysinfo_page_title": "System info", "manage_slide_button_add": "Add a slide", "manage_slide_panel_active": "Active slides", "manage_slide_panel_inactive": "Inactive slides", @@ -25,5 +23,15 @@ "manage_slide_form_label_duration": "Duration", "manage_slide_form_label_duration_unit": "seconds", "manage_slide_form_button_cancel": "Cancel", - "manage_slide_delete_confirmation": "Are you sure?" + "js_manage_slide_delete_confirmation": "Are you sure?", + + "sysinfo_page_title": "System infos", + "sysinfo_panel_title": "Infos", + "sysinfo_panel_th_attribute": "Attribute", + "sysinfo_panel_th_value": "Value", + "sysinfo_panel_td_ipaddr": "IP Address", + + + + "settings_page_title": "Settings" } diff --git a/lang/fr.json b/lang/fr.json index b2f80c6..2aab7e0 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -1,7 +1,5 @@ { "manage_page_title": "Vue Planning", - "settings_page_title": "Paramètres", - "sysinfo_page_title": "Système", "manage_slide_button_add": "Ajouter une slide", "manage_slide_panel_active": "Slides actives", "manage_slide_panel_inactive": "Slides inactives", @@ -25,5 +23,13 @@ "manage_slide_form_label_duration": "Durée", "manage_slide_form_label_duration_unit": "secondes", "manage_slide_form_button_cancel": "Annuler", - "manage_slide_delete_confirmation": "Êtes-vous sûr ?" + "js_manage_slide_delete_confirmation": "Êtes-vous sûr ?", + + "sysinfo_page_title": "Système", + "sysinfo_panel_title": "Informations", + "sysinfo_panel_th_attribute": "Attribut", + "sysinfo_panel_th_value": "Valeur", + "sysinfo_panel_td_ipaddr": "Adresse IP", + + "settings_page_title": "Paramètres" } diff --git a/obscreen.py b/obscreen.py index f983112..85c5f86 100755 --- a/obscreen.py +++ b/obscreen.py @@ -82,9 +82,16 @@ def get_ip_address(): # # +@app.context_processor +def inject_global_vars(): + return dict( + LANG=config['lang'], + STATIC_PREFIX='/data/www/' + ) + @app.route('/') def index(): - return render_template('player.jinja.html', items=json.dumps(slide_manager.to_dict(slide_manager.get_enabled_slides()))) + return render_template('player/player.jinja.html', items=json.dumps(slide_manager.to_dict(slide_manager.get_enabled_slides()))) @app.route('/playlist') def playlist(): @@ -92,16 +99,23 @@ def playlist(): @app.route('/slide/default') def slide_default(): - return render_template('default.jinja.html', ipaddr=get_ip_address()) + return render_template('player/default.jinja.html', ipaddr=get_ip_address()) @app.route('/manage') def manage(): return render_template( - 'manage.jinja.html', - ipaddr=get_ip_address(), + 'manager/manage.jinja.html', l=LANGDICT, enabled_slides=slide_manager.get_enabled_slides(), - disabled_slides=slide_manager.get_disabled_slides() + disabled_slides=slide_manager.get_disabled_slides(), + ) + +@app.route('/manage/sysinfo') +def manage_sysinfo(): + return render_template( + 'manager/sysinfo.jinja.html', + ipaddr=get_ip_address(), + l=LANGDICT, ) @app.route('/manage/slide/add', methods=['GET', 'POST']) @@ -158,7 +172,7 @@ def manage_slide_position(): @app.errorhandler(404) def not_found(e): - return send_from_directory('views', 'error404.html'), 404 + return send_from_directory('views', 'core/error404.html'), 404 # if __name__ == '__main__': diff --git a/views/error404.html b/views/core/error404.html similarity index 100% rename from views/error404.html rename to views/core/error404.html diff --git a/views/manage.jinja.html b/views/manage.jinja.html deleted file mode 100644 index 3dcda3a..0000000 --- a/views/manage.jinja.html +++ /dev/null @@ -1,301 +0,0 @@ - - - - - Obscreen - {{ l.manage_page_title }} - - - - - - - - - - -
-
-

- - Obscreen -

- - - -
-
-

{{ l.manage_page_title }}

- -
- -
-
-
-
-

{{ l.manage_slide_panel_active }}

- - - - - - - - - - - - - - {% for slide in enabled_slides %} - - - - - - - {% endfor %} - -
{{ l.manage_slide_panel_th_name }}{{ l.manage_slide_panel_th_duration }}{{ l.manage_slide_panel_th_enabled }}{{ l.manage_slide_panel_th_activity }}
- {{ - l.manage_slide_panel_empty|replace( - '%link%', - (''~l.manage_slide_button_add~'')|safe - ) - }} -
-
- - - - {% set icon_type = 'globe' %} - {% if slide.type == 'video' %} - {% set icon_type = 'video' %} - {% elif slide.type == 'picture' %} - {% set icon_type = 'image' %} - {% endif %} - - - {{ slide.name }} -
- 		- {{ slide.duration }} {{ l.manage_slide_panel_th_duration_unit }} - - - - - - - - - - - - -
-
-
-
-
-

{{ l.manage_slide_panel_inactive }}

- - - - - - - - - - - - - - {% for slide in disabled_slides %} - - - - - - - {% endfor %} - -
{{ l.manage_slide_panel_th_name }}{{ l.manage_slide_panel_th_duration }}{{ l.manage_slide_panel_th_enabled }}{{ l.manage_slide_panel_th_activity }}
- {{ - l.manage_slide_panel_empty|replace( - '%link%', - (''~l.manage_slide_button_add~'')|safe - ) - }} -
-
- - - - {% set icon_type = 'globe' %} - {% if slide.type == 'video' %} - {% set icon_type = 'video' %} - {% elif slide.type == 'picture' %} - {% set icon_type = 'image' %} - {% endif %} - - - {{ slide.name }} -
- 		- {{ slide.duration }} {{ l.manage_slide_panel_th_duration_unit }} - - - - - - - - - - - - -
-
-
-
- -
- - -
- - - - - - diff --git a/views/manager/base.jinja.html b/views/manager/base.jinja.html new file mode 100755 index 0000000..b05a902 --- /dev/null +++ b/views/manager/base.jinja.html @@ -0,0 +1,62 @@ + + + + + Obscreen - {% block page_title %}{% endblock %} + + + + + + + + + {% block add_css %}{% endblock %} + + +
+ + {% block header %} +
+

+ + Obscreen +

+ + + +
+ {% endblock %} + + {% block page %} + + {% endblock %} + + + {% block footer %} + + {% endblock %} +
+ + +{% block add_js %}{% endblock %} + + diff --git a/views/manager/manage-table.jinja.html b/views/manager/manage-table.jinja.html new file mode 100644 index 0000000..b9b3221 --- /dev/null +++ b/views/manager/manage-table.jinja.html @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + {% for slide in slides %} + + + + + + + {% endfor %} + +
{{ l.manage_slide_panel_th_name }}{{ l.manage_slide_panel_th_duration }}{{ l.manage_slide_panel_th_enabled }}{{ l.manage_slide_panel_th_activity }}
+ {{ l.manage_slide_panel_empty|replace( + '%link%', + (''~l.manage_slide_button_add~'')|safe + ) }} +
+
+ + + + {% set icon_type = 'globe' %} + {% if slide.type == 'video' %} + {% set icon_type = 'video' %} + {% elif slide.type == 'picture' %} + {% set icon_type = 'image' %} + {% endif %} + + + {{ slide.name }} +
+ 		+ {{ slide.duration }} {{ l.manage_slide_panel_th_duration_unit }} + + + + + + + + + + + + +
\ No newline at end of file diff --git a/views/manager/manage.jinja.html b/views/manager/manage.jinja.html new file mode 100644 index 0000000..ef20026 --- /dev/null +++ b/views/manager/manage.jinja.html @@ -0,0 +1,52 @@ +{% extends 'manager/base.jinja.html' %} + + +{% block page_title %} + {{ l.manage_page_title }} +{% endblock %} + +{% block add_js %} + + +{% endblock %} + +{% block page %} +
+

{{ l.manage_page_title }}

+ +
+ +
+
+
+
+

{{ l.manage_slide_panel_active }}

+ + {% with tclass='active', slides=enabled_slides %} + {% include 'manager/manage-table.jinja.html' %} + {% endwith %} +
+
+
+
+

{{ l.manage_slide_panel_inactive }}

+ + {% with tclass='inactive', slides=disabled_slides %} + {% include 'manager/manage-table.jinja.html' %} + {% endwith %} +
+
+ + + +{% endblock %} diff --git a/views/manager/modal/slide-add.jinja.html b/views/manager/modal/slide-add.jinja.html new file mode 100644 index 0000000..99ec847 --- /dev/null +++ b/views/manager/modal/slide-add.jinja.html @@ -0,0 +1,50 @@ +
+

+ {{ l.manage_slide_form_add_title }} +

+ +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + {{ l.manage_slide_form_label_duration_unit }} +
+
+ +
+ + +
+
+
\ No newline at end of file diff --git a/views/manager/modal/slide-edit.jinja.html b/views/manager/modal/slide-edit.jinja.html new file mode 100644 index 0000000..3972993 --- /dev/null +++ b/views/manager/modal/slide-edit.jinja.html @@ -0,0 +1,50 @@ + \ No newline at end of file diff --git a/views/manager/sysinfo.jinja.html b/views/manager/sysinfo.jinja.html new file mode 100644 index 0000000..ead0c8a --- /dev/null +++ b/views/manager/sysinfo.jinja.html @@ -0,0 +1,35 @@ +{% extends 'manager/base.jinja.html' %} + + +{% block page_title %} + {{ l.sysinfo_page_title }} +{% endblock %} + +{% block add_js %} + +{% endblock %} + +{% block page %} +
+

{{ l.sysinfo_page_title }}

+
+
+
+

{{ l.sysinfo_panel_title }}

+ + + + + + + + + + + + + +
{{ l.sysinfo_panel_th_attribute }}{{ l.sysinfo_panel_th_value }}
{{ l.sysinfo_panel_td_ipaddr }}{{ ipaddr }}
+
+
+{% endblock %} diff --git a/views/default.jinja.html b/views/player/default.jinja.html similarity index 100% rename from views/default.jinja.html rename to views/player/default.jinja.html diff --git a/views/player.jinja.html b/views/player/player.jinja.html similarity index 100% rename from views/player.jinja.html rename to views/player/player.jinja.html