changeset 2404:5b5a8039be8b

bootstrap version bump, moved the bootstrap js include from snipetts to base.html
author sharky93 <rishabhr123@gmail.com>
date Wed, 21 Aug 2013 19:32:38 +0530
parents cd9dd893cbb5
children 8b7cb57279b8
files MoinMoin/templates/base.html MoinMoin/templates/snippets.html setup.py
diffstat 3 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/base.html	Tue Aug 20 14:22:10 2013 +0530
+++ b/MoinMoin/templates/base.html	Wed Aug 21 19:32:38 2013 +0530
@@ -80,6 +80,7 @@
         <script src="{{ url_for('serve.files', name='svgweb', filename='svg.js') }}"></script>
     <![endif]-->
     <script src="{{ url_for('serve.files', name='jquery', filename='jquery.min.js') }}"></script>
+    <script src="{{ url_for('serve.files', name='bootstrap', filename='js/bootstrap.min.js') }}"></script>
     <script src="{{ url_for('frontend.template', filename='common.js') }}"></script>
     <script src="{{ url_for('serve.files', name='autosize', filename='jquery.autosize-min.js') }}"></script>
     {{ scripts }}
--- a/MoinMoin/templates/snippets.html	Tue Aug 20 14:22:10 2013 +0530
+++ b/MoinMoin/templates/snippets.html	Wed Aug 21 19:32:38 2013 +0530
@@ -69,6 +69,5 @@
 
 {# Additional Javascript #}
 {% macro scripts() -%}
-<script src="{{ url_for('serve.files', name='bootstrap', filename='js/bootstrap.min.js') }}"></script>
 <script src="{{ url_for('frontend.template', filename='basic.js') }}"></script>
 {%- endmacro %}
--- a/setup.py	Tue Aug 20 14:22:10 2013 +0530
+++ b/setup.py	Wed Aug 21 19:32:38 2013 +0530
@@ -106,7 +106,7 @@
         'pdfminer',  # pdf -> text/plain conversion
         'passlib>=1.6.0',  # strong password hashing (1.6 needed for consteq)
         'XStatic>=0.0.2',  # support for static file pypi packages
-        'XStatic-Bootstrap>=2.3.2.1',
+        'XStatic-Bootstrap>=3.0.0.1',
         'XStatic-Font-Awesome>=3.2.1.1',
         'XStatic-CKEditor>=3.6.1.2',
         'XStatic-autosize',