Merge branch 'dev' into feature/admin-sortable-2-prettify

Conflicts:
	jet/static/jet/css/themes/default/base.css.map
	jet/static/jet/css/themes/default/jquery-ui.theme.css.map
	jet/static/jet/css/themes/default/select2.theme.css.map
	jet/static/jet/css/themes/green/base.css.map
	jet/static/jet/css/themes/green/jquery-ui.theme.css.map
	jet/static/jet/css/themes/green/select2.theme.css.map
	jet/static/jet/css/themes/light-blue/base.css.map
	jet/static/jet/css/themes/light-blue/jquery-ui.theme.css.map
	jet/static/jet/css/themes/light-blue/select2.theme.css.map
	jet/static/jet/css/themes/light-gray/base.css.map
	jet/static/jet/css/themes/light-gray/jquery-ui.theme.css.map
	jet/static/jet/css/themes/light-gray/select2.theme.css.map
	jet/static/jet/css/themes/light-green/base.css.map
	jet/static/jet/css/themes/light-green/jquery-ui.theme.css.map
	jet/static/jet/css/themes/light-green/select2.theme.css.map
	jet/static/jet/css/themes/light-violet/base.css.map
	jet/static/jet/css/themes/light-violet/jquery-ui.theme.css.map
	jet/static/jet/css/themes/light-violet/select2.theme.css.map

CHANGELOG.rst

@@ -1,8 +1,8 @@
 Changelog
 =========
 
-new
----
+0.1.4
+-----
 * [Feature] Side bar compact mode (lists all models without opening second menu)
 * [Feature] Custom side bar menu applications and models content and ordering
 * [Feature] Related objects actions in nice-looking popup instead of new window
@@ -10,6 +10,9 @@ new
 * [Fix] Better 3rd party applications template compatibility
 * [Fix] JET and Django js translation conflicts
 * [Fix] Hide empty model form labels
+* [Fix] Wrong positioning for 0 column
+* [Fix] Issue-21: Init label wrapped checkboxes
+* [Improvement] Add top bar arrow transition
 
 
 0.1.3

jet/__init__.py

@@ -1 +1 @@
-VERSION = '0.1.3'
+VERSION = '0.1.4'

jet/static/admin/js/admin/RelatedObjectLookups.js

@@ -66,6 +66,14 @@ function showRelatedObjectPopup(triggeringLink) {
     var href = triggeringLink.href;
 
     // Django JET
+    if (href.indexOf('_popup=1') == -1) {
+        if (href.indexOf('?') == -1) {
+            href += '?_popup=1';
+        } else {
+            href += '&_popup=1';
+        }
+    }
+
     showRelatedPopup(name, href);
 
     return false;
@@ -147,8 +155,9 @@ opener = parent.window;
 
 function showRelatedPopup(name, href) {
     django.jQuery(function($) {
-        var $container = $('.related-popup-container');
-        var $loading = $container.find('.loading-indicator');
+        var $container = $('.related-popup-container', parent.document);
+        var $loading = $container.find('.loading-indicator', parent.document);
+        var $body = $('body').addClass('non-scrollable', parent.document);
         var $popup = $('<iframe>').attr('name', name).attr('src', href).addClass('related-popup').on('load', function() {
             $popup.add($('.related-popup-back')).fadeIn(200, 'swing', function() {
                 $loading.hide();
@@ -157,9 +166,9 @@ function showRelatedPopup(name, href) {
 
         $loading.show();
         $container.fadeIn(200, 'swing', function() {
-            $('.related-popup-container').append($popup);
+            $container.append($popup);
         });
-        $('body').addClass('non-scrollable');
+        $body.addClass('non-scrollable', parent.document);
     });
 }
 

jet/static/jet/css/icons/style.css

@@ -1,118 +1,123 @@
 @font-face {
-	font-family: 'jet-icons';
-	src:url('fonts/jet-icons.eot?-lem1jo');
-	src:url('fonts/jet-icons.eot?#iefix-lem1jo') format('embedded-opentype'),
-		url('fonts/jet-icons.ttf?-lem1jo') format('truetype'),
-		url('fonts/jet-icons.woff?-lem1jo') format('woff'),
-		url('fonts/jet-icons.svg?-lem1jo#jet-icons') format('svg');
-	font-weight: normal;
-	font-style: normal;
+    font-family: 'jet-icons';
+    src:    url('fonts/jet-icons.eot?2orr6h');
+    src:    url('fonts/jet-icons.eot?2orr6h#iefix') format('embedded-opentype'),
+        url('fonts/jet-icons.ttf?2orr6h') format('truetype'),
+        url('fonts/jet-icons.woff?2orr6h') format('woff'),
+        url('fonts/jet-icons.svg?2orr6h#jet-icons') format('svg');
+    font-weight: normal;
+    font-style: normal;
 }
 
 [class^="icon-"], [class*=" icon-"] {
-	font-family: 'jet-icons';
-	speak: none;
-	font-style: normal;
-	font-weight: normal;
-	font-variant: normal;
-	text-transform: none;
-	line-height: 1;
+    /* use !important to prevent issues with browser extensions that change fonts */
+    font-family: 'jet-icons' !important;
+    speak: none;
+    font-style: normal;
+    font-weight: normal;
+    font-variant: normal;
+    text-transform: none;
+    line-height: 1;
 
-	/* Better Font Rendering =========== */
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
+    /* Better Font Rendering =========== */
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-order:before {
+    content: "\e901";
+}
 .icon-reset:before {
-	content: "\e61e";
+    content: "\e61e";
 }
 .icon-search:before {
-	content: "\e61d";
+    content: "\e61d";
 }
 .icon-user:before {
-	content: "\e61c";
+    content: "\e61c";
 }
 .icon-jet:before {
-	content: "\e61b";
+    content: "\e61b";
 }
 .icon-refresh:before {
-	content: "\e61a";
+    content: "\e61a";
 }
 .icon-grid:before {
-	content: "\e619";
+    content: "\e619";
 }
 .icon-star:before {
-	content: "\e618";
+    content: "\e618";
 }
 .icon-pin:before {
-	content: "\e617";
+    content: "\e617";
 }
 .icon-new:before {
-	content: "\e616";
+    content: "\e616";
 }
 .icon-edit:before {
-	content: "\e615";
+    content: "\e615";
 }
 .icon-clock:before {
-	content: "\e611";
+    content: "\e611";
 }
 .icon-calendar:before {
-	content: "\e612";
+    content: "\e612";
 }
 .icon-book:before {
-	content: "\e60d";
+    content: "\e60d";
 }
 .icon-open-external:before {
-	content: "\e60e";
+    content: "\e60e";
 }
 .icon-data:before {
-	content: "\e60f";
+    content: "\e60f";
 }
 .icon-question:before {
-	content: "\e613";
+    content: "\e613";
 }
 .icon-tick:before {
-	content: "\e614";
+    content: "\e614";
 }
 .icon-cross:before {
-	content: "\e610";
+    content: "\e610";
 }
 .icon-key:before {
-	content: "\e60c";
+    content: "\e60c";
 }
 .icon-arrow-right:before {
-	content: "\e60b";
+    content: "\e60b";
 }
 .icon-arrow-left:before {
-	content: "\e60a";
+    content: "\e60a";
 }
 .icon-arrow-down:before {
-	content: "\e608";
+    content: "\e608";
 }
 .icon-arrow-up:before {
-	content: "\e609";
+    content: "\e609";
 }
 .icon-checkbox-outline:before {
-	content: "\e607";
+    content: "\e607";
 }
 .icon-remove:before {
-	content: "\e600";
+    content: "\e600";
 }
 .icon-add2:before {
-	content: "\e601";
+    content: "\e601";
 }
 .icon-exit:before {
-	content: "\e602";
+    content: "\e602";
 }
 .icon-add:before {
-	content: "\e603";
+    content: "\e603";
 }
 .icon-add3:before {
-	content: "\e604";
+    content: "\e604";
 }
 .icon-expand:before {
-	content: "\e605";
+    content: "\e605";
 }
 .icon-checkbox:before {
-	content: "\e606";
+    content: "\e606";
 }
+

jet/templates/admin/change_form.html

@@ -76,7 +76,7 @@
                     </ul>
                 {% endif %}
 
-                {% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1" />{% endif %}
+                {% if is_popup %}<input type="hidden" name="{{ is_popup_var|default:"_popup" }}" value="1" />{% endif %}
                 {% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}" />{% endif %}
                 {% if errors %}
                     {{ adminform.form.non_field_errors }}
@@ -106,12 +106,13 @@
                 {% block admin_change_form_document_ready %}
                     <script type="text/javascript">
                         (function($) {
+                            {# JET: Add handlers for Django <= 1.6 #}
                             $(document).ready(function() {
-                                $('.add-another').click(function(e) {
+                                $('.add-another').removeAttr('onclick').click(function(e) {
                                     e.preventDefault();
                                     showAddAnotherPopup(this);
                                 });
-                                $('.related-lookup').click(function(e) {
+                                $('.related-lookup').removeAttr('onclick').click(function(e) {
                                     e.preventDefault();
                                     showRelatedObjectLookupPopup(this);
                                 });