Major improvements

ktalik · ktalik · commit 1aeca29153b8 · 2019-08-09T16:07:47.000+02:00
1. settings.py variable where customer-specific and deployment-specific
settings can be kept directly in code
2. Skin choice
3. Misleading demo features disabling/enabling
4. Search form disabling/enabling
5. Main navigation app feature, where app models are put on top of the
menu
6. Navigation expanded feature, making navigation elements not being
hidden under openable menu
7. Customer-specific copyright notice
8. Django CSS related improvements when AdminLTE breaks Django Admin
look and feel
9. Removal of CDN links to make page load smoother:
font-awesome, ionicons
10. Copyright notice showing current year, instead of hardcoded 2019
change
11. Fixed that "Add new item" button sometimes changed its place
12. Added plus icon with circle to "Add new item" button, resembling
original Django Admin button
13. Made "select all" column of change list results constant width
14. Fixed pagination text that was in Chinese
15. Made settings.py-configurable app model icons decorated from
adminlte_menu.py templatetags
diff --git a/adminlteui/context_processors.py b/adminlteui/context_processors.py
@@ -0,0 +1,12 @@
+from django.conf import settings
+
+
+def adminlte_settings(request):
+    if hasattr(settings, 'ADMINLTE_SETTINGS'):
+        return {
+            'adminlte': settings.ADMINLTE_SETTINGS
+        }
+    else:
+        return {
+            'adminlte': {}
+        }
diff --git a/adminlteui/static/admin/dist/css/django.css b/adminlteui/static/admin/dist/css/django.css
@@ -0,0 +1,38 @@
+/** Django-related improvements to AdminLTE UI **/
+
+div.inline-related {
+    padding: 10px;
+}
+
+.form-row {
+    padding: 5px;
+}
+
+.inlinechangelink {
+    content: url('/static/admin/img/icon-changelink.svg');
+}
+
+.inline-related .tabular {
+    background-color: white;
+    box-shadow: 0 1px 1px rgba(0,0,0,0.1);
+}
+
+td.djn-td,
+th.djn-th {
+    padding: 10px;
+}
+
+td.delete input {
+    margin: 10px;
+}
+
+tr.djn-tr > .original {
+    padding-left: 20px;
+}
+
+/* Checkbox selection table header */
+.djn-checkbox-select-all {
+    padding-right: 0px !important;
+    width: 0px;
+}
+
diff --git a/adminlteui/static/admin/font-awesome/css/font-awesome.min.css b/adminlteui/static/admin/font-awesome/css/font-awesome.min.css
diff --git a/adminlteui/static/admin/font-awesome/fonts/fontawesome-webfont.eot b/adminlteui/static/admin/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/adminlteui/static/admin/font-awesome/fonts/fontawesome-webfont.ttf b/adminlteui/static/admin/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/adminlteui/static/admin/font-awesome/fonts/fontawesome-webfont.woff2 b/adminlteui/static/admin/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/adminlteui/static/admin/ionicons/ionicons.min.css b/adminlteui/static/admin/ionicons/ionicons.min.css
diff --git a/adminlteui/templates/admin/base.html b/adminlteui/templates/admin/base.html
@@ -10,17 +10,28 @@
     <!-- Bootstrap 3.3.6 -->
     <link rel="stylesheet" href={% static "admin/bootstrap/css/bootstrap.min.css" %}>
     <!-- Font Awesome -->
-    <link rel="stylesheet" href="//cdn.bootcss.com/font-awesome/4.5.0/css/font-awesome.min.css">
+    <!--<link rel="stylesheet" href="//cdn.bootcss.com/font-awesome/4.5.0/css/font-awesome.min.css">-->
+    <link rel="stylesheet" href={% static "admin/font-awesome/css/font-awesome.min.css" %}>
     <!-- Ionicons -->
-    <link rel="stylesheet" href="//cdn.bootcss.com/ionicons/2.0.1/css/ionicons.min.css">
+    <link rel="stylesheet" href={% static "admin/ionicons/ionicons.min.css" %}>
+
     {% block extrastyle %} {% endblock %}
 
     {% block extrahead %} {% endblock %}
     <!-- Theme style -->
     <link rel="stylesheet" href={% static "admin/dist/css/AdminLTE.min.css" %}>
     <!-- AdminLTE Skins. Choose a skin from the css/skins
          folder instead of downloading all of them to reduce the load. -->
+    {% if adminlte.skin %}
+    <link rel="stylesheet" href={% static "admin/dist/css/skins/skin-"|add:adminlte.skin|add:".min.css" %}>
+    {% else %}
     <link rel="stylesheet" href={% static "admin/dist/css/skins/_all-skins.min.css" %}>
+    {% endif %}
+
+    <link rel="stylesheet" href={% static "admin/dist/css/django.css" %}>
+
+    <link rel="apple-touch-icon" href="/{{ adminlte_site_logo.site_logo }}">
+    <link rel="icon" href="/{{ adminlte_site_logo.site_logo }}">
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -30,7 +41,7 @@
     <![endif]-->
 
 </head>
-<body class="hold-transition skin-blue sidebar-mini fixed">
+<body class="hold-transition skin-{% if adminlte.skin %}{{ adminlte.skin }}{% else %}blue{% endif %} sidebar-mini fixed">
 
 <div class="wrapper">
     {% if not is_popup %}
@@ -173,7 +184,9 @@
                     </li>
                     <!-- Control Sidebar Toggle Button -->
                     <li>
+                        {% if adminlte.demo %}
                         <a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
+                        {% endif %}
                     </li>
                 </ul>
             </div>
@@ -202,6 +215,7 @@
             </div>
             {% endif %}
             <!-- search form -->
+            {% if adminlte.search_form %}
             <form action="#" method="get" class="sidebar-form">
                 <div class="input-group">
                     <input type="text" name="q" class="form-control" placeholder="{% trans 'Search' %}...">
@@ -211,60 +225,96 @@
               </span>
                 </div>
             </form>
+            {% endif %}
             <!-- /.search form -->
             <!-- sidebar menu: : style can be found in sidebar.less -->
             <ul class="sidebar-menu">
-                <li class="header">{% trans 'MAIN NAVIGATION' %}</li>
-                <li>
-                    <a id="adminIndex" href="{% url 'admin:index' %}">
-                        <i class="fa fa-dashboard"></i> <span>{% trans 'Dashboard' %}</span>
-                    </a>
-                </li>
-                {% get_menu request as app_list %}
-                {% if app_list %}
-                {% for app in app_list %}
-                <li {% if not app.admin_url %}class="treeview"{% endif %}>
-                    <a href="{% if app.admin_url %}{{app.admin_url}}{% else %}javascript:void(0){% endif %}">
-                        <i class="fa {% if app.icon %} {{app.icon}} {% else %}fa-database{% endif %}"></i>
-                        <span style="overflow: hidden; display: inline-block; vertical-align:top;">{{ app.name }}</span>
-                        {% if not app.admin_url %}
-                        <span class="pull-right-container">
-                          <i class="fa fa-angle-left pull-right"></i>
-                        </span>
+
+                    <li class="header">{% trans 'MAIN NAVIGATION' %}</li>
+                    <li>
+                        <a id="adminIndex" href="{% url 'admin:index' %}">
+                            <i class="fa fa-dashboard"></i> <span>{% trans 'Dashboard' %}</span>
+                        </a>
+                    </li>
+
+                    {% if adminlte.main_navigation_app %}
+
+                        {% get_menu request as app_list %}
+                        {% if app_list %}
+                        {% for app in app_list %}
+                            {% if app.app_label == adminlte.main_navigation_app %}
+                            {% for model in app.models %}
+                            {% if model.admin_url %}
+                            <li>
+                                <a href="{{ model.admin_url }}">
+                                    <i class="fa {% if model.icon %} {{model.icon}} {% else %}fa-circle-o{% endif %}"></i> <span>{{ model.name }}</span>
+                                </a>
+                            </li>
+                            {% endif %}
+                            {% endfor %}
+                            {% endif %}
+                        {% endfor %}
                         {% endif %}
-                    </a>
-                    {% if not app.admin_url %}
-                    <ul class="treeview-menu">
+
+                    {% endif %}
+
+                {% if adminlte.navigation_expanded %}
+
+                    {% get_menu request as app_list %}
+                    {% if app_list %}
+                    {% for app in app_list %}
+                        {% if not adminlte.show_apps or adminlte.show_apps and app.app_label in adminlte.show_apps %}
+                        {% if app.app_label != adminlte.main_navigation_app %}
+                        <li class="header">{{ app.name|upper }}</li>
                         {% for model in app.models %}
+                        {% ifchanged %}
                         {% if model.admin_url %}
-                        <li><a href="{{ model.admin_url }}" ><i class="fa {% if model.icon %} {{model.icon}} {% else %}fa-circle-o{% endif %}"></i>{{ model.name }}</a></li>
+                        <li>
+                            <a href="{{ model.admin_url }}">
+                                <i class="fa {% if model.icon %} {{model.icon}} {% else %}fa-circle-o{% endif %}"></i> <span>{{ model.name }}</span>
+                            </a>
+                        </li>
                         {% endif %}
+                        {% endifchanged %}
                         {% endfor %}
-                    </ul>
+                        {% endif %}
+                        {% endif %}
+                    {% endfor %}
+                    {% endif %}
+
+                {% else %}
+
+                    {% get_menu request as app_list %}
+                    {% if app_list %}
+                    {% for app in app_list %}
+                        {% if not adminlte.show_apps or adminlte.show_apps and app.app_label in adminlte.show_apps %}
+                        {% if app.app_label != adminlte.main_navigation_app %}
+                        <li {% if not app.admin_url %}class="treeview"{% endif %}>
+                            <a href="{% if app.admin_url %}{{app.admin_url}}{% else %}javascript:void(0){% endif %}">
+                                <i class="fa {% if app.icon %} {{app.icon}} {% else %}fa-database{% endif %}"></i>
+                                <span style="overflow: hidden; display: inline-block; vertical-align:top;">{{ app.name }}</span>
+                                {% if not app.admin_url %}
+                                <span class="pull-right-container">
+                                  <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                                {% endif %}
+                            </a>
+                            {% if not app.admin_url %}
+                            <ul class="treeview-menu">
+                                {% for model in app.models %}
+                                {% if model.admin_url %}
+                                <li><a href="{{ model.admin_url }}" ><i class="fa {% if model.icon %} {{model.icon}} {% else %}fa-circle-o{% endif %}"></i>{{ model.name }}</a></li>
+                                {% endif %}
+                                {% endfor %}
+                            </ul>
+                            {% endif %}
+                        </li>
+                        {% endif %}
+                        {% endif %}
+                    {% endfor %}
                     {% endif %}
-                </li>
-                {% endfor %}
+
                 {% endif %}
-                <!--{% if request.user.is_superuser %}-->
-                <!--<li class="treeview">-->
-                <!--<a href="#">-->
-                <!--<i class="fa fa-cog"></i>-->
-                <!--<span>{% trans 'System manage' %}</span>-->
-                <!--<span class="pull-right-container">-->
-                <!--<i class="fa fa-angle-left pull-right"></i>-->
-                <!--</span>-->
-                <!--</a>-->
-                <!--<ul class="treeview-menu">-->
-                <!--<li><a href="" ><i class="fa fa-file-text-o"></i>{% trans 'Log manage' %}</a></li>-->
-                <!--<li><a href="/admin/config/system/" ><i class="fa fa-wrench"></i>{% trans 'System config' %}</a></li>-->
-                <!--</ul>-->
-                <!--</li>-->
-                <!--{% endif %}-->
-
-                <!--<li class="header">LABELS</li>-->
-                <!--<li><a href="#"><i class="fa fa-circle-o text-red"></i> <span>{% trans 'Important' %}</span></a></li>-->
-                <!--<li><a href="#"><i class="fa fa-circle-o text-yellow"></i> <span>{% trans 'Warning' %}</span></a></li>-->
-                <!--<li><a href="#"><i class="fa fa-circle-o text-aqua"></i> <span>{% trans 'Information' %}</span></a></li>-->
             </ul>
         </section>
         <!-- /.sidebar -->
@@ -497,7 +547,9 @@ <h3 class="control-sidebar-heading">Chat Settings</h3>
 <!-- AdminLTE App -->
 <script src={% static "admin/dist/js/app.min.js" %}></script>
 <!-- AdminLTE for demo purposes -->
+{% if adminlte.demo %}
 <script src={% static "admin/dist/js/demo.js" %}></script>
+{% endif %}
 <script>
 // use js control active status of siderbar-menu
 $(function() {
diff --git a/adminlteui/templates/admin/base_site.html b/adminlteui/templates/admin/base_site.html
@@ -68,8 +68,14 @@ <h5><i class="icon fa fa-info"></i>{{ message|capfirst }}</h5>
 <div class="pull-right hidden-xs">
     <b>Adminlte Version</b> 2.3.6
 </div>
-<strong>Copyright &copy; 2019 <a href="https://github.com/wuyue92tree/django-adminlte-ui">django-adminlte-ui</a>.</strong> All rights
-reserved.
+<strong>
+Copyright &copy; {% now 'Y' %}
+{% if adminlte.copyright %}
+    {{ adminlte.copyright }}.
+{% else %}
+    <a href="https://github.com/wuyue92tree/django-adminlte-ui">django-adminlte-ui</a>.
+{% endif %}
+</strong> All rights reserved.
 {% endblock %}
 
-{% block extrajs %} {% endblock %}
+{% block extrajs %} {% endblock %}
diff --git a/adminlteui/templates/admin/change_form.html b/adminlteui/templates/admin/change_form.html
@@ -130,4 +130,4 @@ <h4 class="box-title">
 <script>
 $('[required]').before('<span class="text-red" style="margin-left: -10px;">* </span>');
 </script>
-{% endblock %}
+{% endblock %}
diff --git a/adminlteui/templates/admin/change_list.html b/adminlteui/templates/admin/change_list.html
@@ -65,7 +65,7 @@ <h4 class="box-title">
                             {% endblock %}
 
                             {% block object-tools %}
-                            <div {% if cl.has_filters or cl.search_fields %}class="col-md-2 col-sm-12 col-xs-12 text-right"{% else %}class="col-md-12"{% endif %}>
+                            <div {% if cl.has_filters or cl.search_fields %}class="col-md-2 col-sm-12 col-xs-12 text-right"{% else %}class="col-md-12 text-right"{% endif %}>
                                 {% block object-tools-items %}
                                 {% change_list_object_tools %}
                                 {% endblock %}
diff --git a/adminlteui/templates/admin/change_list_object_tools.html b/adminlteui/templates/admin/change_list_object_tools.html
@@ -4,7 +4,7 @@
 {% if has_add_permission %}
 {% url cl.opts|admin_urlname:'add' as add_url %}
 <a href="{% add_preserved_filters add_url is_popup to_field %}" class="btn btn-success">
-    {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}
+    {% blocktrans with cl.opts.verbose_name as name %}<i class="fa fa-plus-circle"></i> &nbsp; Add {{ name }}{% endblocktrans %}
 </a>
 {% endif %}
 {% endblock %}
diff --git a/adminlteui/templates/admin/change_list_results.html b/adminlteui/templates/admin/change_list_results.html
@@ -28,6 +28,9 @@
                         class="sorting"
                         {% endif %}
                         {% endif %}
+                        {% if forloop.counter0 == 0 %}
+                        class="djn-checkbox-select-all"
+                        {% endif %}
                         tabindex="0" aria-controls="example2" rowspan="1" colspan="1" aria-label="Rendering engine: activate to sort column descending"><div class="text">{% if header.sortable %}<a href="{{ header.url_primary }}">
                         {{ header.text|capfirst }}</a>{% else %}<span>{{ header.text|capfirst }}</span>{% endif %} {% if header.sorted %}<a href="{{ header.url_remove }}"><div style="margin-top: .2em;" class="fa fa-close pull-right"></div></a>{% endif %}</div>
                     </th>
@@ -45,4 +48,4 @@
         </div>
     </div>
 </div>
-{% endif %}
+{% endif %}
diff --git a/adminlteui/templates/admin/pagination.html b/adminlteui/templates/admin/pagination.html
@@ -3,7 +3,13 @@
 
 <div class="col-sm-5">
     <div class="dataTables_info" id="example2_info" role="status" aria-live="polite">
-        共 {{ cl.result_count }} 条记录
+        {{ cl.result_count }}
+        {% if cl.result_count == 1 %}
+            {{ cl.opts.verbose_name }}
+        {% else %}
+            {{ cl.opts.verbose_name_plural }}
+        {% endif %}
+
         {% if show_all_url %}&nbsp;&nbsp;<a href="{{ show_all_url }}"
                                             class="showall">{% trans 'Show all' %}</a>{% endif %}
         {% if cl.formset and cl.result_count %}<input type="submit" name="_save"
@@ -33,4 +39,4 @@
             {% endif %}
         </ul>
     </div>
-</div>
+</div>
diff --git a/adminlteui/templatetags/adminlte_menu.py b/adminlteui/templatetags/adminlte_menu.py
@@ -2,6 +2,7 @@
 
 import django
 from django import template
+from django.conf import settings
 from django.contrib.admin import AdminSite
 from django.http import HttpRequest
 from django.utils.translation import gettext_lazy as _
@@ -143,7 +144,7 @@ def get_menu(context, request, position='left'):
                     request.user.has_perm(
                         'django_admin_settings.change_options'):
                 app.get('models').insert(0, {
-                    'name': _('General Option'),
+                    'name': _('General Options'),
                     'object_name': 'Options',
                     'perms':
                         {
@@ -156,6 +157,10 @@ def get_menu(context, request, position='left'):
                         'admin:general_option'),
                     'view_only': False
                 })
+        else:
+            for model in app.get('models', []):
+                model['icon'] = settings.ADMINLTE_SETTINGS\
+                    .get('icons', {}).get(app['app_label'], {}).get(model['name'].lower())
     # return MenuManager(available_apps, context, request)
     return available_apps
 
