summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-10-20 12:23:58 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-10-20 12:23:58 +0200
commitb4ad4c2541a9bb6d7ce2704d2f7fae6aeb642cbb (patch)
tree395368a98004ff7b5e80631f5a726034c454fe2f
parent2d783c053e96120139efffa5f8280f64a8b44fe3 (diff)
downloadIshtar-b4ad4c2541a9bb6d7ce2704d2f7fae6aeb642cbb.tar.bz2
Ishtar-b4ad4c2541a9bb6d7ce2704d2f7fae6aeb642cbb.zip
Use django-compressor to compress CSS and JS - switch to html5 page declaration
Diffstat
-rw-r--r--example_project/settings.py7
-rw-r--r--ishtar_common/templates/base.html40
-rw-r--r--ishtar_pdl/templates/blocks/extra_head.html1
-rw-r--r--requirements.txt1
4 files changed, 29 insertions, 20 deletions
diff --git a/example_project/settings.py b/example_project/settings.py
index 6ca8cb5fc..90991ebd5 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -36,6 +36,12 @@ STATICFILES_DIRS = (
ROOT_PATH + "../static/",
)
+STATICFILES_FINDERS = (
+ 'django.contrib.staticfiles.finders.FileSystemFinder',
+ 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+ 'compressor.finders.CompressorFinder',
+)
+
ODT_TEMPLATE = ROOT_PATH + "../ishtar_common/static/template.odt"
LOGIN_REDIRECT_URL = "/" + URL_PATH
@@ -155,6 +161,7 @@ INSTALLED_APPS = [
'archaeological_warehouse',
'archaeological_finds',
'ajax_select',
+ 'compressor',
# 'debug_toolbar',
]
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 75e0e3740..c8248841f 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -1,11 +1,10 @@
-{% load i18n %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{LANGUAGE_CODE}}" lang="{{LANGUAGE_CODE}}">
-
+{% load i18n compress %}<!doctype html>
+<html lang="{{LANGUAGE_CODE}}">
<head>
+ <meta charset="utf-8">
<link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png"/>
- <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}
- </title>
+ <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}</title>
+ {% compress js %}
<script language="javascript" type="text/javascript">
var url_path = "{{URL_PATH}}";
</script>
@@ -13,23 +12,11 @@
<script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}jquery-ui.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}ui/i18n/jquery.ui.datepicker-{{COUNTRY}}.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/chosen/chosen.jquery.min.js?ver={{VERSION}}"></script>
- <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/prettyPhoto/js/jquery.prettyPhoto.js?ver={{VERSION}}"></script>
+ {# <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/prettyPhoto/js/jquery.prettyPhoto.js?ver={{VERSION}}"></script> #}
<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/i18n/grid.locale-{{COUNTRY}}.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/jquery.jqGrid.min.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/grid.tbltogrid.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/ishtar.js?ver={{VERSION}}"></script>
- <link type="text/css" href="{{JQUERY_UI_URL}}jquery-ui.css?ver={{VERSION}}" rel="stylesheet" />
- <link type="text/css" href="{{STATIC_URL}}js/chosen/chosen.min.css?ver={{VERSION}}" rel="stylesheet" />
- <link rel="stylesheet" href="{{STATIC_URL}}font-awesome/css/font-awesome.min.css?ver={{VERSION}}" />
- <link rel="stylesheet" href="{{STATIC_URL}}js/prettyPhoto/css/prettyPhoto.css?ver={{VERSION}}" />
- <link rel="stylesheet" href="{{STATIC_URL}}media/ui.jqgrid.css?ver={{VERSION}}" />
- <link rel="stylesheet" href="{{STATIC_URL}}media/style.css?ver={{VERSION}}" />
- {% for url_css in JQGRID_CSS %}<link rel="stylesheet" href="{{url_css}}?ver={{VERSION}}" />{% endfor %}
- {% include "blocks/extra_head.html" %}
- {% block extra_head %}
- {% endblock %}
- {% if raw_css %}<style media="screen" type="text/css">{{raw_css|safe}}
- </style>{% endif %}
<script type='text/javascript'>
var shortcut_url = '{% url "shortcut-menu" %}';
var get_file_url = '{% url "get-file-shortcut" %}';
@@ -41,6 +28,21 @@
var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deal with all items.' %}";
var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deal with only your items.' %}";
</script>
+ {% endcompress %}
+ {% compress css %}
+ <link rel="stylesheet" href="{{JQUERY_UI_URL}}jquery-ui.css?ver={{VERSION}}">
+ <link rel="stylesheet" href="{{STATIC_URL}}js/chosen/chosen.min.css?ver={{VERSION}}">
+ <link rel="stylesheet" href="{{STATIC_URL}}font-awesome/css/font-awesome.min.css?ver={{VERSION}}">
+ <link rel="stylesheet" href="{{STATIC_URL}}js/prettyPhoto/css/prettyPhoto.css?ver={{VERSION}}">
+ <link rel="stylesheet" href="{{STATIC_URL}}media/ui.jqgrid.css?ver={{VERSION}}">
+ <link rel="stylesheet" href="{{STATIC_URL}}media/style.css?ver={{VERSION}}">
+ {% for url_css in JQGRID_CSS %}<link rel="stylesheet" href="{{url_css}}?ver={{VERSION}}">{% endfor %}
+ <link rel="stylesheet" href="{{STATIC_URL}}pdl/styles.css?ver={{VERSION}}" />
+ {% endcompress %}
+ {% block extra_head %}
+ {% endblock %}
+ {% if raw_css %}<style media="screen" type="text/css">{{raw_css|safe}}
+ </style>{% endif %}
</head>
<body{% if current_theme%} id='{{current_theme}}'{%endif%}>
<div id="header">
diff --git a/ishtar_pdl/templates/blocks/extra_head.html b/ishtar_pdl/templates/blocks/extra_head.html
deleted file mode 100644
index aa429bed4..000000000
--- a/ishtar_pdl/templates/blocks/extra_head.html
+++ /dev/null
@@ -1 +0,0 @@
- <link rel="stylesheet" href="{{STATIC_URL}}pdl/styles.css?ver={{VERSION}}" />
diff --git a/requirements.txt b/requirements.txt
index 2b41343a2..7ef1b5ce2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,6 +16,7 @@ django-extra-views==0.2.4
beautifulsoup4==4.3.2
markdown==2.5.1
django-ajax-selects==1.6.0
+django-compressor==2.1
django-formtools==2.0
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 08:58:44 +0000