changeset 2209:88ec5e5d18aa

merged
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 15 Oct 2013 21:18:45 -0700
parents 85840f06e1ac (current diff) 0aee7913a866 (diff)
children c5562f2a893c
files wikiconfig.py
diffstat 3 files changed, 2 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/base.html	Wed Oct 16 05:35:04 2013 +0200
+++ b/MoinMoin/templates/base.html	Tue Oct 15 21:18:45 2013 -0700
@@ -49,7 +49,7 @@
     {% block icons_stylesheet %}
     <link rel="stylesheet" href="{{ url_for('serve.files', name='font_awesome', filename='css/font-awesome.css') }}" />
     {% endblock %}
-    
+
     <link rel="shortcut icon" href="{{ url_for('static', filename='logos/favicon.ico') }}" />
 
     {% block theme_stylesheets %}
@@ -76,9 +76,6 @@
 </div>
 
 {% block body_scripts %} {# js before </body> reduces IE8 js errors related to svgweb #}
-    <!--[if IE 8]>
-        <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>
@@ -87,10 +84,6 @@
         {# TODO: use a local copy later #}
         <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
-    <!--[if lt IE 8]>
-        {# required to save user settings with IE7 and earlier #}
-        <script src="{{ url_for('serve.files', name='json_js', filename='json2.js') }}"></script>
-    <![endif]-->
 {% endblock %}
 
 </body>
--- a/setup.py	Wed Oct 16 05:35:04 2013 +0200
+++ b/setup.py	Tue Oct 15 21:18:45 2013 -0700
@@ -103,7 +103,7 @@
                               # note: pytest-pep8 1.0.3 needs pytest 2.3
         'whoosh>=2.5.0',  # needed for indexed search
         'sphinx>=1.1',  # needed to build the docs
-        'pdfminer',  # pdf -> text/plain conversion
+        'pdfminer>=20110515',  # 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>=3.0.0.1',
@@ -111,8 +111,6 @@
         'XStatic-CKEditor>=3.6.1.2',
         'XStatic-jQuery>=1.8.2',
         'XStatic-jQuery-File-Upload>=4.4.2',
-        'XStatic-JSON-js',
-        'XStatic-svgweb>=2011.2.3.2',
         'XStatic-TWikiDraw-moin>=2004.10.23.2',
         'XStatic-AnyWikiDraw>=0.14.2',
         'XStatic-svg-edit-moin>=2012.11.15.1',
--- a/wikiconfig.py	Wed Oct 16 05:35:04 2013 +0200
+++ b/wikiconfig.py	Tue Oct 15 21:18:45 2013 -0700
@@ -65,11 +65,9 @@
     # names below must be package names
     mod_names = [
         'jquery', 'jquery_file_upload',
-        'json_js',
         'bootstrap',
         'font_awesome',
         'ckeditor',
-        'svgweb',
         'svgedit_moin', 'twikidraw_moin', 'anywikidraw',
     ]
     pkg = __import__('xstatic.pkg', fromlist=mod_names)