web - added page titles

code/web/base/ga/config/site.py

@@ -7,30 +7,30 @@
 
 type_dict = {
     # objects
-    'connectionobject': {'model': ObjectConnectionModel, 'form': ObjectConnectionForm, 'pretty': 'Connection object', 'hidden': False},
-    'inputobject': {'model': ObjectInputModel, 'form': ObjectInputForm, 'pretty': 'Input object', 'hidden': False},
-    'outputobject': {'model': ObjectOutputModel, 'form': ObjectOutputForm, 'pretty': 'Output object', 'hidden': False},
+    'connectionobject': {'model': ObjectConnectionModel, 'form': ObjectConnectionForm, 'pretty': 'Connection device', 'hidden': False},
+    'inputobject': {'model': ObjectInputModel, 'form': ObjectInputForm, 'pretty': 'Input device', 'hidden': False},
+    'outputobject': {'model': ObjectOutputModel, 'form': ObjectOutputForm, 'pretty': 'Output device', 'hidden': False},
     'conditionobject': {'model': ObjectConditionModel, 'form': ObjectConditionForm, 'pretty': 'Condition match', 'hidden': False},
     'conditionspecialobject': {'model': ObjectSpecialConditionModel, 'form': ObjectSpecialConditionForm, 'pretty': 'Special condition match', 'hidden': False},
     'controllerobject': {'model': ObjectControllerModel, 'form': ObjectControllerForm, 'pretty': 'Controller', 'hidden': False},
     'timerobject': {'model': ObjectTaskModel, 'form': ObjectTaskForm, 'pretty': 'Task', 'hidden': False},
     # groups
-    'connectiongroup': {'model': GroupConnectionModel, 'form': GroupConnectionForm, 'pretty': 'Connection group', 'hidden': False},
-    'inputgroup': {'model': GroupInputModel, 'form': GroupInputForm, 'pretty': 'Input group', 'hidden': False},
-    'outputgroup': {'model': GroupOutputModel, 'form': GroupOutputForm, 'pretty': 'Output group', 'hidden': False},
+    'connectiongroup': {'model': GroupConnectionModel, 'form': GroupConnectionForm, 'pretty': 'Connection device model', 'hidden': False},
+    'inputgroup': {'model': GroupInputModel, 'form': GroupInputForm, 'pretty': 'Input device model', 'hidden': False},
+    'outputgroup': {'model': GroupOutputModel, 'form': GroupOutputForm, 'pretty': 'Output device model', 'hidden': False},
     'conditiongroup': {'model': GroupConditionModel, 'form': GroupConditionForm, 'pretty': 'Condition', 'hidden': False},
     'conditionlinkgroup': {'model': ObjectConditionLinkModel, 'form': ObjectConditionLinkForm, 'pretty': 'Condition link', 'hidden': False},
     'areagroup': {'model': GroupAreaModel, 'form': GroupAreaForm, 'pretty': 'Area', 'hidden': False},
     # members
-    'connectionmember': {'model': MemberConnectionModel, 'form': MemberConnectionForm, 'pretty': 'Connection member', 'hidden': True, 'redirect': 'connectiongroup'},
-    'inputmember': {'model': MemberInputModel, 'form': MemberInputForm, 'pretty': 'Input member', 'hidden': True, 'redirect': 'inputgroup'},
-    'outputmember': {'model': MemberOutputModel, 'form': MemberOutputForm, 'pretty': 'Output member', 'hidden': True, 'redirect': 'outputgroup'},
-    'conditionlinkmember': {'model': MemberConditionLinkModel, 'form': MemberConditionLinkForm, 'pretty': 'Condition Link Member', 'hidden': True, 'redirect': 'conditionlinkgroup'},
+    'connectionmember': {'model': MemberConnectionModel, 'form': MemberConnectionForm, 'pretty': 'Connection model member', 'hidden': True, 'redirect': 'connectiongroup'},
+    'inputmember': {'model': MemberInputModel, 'form': MemberInputForm, 'pretty': 'Input model member', 'hidden': True, 'redirect': 'inputgroup'},
+    'outputmember': {'model': MemberOutputModel, 'form': MemberOutputForm, 'pretty': 'Output model member', 'hidden': True, 'redirect': 'outputgroup'},
+    'conditionlinkmember': {'model': MemberConditionLinkModel, 'form': MemberConditionLinkForm, 'pretty': 'Condition link member', 'hidden': True, 'redirect': 'conditionlinkgroup'},
     'conditionmember': {'model': MemberConditionModel, 'form': MemberConditionForm, 'pretty': 'Condition Member', 'hidden': True, 'redirect': 'conditiongroup'},
-    'conditionoutputmember': {'model': MemberConditionOutputModel, 'form': MemberConditionOutputForm, 'pretty': 'Condition Output Member', 'hidden': True, 'redirect': 'conditiongroup'},
-    'conditionoutputgroupmember': {'model': MemberConditionOutputGroupModel, 'form': MemberConditionOutputGroupForm, 'pretty': 'Condition Output Member Group', 'hidden': True, 'redirect': 'conditiongroup'},
-    'conditionareamember': {'model': MemberConditionAreaGroupModel, 'form': MemberConditionAreaGroupForm, 'pretty': 'Condition Area', 'hidden': True, 'redirect': 'conditiongroup'},
-    'areamember': {'model': MemberAreaModel, 'form': MemberAreaForm, 'pretty': 'Area Member', 'hidden': True, 'redirect': 'areagroup'},
+    'conditionoutputmember': {'model': MemberConditionOutputModel, 'form': MemberConditionOutputForm, 'pretty': 'Condition output member', 'hidden': True, 'redirect': 'conditiongroup'},
+    'conditionoutputgroupmember': {'model': MemberConditionOutputGroupModel, 'form': MemberConditionOutputGroupForm, 'pretty': 'Condition output member group', 'hidden': True, 'redirect': 'conditiongroup'},
+    'conditionareamember': {'model': MemberConditionAreaGroupModel, 'form': MemberConditionAreaGroupForm, 'pretty': 'Condition area', 'hidden': True, 'redirect': 'conditiongroup'},
+    'areamember': {'model': MemberAreaModel, 'form': MemberAreaForm, 'pretty': 'Area member', 'hidden': True, 'redirect': 'areagroup'},
     'areanestedgroup': {'model': NestedAreaModel, 'form': NestedAreaForm, 'pretty': 'Nested area group', 'hidden': True, 'redirect': 'areagroup'},
 }
 

code/web/base/ga/subviews/config/main.py

@@ -19,7 +19,7 @@ def __init__(self, request, typ: str, action: str, uid: (str, int) = None, sub_t
         self.sub_type = sub_type
         self.tmpl_root = 'config'
         try:
-            self.title = f"{type_dict[self.type]['pretty']} config"
+            self.title = f"{type_dict[self.type]['pretty']}"
 
         except KeyError:
             self.title = 'Config'

code/web/base/ga/subviews/data/chart/obj.py

@@ -6,8 +6,6 @@
 from ....utils.main import error_formatter, method_user_passes_test
 from ....user import authorized_to_read, authorized_to_write
 
-TITLE = 'Data charts'
-
 
 class Chart:
     def __init__(self, request, html_template: str, model, form):
@@ -17,12 +15,22 @@ def __init__(self, request, html_template: str, model, form):
         self.root_path = 'data/chart'
         self.model = model
         self.form = form
+        self.title = 'Data charts'
 
     def go(self, chart_option_defaults: dict):
         if self.request.method == 'POST':
             return self.post()
 
         else:
+            if self.html_template == 'dataset':
+                self.title = 'Chart datasets'
+
+            elif self.html_template == 'dbe':
+                self.title = 'Chart dashboard elements'
+
+            elif self.html_template == 'graph':
+                self.title = 'Chart graphs'
+
             return self.get(chart_option_defaults)
 
     @method_user_passes_test(authorized_to_read, login_url='/accounts/login/')
@@ -70,7 +78,7 @@ def get(self, chart_option_defaults: dict):
             return render(self.request, f'{self.root_path}/{self.html_template}.html', context={
                 'request': self.request, 'input_device_dict': input_device_dict, 'start_ts': start_ts, 'stop_ts': stop_ts,
                 'input_device': input_device, 'input_model_dict': input_model_dict, 'action': action, 'selected': chart_dict['id'], 'form': chart_dict['form'],
-                'object_list': chart_dict['list'], 'title': TITLE,
+                'object_list': chart_dict['list'], 'title': self.title,
             })
 
         elif self.html_template == 'dbe':
@@ -96,14 +104,14 @@ def get(self, chart_option_defaults: dict):
                 'request': self.request, 'input_device_dict': input_device_dict, 'input_model_dict': input_model_dict, 'action': action,
                 'form': chart_dict['form'], 'selected': chart_dict['id'], 'object_list': chart_dict['list'], 'selected_dataset_ids': selected_dataset_ids,
                 'dataset_link_list': dataset_link_list, 'graph_link_list': graph_link_list, 'dataset_list': dataset_list, 'graph_form': graph_form,
-                'form_error': form_error, 'title': TITLE,
+                'form_error': form_error, 'title': self.title,
             })
 
         else:
 
             return render(self.request, f'{self.root_path}/{self.html_template}.html', context={
                 'request': self.request, 'input_device_dict': input_device_dict, 'input_model_dict': input_model_dict, 'action': action,
-                'form': chart_dict['form'], 'selected': chart_dict['id'], 'object_list': chart_dict['list'], 'title': TITLE,
+                'form': chart_dict['form'], 'selected': chart_dict['id'], 'object_list': chart_dict['list'], 'title': self.title,
             })
 
     @method_user_passes_test(authorized_to_write, login_url='/accounts/login/')
@@ -161,7 +169,7 @@ def post(self):
             return redirect(redirect_url)
 
         return render(self.request, f'{self.root_path}/{self.html_template}.html', context={
-            'request': self.request, 'form': form, 'action': action, 'selected': chart_id, 'object_list': chart_list, 'title': TITLE,
+            'request': self.request, 'form': form, 'action': action, 'selected': chart_id, 'object_list': chart_list, 'title': self.title,
         })
 
     def _add_form_error(self, url: str, error: str = 'Failed+to+save+form'):

code/web/base/ga/templates/body.html

@@ -17,6 +17,9 @@
             {% include "./info/read_only.html" %}
         {% endif %}
         <main class="ga-main">
+            {% if title %}
+            <h1 class="ga-header">{{ title }}</h1>
+            {% endif %}
             {% block content %}
             {% endblock %}
         </main>

code/web/base/ga/templates/data/chart/dashboard.html

@@ -1,9 +1,6 @@
 {% extends "./tmpl/main.html" %}
 {% load bootstrap_tags %}
 {% load util %}
-{% block title %}
-    <h1>{{ action|title }} dashboard element</h1>
-{% endblock %}
 {% block extraoptions %}
     <br><hr><br>
     <h2>

code/web/base/ga/templates/data/chart/dataset.html

@@ -1,7 +1,4 @@
 {% extends "./tmpl/main.html" %}
-{% block title %}
-    <h1>Configure dataset</h1>
-{% endblock %}
 {% block options %}
         {% include "../tmpl/filter_start_stop.html" %}
         <br>

code/web/base/ga/templates/data/chart/dbe.html

@@ -1,9 +1,6 @@
 {% extends "./tmpl/main.html" %}
 {% load bootstrap_tags %}
 {% load util %}
-{% block title %}
-    <h1>Configure dashboard element</h1>
-{% endblock %}
 {% block extraoptions %}
     <br><hr><br>
     <h2>

code/web/base/ga/templates/data/chart/graph.html

@@ -1,7 +1,4 @@
 {% extends "./tmpl/main.html" %}
-{% block title %}
-    <h1>Configure graph prototype</h1>
-{% endblock %}
 {% block js %}
     {% include "./js/graph.html" %}
 {% endblock %}

code/web/base/ga/templates/data/chart/main.html

@@ -4,8 +4,6 @@
 {% load static %}
 {% load bootstrap4 %}
 {% block content %}
-    <h1>Charts</h1>
-    <br><hr><br>
     {% if status is not None and what is not None %}
         <div class="alert alert-success">
             <strong>{{ status|title }} {{ what }}</strong>

code/web/base/ga/templates/data/chart/tmpl/main.html

@@ -4,9 +4,6 @@
     {% include "../../tmpl/chart_head.html" %}
 {% endblock %}
 {% block content %}
-    {% block title %}
-    {% endblock %}
-    <br><hr><br>
     {% include "../../../error/form.html" %}
     {% if action != 'create' and object_list|length != 0 %}
         <form method="get">

code/web/base/ga/templates/data/dashboard/main.html

@@ -8,8 +8,6 @@
     {% set_var db_dict|get_item:'list' as object_list %}
     {% set_var db_dict|get_item:'id' as selected %}
     {% set_var db_dict|get_item:'obj' as dashboard %}
-    <h1>Dashboard</h1>
-    <br><hr><br>
     {% include "./main/forms.html" %}
     {% include "./main/dashboard.html" %}
     {% include "./js.html" %}

code/web/base/static/css/ga.css

@@ -299,3 +299,14 @@ form .error-msg {
 .ga-nav-right-li:hover .ga-icon-logout {
     color: #B00020;
 }
+
+.ga-header {
+    color: #121212;
+    padding-bottom: 15px;
+    margin-bottom: 35px;
+    font-family: 'Open Sans Condensed', sans-serif;
+    letter-spacing: 3px;
+    text-transform: capitalize;
+    font-weight: bold;
+    border-bottom: 3px solid #121212;
+}