summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-19 16:56:15 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-19 16:56:15 +0100
commitbed65ee5480783ee979d31622effd7a7a78718cf (patch)
treef651a68671d2ae6735b73b9b603dbe4cb1000dfb
parent266836701081d674db486ebf70d8a3960493a9fc (diff)
downloadIshtar-bed65ee5480783ee979d31622effd7a7a78718cf.tar.bz2
Ishtar-bed65ee5480783ee979d31622effd7a7a78718cf.zip
UI : improve forms - sheet source
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operation.html2
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operationsource.html4
-rw-r--r--ishtar_common/forms.py1
-rw-r--r--ishtar_common/templates/blocks/bs_form_snippet.html5
-rw-r--r--ishtar_common/templates/ishtar/sheet.html6
-rw-r--r--ishtar_common/templates/ishtar/sheet_source.html59
6 files changed, 41 insertions, 36 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 0052dde7b..1f3e9e157 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -1,7 +1,7 @@
{% extends "ishtar/sheet.html" %}
{% load i18n window_tables window_header window_ope_tables window_field from_dict %}
-{% block head_title %}{% trans "Operation:" %} {{item.short_label}}{% endblock %}
+{% block head_title %}<strong>{% trans "Operation" %}</strong> - {{item.short_label}}{% endblock %}
{% block toolbar %}
{% window_nav item window_id 'show-operation' 'operation_modify' 'show-historized-operation' 'revert-operation' previous next 1 %}
diff --git a/archaeological_operations/templates/ishtar/sheet_operationsource.html b/archaeological_operations/templates/ishtar/sheet_operationsource.html
index 55c48b319..91cb483f0 100644
--- a/archaeological_operations/templates/ishtar/sheet_operationsource.html
+++ b/archaeological_operations/templates/ishtar/sheet_operationsource.html
@@ -1,7 +1,7 @@
{% extends "ishtar/sheet_source.html" %}
{% load i18n window_field window_header link_to_window %}
-{% block head_title %}{% trans "Operation source" %}{% endblock %}
+{% block head_title %}<strong>{% trans "Operation source" %}</strong> - {{item.title}} - {{item.owner}}{% endblock %}
{% block window_nav %}
{% window_nav item window_id 'show-operationsource' 'operation_source_modify' %}
@@ -9,5 +9,5 @@
{% block related %}
{% trans "Related operation" as related_item_label %}
-{% field related_item_label item.owner '' item.owner|link_to_window %}
+{% field_flex related_item_label item.owner '' item.owner|link_to_window %}
{% endblock %}
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index 748c3f6f3..038e9bd07 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -333,6 +333,7 @@ def get_form_selection(
raise forms.ValidationError(self._not_selected_error)
return cleaned_data
attrs['clean'] = clean
+ attrs['SEARCH_AND_SELECT'] = True
return type(class_name, (forms.Form,), attrs)
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index dc24b2849..c636465f3 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -13,10 +13,9 @@
{% endfor %}
{% for field in form.visible_fields %}
-{% if field.name == 'pk' %}
+{% if form.SEARCH_AND_SELECT %}
{{field}}
{% elif field.name == 'search_vector' and forloop.counter0 == 0 %}
-
<div class="form-row">
<div class="form-group col-lg-10">
<div class="input-group">
@@ -63,8 +62,6 @@
</div>{% endif %}
<div class="form-row">
{% endif %}
-
-
{% include "blocks/bs_field_snippet.html" %}
{% if forloop.last %}
{% if search and forloop.counter0 >= 1 %}
diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html
index 80bb1d4d1..ee57d312d 100644
--- a/ishtar_common/templates/ishtar/sheet.html
+++ b/ishtar_common/templates/ishtar/sheet.html
@@ -12,7 +12,7 @@
<div class="card sheet" id="{{window_id}}">
<div class="card-header" data-sheet-id="{{sheet_id}}" role="tab" id='head-{{window_id}}'>
<div class="row">
- <div class="col">
+ <div class="col-9">
<h5 class="mb-0">
<a data-toggle="collapse" href="#collapse-{{window_id}}" aria-expanded="true"
aria-controls="collapse-{{window_id}}">
@@ -20,7 +20,7 @@
</a>
</h5>
</div>
- <div class='col text-center'>
+ <div class='col-2 text-center'>
<a href='#' class='previous_page'>
<span class="fa-stack">
<i class="fa fa-circle fa-stack-2x"></i>
@@ -34,7 +34,7 @@
</span>
</a>
</div>
- <div class='col text-right'>
+ <div class='col-1 text-right'>
<a href='#' onclick='$("#{{window_id}}").hide()' title="{% trans 'Close' %}">
<span class="fa-stack">
<i class="fa fa-circle fa-stack-2x"></i>
diff --git a/ishtar_common/templates/ishtar/sheet_source.html b/ishtar_common/templates/ishtar/sheet_source.html
index 24477ce2c..a1a8948dc 100644
--- a/ishtar_common/templates/ishtar/sheet_source.html
+++ b/ishtar_common/templates/ishtar/sheet_source.html
@@ -4,35 +4,42 @@
{% block content %}
{% block window_nav %}{% endblock %}
{% block general %}
-{% block related %}
-{% trans "Related item" as related_item_label %}
-{% field related_item_label item.owner %}
-{% endblock %}
{% if item.image %}
-<a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}" class='photo'><img src='{{item.thumbnail.url}}'/></a>
-{% endif%}
+<div class="row">
+ <div class="offset-lg-4 col-lg-4 offset-md-3 col-md-6 offset-sm-1 col-sm-10 col-12">
+ <div class="card">
+ <img class='card-img-top' src="{{item.thumbnail.url}}">
+ </div>
+ </div>
+</div>
+{% endif %}
+
+<div class="row">
+ {% block related %}
+ {% trans "Related item" as related_item_label %}
+ {% field_flex related_item_label item.owner %}
+ {% endblock %}
+ {% field_flex "Title" item.title %}
+ {% field_flex "Index" item.index %}
+ {% field_flex "Source type" item.source_type %}
+ {% field_flex "Format type" item.format_type %}
+ {% field_flex "Scale" item.scale %}
+ {% trans "Web link" as weblink_label %}
+ {% field_flex_url weblink_label item.associated_url %}
+ {% field_flex "Item number" item.item_number %}
+ {% field_flex "Ref." item.reference %}
+ {% field_flex "Internal ref." item.internal_reference %}
+ {% field_flex "Creation date" item.creation_date %}
+ {% field_flex "Receipt date" item.receipt_date %}
+ {% field_flex "Receipt date in documentation" item.receipt_date_in_documentation %}
+ {% field_flex "Has a duplicate" item.duplicate %}
+ {% field_flex "Description" item.description %}
+ {% field_flex "Comment" item.comment %}
+ {% field_flex "Additional information" item.additional_information %}
+ {% field_flex_full "Authors" item.authors|add_links:'person' %}
+</div>
-<ul class='form-flex'>
-{% field_li "Title" item.title %}
-{% field_li "Index" item.index %}
-{% field_li "Source type" item.source_type %}
-{% field_li "Format type" item.format_type %}
-{% field_li "Scale" item.scale %}
-{% trans "Web link" as weblink_label %}
-{% field_li_url weblink_label item.associated_url %}
-{% field_li "Item number" item.item_number %}
-{% field_li "Ref." item.reference %}
-{% field_li "Internal ref." item.internal_reference %}
-{% field_li "Creation date" item.creation_date %}
-{% field_li "Receipt date" item.receipt_date %}
-{% field_li "Receipt date in documentation" item.receipt_date_in_documentation %}
-{% field_li "Has a duplicate" item.duplicate %}
-{% field_li "Description" item.description %}
-{% field_li "Comment" item.comment %}
-{% field_li "Additional information" item.additional_information %}
-</ul>
-{% field "Authors" item.authors|add_links:'person' %}
{% endblock %}
{% endblock %}