Merge pull request #1327 from NextDom/develop

Merge 0.3.1
NextDom · Sep 3, 2019 · 536e8c5 · 536e8c5
2 parents 0abacfa + 2ef58d1
commit 536e8c5
Show file tree

Hide file tree

Showing 88 changed files with 3,868 additions and 2,849 deletions.
diff --git a/assets/config/nextdom.config.php b/assets/config/nextdom.config.php
@@ -230,6 +230,7 @@
             'SET_VOLUME' => array('name' => 'Volume', 'family' => 'Multimédia', 'type' => 'Action'),
             'CHANNEL' => array('name' => 'Chaine', 'family' => 'Multimédia', 'type' => 'Info'),
             'SET_CHANNEL' => array('name' => 'Chaine', 'family' => 'Multimédia', 'type' => 'Action'),
+            'UPLOAD' => array('name' => 'Fichier', 'family' => 'Generic', 'type' => 'Action'),
             'GENERIC_INFO' => array('name' => ' Générique', 'family' => 'Generic', 'type' => 'Info'),
             'GENERIC_ACTION' => array('name' => ' Générique', 'family' => 'Generic', 'type' => 'Action'),
             'DONT' => array('name' => 'Ne pas tenir compte de cette commande', 'family' => 'Generic', 'type' => 'All'),
@@ -347,6 +348,19 @@
                             'icon' => array('visible' => true, 'parentVisible' => true),
                         ),
                     ),
+                    'upload' => array(
+                        'name' => 'Fichier',
+                        'configuration' => array(
+                            'minValue' => array('visible' => false),
+                            'maxValue' => array('visible' => false),
+                            'listValue' => array('visible' => true)),
+                        'unite' => array('visible' => false),
+                        'isHistorized' => array('visible' => false),
+                        'display' => array(
+                            'invertBinary' => array('visible' => false),
+                            'icon' => array('visible' => true, 'parentVisible' => true),
+                        ),
+                    )
                 ),
             ),
         ),

diff --git a/assets/css/containers/_actionbars.scss b/assets/css/containers/_actionbars.scss
@@ -21,6 +21,7 @@
 
 /* AdminLTE-Ajout */
 .action-bar {
+    min-height: 50px;
     padding: 6px 8px;
     align-items: center;
     display: flex;

diff --git a/assets/js/desktop/gui.js b/assets/js/desktop/gui.js
@@ -230,41 +230,50 @@ window.onscroll = function () {
          alertHeaderHeight = $('.alert-header').height();
          alertHeaderMargin = 15;
      }
-     if ($('*').hasClass("content-header")) {
-         var scrollLimit = 14 + alertHeaderHeight;
-         $(".content-header").each(function() {
-             var container = $(this).parent();
-             if (!container.hasClass("ui-dialog-content") && !container.parent().hasClass("ui-dialog-content")) {
-                 $(this).css("padding-right", paddingSideClose);
-                 if (init || container.css("display")!="none") {
-                     if (container.css("display")=="none") {
-                         container.show();
-                         headerHeight = container.children('.content-header').height();
-                         container.hide();
-                     } else {
-                         headerHeight = container.children('.content-header').height();
+     var fullUrl = document.location.toString();
+     if (fullUrl.indexOf('rescue') === -1) {
+         if ($('*').hasClass("content-header")) {
+             var scrollLimit = 14 + alertHeaderHeight;
+             $(".content-header").each(function() {
+                 var container = $(this).parent();
+                 if (!container.hasClass("ui-dialog-content") && !container.parent().hasClass("ui-dialog-content")) {
+                     $(this).css("padding-right", paddingSideClose);
+                     if (init || container.css("display")!="none") {
+                         if (container.css("display")=="none") {
+                             container.show();
+                             headerHeight = container.children('.content-header').height();
+                             container.hide();
+                         } else {
+                             headerHeight = container.children('.content-header').height();
+                         }
+                         var scrollValue = document.documentElement.scrollTop;
+                         if (scrollValue > scrollLimit) {
+                             container.children(".content-header").css("top", headerSize - 15);
+                             container.children("#dashboard-content").css("padding-top", headerHeight + 15);
+                             container.children(".content").css("padding-top", headerHeight + 30);
+                             container.children(".content-header").children("div").removeClass('scroll-shadow').addClass('fixed-shadow');
+                         } else {
+                             container.children(".content-header").css("top", headerSize - scrollValue + alertHeaderHeight + alertHeaderMargin);
+                             container.children("#dashboard-content").css("padding-top",headerHeight + 15 - alertHeaderMargin);
+                             container.children(".content").css("padding-top", headerHeight + 30 - alertHeaderMargin);
+                             container.children(".content-header").children("div").removeClass('fixed-shadow').addClass('scroll-shadow');
+                         }
+                         container.children(".content-header").show();
                      }
-                     var scrollValue = document.documentElement.scrollTop;
-                     if (scrollValue > scrollLimit) {
-                         container.children(".content-header").css("top", headerSize - 15);
-                         container.children("#dashboard-content").css("padding-top", headerHeight + 15);
-                         container.children(".content").css("padding-top", headerHeight + 30);
-                         container.children(".content-header").children("div").removeClass('scroll-shadow').addClass('fixed-shadow');
-                     } else {
-                         container.children(".content-header").css("top", headerSize - scrollValue + alertHeaderHeight + alertHeaderMargin);
-                         container.children("#dashboard-content").css("padding-top",headerHeight + 15 - alertHeaderMargin);
-                         container.children(".content").css("padding-top", headerHeight + 30 - alertHeaderMargin);
-                         container.children(".content-header").children("div").removeClass('fixed-shadow').addClass('scroll-shadow');
-                     }
-                     container.children(".content-header").show();
                  }
-             }
-         });
-         $("#dashboard-header").css("padding-right", paddingSideClose);
-     } else {
-         $("#dashboard-content").css("padding-top", 15);
-         $(".content").css("padding-top", 15);
-     }
+             });
+             $("#dashboard-header").css("padding-right", paddingSideClose);
+         } else {
+             $("#dashboard-content").css("padding-top", 15);
+             $(".content").css("padding-top", 15);
+         }
+      } else {
+          $(".content-header").css("padding-right", 15);
+          $(".content-header").css("top", 50);
+          $(".content").css("padding-top", 30);
+          // Hide back button
+          $(".content-header").find(".fa-chevron-left").parent().hide();
+      }
  }
 
  /**