update version to 1.6.0

Author: wuyue92tree

adminlteui/__init__.py

@@ -1,2 +1,2 @@
-version = '1.6.0b0'
+version = '1.6.0'
 default_app_config = 'adminlteui.apps.AdminlteUIConfig'

adminlteui/templatetags/adminlte_options.py

@@ -47,12 +47,20 @@ def get_adminlte_settings():
 
             # 'show_apps': ['django_admin_settings', 'auth', 'main'],
             # 'main_navigation_app': 'django_admin_settings',
-            'icons': {
-                'myapp': {
-                    'shops': 'fa-shopping-cart',
-                    'products': 'fa-dollar',
-                }
-            }
+            # 'apps': {
+            #     'example-app': {
+            #         'icon': 'fa-desktop',
+            #         'models': {
+            #             'example-model': {
+            #                 'icon': 'fa-archive'
+            #             },
+            #             'example-model1': {}
+            #         }
+            #     },
+            #     'auth': {
+            #         'icon': 'fa-users'
+            #     }
+            # }
         }
 
 

docs/about.md

@@ -1,5 +1,11 @@
 # ChangeLog
 
+## [v1.6.0](https://github.com/wuyue92tree/django-adminlte-ui/releases/tag/1.6.0)
+
+- fix #26 case by modify list_per_page with '…' str
+- add apps options in ADMINLTE_SETTINGS for menu icon & menu order
+- update adminlte from 2.3.6 -> 2.4.18
+
 ## [v1.5.1](https://github.com/wuyue92tree/django-adminlte-ui/releases/tag/1.5.1)
 
 - fix template tag for Django 3;

docs/guide.md

@@ -169,28 +169,79 @@ url_name=video_parsed_changelist, app_names=['admin'], namespaces=['admin'], rou
 django url name = namespaces:url_name
 
 ## settings
+in your setting.py `ADMINLTE_SETTINGS`
 
+### demo
+Misleading demo features disabling/enabling
 ```python
-# in your setting.py
-# this is the default settings
-# what the setting work for? [You can see](https://github.com/wuyue92tree/django-adminlte-ui/pull/6)
-
 ADMINLTE_SETTINGS = {
     'demo': True,
+}
+```
+
+### search_form
+Search form disabling/enabling
+
+```python
+ADMINLTE_SETTINGS = {
     'search_form': True,
-    # 'skin': 'blue',
-    # 'copyright': '<a href="https://github.com/wuyue92tree/django-adminlte-ui/tree/'+version+'">django-adminlte-ui '+version+'</a>',
-    # 'navigation_expanded': True,
-
-    # if you are use custom menu, which will not effective below!
-
-    # 'show_apps': ['django_admin_settings', 'auth', 'main'],
-    # 'main_navigation_app': 'django_admin_settings',
-    # 'icons': {
-    #     'myapp': {
-    #         'shops': 'fa-shopping-cart',
-    #         'products': 'fa-dollar',
-    #     }
-    # }
+}
+```
+
+### skin
+Skin choice
+```python
+ADMINLTE_SETTINGS = {
+    'skin': True,
+}
+```
+
+### copyright
+Customer-specific copyright notice
+```python
+ADMINLTE_SETTINGS = {
+    'copyright': 'John Smith',
+}
+```
+
+### navigation_expanded
+Navigation expanded feature, making navigation elements not being hidden under openable menu
+```python
+ADMINLTE_SETTINGS = {
+    'navigation_expanded': True,
+}
+```
+
+### show_apps
+```python
+ADMINLTE_SETTINGS = {
+    'show_apps': ['django_admin_settings', 'auth', 'main'],
+}
+```
+### main_navigation_app
+Main navigation app feature, where app models are put on top of the menu
+```python
+ADMINLTE_SETTINGS = {
+    'main_navigation_app': 'django_admin_settings',
+}
+```
+
+### apps
+Modify apps icon & order apps/models
+
+```python
+ADMINLTE_SETTINGS = {
+    'example-app': {
+        'icon': 'fa-desktop',
+        'models': {
+            'example-model': {
+                'icon': 'fa-archive'
+            },
+            'example-model1': {}
+        }
+    },
+    'auth': {
+        'icon': 'fa-users'
+    }
 }
 ```

setup.py

@@ -20,6 +20,6 @@
     zip_safe=False,
     entry_points={},
     install_requires=[
-        'django-treebeard==4.3'
+        'django-treebeard>=4.5.1'
     ],
 )