Home Verkennen Help
Inloggen
yangck
/
django-jet
1
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

Prefix jet tags

Denis K 8 jaren geleden
bovenliggende
d0a71f72a3
commit
5645cb6b3c
5 gewijzigde bestanden met toevoegingen van 27 en 27 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 1 1
      jet/dashboard/templates/jet.dashboard/update_module_fieldset.html
  2. 9 9
      jet/templates/admin/base.html
  3. 1 1
      jet/templates/admin/includes/fieldset.html
  4. 12 12
      jet/templatetags/jet_tags.py
  5. 4 4
      jet/tests/test_tags.py

+ 1 - 1
jet/dashboard/templates/jet.dashboard/update_module_fieldset.html
Bestand weergeven 

@@ -6,7 +6,7 @@
 
             <div class="form-row{% if field.errors %} errors{% endif %}">
 
                 {{ field.errors }}
 
 
-                {% if field|is_checkbox %}
 
+                {% if field|jet_is_checkbox %}
 
                     {{ field }} <label{% if field.field.required %} class="required"{% endif %} for="{{ field.id_for_label }}">{{ field.label }}</label>
 
                 {% else %}
 
                     <label{% if field.field.required %} class="required"{% endif %} for="{{ field.id_for_label }}">{{ field.label }}:</label>

+ 9 - 9
jet/templates/admin/base.html
Bestand weergeven 

@@ -1,7 +1,7 @@
 
 {% load i18n static jet_tags %}<!DOCTYPE html>
 
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 
-{% get_current_theme as THEME %}
 
-{% get_current_jet_version as JET_VERSION %}
 
+{% jet_get_current_theme as THEME %}
 
+{% jet_get_current_version as JET_VERSION %}
 
 {% block html %}<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 
 <head>
 
 <title>{% block title %}{% endblock %}</title>
 
@@ -19,9 +19,9 @@
 
 {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}" />{% endif %}
 
 
 <script type="text/javascript" charset="utf-8">
 
-    var DATE_FORMAT = "{% get_date_format %}";
 
-    var TIME_FORMAT = "{% get_time_format %}";
 
-    var DATETIME_FORMAT = "{% get_datetime_format %}";
 
+    var DATE_FORMAT = "{% jet_get_date_format %}";
 
+    var TIME_FORMAT = "{% jet_get_time_format %}";
 
+    var DATETIME_FORMAT = "{% jet_get_datetime_format %}";
 
 </script>
 
 <script type="text/javascript" src="{% url 'jet:jsi18n' %}"></script>
 
 <script src="{% static "jet/js/build/bundle.min.js" %}"></script>
 
@@ -125,7 +125,7 @@
 
         </div>
 
     {% endif %}
 
 
-    {% get_side_menu_compact as SIDE_MENU_COMPACT %}
 
+    {% jet_get_side_menu_compact as SIDE_MENU_COMPACT %}
 
     {% if not is_popup %}
 
         <div class="related-popup-container scrollable">
 
             <a href="#" class="related-popup-back">
 
@@ -175,7 +175,7 @@
 
                 </div>
 
 
                 {% if user.is_active and user.is_staff %}
 
-                    {% get_menu as app_list %}
 
+                    {% jet_get_menu as app_list %}
 
                     {% if app_list.apps or app_list.pinned_apps %}
 
                         {% if SIDE_MENU_COMPACT %}
 
                             {% for app in app_list.all_apps %}
 
@@ -295,7 +295,7 @@
 
                         </div>
 
 
                         <div class="bookmarks-list">
 
-                            {% get_bookmarks user as bookmarks %}
 
+                            {% jet_get_bookmarks user as bookmarks %}
 
                             {% for bookmark in bookmarks %}
 
                                 <a href="{{ bookmark.url }}" class="sidebar-link bookmark-item">
 
                                     <span class="sidebar-right collapsible">
 
@@ -357,7 +357,7 @@
 
         </div>
 
     {% endif %}
 
 
-    {% get_themes as THEMES %}
 
+    {% jet_get_themes as THEMES %}
 
     {% if THEMES %}
 
         <li class="user-tools-contrast-block theme-chooser">
 
             <div class="user-tools-contrast-block-title">{% trans "current theme" %}</div>

+ 1 - 1
jet/templates/admin/includes/fieldset.html
Bestand weergeven 

@@ -17,7 +17,7 @@
 
                         {% if field.is_readonly %}
 
                             <p>{{ field.contents }}</p>
 
                         {% else %}
 
-                            {{ field.field|select2_lookups }}
 
+                            {{ field.field|jet_select2_lookups }}
 
                         {% endif %}
 
                     {% endif %}
 
                     {% if field.field.help_text %}

+ 12 - 12
jet/templatetags/jet_tags.py
Bestand weergeven 

@@ -21,22 +21,22 @@ register = template.Library()
 
 
 
 @register.simple_tag
 
-def get_date_format():
 
+def jet_get_date_format():
 
     return get_format('DATE_INPUT_FORMATS')[0]
 
 
 
 @register.simple_tag
 
-def get_time_format():
 
+def jet_get_time_format():
 
     return get_format('TIME_INPUT_FORMATS')[0]
 
 
 
 @register.simple_tag
 
-def get_datetime_format():
 
+def jet_get_datetime_format():
 
     return get_format('DATETIME_INPUT_FORMATS')[0]
 
 
 
 @register.assignment_tag(takes_context=True)
 
-def get_menu(context):
 
+def jet_get_menu(context):
 
     if settings.JET_SIDE_MENU_CUSTOM_APPS not in (None, False):
 
         app_list = get_app_list(context, False)
 
         app_dict = {}
 
@@ -105,19 +105,19 @@ def get_menu(context):
 
 
 
 @register.assignment_tag
 
-def get_bookmarks(user):
 
+def jet_get_bookmarks(user):
 
     if user is None:
 
         return None
 
     return Bookmark.objects.filter(user=user.pk)
 
 
 
-@register.filter(name='is_checkbox')
 
-def is_checkbox(field):
 
+@register.filter
 
+def jet_is_checkbox(field):
 
     return field.field.widget.__class__.__name__ == CheckboxInput().__class__.__name__
 
 
 
 @register.filter
 
-def select2_lookups(field):
 
+def jet_select2_lookups(field):
 
     if hasattr(field, 'field') and isinstance(field.field, ModelChoiceField):
 
         qs = field.field.queryset
 
         model = qs.model
 
@@ -166,7 +166,7 @@ def select2_lookups(field):
 
 
 
 @register.assignment_tag(takes_context=True)
 
-def get_current_theme(context):
 
+def jet_get_current_theme(context):
 
     if 'request' in context and 'JET_THEME' in context['request'].COOKIES:
 
         theme = context['request'].COOKIES['JET_THEME']
 
         if isinstance(settings.JET_THEMES, list) and len(settings.JET_THEMES) > 0:
 
@@ -177,12 +177,12 @@ def get_current_theme(context):
 
 
 
 @register.assignment_tag
 
-def get_themes():
 
+def jet_get_themes():
 
     return settings.JET_THEMES
 
 
 
 @register.assignment_tag
 
-def get_current_jet_version():
 
+def jet_get_current_version():
 
     return VERSION
 
 
 
@@ -195,7 +195,7 @@ def jet_append_version(url):
 
 
 
 @register.assignment_tag
 
-def get_side_menu_compact():
 
+def jet_get_side_menu_compact():
 
     return settings.JET_SIDE_MENU_COMPACT

+ 4 - 4
jet/tests/test_tags.py
Bestand weergeven 

@@ -1,7 +1,7 @@
 
 from django import forms
 
 from django.core.urlresolvers import reverse
 
 from django.test import TestCase
 
-from jet.templatetags.jet_tags import select2_lookups, jet_next_object_url, jet_previous_object_url
 
+from jet.templatetags.jet_tags import jet_select2_lookups, jet_next_object_url, jet_previous_object_url
 
 from jet.tests.models import TestModel, SearchableTestModel
 
 
 
@@ -23,7 +23,7 @@ class TagsTestCase(TestCase):
 
 
         form = TestForm(initial={'form_field': value.pk})
 
         field = form['form_field']
 
-        field = select2_lookups(field)
 
+        field = jet_select2_lookups(field)
 
         choices = [choice for choice in field.field.choices]
 
 
         self.assertEqual(len(choices), 1)
 
@@ -37,7 +37,7 @@ class TagsTestCase(TestCase):
 
 
         form = TestForm(data={'form_field': value.pk})
 
         field = form['form_field']
 
-        field = select2_lookups(field)
 
+        field = jet_select2_lookups(field)
 
         choices = [choice for choice in field.field.choices]
 
 
         self.assertEqual(len(choices), 1)
 
@@ -51,7 +51,7 @@ class TagsTestCase(TestCase):
 
 
         form = TestForm(initial={'form_field': value.pk})
 
         field = form['form_field']
 
-        field = select2_lookups(field)
 
+        field = jet_select2_lookups(field)
 
         choices = [choice for choice in field.field.choices]
 
 
         self.assertEqual(len(choices), len(self.models) + 1)