Merge branch 'master' into v0.9

5 files changed, 46 insertions, 27 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 41381e0b8..369ffdaf0 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2015  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2016  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -37,7 +37,7 @@ from ishtar_common.forms import FinalForm, get_now, reverse_lazy, TableSelect
 from ishtar_common.forms_common import get_town_field
 from archaeological_operations.forms import AdministrativeActOpeForm, \
     AdministrativeActOpeFormSelection, \
-    ParcelField, SLICING, HEAD_SCIENTIST, SRA_AGENT
+    ParcelField, SLICING, HEAD_SCIENTIST, SRA_AGENT, AdministrativeActModifForm
 from ishtar_common import widgets
 
 GENERAL_CONTRACTOR, created = PersonType.objects.get_or_create(
@@ -538,3 +538,9 @@ class AdministrativeActFileForm(AdministrativeActOpeForm):
             dct={'intented_to': 'F'})
         self.fields['act_type'].help_text = ActType.get_help(
             dct={'intented_to': 'F'})
+
+
+class AdministrativeActFileModifForm(AdministrativeActModifForm,
+                                     AdministrativeActFileForm):
+    pk = forms.IntegerField(required=False, widget=forms.HiddenInput)
+    index = forms.IntegerField(label=_("Index"), required=False)
diff --git a/archaeological_files/templates/ishtar/blocks/window_file_nav.html b/archaeological_files/templates/ishtar/blocks/window_file_nav.html
new file mode 100644
index 000000000..149603af8
--- /dev/null
+++ b/archaeological_files/templates/ishtar/blocks/window_file_nav.html
@@ -0,0 +1,12 @@
+{% extends "ishtar/blocks/window_nav.html" %}
+{% load i18n %}
+{% load url from future %}
+{% block extra_actions %}
+<a class='history-nav' href='{% url "operation_add" item.pk %}'>
+  <span class="fa-stack fa-lg">
+    <i class="fa fa-circle fa-stack-2x"></i>
+    <i class="fa fa-plus fa-stack-1x fa-inverse"></i>
+  </span>
+  <br/>{%trans "Add an operation for this file" %}
+</a>
+{% endblock %}
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index a5879b3ec..9ff6e8356 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -1,31 +1,14 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n window_ope_tables window_field %}
+{% load i18n window_ope_tables window_field window_header %}
 
-{% block head_sheet %}
-{{block.super}}
-<h1>{% trans "Archaeological file"%}</h1>
-{% endblock %}
+{% block head_title %}{% trans "Archaeological file" %}{% endblock %}
 
 {% block content %}
-{% if previous or next %}
-<div class='tool'>
-{%if previous%}
-<a href="#" onclick='load_window("{% url show-historized-file item.pk previous|date:"c"%}");$("#{{window_id}}").hide();return false;'>{%trans "Previous version"%} ({{previous}})</a>
-{% endif %}
-{% if previous and next %} - {% endif %}
-{%if next%}
-<a href="#" onclick='if(confirm("{%trans "Are you sure to rollback to this version?"%}")){load_url("{% url revert-file item.pk item.history_date|date:"c"%}");closeAllWindows();load_window("{% url show-file item.pk None %}");}'>Rollback</a> -
-<a href="#" onclick='load_window("{% url show-historized-file item.pk next|date:"c" %}");$("#{{window_id}}").hide();return false;'>{%trans "Next version"%} ({{next}})</a>
-{% endif %}
-</div>
-{% endif %}
-<div class='tool'>{%trans "Export as:"%} <a href='{% url show-file item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-file item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
-<hr/>
-<div class='tool modify'><a href='{% url file_modify item.pk %}'>{% trans "Modify" %}</a></div>
 
 {% if can_add_operation %}
-<div class='tool modify'><a href='{% url operation_add item.pk %}'>{%trans "Add an associated archaeological operation"%}</a></div>
-
+{% window_file_nav item window_id previous next %}
+{% else %}
+{% window_nav item window_id 'show-file' 'file_modify' 'show-historized-file' 'revert-file' previous next %}
 {%endif%}
 
 <h3>{% trans "General"%}</h3>
diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py
index 1fcf71531..c6b932fec 100644
--- a/archaeological_files/urls.py
+++ b/archaeological_files/urls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2015 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2016 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -35,6 +35,9 @@ urlpatterns = patterns(
         check_rights(['change_administrativeact'])(
             views.file_administrativeactfile_wizard),
         name='file_administrativeactfile'),
+    url(r'file_administrativeactfile_modify/(?P<pk>.+)/$',
+        views.file_administrativeactfile_modify,
+        name='file_administrativeactfile_modify'),
     url(r'file_administrativeactfil_deletion/(?P<step>.+)?$',
         check_rights(['change_administrativeact'])(
             views.file_administrativeactfile_deletion_wizard),
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index 3341c2813..7e96c33d3 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2015  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2016  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -236,11 +236,26 @@ file_administrativeactfile_modification_wizard = \
         ('selec-file_administrativeactfile_modification',
          AdministrativeActFileModifyFormSelection),
         ('administrativeact-file_administrativeactfile_modification',
-         AdministrativeActFileForm),
+         AdministrativeActFileModifForm),
         ('final-file_administrativeactfile_modification', FinalForm)],
         label=_(u"File: administrative act modification"),
         url_name='file_administrativeactfile_modification',)
 
+
+def file_administrativeactfile_modify(request, pk):
+    file_administrativeactfile_modification_wizard(request)
+    FileEditAdministrativeActWizard.session_set_value(
+        request, 'selec-file_administrativeactfile_modification',
+        'pk', pk, reset=True)
+    return redirect(
+        reverse(
+            'file_administrativeactfile_modification',
+            kwargs={
+                'step':
+                'administrativeact-file_administrativeactfile_modification'
+            }))
+
+
 file_administrativeactfile_deletion_wizard = \
     AdministrativeActDeletionWizard.as_view([
         ('selec-file_administrativeactfile_deletion',