diff --git a/apps/dyn_dt/routes.py b/apps/dyn_dt/routes.py index b441ab4a..de1651d7 100644 --- a/apps/dyn_dt/routes.py +++ b/apps/dyn_dt/routes.py @@ -13,7 +13,8 @@ def dynamic_dt(): context = { 'routes': config.Config.DYNAMIC_DATATB.keys(), - 'segment': 'dynamic_dt' + 'segment': 'dynamic_dt', + 'parent': 'dashboard', } return render_template('dyn_dt/index.html', **context) @@ -167,6 +168,7 @@ def model_dt(aPath): 'fk_fields_keys': fk_fields.keys(), 'fk_fields': fk_fields, 'segment': 'dynamic_dt', + 'parent': 'dashboard', 'choices_dict': choices_dict, 'exclude_auto_gen_fields': exclude_auto_gen_fields(aModelClass) } diff --git a/apps/home/routes.py b/apps/home/routes.py index 399f7a98..faef3820 100644 --- a/apps/home/routes.py +++ b/apps/home/routes.py @@ -12,7 +12,7 @@ @blueprint.route('/') @blueprint.route('/index') def index(): - return render_template('pages/index.html', segment='dashboard') + return render_template('pages/index.html', segment='dashboard', parent="dashboard") @blueprint.route('/billing') def billing(): diff --git a/apps/static/assets/img/csv.png b/apps/static/assets/img/csv.png new file mode 100644 index 00000000..330065b7 Binary files /dev/null and b/apps/static/assets/img/csv.png differ diff --git a/apps/static/assets/img/export.png b/apps/static/assets/img/export.png new file mode 100644 index 00000000..25cac3cd Binary files /dev/null and b/apps/static/assets/img/export.png differ diff --git a/apps/templates/dyn_dt/index.html b/apps/templates/dyn_dt/index.html index 3319b906..1178dfb1 100644 --- a/apps/templates/dyn_dt/index.html +++ b/apps/templates/dyn_dt/index.html @@ -7,45 +7,23 @@ {% block content %} -
-
- - - -
-
-
-
-
Available Routes (defined in config.DYNAMIC_DATATB)
-
-
-
    - {% for link in routes %} -
  • - {{ link }} -
  • - {% endfor %} -
- -
+
+
+
+
+
+

Available Routes (defined in config.DYNAMIC_DATATB)

+
+
+
    + {% for link in routes %} +
  • + {{ link }} +
  • + {% endfor %} +
+
diff --git a/apps/templates/dyn_dt/model.html b/apps/templates/dyn_dt/model.html index 25eec1af..7c7a4776 100644 --- a/apps/templates/dyn_dt/model.html +++ b/apps/templates/dyn_dt/model.html @@ -29,7 +29,6 @@ position: absolute; left: 50%; right: 50%; - bottom: -10px; } .table-row:hover .data-td { opacity: 0.1; @@ -37,6 +36,7 @@ .table-row:hover .action-td { display: flex !important; gap:3px !important; + width: 100%; } @@ -44,444 +44,423 @@ {% endblock extrastyle %} {% block content %} - -
-
- - - -
- -
-
-
- - -
- -
-
- -
-
-
-
- -
-
- - img - -
- {% if current_user.is_authenticated %} -
- + +
+
+ +
+
+
+
+
+ +
+
+ + img + +
+ {% if current_user.is_authenticated %} +
+ +
+ {% endif %}
+
-
-
- -
-

Filters

- -
+
+ + +
+

Filters

+ +
-
- {% if filter_instance %} - {% for filter_data in filter_instance %} -
-
- - -
- X +
+ {% if filter_instance %} + {% for filter_data in filter_instance %} +
+
+ +
- {% endfor %} - {% endif %} -
- - + X +
+ {% endfor %} + {% endif %} +
+ + -
-
- - - - {% for field in db_field_names %} - - {% endfor %} - - - - {% for item in items %} - - {% for field_name in db_field_names %} - {% if field_name in choices_dict %} - - {% else %} - - {% endif %} - {% endfor %} - - {% if current_user.is_authenticated %} - +
+
+
{{ field }}
{{ item|getenumattribute(field_name) }}{{ item|getattribute(field_name) }} - - -
+ + + {% for field in db_field_names %} + + {% endfor %} + + + + {% for item in items %} + + {% for field_name in db_field_names %} + {% if field_name in choices_dict %} + {% else %} - + {% endif %} - - - - + {% else %} + + {% endif %} + + + + -
{{ field }}
{{ item|getenumattribute(field_name) }} - - {{ item|getattribute(field_name) }}
+ + edit + + + delete + + + + visibility + +
-
+
+ + {% endfor %} + +
+
- {% if pagination.has_prev or pagination.has_next %} - + {% endif %} -
+
- -