From c9c8976c60c5532468310bcf1a96a0419d8bd62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Thu, 21 Jul 2022 23:01:34 +0200 Subject: [PATCH] UX improvements --- ram/portal/templates/base.html | 5 +---- ram/portal/templates/companies.html | 2 +- ram/portal/templates/consist.html | 20 +++++++++----------- ram/portal/templates/consists.html | 5 +---- ram/portal/templates/page.html | 1 + ram/portal/templates/scales.html | 2 +- ram/ram/__init__.py | 2 +- 7 files changed, 15 insertions(+), 22 deletions(-) diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html index 88fa959..17ee185 100644 --- a/ram/portal/templates/base.html +++ b/ram/portal/templates/base.html @@ -159,13 +159,10 @@ {% endif %} -
+
Show all data {% if request.user.is_staff %}Edit{% endif %}
-
- Updated {{ r.updated_time | date:"M d, Y H:m" }} -
diff --git a/ram/portal/templates/companies.html b/ram/portal/templates/companies.html index d9c5da4..644c1a4 100644 --- a/ram/portal/templates/companies.html +++ b/ram/portal/templates/companies.html @@ -45,7 +45,7 @@ {% endif %} -
+
Show all rolling stock {% if request.user.is_staff %}Edit{% endif %}
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html index a1caa45..bdafb41 100644 --- a/ram/portal/templates/consist.html +++ b/ram/portal/templates/consist.html @@ -2,13 +2,14 @@ {% load markdown %} {% block header %} -

{{ consist }}

- {% if consist.tags.all %} -

Tags: - {% for t in consist.tags.all %} - {{ t.name }}{# new line is required #} - {% endfor %} -

+

{{ consist }}

+ {% if consist.tags.all %} +

Tags: + {% for t in consist.tags.all %} + {{ t.name }}{# new line is required #} + {% endfor %} +

+ Updated {{ consist.updated_time | date:"M d, Y H:i" }} {% endif %} {% endblock %} {% block cards %} @@ -90,13 +91,10 @@ {% endif %} -
+
Show all data {% if request.user.is_staff %}Edit{% endif %}
-
- Updated {{ r.rolling_stock.updated_time | date:"M d, Y H:m" }} -
diff --git a/ram/portal/templates/consists.html b/ram/portal/templates/consists.html index d97a591..36bbe8b 100644 --- a/ram/portal/templates/consists.html +++ b/ram/portal/templates/consists.html @@ -48,13 +48,10 @@ -
+
Show all data {% if request.user.is_staff %}Edit{% endif %}
-
- Updated {{ c.updated_time | date:"M d, Y H:m" }} -
diff --git a/ram/portal/templates/page.html b/ram/portal/templates/page.html index ea832f7..82c2028 100644 --- a/ram/portal/templates/page.html +++ b/ram/portal/templates/page.html @@ -10,6 +10,7 @@ {% endfor %}

{% endif %} + Updated {{ rolling_stock.updated_time | date:"M d, Y H:i" }} {% endblock %} {% block cards %} {% for t in rolling_stock.image.all %} diff --git a/ram/portal/templates/scales.html b/ram/portal/templates/scales.html index e3099d2..cf95073 100644 --- a/ram/portal/templates/scales.html +++ b/ram/portal/templates/scales.html @@ -35,7 +35,7 @@ -
+
Show all rolling stock {% if request.user.is_staff %}Edit{% endif %}
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py index 9c10b92..f7e742c 100644 --- a/ram/ram/__init__.py +++ b/ram/ram/__init__.py @@ -1,4 +1,4 @@ from ram.utils import git_suffix -__version__ = "0.0.9" +__version__ = "0.0.10" __version__ += git_suffix(__file__)