From 1d38e89007808b9907fc9e7ea4c7d75b2f72f793 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 6 Apr 2012 15:08:11 +0200
Subject: [PATCH] Misc fixes.

---
 admin/views.py                   |  3 ++-
 extensions/sievefilters/views.py |  3 ++-
 static/js/admin.js               |  2 +-
 templates/common/tabforms.html   | 13 +++----------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/admin/views.py b/admin/views.py
index ca10f976f..6cc2463da 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -328,7 +328,8 @@ def editaccount(request, accountid, tplname="common/tabforms.html"):
     ctx = dict(
         title=account.username,
         action=reverse(editaccount, args=[accountid]),
-        submit_label=_("Update")
+        action_label=_("Update"),
+        action_classes="submit"
         )
 
     if request.method == "POST":
diff --git a/extensions/sievefilters/views.py b/extensions/sievefilters/views.py
index 51e321811..641a68674 100644
--- a/extensions/sievefilters/views.py
+++ b/extensions/sievefilters/views.py
@@ -193,7 +193,8 @@ def savefs(request, name):
 def new_filters_set(request, tplname="common/generic_modal_form.html"):
     ctx = {"title" : _("Create a new filters set"),
            "formid" : "newfiltersset",
-           "submit_label" : _("Create"),
+           "action_label" : _("Create"),
+           "action_classes" : "submit",
            "action" : reverse(new_filters_set),
            "withmenu" : False,
            "withunseen" : False}
diff --git a/static/js/admin.js b/static/js/admin.js
index 5ab4c3516..5d76beb1e 100644
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -27,7 +27,7 @@ function newaccount_cb() {
 
 function editaccount_cb() {
     accountform_init();
-    $('#submit').click(function(e) {
+    $('.submit').one('click', function(e) {
         simple_ajax_form_post(e, {
             error_cb: editaccount_cb
         });
diff --git a/templates/common/tabforms.html b/templates/common/tabforms.html
index b5d68c30b..5eb25f104 100644
--- a/templates/common/tabforms.html
+++ b/templates/common/tabforms.html
@@ -1,9 +1,6 @@
+{% extends "common/generic_modal.html" %}
 {% load i18n libextras %}
-<div class="modal-header">
-  <a class="close" data-dismiss="modal">x</a>
-  <h3>{{ title }}</h3>
-</div>
-<div class="modal-body">
+{% block modalbody %}
   <form class="form-horizontal" action="{{ action }}" method="POST">
     <ul class="nav nav-pills">
       {% for tab in tabs %}
@@ -24,8 +21,4 @@
       {% endfor %}
     </div>
   </form>
-</div>
-<div class="modal-footer">
-  <a href="#" class="btn btn-primary" id="submit">{{ submit_label }}</a>
-  <a class="btn" data-dismiss="modal">{% trans "Close" %}</a>
-</div>
+{% endblock %}