Browse Source

Merge branch 'dev'

Denis K 9 years ago
parent
commit
704475f9fa

+ 23 - 0
CHANGELOG.rst

@@ -0,0 +1,23 @@
+Changelog
+=========
+
+0.0.4
+-----
+
+* [Feature] Added ability to set your own branding in the top of the sidebar
+
+
+0.0.3
+-----
+
+* [Feature] Added Python 3 support
+
+
+0.0.1
+-----
+
+* Initial release
+
+
+
+

+ 5 - 0
jet/static/jet/css/_login.scss

@@ -47,6 +47,11 @@
       height: 100%;
       padding: 30px;
     }
+
+    &-submit-row {
+      text-align: center;
+      margin-top: 20px;
+    }
   }
 }
 

+ 3 - 0
jet/static/jet/css/themes/default/base.css

@@ -4269,6 +4269,9 @@ table#change-history {
       background: #fff;
       height: 100%;
       padding: 30px; }
+    .login-container-submit-row {
+      text-align: center;
+      margin-top: 20px; }
 
 .login-form .form-row {
   padding: 6px 0; }

File diff suppressed because it is too large
+ 0 - 0
jet/static/jet/css/themes/default/base.css.map


+ 3 - 0
jet/static/jet/css/themes/green/base.css

@@ -4300,6 +4300,9 @@ table#change-history {
       background: white;
       height: 100%;
       padding: 30px; }
+    .login-container-submit-row {
+      text-align: center;
+      margin-top: 20px; }
 
 .login-form .form-row {
   padding: 6px 0; }

File diff suppressed because it is too large
+ 0 - 0
jet/static/jet/css/themes/green/base.css.map


+ 2 - 0
jet/templates/admin/app_index.html

@@ -7,6 +7,7 @@
 {% endblock %}
 
 {% block extrastyle %}
+    {{ block.super }}
     <link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />
 
     {% for css in dashboard.media.css %}
@@ -15,6 +16,7 @@
 {% endblock %}
 
 {% block extrahead %}
+    {{ block.super }}
     {% for js in dashboard.media.js %}
         <script src="{% static js %}"></script>
     {% endfor %}

+ 139 - 16
jet/templates/admin/base.html

@@ -1,13 +1,11 @@
 {% load i18n admin_static jet_tags %}
-
-
+{% 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 %}
 {% block html %}<!DOCTYPE html>
-{% 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 %}
 <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 <head>
     <title>{% block title %}{% endblock %}</title>
     <meta name="copyright" content="geex-arts.com">
+    {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
 
     <link href="{% static "jet/vendor/select2/css/select2.min.css" %}" rel="stylesheet" />
     <link href="{% static "jet/vendor/jquery-ui/jquery-ui.min.css" %}" rel="stylesheet" />
@@ -16,10 +14,9 @@
     <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" />
-
-    {% block extrastyle %}{% endblock %}
     <!--[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 %}
 
     <script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}";</script>
     <script type="text/javascript">window.__admin_utc_offset__ = "{% filter escapejs %}{% now "Z" %}{% endfilter %}";</script>
@@ -28,10 +25,6 @@
         var TIME_FORMAT = "{% get_time_format %}";
         var DATETIME_FORMAT = "{% get_datetime_format %}";
     </script>
-
-    {% block extrahead %}{% endblock %}
-    {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
-
     <script type="text/javascript" src="{% url 'jet:jsi18n' %}"></script>
     <script src="{% static "jet/vendor/jquery/jquery-1.11.3.min.js" %}"></script>
     <script src="{% static "jet/vendor/jquery-ui/jquery-ui.min.js" %}"></script>
@@ -52,9 +45,9 @@
         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>
+    {% block extrahead %}{% endblock %}
 </head>
 <body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">
     {% block body %}
@@ -66,9 +59,6 @@
                 {% if not is_popup %}
                     {% block header %}
                         <div id="header" class="top">
-{#                            <div id="branding">#}
-{#                                {% block branding %}{% endblock %}#}
-{#                            </div>#}
                             <div class="top-right">
                                 {% block top-right %}{% endblock %}
                                 {% block usertools %}
@@ -105,7 +95,6 @@
                                     {% endblock %}
                                 {% endformat_breadcrumbs %}
                             </div>
-                            {% block nav-global %}{% endblock %}
                         </div>
                     {% endblock %}
                 {% endif %}
@@ -139,7 +128,141 @@
             </div>
 
         {% if not is_popup %}
-                {% include "admin/sidebar.html" %}
+            <div class="sidebar">
+                <div class="sidebar-menu-wrapper">
+                    <div id="branding">
+                        {% block branding %}{% endblock %}
+                    </div>
+                    <ul class="sidebar-menu">
+                        {% if user.is_active and user.is_staff %}
+                            <li class="sidebar-menu-item">
+                                <span class="sidebar-menu-item-icon icon-data"></span> <a href="{% url 'admin:index' %}" class="sidebar-menu-item-link">{% trans 'Home' %}</a>
+                            </li>
+                        {% endif %}
+                        {% if site_url %}
+                            <li class="sidebar-menu-item">
+                                <span class="sidebar-menu-item-icon icon-open-external"></span> <a href="{{ site_url }}" class="sidebar-menu-item-link">{% trans 'View site' %}</a>
+                            </li>
+                        {% endif %}
+                        {% if user.is_active and user.is_staff %}
+                            {% get_menu as app_list %}
+                            {% if app_list.apps or app_list.pinned_apps %}
+                                <form action="{% url "jet:toggle_application_pin" %}" method="POST" id="toggle-application-pin-form">
+                                    {% csrf_token %}
+                                    <input type="hidden" name="app_label">
+                                </form>
+                                <li class="sidebar-menu-item no-horizontal-padding">
+                                    <span class="sidebar-menu-item-title">{% trans 'Applications' %}</span>
+                                    <ul class="sidebar-menu-item-list apps-list-pinned">
+                                        {% for app in app_list.pinned_apps %}
+                                            <li class="sidebar-menu-item-list-item app-item pinned app-{{ app.app_label }}" data-app-label="{{ app.app_label }}">
+                                                <a href="{{ app.app_url }}" class="sidebar-menu-item-list-item-link popup-item-link" data-popup-item-id="sidebar-popup-item-{{ app.app_label }}">
+                                                    <span class="sidebar-menu-item-list-item-arrow icon-arrow-right"></span>
+                                                    <span class="sidebar-menu-item-list-item-link-pin icon-star pin-toggle"></span>
+                                                    <span class="sidebar-menu-item-list-item-link-unpin icon-cross pin-toggle"></span>
+                                                    {% if app.name != app.app_label|capfirst|escape %}{{ app.name }}{% else %}{% trans app.app_label as app_label %}{{ app_label|capfirst|escape }}{% endif %}
+                                                </a>
+                                            </li>
+                                        {% endfor %}
+                                    </ul>
+                                    <a href="#" class="sidebar-menu-item-action apps-hide"></a>
+                                    <ul class="sidebar-menu-item-list apps-list">
+                                        {% for app in app_list.apps %}
+                                            <li class="sidebar-menu-item-list-item app-item app-{{ app.app_label }}" data-app-label="{{ app.app_label }}">
+                                                <a href="{{ app.app_url }}" class="sidebar-menu-item-list-item-link popup-item-link" data-popup-item-id="sidebar-popup-item-{{ app.app_label }}">
+                                                    <span class="sidebar-menu-item-list-item-arrow icon-arrow-right"></span>
+                                                    <span class="sidebar-menu-item-list-item-link-pin icon-star pin-toggle"></span>
+                                                    <span class="sidebar-menu-item-list-item-link-unpin icon-cross pin-toggle"></span>
+                                                    {% if app.name != app.app_label|capfirst|escape %}{{ app.name }}{% else %}{% trans app.app_label as app_label %}{{ app_label|capfirst|escape }}{% endif %}
+                                                </a>
+                                            </li>
+                                        {% endfor %}
+                                    </ul>
+                                </li>
+                            {% endif %}
+                            <li class="sidebar-menu-item no-horizontal-padding">
+                                <div class="dialog-confirm" id="bookmarks-add-dialog" title="{% trans "Add bookmark" %}">
+                                    <form action="{% url "jet:add_bookmark" %}" method="POST" id="bookmarks-add-form">
+                                        {% csrf_token %}
+                                        <p>{% trans "Title" %}:</p>
+                                        <input type="text" name="title" class="fill_width">
+                                        <p>{% trans "URL" %}:</p>
+                                        <input type="text" name="url" class="fill_width">
+                                    </form>
+                                </div>
+                                <form action="{% url "jet:remove_bookmark" %}" method="POST" id="bookmarks-remove-form">
+                                    {% csrf_token %}
+                                    <input type="hidden" name="id">
+                                </form>
+                                <div class="dialog-confirm" id="bookmarks-remove-dialog" title="{% trans "Delete bookmark" %}">
+                                    <p>{% trans "Are you sure want to delete this bookmark?" %}</p>
+                                </div>
+                                <span class="sidebar-menu-item-title">
+                                    <a href="#" class="sidebar-menu-item-title-icon bookmarks-add" title="{% trans "Add bookmark" %}"{% if title %} data-title="{{ title }}"{% endif %}><span class="icon-add"></span></a>
+                                    {% trans 'bookmarks' %}
+                                </span>
+                                <ul class="sidebar-menu-item-list bookmarks-list">
+                                    {% get_bookmarks user as bookmarks %}
+                                    {% for bookmark in bookmarks %}
+                                        <li class="sidebar-menu-item-list-item">
+                                            <a href="{{ bookmark.url }}" class="sidebar-menu-item-list-item-link">
+                                                <span class="sidebar-menu-item-list-item-link-remove bookmarks-remove" data-bookmark-id="{{ bookmark.pk }}">{% trans "Remove" %}</span>
+                                                {{ bookmark.title }}
+                                            </a>
+                                        </li>
+                                    {% endfor %}
+                                    <li class="sidebar-menu-item-list-item empty">
+                                        <a href="" class="sidebar-menu-item-list-item-link">
+                                            <span class="sidebar-menu-item-list-item-link-remove bookmarks-remove">{% trans "Remove" %}</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                            </li>
+                            {% url 'django-admindocs-docroot' as docsroot %}
+                            {% if docsroot %}
+                                <li class="sidebar-menu-item">
+                                    <span class="sidebar-menu-item-icon icon-book"></span> <a href="{{ docsroot }}" class="sidebar-menu-item-link">{% trans 'Documentation' %}</a>
+                                </li>
+                            {% endif %}
+                            {% block nav-global %}{% endblock %}
+                        {% endif %}
+                    </ul>
+                </div>
+                <div class="sidebar-copyright">powered by DJANGO JET</div>
+            </div>
+
+            {% if app_list %}
+                <div class="sidebar-popup-container">
+                    <div class="sidebar-popup">
+                        {% for app in app_list.apps|add:app_list.pinned_apps %}
+                            <div class="sidebar-popup-item" id="sidebar-popup-item-{{ app.app_label }}">
+                                <div class="sidebar-popup-title">
+                                    {% if app.name != app.app_label|capfirst|escape %}{{ app.name }}{% else %}{% trans app.app_label as app_label %}{{ app_label|capfirst|escape }}{% endif %}
+                                </div>
+
+                                <input class="sidebar-popup-search" placeholder="Search...">
+
+                                <ul class="sidebar-popup-list">
+                                    <li class="sidebar-popup-list-item app-{{ app.app_label }}{{ app.current|yesno:" current," }}">
+                                        <a href="{{ app.app_url }}" class="sidebar-popup-list-item-link">{% trans 'Application page' %}</a>
+                                    </li>
+
+                                    {% for model in app.models %}
+                                        <li class="sidebar-popup-list-item model-{{ model.object_name|lower }}{{ model.current|yesno:" current," }}">
+                                            {% if model.admin_url %}
+                                                <a href="{{ model.admin_url }}" class="sidebar-popup-list-item-link">{{ model.name }}</a>
+                                            {% else %}
+                                                {{ model.name }}
+                                            {% endif %}
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            </div>
+                        {% endfor %}
+                    </div>
+                    <div class="sidebar-popup-background"></div>
+                </div>
+            {% endif %}
             </div>
         {% endif %}
     {% endblock %}

+ 7 - 0
jet/templates/admin/base_site.html

@@ -0,0 +1,7 @@
+{% extends "admin/base.html" %}
+
+{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
+
+{% block branding %}{% endblock %}
+
+{% block nav-global %}{% endblock %}

+ 2 - 0
jet/templates/admin/index.html

@@ -7,6 +7,7 @@
 {% endblock %}
 
 {% block extrastyle %}
+    {{ block.super }}
     <link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />
 
     {% for css in dashboard.media.css %}
@@ -15,6 +16,7 @@
 {% endblock %}
 
 {% block extrahead %}
+    {{ block.super }}
     {% for js in dashboard.media.js %}
         <script src="{% static js %}"></script>
     {% endfor %}

+ 1 - 1
jet/templates/admin/login.html

@@ -50,7 +50,7 @@
                     <a href="{{ password_reset_url }}">{% trans 'Forgotten your password or username?' %}</a>
                     </div>
                 {% endif %}
-                <div class="submit-row">
+                <div class="login-container-submit-row">
                 <label>&nbsp;</label><input type="submit" value="{% trans 'Log in' %}" />
                 </div>
             </form>

+ 0 - 134
jet/templates/admin/sidebar.html

@@ -1,134 +0,0 @@
-{% load i18n admin_static jet_tags %}
-
-<div class="sidebar">
-    <div class="sidebar-menu-wrapper">
-        <ul class="sidebar-menu">
-            {% if user.is_active and user.is_staff %}
-                <li class="sidebar-menu-item">
-                    <span class="sidebar-menu-item-icon icon-data"></span> <a href="{% url 'admin:index' %}" class="sidebar-menu-item-link">{% trans 'Home' %}</a>
-                </li>
-            {% endif %}
-            {% if site_url %}
-                <li class="sidebar-menu-item">
-                    <span class="sidebar-menu-item-icon icon-open-external"></span> <a href="{{ site_url }}" class="sidebar-menu-item-link">{% trans 'View site' %}</a>
-                </li>
-            {% endif %}
-            {% if user.is_active and user.is_staff %}
-                {% get_menu as app_list %}
-                {% if app_list.apps or app_list.pinned_apps %}
-                    <form action="{% url "jet:toggle_application_pin" %}" method="POST" id="toggle-application-pin-form">
-                        {% csrf_token %}
-                        <input type="hidden" name="app_label">
-                    </form>
-                    <li class="sidebar-menu-item no-horizontal-padding">
-                        <span class="sidebar-menu-item-title">{% trans 'Applications' %}</span>
-                        <ul class="sidebar-menu-item-list apps-list-pinned">
-                            {% for app in app_list.pinned_apps %}
-                                <li class="sidebar-menu-item-list-item app-item pinned app-{{ app.app_label }}" data-app-label="{{ app.app_label }}">
-                                    <a href="{{ app.app_url }}" class="sidebar-menu-item-list-item-link popup-item-link" data-popup-item-id="sidebar-popup-item-{{ app.app_label }}">
-                                        <span class="sidebar-menu-item-list-item-arrow icon-arrow-right"></span>
-                                        <span class="sidebar-menu-item-list-item-link-pin icon-star pin-toggle"></span>
-                                        <span class="sidebar-menu-item-list-item-link-unpin icon-cross pin-toggle"></span>
-                                        {% if app.name != app.app_label|capfirst|escape %}{{ app.name }}{% else %}{% trans app.app_label as app_label %}{{ app_label|capfirst|escape }}{% endif %}
-                                    </a>
-                                </li>
-                            {% endfor %}
-                        </ul>
-                        <a href="#" class="sidebar-menu-item-action apps-hide"></a>
-                        <ul class="sidebar-menu-item-list apps-list">
-                            {% for app in app_list.apps %}
-                                <li class="sidebar-menu-item-list-item app-item app-{{ app.app_label }}" data-app-label="{{ app.app_label }}">
-                                    <a href="{{ app.app_url }}" class="sidebar-menu-item-list-item-link popup-item-link" data-popup-item-id="sidebar-popup-item-{{ app.app_label }}">
-                                        <span class="sidebar-menu-item-list-item-arrow icon-arrow-right"></span>
-                                        <span class="sidebar-menu-item-list-item-link-pin icon-star pin-toggle"></span>
-                                        <span class="sidebar-menu-item-list-item-link-unpin icon-cross pin-toggle"></span>
-                                        {% if app.name != app.app_label|capfirst|escape %}{{ app.name }}{% else %}{% trans app.app_label as app_label %}{{ app_label|capfirst|escape }}{% endif %}
-                                    </a>
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    </li>
-                {% endif %}
-                <li class="sidebar-menu-item no-horizontal-padding">
-                    <div class="dialog-confirm" id="bookmarks-add-dialog" title="{% trans "Add bookmark" %}">
-                        <form action="{% url "jet:add_bookmark" %}" method="POST" id="bookmarks-add-form">
-                            {% csrf_token %}
-                            <p>{% trans "Title" %}:</p>
-                            <input type="text" name="title" class="fill_width">
-                            <p>{% trans "URL" %}:</p>
-                            <input type="text" name="url" class="fill_width">
-                        </form>
-                    </div>
-                    <form action="{% url "jet:remove_bookmark" %}" method="POST" id="bookmarks-remove-form">
-                        {% csrf_token %}
-                        <input type="hidden" name="id">
-                    </form>
-                    <div class="dialog-confirm" id="bookmarks-remove-dialog" title="{% trans "Delete bookmark" %}">
-                        <p>{% trans "Are you sure want to delete this bookmark?" %}</p>
-                    </div>
-                    <span class="sidebar-menu-item-title">
-                        <a href="#" class="sidebar-menu-item-title-icon bookmarks-add" title="{% trans "Add bookmark" %}"{% if title %} data-title="{{ title }}"{% endif %}><span class="icon-add"></span></a>
-                        {% trans 'bookmarks' %}
-                    </span>
-                    <ul class="sidebar-menu-item-list bookmarks-list">
-                        {% get_bookmarks user as bookmarks %}
-                        {% for bookmark in bookmarks %}
-                            <li class="sidebar-menu-item-list-item">
-                                <a href="{{ bookmark.url }}" class="sidebar-menu-item-list-item-link">
-                                    <span class="sidebar-menu-item-list-item-link-remove bookmarks-remove" data-bookmark-id="{{ bookmark.pk }}">{% trans "Remove" %}</span>
-                                    {{ bookmark.title }}
-                                </a>
-                            </li>
-                        {% endfor %}
-                        <li class="sidebar-menu-item-list-item empty">
-                            <a href="" class="sidebar-menu-item-list-item-link">
-                                <span class="sidebar-menu-item-list-item-link-remove bookmarks-remove">{% trans "Remove" %}</span>
-                            </a>
-                        </li>
-                    </ul>
-                </li>
-
-                {% url 'django-admindocs-docroot' as docsroot %}
-                {% if docsroot %}
-                    <li class="sidebar-menu-item">
-                        <span class="sidebar-menu-item-icon icon-book"></span> <a href="{{ docsroot }}" class="sidebar-menu-item-link">{% trans 'Documentation' %}</a>
-                    </li>
-                {% endif %}
-            {% endif %}
-        </ul>
-    </div>
-    <div class="sidebar-copyright">powered by DJANGO JET</div>
-</div>
-
-{% if app_list %}
-    <div class="sidebar-popup-container">
-        <div class="sidebar-popup">
-            {% for app in app_list.apps|add:app_list.pinned_apps %}
-                <div class="sidebar-popup-item" id="sidebar-popup-item-{{ app.app_label }}">
-                    <div class="sidebar-popup-title">
-                        {% if app.name != app.app_label|capfirst|escape %}{{ app.name }}{% else %}{% trans app.app_label as app_label %}{{ app_label|capfirst|escape }}{% endif %}
-                    </div>
-
-                    <input class="sidebar-popup-search" placeholder="Search...">
-
-                    <ul class="sidebar-popup-list">
-                        <li class="sidebar-popup-list-item app-{{ app.app_label }}{{ app.current|yesno:" current," }}">
-                            <a href="{{ app.app_url }}" class="sidebar-popup-list-item-link">{% trans 'Application page' %}</a>
-                        </li>
-
-                        {% for model in app.models %}
-                            <li class="sidebar-popup-list-item model-{{ model.object_name|lower }}{{ model.current|yesno:" current," }}">
-                                {% if model.admin_url %}
-                                    <a href="{{ model.admin_url }}" class="sidebar-popup-list-item-link">{{ model.name }}</a>
-                                {% else %}
-                                    {{ model.name }}
-                                {% endif %}
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </div>
-            {% endfor %}
-        </div>
-        <div class="sidebar-popup-background"></div>
-    </div>
-{% endif %}

+ 1 - 0
jet/templates/jet/dashboard/update_module.html

@@ -2,6 +2,7 @@
 {% load i18n jet_tags static %}
 
 {% block extrahead %}
+    {{ block.super }}
     <script type="text/javascript" src="{% static "admin/js/jquery.js" %}"></script>
     <script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
     <script type="text/javascript" src="{% static "admin/js/inlines.js" %}"></script>

Some files were not shown because too many files changed in this diff