Главная Обзор Помощь
Вход
221V
/
Misago
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

removed django-pipeline dependency

Rafał Pitoń 9 лет назад
Родитель
8f132fc93a
Сommit
6d4d98f248
6 измененных файлов с 15 добавлено и 55 удалено
Единый вид Показать статистику Diff
  1. 0 45
      misago/conf/defaults.py
  2. 0 1
      misago/project_template/requirements.txt
  3. 11 3
      misago/templates/misago/admin/base.html
  4. 2 2
      misago/templates/misago/admin/base_thin.html
  5. 1 3
      misago/templates/misago/admin/generic/base.html
  6. 1 1
      misago/templates/misago/base.html

+ 0 - 45
misago/conf/defaults.py
Просмотреть файл 

@@ -36,50 +36,6 @@ MISAGO_BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 _MISAGO_JS_DEBUG = False
 
 _MISAGO_JS_DEBUG = False
 
 
 
 
 
-# Assets Pipeline
 
-# See http://django-pipeline.readthedocs.org/en/latest/configuration.html
 
-PIPELINE_CSS = {
 
-    'misago_admin': {
 
-        'source_filenames': (
 
-            'misago/admin/css/style.less',
 
-        ),
 
-        'output_filename': 'misago_admin.css',
 
-    },
 
-}
 
-
 
-PIPELINE_JS = {
 
-    'misago_admin': {
 
-        'source_filenames': (
 
-            'misago/admin/js/jquery.js',
 
-            'misago/admin/js/bootstrap.js',
 
-            'misago/admin/js/moment.min.js',
 
-            'misago/admin/js/bootstrap-datetimepicker.min.js',
 
-            'misago/admin/js/misago-datetimepicker.js',
 
-            'misago/admin/js/misago-timestamps.js',
 
-            'misago/admin/js/misago-tooltips.js',
 
-            'misago/admin/js/misago-tables.js',
 
-            'misago/admin/js/misago-yesnoswitch.js',
 
-        ),
 
-        'output_filename': 'misago_admin.js',
 
-    },
 
-}
 
-
 
-PIPELINE_COMPILERS = (
 
-    'pipeline.compilers.less.LessCompiler',
 
-)
 
-
 
-PIPELINE_CSS_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',
 
-)
 
-
 
-STATICFILES_STORAGE = 'pipeline.storage.PipelineStorage'
 
-
 
-
 
 # Application definition
 
 # Application definition
 
 
 
 INSTALLED_APPS = (
 
 INSTALLED_APPS = (
 
@@ -94,7 +50,6 @@ INSTALLED_APPS = (
 
     'django.contrib.staticfiles',
 
     'django.contrib.staticfiles',
 
     'django.contrib.humanize',
 
     'django.contrib.humanize',
 
     'debug_toolbar',
 
     'debug_toolbar',
 
-    'pipeline',
 
     'crispy_forms',
 
     'crispy_forms',
 
     'mptt',
 
     'mptt',
 
     'rest_framework',
 
     'rest_framework',

+ 0 - 1
misago/project_template/requirements.txt
Просмотреть файл 

@@ -6,7 +6,6 @@ django-debug-toolbar==1.3.2
 
 django-crispy-forms==1.4.0
 
 django-crispy-forms==1.4.0
 
 django-htmlmin==0.7
 
 django-htmlmin==0.7
 
 django-mptt==0.7.4
 
 django-mptt==0.7.4
 
-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==7.0
 
 path.py==7.0

+ 11 - 3
misago/templates/misago/admin/base.html
Просмотреть файл 

@@ -1,5 +1,5 @@
 
 {% extends "misago/admin/base_thin.html" %}
 
 {% extends "misago/admin/base_thin.html" %}
 
-{% load pipeline i18n %}
 
+{% load staticfiles %}
 
 
 
 
 
 {% block body %}
 
 {% block body %}
 
@@ -20,6 +20,14 @@
 
 {% 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 #}
 
-{% javascript 'misago_admin' %}
 
+<script type="text/javascript" src="{% static 'misago/admin/js/jquery.js' %}"></script>
 
+<script type="text/javascript" src="{% static 'misago/admin/js/bootstrap.js' %}"></script>
 
+<script type="text/javascript" src="{% static 'misago/admin/js/moment.min.js' %}"></script>
 
+<script type="text/javascript" src="{% static 'misago/admin/js/bootstrap-datetimepicker.min.js' %}"></script>
 
+<script type="text/javascript" src="{% static 'misago/admin/js/misago-datetimepicker.js' %}"></script>
 
+<script type="text/javascript" src="{% static 'misago/admin/js/misago-timestamps.js' %}"></script>
 
+<script type="text/javascript" src="{% static 'misago/admin/js/misago-tooltips.js' %}"></script>
 
+<script type="text/javascript" src="{% static 'misago/admin/js/misago-tables.js' %}"></script>
 
+<script type="text/javascript" src="{% static 'misago/admin/js/misago-yesnoswitch.js' %}"></script>
 
 {% block javascripts %}{% endblock javascripts %}
 
 {% block javascripts %}{% endblock javascripts %}
 
-{% endblock %}
 
+{% endblock body %}

+ 2 - 2
misago/templates/misago/admin/base_thin.html
Просмотреть файл 

@@ -1,4 +1,4 @@
 
-{% load pipeline i18n staticfiles %}
 
+{% load 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]-->
 
-    {% stylesheet 'misago_admin' %}
 
+    <link href="{% static 'misago/admin/css/style.css' %}" rel="stylesheet">
 
     <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' %}">

+ 1 - 3
misago/templates/misago/admin/generic/base.html
Просмотреть файл 

@@ -1,5 +1,4 @@
 
 {% extends "misago/admin/base.html" %}
 
 {% extends "misago/admin/base.html" %}
 
-{% load i18n %}
 
 
 
 
 
 {% block content %}
 
 {% block content %}
 
@@ -20,7 +19,6 @@
 
 </div>
 
 </div>
 
 
 
 <div class="container">
 
 <div class="container">
 
-  {% block view %}
 
-  {% endblock view %}
 
+  {% block view %}{% endblock view %}
 
 </div>
 
 </div>
 
 {% endblock content %}
 
 {% endblock content %}

+ 1 - 1
misago/templates/misago/base.html
Просмотреть файл 

@@ -1,4 +1,4 @@
 
-{% load pipeline i18n staticfiles misago_json %}
 
+{% load i18n staticfiles misago_json %}
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 <html lang="en">
 
   <head>
 
   <head>