From 08b8dc3f27c56c72de2f1c9f8dc79a0d35c78097 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Wed, 1 Apr 2015 03:13:40 -0400
Subject: [PATCH] Update assign_remove view to work with bootstrap

---
 .../appearance/templates/appearance/generic_detail.html   | 4 ++--
 .../appearance/templates/appearance/generic_form.html     | 8 +++-----
 .../templates/appearance/generic_multi_subtemplates.html  | 4 ++--
 mayan/apps/common/views.py                                | 5 ++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/mayan/apps/appearance/templates/appearance/generic_detail.html b/mayan/apps/appearance/templates/appearance/generic_detail.html
index 9ee13e00b3..80b608c0a1 100644
--- a/mayan/apps/appearance/templates/appearance/generic_detail.html
+++ b/mayan/apps/appearance/templates/appearance/generic_detail.html
@@ -16,8 +16,8 @@
     <div class="row">
         {% for subtemplate in subtemplates_list %}
 
-            {% if subtemplate.grid %}
-                <div class="col-xs-{{ subtemplate.grid }}">
+            {% if subtemplate.column_class %}
+                <div class="{{ subtemplate.column_class }}">
             {% else %}
                 <div class="col-xs-12">
             {% endif %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_form.html b/mayan/apps/appearance/templates/appearance/generic_form.html
index d9b0866a8e..f0f73fd36b 100644
--- a/mayan/apps/appearance/templates/appearance/generic_form.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form.html
@@ -16,8 +16,8 @@
 
     <div class="row">
         {% for subtemplate in subtemplates_list %}
-            {% if subtemplate.grid %}
-                <div class="col-xs-{{ subtemplate.grid }}">
+            {% if subtemplate.column_class %}
+                <div class="{{ subtemplate.column_class }}">
             {% else %}
                 <div class="col-xs-12">
             {% endif %}
@@ -29,8 +29,6 @@
                     {{ rendered_subtemplate }}
                 {% endif %}
             </div>
-            {% if subtemplate.grid_clear or not subtemplate.grid %}
-            {% endif %}
-         {% endfor %}
+        {% endfor %}
     </div>
 {% endblock %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html b/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
index 3585d215da..9622c75429 100644
--- a/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
+++ b/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
@@ -12,8 +12,8 @@
 
     <div class="row">
         {% for subtemplate in subtemplates_list %}
-            {% if subtemplate.grid %}
-                <div class="col-xs-{{ subtemplate.grid }}">
+            {% if subtemplate.column_class %}
+                <div class="{{ subtemplate.column_class }}">
             {% else %}
                 <div class="cols-xs-12">
             {% endif %}
diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py
index 011bdaee79..8e5db9f7a6 100644
--- a/mayan/apps/common/views.py
+++ b/mayan/apps/common/views.py
@@ -135,7 +135,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
         'subtemplates_list': [
             {
                 'name': 'appearance/generic_form_subtemplate.html',
-                'grid': 12,
+                'column_class': 'col-xs-12 col-sm-6 col-md-6 col-lg-6',
                 'context': {
                     'form': unselected_list,
                     'title': left_list_title or ' ',
@@ -145,8 +145,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
             },
             {
                 'name': 'appearance/generic_form_subtemplate.html',
-                'grid': 12,
-                'grid_clear': True,
+                'column_class': 'col-xs-12 col-sm-6 col-md-6 col-lg-6',
                 'context': {
                     'form': selected_list,
                     'title': right_list_title or ' ',