changeset 2176:7b78960fc720

Merged thomaswaldmann/moin-2.0 into default
author ana-balica <ana.balica@gmail.com>
date Wed, 21 Aug 2013 17:00:14 +0300
parents d7842de4dbb2 (current diff) 56ca9d2dcfc9 (diff)
children 98af52a80d21
files MoinMoin/apps/frontend/views.py wikiconfig.py
diffstat 4 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/frontend/views.py	Tue Aug 20 00:12:51 2013 +0300
+++ b/MoinMoin/apps/frontend/views.py	Wed Aug 21 17:00:14 2013 +0300
@@ -803,7 +803,7 @@
     """
     Returns the list of all items the current user has contributed to.
 
-    :returns: a page with all the items which link or transclude item_name
+    :returns: a page with all the items the current user has contributed to
     """
     my_changes = _mychanges(flaskg.user.itemid)
     return render_template('link_list_no_item_panel.html',
--- a/MoinMoin/templates/base.html	Tue Aug 20 00:12:51 2013 +0300
+++ b/MoinMoin/templates/base.html	Wed Aug 21 17:00:14 2013 +0300
@@ -43,9 +43,13 @@
     {% block head_links %}
 
     {% block bootstrap_stylesheet %}
-    <link rel="stylesheet" href="{{ url_for('serve.files', name='bootstrap', filename='bootstrap/css/bootstrap.css') }}" />
+    <link rel="stylesheet" href="{{ url_for('serve.files', name='bootstrap', filename='css/bootstrap.css') }}" />
     {% endblock %}
 
+    {% 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,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>
     {{ scripts }}
     <!--[if lt IE 9]>
--- a/setup.py	Tue Aug 20 00:12:51 2013 +0300
+++ b/setup.py	Wed Aug 21 17:00:14 2013 +0300
@@ -106,7 +106,8 @@
         '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-jQuery>=1.8.2',
         'XStatic-jQuery-File-Upload>=4.4.2',
--- a/wikiconfig.py	Tue Aug 20 00:12:51 2013 +0300
+++ b/wikiconfig.py	Wed Aug 21 17:00:14 2013 +0300
@@ -67,6 +67,7 @@
         'jquery', 'jquery_file_upload',
         'json_js',
         'bootstrap',
+        'font_awesome',
         'ckeditor',
         'svgweb',
         'svgedit_moin', 'twikidraw_moin', 'anywikidraw',