Move passport page from tab to modal button

abonapp/locale/ru/LC_MESSAGES/django.po

@@ -1163,3 +1163,6 @@ msgstr "История задач"
 
 msgid "Charts"
 msgstr "Графики"
+
+msgid "Cancel"
+msgstr "Отмена"

abonapp/models.py

@@ -296,7 +296,7 @@ class PassportInfo(models.Model):
     series = models.CharField(_('Pasport serial'), max_length=4, validators=(validators.integer_validator,))
     number = models.CharField(_('Pasport number'), max_length=6, validators=(validators.integer_validator,))
     distributor = models.CharField(_('Distributor'), max_length=64)
-    date_of_acceptance = models.DateField()
+    date_of_acceptance = models.DateField(_('Date of acceptance'))
     abon = models.OneToOneField(Abon, on_delete=models.CASCADE, blank=True, null=True)
 
     class Meta:

abonapp/templates/abonapp/editAbon.html

@@ -97,6 +97,16 @@
                                         <span class="glyphicon glyphicon-envelope"></span> {% trans 'Send sms' %}
                                     </a>
                                 {% endif %}
+
+                                {% if perms.abonapp.can_view_passport %}
+                                    <a href="{% url 'abonapp:passport_view' group.pk abon.username %}" class="btn btn-default btn-modal">
+                                        <span class="glyphicon glyphicon-paperclip"></span> {% trans 'Passport information' %}
+                                    </a>
+                                {% else %}
+                                    <a href="#" class="btn btn-default" disabled title="{% trans 'Permission denied' %}">
+                                        <span class="glyphicon glyphicon-paperclip"></span> {% trans 'Passport information' %}
+                                    </a>
+                                {% endif %}
                             </div>
                         </div>
 

abonapp/templates/abonapp/ext.htm

@@ -29,13 +29,6 @@
             <a href="{{ abserv }}">{% trans 'Services' %}</a>
         </li>
 
-        {% if perms.abonapp.can_view_passport %}
-            {% url 'abonapp:passport_view' group.pk abon.username as passport_view_url %}
-            <li{% if passport_view_url == request.path %} class="active"{% endif %}>
-                <a href="{{ passport_view_url }}">{% trans 'Passport information' %}</a>
-            </li>
-        {% endif %}
-
         {% url 'abonapp:abon_phistory' group.pk abon.username as abphist %}
         <li{% if abphist == request.path %} class="active"{% endif %}>
             <a href="{{ abphist }}">{% trans 'Payments' %}</a>

abonapp/templates/abonapp/modal_passport_view.html

@@ -0,0 +1,15 @@
+{% load i18n %}
+{% load bootstrap3 %}
+<form role="form" action="{% url 'abonapp:passport_view' group.pk abon.username %}" method="post"> {% csrf_token %}
+    <div class="modal-header primary">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title"><span class="glyphicon glyphicon-edit"></span>{% trans 'Passport information' %}</h4>
+    </div>
+    <div class="modal-body">
+
+        {% bootstrap_form form %}
+
+        {% trans 'Save' as tx %}
+        {% bootstrap_button tx button_type='submit' button_class='btn-primary' icon='floppy-disk' %}
+    </div>
+</form>

abonapp/templates/abonapp/passport_view.html

@@ -1,46 +0,0 @@
-{% extends request.is_ajax|yesno:'nullcont.htm,abonapp/ext.htm' %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% block content %}
-
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">{% trans 'Passport information' %}</h3>
-                </div>
-                <div class="panel-body">
-                    <form role="form" class="form-horizontal" action="{% url 'abonapp:passport_view' group.pk abon.username %}" method="post">{% csrf_token %}
-
-                        {% bootstrap_field form.series label_class='col-sm-5 col-md-3' field_class='col-sm-7 col-md-9' form_group_class='form-group-sm' %}
-                        {% bootstrap_field form.number label_class='col-sm-5 col-md-3' field_class='col-sm-7 col-md-9' form_group_class='form-group-sm' %}
-                        {% bootstrap_field form.distributor label_class='col-sm-5 col-md-3' field_class='col-sm-7 col-md-9' form_group_class='form-group-sm' %}
-
-                        <div class="form-group-sm">
-                            <label for="id_date_of_acceptance" class="col-sm-5 col-md-3 control-label">{% trans 'Date of acceptance' %}</label>
-                            <div class="col-sm-7 col-md-9">
-                                {{ form.date_of_acceptance }}{{ form.date_of_acceptance.errors }}
-                            </div>
-                            <script type="text/javascript">
-                                $(function () {
-                                    $('#id_date_of_acceptance').datetimepicker({
-                                        format: 'YYYY-MM-DD'
-                                    });
-                                });
-                            </script>
-                        </div>
-
-                        <div class="form-group-sm">
-                            <div class="col-sm-offset-5 col-md-offset-3 col-sm-7 col-md-9">
-                                <button type="submit" class="btn btn-primary btn-sm">
-                                    <span class="glyphicon glyphicon-save"></span> {% trans 'Save' %}
-                                </button>
-                            </div>
-                        </div>
-
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}

abonapp/views.py

@@ -517,7 +517,7 @@ class TaskLogListView(ListView):
 class PassportUpdateView(UpdateView):
     form_class = forms.PassportForm
     model = models.PassportInfo
-    template_name = 'abonapp/passport_view.html'
+    template_name = 'abonapp/modal_passport_view.html'
 
     def get_object(self, queryset=None):
         self.abon = get_object_or_404(models.Abon, username=self.kwargs.get('uname'))
@@ -535,7 +535,7 @@ class PassportUpdateView(UpdateView):
         return super(PassportUpdateView, self).form_valid(form)
 
     def get_success_url(self):
-        return resolve_url('abonapp:passport_view',
+        return resolve_url('abonapp:abon_home',
                            gid=self.kwargs.get('gid'),
                            uname=self.kwargs.get('uname'))