Domovská stránka Prehľadávať Pomoc
Prihlásiť sa
yangck
/
django-jet
1
0
Fork 0
Súbory Issues 0 Pull requesty 0 Wiki
Prechádzať zdrojové kódy

Separate static browser cache for each jet version

Denis K 10 rokov pred
rodič
130d443088
commit
6f4d23f05e
2 zmenil súbory, kde vykonal 13 pridanie a 8 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 7 7
      jet/templates/admin/base.html
  2. 6 1
      jet/templatetags/jet_tags.py

+ 7 - 7
jet/templates/admin/base.html
Zobraziť súbor 

@@ -1,5 +1,5 @@
 
 {% load i18n admin_static jet_tags %}
 
-{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}{% format_current_language LANGUAGE_CODE as LANGUAGE_CODE %}{% get_current_theme as THEME %}
 
+{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}{% format_current_language LANGUAGE_CODE as LANGUAGE_CODE %}{% get_current_theme as THEME %}{% get_current_jet_version as JET_VERSION %}
 
 {% block html %}<!DOCTYPE html>
 
 <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 
 <head>
 
@@ -11,10 +11,10 @@
 
     <link href="{% static "jet/vendor/jquery-ui/jquery-ui.min.css" %}" rel="stylesheet" />
 
     <link href="{% static "jet/vendor/jquery-ui-timepicker/jquery.ui.timepicker.css" %}" rel="stylesheet" />
 
     <link href="{% static "jet/vendor/perfect-scrollbar/css/perfect-scrollbar.css" %}" rel="stylesheet" />
 
-    <link href="{% static "jet/css/icons/style.css" %}" rel="stylesheet" />
 
-    <link href="{% static "jet/css/themes/"|add:THEME|add:"/base.css" %}" rel="stylesheet" />
 
-    <link href="{% static "jet/css/themes/"|add:THEME|add:"/select2.theme.css" %}" rel="stylesheet" />
 
-    <link href="{% static "jet/css/themes/"|add:THEME|add:"/jquery-ui.theme.css" %}" rel="stylesheet" />
 
+    <link href="{% static "jet/css/icons/style.css" %}?v={{ JET_VERSION }}" rel="stylesheet" />
 
+    <link href="{% static "jet/css/themes/"|add:THEME|add:"/base.css" %}?v={{ JET_VERSION }}" rel="stylesheet" />
 
+    <link href="{% static "jet/css/themes/"|add:THEME|add:"/select2.theme.css" %}?v={{ JET_VERSION }}" rel="stylesheet" />
 
+    <link href="{% static "jet/css/themes/"|add:THEME|add:"/jquery-ui.theme.css" %}?v={{ JET_VERSION }}" rel="stylesheet" />
 
     <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% static "admin/css/ie.css" %}{% endblock %}" /><![endif]-->
 
     {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}" />{% endif %}
 
     {% block extrastyle %}{% endblock %}
 
@@ -48,8 +48,8 @@
 
         var jet = jet || {};
 
         jet.jQuery = jQuery.noConflict(true);
 
     </script>
 
-    <script src="{% static "jet/js/main.min.js" %}"></script>
 
-    <script src="{% static "jet/js/select2.jet.min.js" %}"></script>
 
+    <script src="{% static "jet/js/main.min.js" %}?v={{ JET_VERSION }}"></script>
 
+    <script src="{% static "jet/js/select2.jet.min.js" %}?v={{ JET_VERSION }}"></script>
 
     {% block extrahead %}{% endblock %}
 
 </head>
 
 <body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">

+ 6 - 1
jet/templatetags/jet_tags.py
Zobraziť súbor 

@@ -6,7 +6,7 @@ from django.forms import CheckboxInput, ModelChoiceField, Select, ModelMultipleC
 
 from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
 
 from django.utils.formats import get_format
 
 from django.template import loader, Context
 
-from jet import settings
 
+from jet import settings, VERSION
 
 from jet.models import Bookmark, PinnedApplication
 
 import re
 
 from jet.utils import get_app_list, get_model_instance_label
 
@@ -245,3 +245,8 @@ def format_current_language(language):
 
 @register.assignment_tag(takes_context=True)
 
 def get_current_theme(context):
 
     return settings.JET_THEME
 
+
 
+
 
+@register.assignment_tag
 
+def get_current_jet_version():
 
+    return VERSION