diff options
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 2 | ||||
| -rw-r--r-- | archaeological_finds/urls.py | 2 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 4 | ||||
| -rw-r--r-- | archaeological_warehouse/urls.py | 2 | ||||
| -rw-r--r-- | ishtar_common/static/media/style.css | 5 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/display_item.html | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/manage_basket.html | 11 | ||||
| -rw-r--r-- | ishtar_common/views.py | 8 | ||||
| -rw-r--r-- | version.py | 2 |
9 files changed, 30 insertions, 8 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 381c81a31..912bf1b93 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -142,7 +142,7 @@ </a> </td> <td class='string'>{{ treatment.year }} - {{treatment.index}}</td> - <td class='string'>{{ treatment.label }}</td> + <td class='string'>{{ treatment.label|default_if_none:"-" }}</td> <td class='string'>{{ treatment.treatment_types_lbl }}</td> <td class='string'>{{ treatment.treatment_state|default_if_none:"-" }}</td> <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td> diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index 4a8dec030..9c554a124 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -267,6 +267,8 @@ urlpatterns += patterns( name=models.FindSource.SHOW_URL), url(r'^show-find/basket-(?P<pk>.+)/(?P<type>.+)?$', 'show_findbasket', name='show-findbasket'), + url(r'^display-find/basket-(?P<pk>.+)/$', 'display_findbasket', + name='display-findbasket'), url(r'^show-find(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_find', name=models.Find.SHOW_URL), url(r'^display-find/(?P<pk>.+)/$', 'display_find', diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 084f15d13..341734ae7 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -108,10 +108,12 @@ show_findsource = show_item(models.FindSource, 'findsource') get_findsource = get_item(models.FindSource, 'get_findsource', 'findsource') show_find = show_item(models.Find, 'find') -display_find = display_item(models.Find, 'find') +display_find = display_item(models.Find) revert_find = revert_item(models.Find) show_findbasket = show_item(models.FindBasket, 'findbasket') +display_findbasket = display_item(models.FindBasket, + show_url='show-find/basket-') find_creation_steps = [ ('selecrecord-find_creation', RecordFormSelectionTable), diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index e5920606a..5d4427301 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -23,7 +23,7 @@ from ishtar_common.wizards import check_rights import views from archaeological_warehouse import models -# be carreful: each check_rights must be relevant with ishtar_menu +# be careful: each check_rights must be relevant with ishtar_menu # forms urlpatterns = patterns( diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 84ef710b2..adaf94200 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -410,6 +410,11 @@ a.button{ color: white; } +#validate-button{ + background-color: #fff; + display: inline-block; +} + .display_details_inline, .display_details{ display:inline-block; diff --git a/ishtar_common/templates/ishtar/display_item.html b/ishtar_common/templates/ishtar/display_item.html index e00fef05b..e1c63b775 100644 --- a/ishtar_common/templates/ishtar/display_item.html +++ b/ishtar_common/templates/ishtar/display_item.html @@ -4,7 +4,7 @@ <script type='text/javascript'> $(document).ready( function(){ - load_window("/show-{{item_type}}/{{pk}}/"); + load_window("{{show_url}}"); }); </script> {% endblock %} diff --git a/ishtar_common/templates/ishtar/manage_basket.html b/ishtar_common/templates/ishtar/manage_basket.html index de17f3ad7..a6065a7c2 100644 --- a/ishtar_common/templates/ishtar/manage_basket.html +++ b/ishtar_common/templates/ishtar/manage_basket.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load i18n inline_formset %} +{% load url from future %} {% block content %} <h2>{{page_name}}{% trans ":"%} {{basket}}</h2> <form enctype="multipart/form-data" action="." method="post">{% csrf_token %} @@ -13,6 +14,16 @@ <h3>{% trans "Basket content" %}</h3> <div id='basket-content' style='text-align:left'> </div> + {% block "footer" %} + <div id="footer"> + <div id='validation-bar'> + <a href="{% url 'display-findbasket' basket.id %}" + id="validate-button" + class='button'>{% trans "Close" %}</a> + </div> + {% include 'ishtar/blocks/footer.html' %} + </div> + {% endblock %} </div> </form> <script type='text/javascript' language='javascript'> diff --git a/ishtar_common/views.py b/ishtar_common/views.py index cbf27c8e7..22591164f 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1174,10 +1174,12 @@ def get_by_importer(request, slug, data_type='json', full=False, )(request, data_type, full, force_own, col_names=col_names, **dct) -def display_item(model, name, extra_dct=None): +def display_item(model, extra_dct=None, show_url=None): def func(request, pk, **dct): - dct['item_type'] = name - dct['pk'] = pk + if show_url: + dct['show_url'] = "/{}{}/".format(show_url, pk) + else: + dct['show_url'] = "/show-{}/{}/".format(model.SLUG, pk) return render_to_response('ishtar/display_item.html', dct, context_instance=RequestContext(request)) return func diff --git a/version.py b/version.py index 4d6a65db2..82ee5cd03 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 99, 15, 1) +VERSION = (0, 99, 15, 2) def get_version(): |