djgentelella 0.4.8__tar.gz → 0.4.9__tar.gz

{djgentelella-0.4.8/djgentelella.egg-info → djgentelella-0.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: djgentelella
-Version: 0.4.8
+Version: 0.4.9
 Summary: Help building extra widgets for forms and speciall methods to render forms in templates
 Author-email: Solvosoft <info@solvosoft.com>
 Maintainer-email: Luis Zarate Montero <luis.zarate@solvosoft.com>

{djgentelella-0.4.8 → djgentelella-0.4.9}/djgentelella/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.4.8'
+__version__ = '0.4.9'
 
 if __name__ == '__main__':
     print(__version__)

{djgentelella-0.4.8 → djgentelella-0.4.9}/djgentelella/static/gentelella/css/custom.css

@@ -4681,3 +4681,7 @@ input-group > .custom-file {
     border: 1px solid #1ABB9C;; /* Bordes */
     border-radius: 5px; /* Esquinas redondeadas */
 }
+.overflow-scroll{
+    overflow:auto;
+    -webkit-overflow-scrolling: touch
+}

djgentelella-0.4.9/djgentelella/static/gentelella/js/base/select2_wrap.js

@@ -0,0 +1,25 @@
+function decore_select2 (data) {
+    // We only really care if there is an element to pull classes from
+    if (!data.element) {
+      return data.text;
+    }
+    var $element = $(data.element);
+    var $wrapper = $('<span></span>');
+    $wrapper.addClass($element[0].className);
+    $wrapper.text(data.text);
+    return $wrapper;
+}
+
+function decore_img_select2 (data) {
+  if(!data.url && data.text){
+      return $('<span>'+data.text+'</span>');
+  }
+  if (!data.url) {
+    return "";
+  }
+  let img_width = "2em";   let img_height="2em;";
+  if(data.img_width != undefined){img_width=data.img_width;}
+  if(data.img_height != undefined){ img_height=data.img_height; }
+  var $state = $('<span><img style="width: '+img_width+'; height: '+img_height+';" src="' + data.url+ '" class="img-flag" /> ' +  data.text + '</span>');
+  return $state;
+};

{djgentelella-0.4.8 → djgentelella-0.4.9}/djgentelella/static/gentelella/js/base/select2related.js

@@ -14,6 +14,11 @@ function extract_select2_context(context, instance){
     }else{
         context.theme='bootstrap-5'
     }
+    let template = data.templateresult;
+    if(template != undefined){
+        context.templateResult=window[template];
+        context.templateSelection=window[template];
+    }
 }
 
 function add_selected_option(item, data){

{djgentelella-0.4.8 → djgentelella-0.4.9}/djgentelella/static/gentelella/js/base.js

@@ -553,6 +553,11 @@ function extract_select2_context(context, instance){
     }else{
         context.theme='bootstrap-5'
     }
+    let template = data.templateresult;
+    if(template != undefined){
+        context.templateResult=window[template];
+        context.templateSelection=window[template];
+    }
 }
 
 function add_selected_option(item, data){
@@ -1529,6 +1534,21 @@ function decore_select2 (data) {
     return $wrapper;
 }
 
+function decore_img_select2 (data) {
+  if(!data.url && data.text){
+      return $('<span>'+data.text+'</span>');
+  }
+  if (!data.url) {
+    return "";
+  }
+  let img_width = "2em";   let img_height="2em;";
+  if(data.img_width != undefined){img_width=data.img_width;}
+  if(data.img_height != undefined){ img_height=data.img_height; }
+  var $state = $('<span><img style="width: '+img_width+'; height: '+img_height+';" src="' + data.url+ '" class="img-flag" /> ' +  data.text + '</span>');
+  return $state;
+};
+
+
 function load_date_range(instance, format='DD/MM/YYYY') {
     var options = {
         'autoUpdateInput': false,

{djgentelella-0.4.8 → djgentelella-0.4.9}/djgentelella/static/gentelella/js/custom.js

@@ -87,11 +87,16 @@ function init_sidebar() {
             // prevent closing menu if we are on child menu
             if (!$li.parent().is('.child_menu')) {
                 $SIDEBAR_MENU.find('li').removeClass('active active-sm');
-                $SIDEBAR_MENU.find('li ul').slideUp();
+                if ($BODY.is(".nav-sm")) {
+                    $li.find('.child_menu').show();
+                }else{
+                    $SIDEBAR_MENU.find('li ul').slideUp();
+                }
             } else {
                 if ($BODY.is(".nav-sm")) {
                     $SIDEBAR_MENU.find("li").removeClass("active active-sm");
                     $SIDEBAR_MENU.find("li ul").slideUp();
+                    ev.preventDefault();
                 }
             }
             $li.addClass('active');

{djgentelella-0.4.8 → djgentelella-0.4.9}/djgentelella/static/gentelella/js/widgets.js

@@ -1,4 +1,5 @@
 document.formset = [];
+
 document.gtwidgets = {
     ImageRecordInput: function (instance) {
         instance.each(function (i, e) {
@@ -310,7 +311,8 @@ document.gtwidgets = {
         instance.each(function (i, e) {
             build_cors_headers(e);
         });
-    }
+    },
+
 }
 
 function gt_find_initialize(instance) {
@@ -321,7 +323,9 @@ function gt_find_initialize(instance) {
             document.gtwidgets[widgetname](elems);
         }
     });
-    var autocomplete = instance.find('[data-widget="AutocompleteSelectMultiple"],[data-widget="AutocompleteSelect"]');
+    let textautocomplete = '[data-widget="AutocompleteSelectMultiple"],[data-widget="AutocompleteSelect"]';
+    textautocomplete += ',[data-widget="AutocompleteSelectMultipleImage"],[data-widget="AutocompleteSelectImage"]';
+    var autocomplete = instance.find(textautocomplete);
     if (autocomplete.length > 0) {
         document.gtwidgets['GTAutocompleteSelect'](autocomplete);
     }

djgentelella-0.4.9/djgentelella/templates/gentelella/app/sidebar.html

@@ -0,0 +1,24 @@
+{% load gentelellamenu gtsettings %}
+<div class="left_col overflow-scroll">
+	<div class="navbar nav_title" style="border: 0;">
+		<a href="{% url 'home' %}" class="site_title"><i class="{% get_settings 'sidebar_icon' 'fa fa-spinner' %}"></i> <span>{% get_settings 'sidebar_title' 'My Site' %}</span></a>
+	</div>
+
+
+	<div class="clearfix"></div>
+
+	<!-- sidebar menu -->
+
+	<div id="sidebar-menu" class="main_menu_side d-print-none main_menu">
+
+		{% sidebar_menu %}
+
+	</div>
+	<!-- /sidebar menu -->
+
+	<!-- /menu footer buttons -->
+	<div class="sidebar-footer d-print-none nohidden">
+		{% footer_sidebar_menu %}
+	</div>
+	<!-- /menu footer buttons -->
+</div>

{djgentelella-0.4.8 → djgentelella-0.4.9}/djgentelella/views/select2autocomplete.py

@@ -59,6 +59,29 @@ class GSerializerBase(serializers.Serializer):
     selected = serializers.SerializerMethodField()
 
 
+class GSerializerImgBase(serializers.Serializer):
+    def get_id(self, obj):
+        return self.view.get_id_display(obj)
+
+    def get_text(self, obj):
+        return self.view.get_text_display(obj)
+
+    def get_url(self, obj):
+        return self.view.get_url(obj)
+
+    def get_selected(self, obj):
+        return self.view.get_selected_display(obj)
+
+    def get_disabled(self, obj):
+        return self.view.get_disabled_display(obj)
+
+    id = serializers.SerializerMethodField()
+    text = serializers.SerializerMethodField()
+    url = serializers.SerializerMethodField()
+    disabled = serializers.SerializerMethodField()
+    selected = serializers.SerializerMethodField()
+
+
 class BaseSelect2View(generics.ListAPIView, viewsets.GenericViewSet):
     model = None
     fields = []
@@ -165,3 +188,20 @@ class BaseSelect2View(generics.ListAPIView, viewsets.GenericViewSet):
 
     def get_disabled_display(self, obj):
         return False
+
+
+class BaseSelectImg2View(BaseSelect2View):
+    model = None
+    fields = []
+    pagination_class = GPaginator
+    serializer_class = GSerializerImgBase
+
+    def get_serializer_class(self):
+        class S(self.serializer_class, serializers.ModelSerializer):
+            view = self
+
+            class Meta:
+                model = self.model
+                fields = ['id', 'text', 'url', 'disabled', 'selected']
+
+        return S

{djgentelella-0.4.8 → djgentelella-0.4.9}/djgentelella/widgets/selects.py

@@ -80,3 +80,50 @@ def AutocompleteSelectMultiple(url, url_suffix="-list", url_args=[], url_kwargs=
         extra_url_args = url_args.copy()
 
     return AutocompleteSelectMultiple
+
+
+def AutocompleteSelectImage(url, url_suffix="-list", url_args=[], url_kwargs={},
+                            attrs={}):
+    class ImgAutocompleteSelect(AutocompleteSelectBase):
+        baseurl = url + url_suffix
+        extra_attrs = attrs.copy()
+        extra_url_kwargs = url_kwargs.copy()
+        extra_url_args = url_args.copy()
+
+        def __init__(self, attrs=None, choices=(), extraskwargs=False):
+            if attrs is None:
+                attrs = {}
+            attrs = update_kwargs(attrs, 'AutocompleteSelectImage',
+                                  base_class='form-control ')
+            if 'templateresult' not in attrs:
+                attrs['data-templateresult'] = 'decore_img_select2'
+            super().__init__(attrs=attrs, choices=choices, extraskwargs=extraskwargs)
+
+        def optgroups(self, name, value, attrs=None):
+            return super().optgroups(name, value, attrs=attrs)
+
+    return ImgAutocompleteSelect
+
+
+def AutocompleteSelectMultipleImage(url, url_suffix="-list", url_args=[], url_kwargs={},
+                                    attrs={}):
+    class ImgAutocompleteSelectMultiple(AutocompleteSelectMultipleBase):
+        baseurl = url + url_suffix
+        extra_attrs = attrs.copy()
+        extra_url_kwargs = url_kwargs.copy()
+        extra_url_args = url_args.copy()
+
+        def __init__(self, attrs=None, choices=(), extraskwargs=True):
+            if attrs is None:
+                attrs = {}
+            attrs['data-widget'] = 'AutocompleteSelectMultipleImage'
+            attrs['class'] = "form-control select2_multiple"
+            if 'templateresult' not in attrs:
+                attrs['data-templateresult'] = 'decore_img_select2'
+            if self.baseurl is None:
+                raise ValueError('Autocomplete requires baseurl to work')
+            else:
+                self.baseurl = self.baseurl
+            super(SelectMultiple, self).__init__(attrs, choices=choices)
+
+    return ImgAutocompleteSelectMultiple

{djgentelella-0.4.8 → djgentelella-0.4.9/djgentelella.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: djgentelella
-Version: 0.4.8
+Version: 0.4.9
 Summary: Help building extra widgets for forms and speciall methods to render forms in templates
 Author-email: Solvosoft <info@solvosoft.com>
 Maintainer-email: Luis Zarate Montero <luis.zarate@solvosoft.com>

djgentelella-0.4.8/djgentelella/static/gentelella/js/base/select2_wrap.js

@@ -1,11 +0,0 @@
-function decore_select2 (data) {
-    // We only really care if there is an element to pull classes from
-    if (!data.element) {
-      return data.text;
-    }
-    var $element = $(data.element);
-    var $wrapper = $('<span></span>');
-    $wrapper.addClass($element[0].className);
-    $wrapper.text(data.text);
-    return $wrapper;
-}

djgentelella-0.4.8/djgentelella/templates/gentelella/app/sidebar.html

@@ -1,24 +0,0 @@
-{% load gentelellamenu gtsettings %}
-<div class="left_col overflow-hidden">
-  <div class="navbar nav_title" style="border: 0;">
-    <a href="{% url 'home' %}" class="site_title"><i class="{% get_settings 'sidebar_icon' 'fa fa-spinner' %}"></i> <span>{% get_settings 'sidebar_title' 'My Site' %}</span></a>
-  </div>
-
-
- <div class="clearfix"></div>
-
-  <!-- sidebar menu -->
-
-  <div id="sidebar-menu" class="main_menu_side d-print-none main_menu">
-
-    {% sidebar_menu %}
-
-  </div>
-  <!-- /sidebar menu -->
-
-  <!-- /menu footer buttons -->
-  <div class="sidebar-footer d-print-none nohidden">
-     {% footer_sidebar_menu %}
-  </div>
-  <!-- /menu footer buttons -->
-</div>