Home Explore Help
Sign In
221V
/
Misago
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Updated requirements and pipeline

Rafał Pitoń 10 years ago
parent
75a4d73e29
commit
0e192af53a
5 changed files with 19 additions and 12 deletions
Unified View Show Diff Stats
  1. 6 0
      misago/conf/defaults.py
  2. 6 5
      misago/project_template/requirements.txt
  3. 2 2
      misago/templates/misago/admin/base.html
  4. 2 2
      misago/templates/misago/admin/base_thin.html
  5. 3 3
      misago/templates/misago/base.html

+ 6 - 0
misago/conf/defaults.py
View File 

@@ -115,6 +115,12 @@ PIPELINE_COMPILERS = (
 
 PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
 
 PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
 
 PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
 
 PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
 
 
 
+STATICFILES_FINDERS = (
 
+    'django.contrib.staticfiles.finders.FileSystemFinder',
 
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 
+    'pipeline.finders.PipelineFinder',
 
+)
 
+
 
 
 
 # Application definition
 
 # Application definition

+ 6 - 5
misago/project_template/requirements.txt
View File 

@@ -1,16 +1,17 @@
 
-django==1.7.1
 
+django==1.7.2
 
+djangorestframework==3.0.2
 
 beautifulsoup4==4.3.2
 
 beautifulsoup4==4.3.2
 
-bleach==1.4
 
+bleach==1.4.1
 
 django-debug-toolbar==1.2.1
 
 django-debug-toolbar==1.2.1
 
 django-crispy-forms==1.4.0
 
 django-crispy-forms==1.4.0
 
 django-htmlmin==0.7
 
 django-htmlmin==0.7
 
 django-mptt==0.6.1
 
 django-mptt==0.6.1
 
-django-pipeline==1.3.25
 
+django-pipeline==1.4.2
 
 fake-factory==0.4.2
 
 fake-factory==0.4.2
 
 markdown==2.4.1
 
 markdown==2.4.1
 
 path.py==5.2
 
 path.py==5.2
 
-pillow==2.5.1
 
-psycopg2==2.5.3
 
+pillow==2.7.0
 
+psycopg2==2.5.4
 
 pytz
 
 pytz
 
 recaptcha-client==1.0.6
 
 recaptcha-client==1.0.6
 
 requests==2.5.1
 
 requests==2.5.1

+ 2 - 2
misago/templates/misago/admin/base.html
View File 

@@ -1,5 +1,5 @@
 
 {% extends "misago/admin/base_thin.html" %}
 
 {% extends "misago/admin/base_thin.html" %}
 
-{% load compressed i18n %}
 
+{% load pipeline i18n %}
 
 
 
 
 
 {% block body %}
 
 {% block body %}
 
@@ -20,6 +20,6 @@
 
 {% include "misago/admin/logout.html" %}
 
 {% include "misago/admin/logout.html" %}
 
 
 
 {# We include JavaScript at the end of page body so it renders faster #}
 
 {# We include JavaScript at the end of page body so it renders faster #}
 
-{% compressed_js 'misago_admin' %}
 
+{% javascript 'misago_admin' %}
 
 {% block javascripts %}{% endblock javascripts %}
 
 {% block javascripts %}{% endblock javascripts %}
 
 {% endblock %}
 
 {% endblock %}

+ 2 - 2
misago/templates/misago/admin/base_thin.html
View File 

@@ -1,4 +1,4 @@
 
-{% load compressed i18n staticfiles %}
 
+{% load pipeline i18n staticfiles %}
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="{{ LANGUAGE_CODE }}">
 
 <html lang="{{ LANGUAGE_CODE }}">
 
   <head>
 
   <head>
 
@@ -11,7 +11,7 @@
 
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
 
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
 
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
 
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
 
     <![endif]-->
 
     <![endif]-->
 
-    {% compressed_css 'misago_admin' %}
 
+    {% stylesheet 'misago_admin' %}
 
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% static 'apple-touch-icon-144-precomposed.png' %}">
 
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% static 'apple-touch-icon-144-precomposed.png' %}">
 
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% static 'apple-touch-icon-114-precomposed.png' %}">
 
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% static 'apple-touch-icon-114-precomposed.png' %}">
 
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% static 'apple-touch-icon-72-precomposed.png' %}">
 
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% static 'apple-touch-icon-72-precomposed.png' %}">

+ 3 - 3
misago/templates/misago/base.html
View File 

@@ -1,4 +1,4 @@
 
-{% load compressed i18n staticfiles %}
 
+{% load pipeline i18n staticfiles %}
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="{{ LANGUAGE_CODE }}">
 
 <html lang="{{ LANGUAGE_CODE }}">
 
   <head>
 
   <head>
 
@@ -12,7 +12,7 @@
 
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
 
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
 
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
 
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
 
     <![endif]-->
 
     <![endif]-->
 
-    {% compressed_css 'misago' %}
 
+    {% stylesheet 'misago' %}
 
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% static 'apple-touch-icon-144-precomposed.png' %}">
 
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% static 'apple-touch-icon-144-precomposed.png' %}">
 
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% static 'apple-touch-icon-114-precomposed.png' %}">
 
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% static 'apple-touch-icon-114-precomposed.png' %}">
 
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% static 'apple-touch-icon-72-precomposed.png' %}">
 
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% static 'apple-touch-icon-72-precomposed.png' %}">
 
@@ -48,7 +48,7 @@
 
 
 
       var uiserver_url = "{% url 'misago:ui_server' %}";
 
       var uiserver_url = "{% url 'misago:ui_server' %}";
 
     </script>
 
     </script>
 
-    {% compressed_js 'misago' %}
 
+    {% javascript 'misago' %}
 
     <script lang="JavaScript">
 
     <script lang="JavaScript">
 
       $(function() {
 
       $(function() {
 
         Misago.Alerts = new MisagoAlerts({
 
         Misago.Alerts = new MisagoAlerts({