diff --git a/base/templates/base/action_type/action_type_form.html b/base/templates/base/action_type/action_type_form.html index a8b43c245..eb1033466 100644 --- a/base/templates/base/action_type/action_type_form.html +++ b/base/templates/base/action_type/action_type_form.html @@ -2,7 +2,7 @@

{% if act_id %} - {% trans "Action Type Update" %} + {% trans "Update Action Type" %} {% else %} {% trans "Create Action Type" %} {% endif %} diff --git a/base/templates/base/company/company_form.html b/base/templates/base/company/company_form.html index b1561333d..d2ba45e9b 100644 --- a/base/templates/base/company/company_form.html +++ b/base/templates/base/company/company_form.html @@ -12,21 +12,21 @@ {% csrf_token %}
- + {{form.company}} {{form.company.errors}}
- + {{form.hq}}
- + {{form.address}} {{form.address.errors}}
- +
- + {{form.city}} {{form.city.errors}}
- + {{form.zip}} {{form.zip.errors}}
- + {{form.icon}} {{form.icon.errors}}
diff --git a/base/templates/base/company/date.html b/base/templates/base/company/date.html index f8fe96a90..38dd9a189 100644 --- a/base/templates/base/company/date.html +++ b/base/templates/base/company/date.html @@ -8,34 +8,38 @@

{% if perms.base.change_company %} - - - - - + +
+ +
+ +
+
{% endif %} -
+
{% trans "Current Date Format"%}   :  
+
+
@@ -45,16 +49,18 @@ {% if perms.base.change_company %} - - - - +
+ +
+ +
+
{% endif %}
diff --git a/base/templates/base/department/department_form.html b/base/templates/base/department/department_form.html index d21c24acc..1061c1826 100644 --- a/base/templates/base/department/department_form.html +++ b/base/templates/base/department/department_form.html @@ -21,21 +21,7 @@ class="oh-profile-section" > {% csrf_token %} {{form.non_field_errors}} -
- -
- {{form.department.errors}} {{form.department}} -
-
- -
- -
- {{form.company_id.errors}} {{form.company_id}} -
-
+ {{form.as_p}}