Merge pull request #432 from lucky-user/master

bootstrap_modal test app
yourlabs · Jun 2, 2015 · 5ea4992 · 5ea4992
2 parents 138e68f + 38f93e8
commit 5ea4992
Show file tree

Hide file tree

Showing 17 changed files with 385 additions and 1 deletion.
diff --git a/test_project/bootstrap_modal/__init__.py b/test_project/bootstrap_modal/__init__.py
diff --git a/test_project/bootstrap_modal/migrations/__init__.py b/test_project/bootstrap_modal/migrations/__init__.py
diff --git a/test_project/bootstrap_modal/static/bootstrap/css/bootstrap-theme.css.map b/test_project/bootstrap_modal/static/bootstrap/css/bootstrap-theme.css.map
diff --git a/test_project/bootstrap_modal/static/bootstrap/css/bootstrap-theme.min.css b/test_project/bootstrap_modal/static/bootstrap/css/bootstrap-theme.min.css
diff --git a/test_project/bootstrap_modal/static/bootstrap/css/bootstrap.css.map b/test_project/bootstrap_modal/static/bootstrap/css/bootstrap.css.map
diff --git a/test_project/bootstrap_modal/static/bootstrap/css/bootstrap.min.css b/test_project/bootstrap_modal/static/bootstrap/css/bootstrap.min.css
diff --git a/test_project/bootstrap_modal/static/bootstrap/fonts/glyphicons-halflings-regular.eot b/test_project/bootstrap_modal/static/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/...project/bootstrap_modal/static/bootstrap/fonts/glyphicons-halflings-regular.svg b/...project/bootstrap_modal/static/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/test_project/bootstrap_modal/static/bootstrap/fonts/glyphicons-halflings-regular.ttf b/test_project/bootstrap_modal/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/test_project/bootstrap_modal/static/bootstrap/fonts/glyphicons-halflings-regular.woff b/test_project/bootstrap_modal/static/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/test_project/bootstrap_modal/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/test_project/bootstrap_modal/static/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/test_project/bootstrap_modal/static/bootstrap/js/bootstrap.min.js b/test_project/bootstrap_modal/static/bootstrap/js/bootstrap.min.js
diff --git a/test_project/bootstrap_modal/static/js/jquery.min.js b/test_project/bootstrap_modal/static/js/jquery.min.js
diff --git a/test_project/bootstrap_modal/templates/bootstrap_modal/modal.html b/test_project/bootstrap_modal/templates/bootstrap_modal/modal.html
@@ -0,0 +1,65 @@
+{% extends "base.html" %}
+{% load static %}
+
+{% block title %}
+    Bootstrap modal dialog example
+{% endblock %}
+
+{% block branding %}
+    <h1 style="display: inline-block" id="site-name">Bootstrap modal dialog example</h1>
+{% endblock %}
+
+{% block extrahead %}
+    <link href="{% static 'bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">
+    <script type="text/javascript" src="{% static 'js/jquery.min.js' %}"></script>
+    <script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
+    {% include 'autocomplete_light/static.html' %}
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $('#modal_autocomplete').yourlabsAutocomplete({
+                url: '{% url 'navigation_autocomplete' %}',
+                choiceSelector: 'a',
+            }).input.bind('selectChoice', function(e, choice, autocomplete) {
+                document.location.href = choice.attr('href');
+            });
+        });
+    </script>
+{% endblock %}
+
+{% block content %}
+<div class="container">
+    <div class="row">
+        <div class="col-md-6">
+            <button style="margin-bottom: 10px" type="button"
+                    class="btn btn-primary btn-block col-md-6"
+                    data-toggle="modal" data-target="#filter-modal">
+                Open dialog
+            </button>
+        </div>
+    </div>
+</div>
+<div class="modal fade" id="filter-modal" tabindex="-1" role="dialog" aria-labelledby="filter-modal-label" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="filter-modal-label">Dialog</h4>
+            </div>
+            <div class="modal-body">
+                <form id="filter-form" class="form-horizontal" method="get">
+                    <div class="form-group">
+                        <div class="col-md-6">
+                            <input type="text" name="q" id="modal_autocomplete" class="form-control">
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <input form="filter-form" name="filter" type="submit" class="btn btn-primary" value="Submit">
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/test_project/bootstrap_modal/urls.py b/test_project/bootstrap_modal/urls.py
@@ -0,0 +1,6 @@
+from django.conf.urls import url
+from django.views.generic.base import TemplateView
+
+urlpatterns = [
+    url(r'^$', TemplateView.as_view(template_name="bootstrap_modal/modal.html"), name="bootstrap_modal"),
+]
diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py
@@ -142,6 +142,7 @@
 
     'navigation_autocomplete',
     'admin_autocomplete_in_row',
+    'bootstrap_modal'
 )
 
 

diff --git a/test_project/test_project/urls.py b/test_project/test_project/urls.py
@@ -27,7 +27,8 @@
     url(r'^non_admin_add_another/',
         include('autocomplete_light.example_apps.non_admin_add_another.urls')),
     url(r'^favicon.ico', generic.RedirectView.as_view(url='http://mozilla.org/favicon.ico')),
-    url(r'^$', generic.TemplateView.as_view(template_name='index.html'))
+    url(r'^$', generic.TemplateView.as_view(template_name='index.html')),
+    url(r'^bootstrap_modal/', include('bootstrap_modal.urls')),
 ]
 
 if django.VERSION < (1, 9):