Aggiornamento AdminLTE

assets/src/css/themes/default.css

@@ -55,7 +55,8 @@
 .skin-default .main-header .navbar .nav .open a:hover,
 .skin-default .main-header .navbar .nav .open a:focus,
 .skin-default .main-header .navbar .nav .active a,
-.skin-default .main-header .navbar .nav .actual a {
+.skin-default .main-header .navbar .nav .actual a,
+.skin-default .main-header .navbar .nav .menu-open a {
     background: rgba(0, 0, 0, 0.2);
     color: #f6f6f6;
 }
@@ -132,7 +133,8 @@
 
 .skin-default .sidebar-menu li:hover a,
 .skin-default .sidebar-menu li.active a,
-.skin-default .sidebar-menu li.actual a {
+.skin-default .sidebar-menu li.actual a,
+.skin-default .sidebar-menu li.menu-open a {
     background: #222;
     border-left-color: #222;
 }

assets/src/js/custom.js

@@ -1,44 +1,8 @@
 $(document).ready(function () {
     // Fix per il menu principale
-    var animationSpeed = 500;
+    $('.sidebar-menu').tree({
-    $(document).off('click', '.sidebar li a')
+        followLink: true,
-        .on('click', '.sidebar li a', function (e) {
+    });
-            //Get the clicked link and the next element
-            var $this = $(this);
-            var checkElement = $this.next();
-
-            //Check if the next element is a menu and is visible
-            if ((checkElement.is('.treeview-menu')) && (checkElement.is(':visible')) && (!$('body').hasClass('sidebar-collapse'))) {
-                //Close the menu
-                checkElement.slideUp(animationSpeed, function () {
-                    checkElement.removeClass('menu-open');
-                });
-                checkElement.parent("li").removeClass("active");
-            }
-            //If the menu is not visible
-            else if ((checkElement.is('.treeview-menu')) && (!checkElement.is(':visible'))) {
-                //Get the parent menu
-                var parent = $this.parents('ul').first();
-                //Close all open menus within the parent
-                var ul = parent.find('ul:visible').slideUp(animationSpeed);
-                //Remove the menu-open class from the parent
-                ul.removeClass('menu-open');
-                //Get the parent li
-                var parent_li = $this.parent("li");
-
-                //Open the target menu and add the menu-open class
-                checkElement.slideDown(animationSpeed, function () {
-                    //Add the class active to the parent li
-                    checkElement.addClass('menu-open');
-                    parent.find('li.active').removeClass('active');
-                    parent_li.addClass('active');
-                });
-            }
-            //if this isn't a link, prevent the page from being redirected
-            if (checkElement.is('.treeview-menu') && $(e.target).is('.pull-right-container')) {
-                e.preventDefault();
-            }
-        });
 
     // Pulsante per il ritorno a inizio pagina
     var slideToTop = $("<div />");

gulpfile.js

@@ -208,16 +208,16 @@ gulp.task('chartjs', function () {
 
 gulp.task('pdfjs', function () {
     gulp.src([
-            config.main.bowerDirectory + '/pdfjs/web/**/*',
+            config.main.bowerDirectory + '/pdf/web/**/*',
-            '!' + config.main.bowerDirectory + '/pdfjs/web/cmaps/*',
+            '!' + config.main.bowerDirectory + '/pdf/web/cmaps/*',
-            '!' + config.main.bowerDirectory + '/pdfjs/web/*.map',
+            '!' + config.main.bowerDirectory + '/pdf/web/*.map',
-            '!' + config.main.bowerDirectory + '/pdfjs/web/*.pdf',
+            '!' + config.main.bowerDirectory + '/pdf/web/*.pdf',
         ])
         .pipe(gulp.dest(config.production + '/pdfjs/web'));
 
     gulp.src([
-            config.main.bowerDirectory + '/pdfjs/build/*',
+            config.main.bowerDirectory + '/pdf/build/*',
-            '!' + config.main.bowerDirectory + '/pdfjs/build/*.map',
+            '!' + config.main.bowerDirectory + '/pdf/build/*.map',
         ])
         .pipe(gulp.dest(config.production + '/pdfjs/build'));
 });

include/top.php

@@ -185,7 +185,7 @@ if (Auth::check()) {
 				<!-- Header Navbar: style can be found in header.less -->
 				<nav class="navbar navbar-static-top" role="navigation">
 					<!-- Sidebar toggle button-->
-					<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
+					<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
 						<span class="sr-only">'.tr('Mostra/nascondi menu').'</span>
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>

package.json

@@ -1,35 +1,8 @@
 {
-    "name": "openstamanager",
+    "private": true,
-    "description": "Gestionale open-source per assistenza tecnica e fatturazione",
-    "license": "GPL-3.0",
-    "keywords": [
-        "open-source",
-        "gestionale",
-        "assistenza tecnica",
-        "fatturazione"
-    ],
-    "homepage": "https://www.openstamanager.com/",
-    "author": {
-        "name": "Fabio Lovato",
-        "email": "info@openstamanager.com"
-    },
-    "contributors": [
-        {
-            "name": "Fabio Piovan",
-            "email": "info@openstamanager.com"
-        },
-        {
-            "name": "Luca Salvà",
-            "email": "info@openstamanager.com"
-        }
-    ],
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/devcode-it/openstamanager.git"
-    },
     "main": "gulpfile.js",
     "dependencies": {
-        "admin-lte": "~2.3.11",
+        "admin-lte": "^2.4.0",
         "autosize": "^3.0.21",
         "bootstrap": "^3.3.7",
         "bootstrap-colorpicker": "^2.5.1",
@@ -55,7 +28,6 @@
         "parsleyjs": "^2.7.2",
         "pdf": "git://github.com/mozilla/pdf.js#gh-pages",
         "pdf.js": "git://github.com/mozilla/pdf.js#gh-pages",
-        "pdfjs": "git://github.com/mozilla/pdf.js#gh-pages",
         "select2": "4.0.3",
         "select2-bootstrap-theme": "^0.1.0-beta.10",
         "signature_pad": "^2.1.1",
@@ -109,7 +81,7 @@
         "admin-lte": {
             "main": [
                 "dist/css/AdminLTE.css",
-                "dist/js/app.js"
+                "dist/js/adminlte.js"
             ],
             "dependencies": {
                 "jquery": ">=1.9.1"

src/HTMLBuilder/Handler/DateHandler.php

@@ -58,22 +58,22 @@ class DateHandler implements HandlerInterface
             if (empty($values['label'])) {
                 $result = '
 <div class="form-group">';
-            }
 
-            if (empty($values['icon-before']) || empty($values['icon-after'])) {
+                if (empty($values['icon-before']) || empty($values['icon-after'])) {
-                $result .= '
+                    $result .= '
     <div class="input-group">';
+                }
             }
 
             $result .= '
     <input |attr|>';
 
-            if (empty($values['icon-before']) || empty($values['icon-after'])) {
-                $result .= '
-    </div>';
-            }
-
             if (empty($values['label'])) {
+                if (empty($values['icon-before']) || empty($values['icon-after'])) {
+                    $result .= '
+    </div>';
+                }
+
                 $result .= '
 </div>';
             }