diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-19 11:32:04 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-19 11:32:04 +0200 |
| commit | 54b87741a26a2bd805ed32200b082ca07ee0e27d (patch) | |
| tree | 70302bf14268e6374fb1faf0438db01e57db01ae /ishtar_common/templates/base.html | |
| parent | 0ca23dab03f240b8e960b417aed4451c10b51402 (diff) | |
| parent | ac1c36d915d54ad4bef873a313fe04e2935c1fad (diff) | |
| download | Ishtar-54b87741a26a2bd805ed32200b082ca07ee0e27d.tar.bz2 Ishtar-54b87741a26a2bd805ed32200b082ca07ee0e27d.zip | |
Merge branch 'master' into v0.9
Conflicts:
CHANGES.txt
version.py
Diffstat (limited to 'ishtar_common/templates/base.html')
| -rw-r--r-- | ishtar_common/templates/base.html | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 8fd563baa..02ddb85df 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -11,20 +11,20 @@ <script language="javascript" type="text/javascript"> var url_path = "{{URL_PATH}}"; </script> - <script language="javascript" type="text/javascript" src="{{JQUERY_URL}}"></script> - <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}jquery-ui.js"></script> - <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}ui/i18n/jquery.ui.datepicker-{{COUNTRY}}.js"></script> - <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/prettyPhoto/js/jquery.prettyPhoto.js"></script> - <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/i18n/grid.locale-{{COUNTRY}}.js"></script> - <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/jquery.jqGrid.min.js"></script> - <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/grid.tbltogrid.js"></script> - <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/ishtar.js"></script> - <link type="text/css" href="{{JQUERY_UI_URL}}jquery-ui.css" rel="stylesheet" /> - <link rel="stylesheet" href="{{STATIC_URL}}/font-awesome/css/font-awesome.min.css" /> - <link rel="stylesheet" href="{{STATIC_URL}}/js/prettyPhoto/css/prettyPhoto.css" /> - <link rel="stylesheet" href="{{STATIC_URL}}media/ui.jqgrid.css" /> - <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" /> - {% for url_css in JQGRID_CSS %}<link rel="stylesheet" href="{{url_css}}" />{% endfor %} + <script language="javascript" type="text/javascript" src="{{JQUERY_URL}}?ver={{VERSION}}"></script> + <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/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 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 %} |