Merge pull request #255 from edx/nickersoft/oscar-advanced-search

XCOM-501: Advanced search modal on order/refund list views now displays when link is clicked

ecommerce/templates/oscar/dashboard/orders/order_list.html

@@ -64,21 +64,27 @@
             <a data-toggle="modal" href="#SearchModal">{% trans "Advanced Search" %}</a>
         </form>
 
-        <div class="modal hide fade" id="SearchModal">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h3>{% trans "Advanced Search" %}</h3>
-            </div>
-            <form action="" method="get" class="form-horizontal">
-                <div class="modal-body">
-                  {% csrf_token %}
-                  {% include "partials/form_fields.html" with form=form %}
-                </div>
-                <div class="modal-footer">
-                    <a href="#" class="btn" data-dismiss="modal">{% trans "Close" %}</a>
-                    <button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
+        <div class="modal fade" id="SearchModal">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                        <h3>{% trans "Advanced Search" %}</h3>
+                    </div>
+                    <form action="" method="get" class="form-horizontal">
+                        <div class="modal-body">
+                            <div class="container-fluid">
+                                {% csrf_token %}
+                                {% include "partials/form_fields.html" with form=form %}
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <a href="#" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</a>
+                            <button type="submit" class="btn btn-primary" data-loading-text="{% trans 'Searching...' %}">{% trans "Search" %}</button>
+                        </div>
+                    </form>
                 </div>
-            </form>
+            </div>
         </div>
     </div>
 

ecommerce/templates/oscar/dashboard/refunds/refund_list.html

@@ -66,18 +66,26 @@
         <a data-toggle="modal" href="#SearchModal">{% trans "Advanced Search" %}</a>
     </form>
 
-    <div class="modal hide fade" id="SearchModal">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal">&times;</button>
-            <h3>{% trans "Advanced Search" %}</h3>
-        </div>
-        <form action="" method="get" class="form-horizontal">
-            <div class="modal-body">{% include "partials/form_fields.html" with form=form %}</div>
-            <div class="modal-footer">
-                <a href="#" class="btn" data-dismiss="modal">{% trans "Close" %}</a>
-                <button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
+    <div class="modal fade" id="SearchModal">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    <h3>{% trans "Advanced Search" %}</h3>
+                </div>
+                <form action="" method="get" class="form-horizontal">
+                    <div class="modal-body">
+                        <div class="container-fluid">
+                            {% include "partials/form_fields.html" with form=form %}
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <a href="#" class="btn" data-dismiss="modal">{% trans "Close" %}</a>
+                        <button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
+                    </div>
+                </form>
             </div>
-        </form>
+        </div>
     </div>
 </div>