Merge pull request #8 from aksharahegde/jquery-ui-upgrade

Jquery UI upgrade - 1.11.4 to 1.13.2

Author: aksharahegde

README.rst

@@ -4,7 +4,7 @@ var gulp = require('gulp'),
     browserify = require('browserify'),
     concatCss = require('gulp-concat-css'),
     cleanCSS = require('gulp-clean-css'),
-    sass = require('gulp-sass'),
+    sass = require('gulp-sass')(require('node-sass')),
     uglify = require('gulp-uglify'),
     buffer = require('vinyl-buffer'),
     source = require('vinyl-source-stream'),
@@ -61,50 +61,47 @@ gulp.task('vendor-styles', function() {
         merge(
             gulp.src([
                 './node_modules/select2/dist/css/select2.css',
-                './node_modules/timepicker/jquery.ui.timepicker.css'
+                './jet/static/jet/css/jquery.ui.timepicker.css'
             ]),
             gulp.src([
                 './node_modules/jquery-ui/themes/base/all.css'
-            ])
-                .pipe(cleanCSS()) // needed to remove jQuery UI comments breaking concatCss
-                .on('error', function(error) {
-                    console.error(error);
-                })
-                .pipe(concatCss('jquery-ui.css', {
-                    rebaseUrls: false
-                }))
-                .on('error', function(error) {
-                    console.error(error);
-                })
-                .pipe(replace('images/', 'jquery-ui/images/'))
-                .on('error', function(error) {
-                    console.error(error);
-                }),
-            gulp.src([
-                './node_modules/perfect-scrollbar/src/css/main.scss'
-            ])
-                .pipe(sass({
-                    outputStyle: 'compressed'
-                }))
-                .on('error', function(error) {
-                    console.error(error);
-                })
-        )
-            .pipe(postcss(cssProcessors))
+            ]).pipe(cleanCSS()) // needed to remove jQuery UI comments breaking concatCss
             .on('error', function(error) {
                 console.error(error);
             })
-            .pipe(concatCss('vendor.css', {
+            .pipe(concatCss('jquery-ui.css', {
                 rebaseUrls: false
             }))
             .on('error', function(error) {
                 console.error(error);
             })
-            .pipe(cleanCSS())
+            .pipe(replace('images/', 'jquery-ui/images/'))
+            .on('error', function(error) {
+                console.error(error);
+            }),
+            gulp.src([
+                './node_modules/perfect-scrollbar/dist/css/perfect-scrollbar.min.css'
+            ]).pipe(sass({
+                outputStyle: 'compressed'
+            }))
             .on('error', function(error) {
                 console.error(error);
             })
-            .pipe(gulp.dest('./jet/static/jet/css'))
+        ).pipe(postcss(cssProcessors))
+        .on('error', function(error) {
+            console.error(error);
+        })
+        .pipe(concatCss('vendor.css', {
+            rebaseUrls: false
+        }))
+        .on('error', function(error) {
+            console.error(error);
+        })
+        .pipe(cleanCSS())
+        .on('error', function(error) {
+            console.error(error);
+        })
+        .pipe(gulp.dest('./jet/static/jet/css'))
     )
 });
 

gulpfile.js

@@ -1 +1 @@
-VERSION = '4.0.0'
+VERSION = '5.0.0'

jet/__init__.py

@@ -42,8 +42,8 @@ def field_choices(self, field, request, model_admin):
     from collections import OrderedDict
     from django import forms
     from django.contrib.admin.widgets import AdminDateWidget
-    from rangefilter.filter import DateRangeFilter as OriginalDateRangeFilter
     from django.utils.translation import gettext_lazy as _
+    from rangefilter.filter import DateRangeFilter as OriginalDateRangeFilter
 
 
     class DateRangeFilter(OriginalDateRangeFilter):

jet/dashboard/locale/ar/LC_MESSAGES/django.mo

@@ -128,6 +128,8 @@
         text-transform: uppercase;
         vertical-align: middle;
         margin-bottom: 5px;
+        margin-left: 5px;
+        margin-right: 20px;
       }
 
       &:hover, &:focus {
@@ -278,7 +280,7 @@
     }
 
     span {
-      background-color: $button-active-background-color;
+      background-color: $paginator-active-background-color;
       color: $button-active-text-color;
 
       &.disabled {

jet/dashboard/locale/ar/LC_MESSAGES/djangojs.mo

@@ -112,7 +112,7 @@
     padding: 0;
     list-style: none;
     display: inline-block;
-    width: 175px;
+    width: 220px;
     z-index: 4;
 
     @include for-mobile {
@@ -127,6 +127,7 @@
       border-radius: 0;
       transform: none;
       transition: transform $transitions-duration;
+      z-index: 10;
 
       body.scroll-to-bottom & {
         transform: translate3d(0, -100%, 0);

jet/dashboard/locale/cs/LC_MESSAGES/django.mo

@@ -205,3 +205,6 @@ $chart-pointHighlightFill: $hover-link-color !default;
 $chart-scaleGridLineColor: transparentize(#000, 0.9) !default;
 $chart-scaleLineColor: transparentize(#000, 0.9) !default;
 $chart-scaleFontColor: $content-contrast2-text-color !default;
+
+// Paginator
+$paginator-active-background-color: #00d2f6;

jet/dashboard/locale/cs/LC_MESSAGES/djangojs.mo

@@ -0,0 +1,57 @@
+/*
+ * Timepicker stylesheet
+ * Highly inspired from datepicker
+ * FG - Nov 2010 - Web3R 
+ *
+ * version 0.0.3 : Fixed some settings, more dynamic
+ * version 0.0.4 : Removed width:100% on tables
+ * version 0.1.1 : set width 0 on tables to fix an ie6 bug
+ */
+
+ .ui-timepicker-inline { display: inline; }
+
+ #ui-timepicker-div { padding: 0.2em; }
+ .ui-timepicker-table { display: inline-table; width: 0; }
+ .ui-timepicker-table table { margin:0.15em 0 0 0; border-collapse: collapse; }
+ 
+ .ui-timepicker-hours, .ui-timepicker-minutes { padding: 0.2em;  }
+ 
+ .ui-timepicker-table .ui-timepicker-title { line-height: 1.8em; text-align: center; }
+ .ui-timepicker-table td { padding: 0.1em; width: 2.2em; }
+ .ui-timepicker-table th.periods { padding: 0.1em; width: 2.2em; }
+ 
+ /* span for disabled cells */
+ .ui-timepicker-table td span {
+     display:block;
+     padding:0.2em 0.3em 0.2em 0.5em;
+     width: 1.2em;
+ 
+     text-align:right;
+     text-decoration:none;
+ }
+ /* anchors for clickable cells */
+ .ui-timepicker-table td a {
+     display:block;
+     padding:0.2em 0.3em 0.2em 0.5em;
+     width: 1.2em;
+     cursor: pointer;
+     text-align:right;
+     text-decoration:none;
+ }
+ 
+ 
+ /* buttons and button pane styling */
+ .ui-timepicker .ui-timepicker-buttonpane {
+     background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0;
+ }
+ .ui-timepicker .ui-timepicker-buttonpane button { margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+ /* The close button */
+ .ui-timepicker .ui-timepicker-close { float: right }
+ 
+ /* the now button */
+ .ui-timepicker .ui-timepicker-now { float: left; }
+ 
+ /* the deselect button */
+ .ui-timepicker .ui-timepicker-deselect { float: left; }
+ 
+ 

jet/dashboard/locale/de/LC_MESSAGES/djangojs.mo

@@ -16,7 +16,7 @@ $error-text-color: #c7254e;
 $link-color: #79A7D8;
 $hover-link-color: #1cacfc;
 
-$contrast-color: #87E9FF;
+$contrast-color: #00d2f6;
 
 $font: Arial, sans-serif !default;
 $font-size: 14px;
@@ -72,11 +72,11 @@ $top-hover-link-color: #1cacfc;
 $top-border-color: #dce0e6;
 $top-icon-color: $link-color;
 
-$top-dropdown-background-color: #5e4d99;
+$top-dropdown-background-color: #2b3647;
 $top-dropdown-text-color: #fff;
-$top-dropdown-contrast-background-color: #4d3b73;
+$top-dropdown-contrast-background-color: #10151d;
 $top-dropdown-contrast-text-color: #c8beeb;
-$top-dropdown-border-color: #594585;
+$top-dropdown-border-color: #2b3647;
 $top-dropdown-link-color: #fff;
 $top-dropdown-hover-link-color: #fff;
 $top-dropdown-icon-color: #c8beeb;
@@ -111,7 +111,7 @@ $button-hover-text-color: #fff;
 $button-active-text-color: #fff;
 
 $primary-button-background-color: $contrast-color;
-$primary-button-text-color: #000;
+$primary-button-text-color: #fff;
 
 $danger-button-background-color: #c7254e;
 $danger-button-text-color: #fff;
@@ -200,3 +200,6 @@ $chart-pointHighlightFill: $hover-link-color;
 $chart-scaleGridLineColor: transparentize(#000, 0.9);
 $chart-scaleLineColor: transparentize(#000, 0.9);
 $chart-scaleFontColor: $content-contrast2-text-color;
+
+// Paginator
+$paginator-active-background-color: #00d2f6;