Merge branch 'dev'

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.1.1
+-----
+* [Feature] Added fade animation to sidebar application popup
+* [Fix] Issue-10: Fixed ability to display multiple admin form fields on the same line (thanks to blueicefield for the report)
+* [Fix] Fixed broken auth page layout for some translations
+* [Fix] Issue-11: Fixed setup.py open file in case utf-8 path (thanks to edvm for the report)
+
+
 0.1.0
 -----
 * [Fix] Issue-9: Fixed dashboard application templates not being loaded because of bad manifest (thanks to blueicefield for the report)

jet/__init__.py

@@ -1 +1 @@
-VERSION = '0.1.0'
+VERSION = '0.1.1'

jet/static/jet/css/_changeform.scss

@@ -30,6 +30,7 @@
 
     .help {
       @extend .small;
+      clear: left;
       color: $dim-text-color;
       margin: 12px 0 0 160px;
     }
@@ -74,11 +75,8 @@
     }
 
     .field-box {
-      padding-top: 6px;
-
-      &:first-child {
-        padding-top: 0;
-      }
+      margin-right: 20px;
+      float: left;
     }
 
     .file-upload {
@@ -471,4 +469,8 @@
     font-weight: normal;
     font-size: 12px;
   }
+}
+
+.related-widget-wrapper {
+  float: left;
 }

jet/static/jet/css/_login.scss

@@ -58,6 +58,7 @@
 .login-form {
   .form-row {
     padding: 6px 0;
+    clear: both;
 
     label {
       display: block;

jet/static/jet/css/_sidebar.scss

@@ -203,33 +203,27 @@
   &-popup {
     position: absolute;
     top: 0;
-    left: $sidebar-width;
     bottom: 0;
     width: $sidebar-width;
     color: $sidebar-popup-text-color;
     background-color: $sidebar-popup-background-color;
-    z-index: 3;
     overflow-y: auto;
 
     &-container {
       display: none;
-    }
-
-    &-item {
-      display: none;
-    }
-
-    &-background {
+      background-color: transparentize($sidebar-popup-overlay-color, 0.5);
       position: absolute;
       top: 0;
       left: $sidebar-width;
       bottom: 0;
       right: 0;
-      background-color: $sidebar-popup-overlay-color;
-      opacity: 0.5;
       z-index: 2;
     }
 
+    &-item {
+      display: none;
+    }
+
     &-title {
       font-size: 12px;
       font-weight: bold;

jet/static/jet/css/themes/default/base.css

@@ -1508,26 +1508,22 @@ a:hover {
   .sidebar-popup {
     position: absolute;
     top: 0;
-    left: 250px;
     bottom: 0;
     width: 250px;
     color: #6f7e95;
     background-color: #ecf2f6;
-    z-index: 3;
     overflow-y: auto; }
     .sidebar-popup-container {
-      display: none; }
-    .sidebar-popup-item {
-      display: none; }
-    .sidebar-popup-background {
+      display: none;
+      background-color: rgba(0, 0, 0, 0.5);
       position: absolute;
       top: 0;
       left: 250px;
       bottom: 0;
       right: 0;
-      background-color: #000;
-      opacity: 0.5;
       z-index: 2; }
+    .sidebar-popup-item {
+      display: none; }
     .sidebar-popup-title {
       font-size: 12px;
       font-weight: bold;
@@ -3331,6 +3327,7 @@ table#change-history {
       float: none;
       display: inline; }
     .module .form-row .help {
+      clear: left;
       color: #d0dbe6;
       margin: 12px 0 0 160px; }
     .module .form-row .checkbox-row .help {
@@ -3365,9 +3362,8 @@ table#change-history {
       .module .form-row .add-another img {
         display: none; }
     .module .form-row .field-box {
-      padding-top: 6px; }
-      .module .form-row .field-box:first-child {
-        padding-top: 0; }
+      margin-right: 20px;
+      float: left; }
     .module .form-row .file-upload {
       background: #f6fafc;
       display: inline-block;
@@ -3606,6 +3602,9 @@ table#change-history {
     font-weight: normal;
     font-size: 12px; }
 
+.related-widget-wrapper {
+  float: left; }
+
 /*
  * General
  */
@@ -4276,7 +4275,8 @@ table#change-history {
       margin-top: 20px; }
 
 .login-form .form-row {
-  padding: 6px 0; }
+  padding: 6px 0;
+  clear: both; }
   .login-form .form-row label {
     display: block;
     padding: 6px 10px 0 0;

jet/static/jet/css/themes/green/base.css

@@ -1539,26 +1539,22 @@ a:hover {
   .sidebar-popup {
     position: absolute;
     top: 0;
-    left: 250px;
     bottom: 0;
     width: 250px;
     color: #62a29c;
     background-color: #eff6f5;
-    z-index: 3;
     overflow-y: auto; }
     .sidebar-popup-container {
-      display: none; }
-    .sidebar-popup-item {
-      display: none; }
-    .sidebar-popup-background {
+      display: none;
+      background-color: rgba(0, 0, 0, 0.5);
       position: absolute;
       top: 0;
       left: 250px;
       bottom: 0;
       right: 0;
-      background-color: black;
-      opacity: 0.5;
       z-index: 2; }
+    .sidebar-popup-item {
+      display: none; }
     .sidebar-popup-title {
       font-size: 12px;
       font-weight: bold;
@@ -3362,6 +3358,7 @@ table#change-history {
       float: none;
       display: inline; }
     .module .form-row .help {
+      clear: left;
       color: #cceae4;
       margin: 12px 0 0 160px; }
     .module .form-row .checkbox-row .help {
@@ -3396,9 +3393,8 @@ table#change-history {
       .module .form-row .add-another img {
         display: none; }
     .module .form-row .field-box {
-      padding-top: 6px; }
-      .module .form-row .field-box:first-child {
-        padding-top: 0; }
+      margin-right: 20px;
+      float: left; }
     .module .form-row .file-upload {
       background: #f5fdfa;
       display: inline-block;
@@ -3637,6 +3633,9 @@ table#change-history {
     font-weight: normal;
     font-size: 12px; }
 
+.related-widget-wrapper {
+  float: left; }
+
 /*
  * General
  */
@@ -4307,7 +4306,8 @@ table#change-history {
       margin-top: 20px; }
 
 .login-form .form-row {
-  padding: 6px 0; }
+  padding: 6px 0;
+  clear: both; }
   .login-form .form-row label {
     display: block;
     padding: 6px 10px 0 0;

jet/templates/admin/base.html

@@ -276,7 +276,6 @@
                             </div>
                         {% endfor %}
                     </div>
-                    <div class="sidebar-popup-background"></div>
                 </div>
             {% endif %}
             </div>

setup.py

@@ -1,9 +1,14 @@
 import os
-from setuptools import setup, find_packages 
+from setuptools import setup, find_packages
 
 
 def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+    path = os.path.join(os.path.dirname(__file__), fname)
+    try:
+        file = open(path, encoding='utf-8')
+    except TypeError:
+        file = open(path)
+    return file.read()
 
 
 def get_install_requires():