summaryrefslogtreecommitdiff
path: root/ishtar_common/templates
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/templates')
-rw-r--r--ishtar_common/templates/base.html3
-rw-r--r--ishtar_common/templates/blocks/bs_form_snippet.html3
-rw-r--r--ishtar_common/templates/ishtar/blocks/shortcut_menu.html3
-rw-r--r--ishtar_common/templates/welcome.html26
4 files changed, 22 insertions, 13 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 8b5c73ba1..6ee3398f8 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -49,8 +49,7 @@
<body{% if current_theme%} id='{{current_theme}}'{%endif%}>
{% include "navbar.html" %}
<div id="window"></div>
- <a href='{% url "start" %}' id="logo">
- </a>
+ <a href='{% url "start" %}' id="logo"></a>
{% if not reminders %}<div id="context-menu" class="navbar navbar-expand-lg"></div>
{% else %}<fieldset id='reminder'><legend>{% trans "Current items" %}</legend>
{% for lbl, value in reminders %}
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index e89e12800..f715c3ece 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -5,7 +5,8 @@
</div>
{%endif%}
{% for hidden in form.hidden_fields %}
-{{field}}{% if field.errors %}<div class="invalid-feedback">
+{{hidden}}
+{% if field.errors %}<div class="invalid-feedback">
{{ field.errors }}
</div>{% endif %}
{% endfor %}
diff --git a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
index a4855dd10..5a811ddf0 100644
--- a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
@@ -5,9 +5,8 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown"
href="#" role="button" aria-haspopup="true">
- Current....
+ {% trans "Default selection" %}
<i class="icon fa fa-thumb-tack fa-2x" aria-hidden="true" title="{% trans 'Pin an item in order to constrain default searches with this item. By default only your items are displayed. New created and modified items are auto-pin.' %}"></i>
-
</a>
<div id="shortcut-menu" class="dropdown-menu dropdown-menu-right">
<form method="post" action="{% url 'update-current-item' %}">
diff --git a/ishtar_common/templates/welcome.html b/ishtar_common/templates/welcome.html
index 4b9f3b5c5..59a53d759 100644
--- a/ishtar_common/templates/welcome.html
+++ b/ishtar_common/templates/welcome.html
@@ -1,11 +1,21 @@
{% load i18n %}
<h2>{% trans "Welcome in Ishtar, open source software for management and inventory of archaeological data" %}</h2>
-{{random_image}}
-<p>{% trans "Some useful links:" %}</p>
-<ul>
- <li><a href='https://ishtar-archeo.net' target="_blank">{% trans "Presentation site and blog" %}</a>{% trans ":"%} {% trans "stay tuned with Ishtar news!" %}</li>
- <li><a href='{% url 'admin:index' %}' target="_blank">{% trans "Admin interface" %}</a>{% trans ":"%} {% trans "for admin only." %}</li>
- <li><a href="https://forum.ishtar-archeo.net/" target="_blank">{% trans "Forum" %}</a>{% trans ":"%} {% trans "need help? find a new bug? a fantastic feature to propose? Here is the place to go." %}</li>
- <li><a href="https://gitlab.com/iggdrasil/ishtar" target="_blank">{% trans "Source code" %}</a> &ndash; <a href="https://tickets.iggdrasil.net/projects/ishtar" target="_blank">{% trans "tickets" %}</a>{% trans ":"%} {% trans "where the magic happens." %}</li>
-</ul>
+<div class="row">
+ <div class="col col-lg-4">
+ {{random_image}}
+ </div>
+ <div class="col col-lg-8">
+ <div class="card">
+ <div class="card-body">
+ <p>{% trans "Some useful links:" %}</p>
+ <ul>
+ <li><a href='https://ishtar-archeo.net' target="_blank">{% trans "Presentation site and blog" %}</a>{% trans ":"%} {% trans "stay tuned with Ishtar news!" %}</li>
+ <li><a href="{% url 'admin:index' %}" target="_blank">{% trans "Admin interface" %}</a>{% trans ":"%} {% trans "for admin only." %}</li>
+ <li><a href="https://forum.ishtar-archeo.net/" target="_blank">{% trans "Forum" %}</a>{% trans ":"%} {% trans "need help? find a new bug? a fantastic feature to propose? Here is the place to go." %}</li>
+ <li><a href="https://gitlab.com/iggdrasil/ishtar" target="_blank">{% trans "Source code" %}</a> &ndash; <a href="https://tickets.iggdrasil.net/projects/ishtar" target="_blank">{% trans "tickets" %}</a>{% trans ":"%} {% trans "where the magic happens." %}</li>
+ </ul>
+ </div>
+ </div>
+ </div>
+</div>