Merge branch 'develop'

app/Http/Controllers/DashboardController.php

@@ -32,8 +32,10 @@ public function index()
 
         $directory = $this->config;
         $settings = $this->reader->parse($directory)["instance"]["children"];
+        $isActive = ($settings["condition"]["dropdown"]["Enabled"]["children"]["active"]["value"] === "true") ? "none" : "block";
 
         return View::make('dashboard', [
+            'isActive' => $isActive,
             'cameraName' => $settings['name']['value'],
             'days' => $days,
             'kerberos' => $this->kerberos,

app/Http/Controllers/ImageController.php

@@ -44,13 +44,15 @@ public function index($selectedDay = "")
 
         $directory = $this->config;
         $settings = $this->reader->parse($directory)["instance"]["children"];
+        $isActive = ($settings["condition"]["dropdown"]["Enabled"]["children"]["active"]["value"] === "true") ? "none" : "block";
 
         // ----------------------------------------------------------------------
         // Get last x days from the imagehandler -> move to BaseController
 
         $days = $this->imageHandler->getDays(5);
 
         return View::make('image', [
+            'isActive' => $isActive,
             'cameraName' => $settings['name']['value'],
             'days' => $days,
             'selectedDay' => $selectedDay,

app/Http/Controllers/SettingsController.php

@@ -34,6 +34,7 @@ public function index()
     {
         $directory = $this->config;
         $settings = $this->reader->parse($directory)["instance"]["children"];
+        $isActive = ($settings["condition"]["dropdown"]["Enabled"]["children"]["active"]["value"] === "true") ? "none" : "block";
 
         $days = $this->imageHandler->getDays(5);
 
@@ -48,6 +49,7 @@ public function index()
 
         return View::make('settings',
         [
+            'isActive' => $isActive,
             'cameraName' => $settings['name']['value'],
             'days' => $days,
             'settings' => $settings,
@@ -56,24 +58,6 @@ public function index()
         ]);
     }
 
-    /********************************************
-     *  Show the cloud page.
-     */
-    public function cloud()
-    {
-        $directory = $this->config;
-
-        $settings = $this->reader->parse($directory)["instance"]["children"]['cloud']['dropdown']['S3']['children'];
-        $days = $this->imageHandler->getDays(5);
-
-        return View::make('cloud',
-        [
-            'days' => $days,
-            'settings' => $settings,
-            'isUpdateAvailable' => $this->isUpdateAvailable()
-        ]);
-    }
-
     public function getConfiguration()
     {
         return $this->kerberos;

app/Http/Controllers/SystemController.php

@@ -40,12 +40,14 @@ public function index()
     {
         $directory = $this->config;
         $settings = $this->reader->parse($directory)["instance"]["children"];
-
+        $isActive = ($settings["condition"]["dropdown"]["Enabled"]["children"]["active"]["value"] === "true") ? "none" : "block";
+
         $days = $this->imageHandler->getDays(5);
         $insideDocker = (trim(shell_exec("[ -f /.dockerenv ] && echo true || echo false")) === 'true');
 
         return View::make('system',
         [
+            'isActive' => $isActive,
             'cameraName' => $settings['name']['value'],
             'days' => $days
         ]);

config/app.php

@@ -13,7 +13,7 @@
     |
     */
 
-    'version' => '2.3.0',
+    'version' => '2.3.1',
 
     'config' => '/etc/opt/kerberosio/config',
 

public/js/app/controllers/hullselection.js

@@ -37,6 +37,7 @@ define(["jquery", "app/controllers/event", "app/models/Hull", "app/views/HullSel
         getLatestImage: function(callback)
         {
             var image = {};
+            var self = this;
 
             $.get( _baseUrl + "/api/v1/images/latest_sequence", function(sequence)
             {
@@ -46,7 +47,6 @@ define(["jquery", "app/controllers/event", "app/models/Hull", "app/views/HullSel
                 image.src = "";
                 image.width = 600;
                 image.height = 480;
-
                 if(sequence.length)
                 {
                     var videos = _.filter(sequence, function(file)
@@ -66,15 +66,18 @@ define(["jquery", "app/controllers/event", "app/models/Hull", "app/views/HullSel
                         {
                             canvas.width = video.videoWidth;
                             canvas.height = video.videoHeight;
+
+                            video.pause();
                             video.play();
                             context.drawImage(video, 0, 0, canvas.width, canvas.height);
                             video.pause();
 
-                            return callback({
+                            callback({
                                 src: canvas.toDataURL(),
                                 width: canvas.width,
                                 height: canvas.height
                             });
+
                         });
                     }
                     else
@@ -120,8 +123,6 @@ define(["jquery", "app/controllers/event", "app/models/Hull", "app/views/HullSel
                 model: hull,
             });
 
-            this.hullView.render(callback);
-
             var self = this;
 
             $(window).resize(function()
@@ -136,6 +137,8 @@ define(["jquery", "app/controllers/event", "app/models/Hull", "app/views/HullSel
                     self.hullView.restore();
                 }
             });
+
+            this.hullView.render(callback);
         }
     };
 });

public/js/app/controllers/toggleMachinery.js

@@ -24,13 +24,15 @@ define(["jquery"], function($)
                 {
                     self.status = data.active;
 
-                    if(self.status)
+                    if(self.status === "true")
                     {
                         $(".machinery-switch input[type='checkbox']").attr("checked", "checked");
+                        $("#disabled-machinery").css("display", "none");
                     }
                     else
                     {
                         $(".machinery-switch input[type='checkbox']").removeAttr("checked");
+                        $("#disabled-machinery").css("display", "table");
                     }
                 }
             });
@@ -39,7 +41,7 @@ define(["jquery"], function($)
         {
             // -----------------------------------
             // Load view and images
-            
+
             var self = this;
             $(".machinery-switch input[type='checkbox']").attr("disabled", true);
             $.get(_baseUrl + "/api/v1/condition/enabled",function(data)
@@ -51,4 +53,4 @@ define(["jquery"], function($)
             });
         }
     };
-});
+});

public/js/app/controllers/toggleSettings.js

@@ -13,7 +13,7 @@ define(["jquery", "app/controllers/hullselection", "app/controllers/twolines"],
         {
             return this.type;
         },
-        reloadHull: function()
+        reloadHull: function(callback)
         {
             hull.setElement($(".hullselection .map"));
             twolines.setElement($(".twolines .map"));
@@ -31,6 +31,8 @@ define(["jquery", "app/controllers/hullselection", "app/controllers/twolines"],
                 twolines.setCoordinates($(".twolines .coordinates").val());
                 twolines.setName($(".twolines .name").val());
                 twolines.initialize();
+
+                callback && callback();
             });
         },
         setType: function(type)
@@ -61,20 +63,21 @@ define(["jquery", "app/controllers/hullselection", "app/controllers/twolines"],
                 }
             });
         },
-        initialize: function()
+        initialize: function(callback)
         {
             // -----------------------------------
             // Load view and images
 
             var self = this;
             $(".configuration-switch input[type='checkbox']").attr("disabled", true);
+
             $.get(_baseUrl + "/api/v1/configure",function(data)
             {
                 self.type = data.type;
                 $(".configuration-switch input[type='checkbox']").attr("checked", (self.type === 'advanced'));
                 $(".configuration-switch input[type='checkbox']").attr("disabled", false);
                 $(".configuration-switch span.well").css("opacity", 1);
-                self.reloadHull();
+                self.reloadHull(callback);
             });
         }
     };

public/js/app/views/HullSelectionView.js

@@ -371,7 +371,7 @@ define(["underscore", "backbone", "app/models/Hull", "app/views/BaseView"], func
 
             this.$el.find("input").val(coordinateString);
         },
-        drawCoordinates: function()
+        drawCoordinates: function(callback)
         {
             var mapPosition = this.$el.find("img");
             var delta = {
@@ -396,6 +396,8 @@ define(["underscore", "backbone", "app/models/Hull", "app/views/BaseView"], func
 
             // close hull
             this.closeHull();
+
+            callback && callback();
         },
         restore: function()
         {
@@ -413,8 +415,10 @@ define(["underscore", "backbone", "app/models/Hull", "app/views/BaseView"], func
                 "coordinates": this.model.coordinates,
             }));
             this.writeCoordinates();
-            this.drawCoordinates();
-            callback && callback();
+            this.drawCoordinates(function()
+            {
+                callback && callback();
+            });
 
             return this;
         }

public/js/app/views/SettingsBasicMotionView.js

@@ -43,7 +43,7 @@ define(["underscore", "jquery", "backbone", "app/views/BaseView", "seiyria-boots
                 ],
                 onInitialized: function()
                 {
-                    callback();
+                    setTimeout(callback, 500);
                 },
             });
 
@@ -87,23 +87,19 @@ define(["underscore", "jquery", "backbone", "app/views/BaseView", "seiyria-boots
             hull.setElement(this.$el.find("#region-selector"));
             hull.getLatestImage(function(image)
             {
-                hull.setImage(image.src);
-                hull.setImageSize(image.width, image.height);
-
-                var retrieveCoordinates = function()
+                if($("input[name='expositor__Hull__region']").length &&
+                $("input[name='expositor__Hull__region']").val() != '')
                 {
-                    if($("input[name='expositor__Hull__region']").length &&
-                    $("input[name='expositor__Hull__region']").val() != '')
+                    hull.setImage(image.src);
+                    hull.setImageSize(image.width, image.height);
+                    hull.setCoordinates($("input[name='expositor__Hull__region']").val());
+                    hull.setName("motion-hullselection");
+                    hull.initialize(function()
                     {
-                        hull.setCoordinates($("input[name='expositor__Hull__region']").val());
-                        hull.setName("motion-hullselection");
-                        hull.initialize(callback);
-                        self.$el.find("#loading-image-view").remove();
-                        clearInterval(interval);
-                    }
-                };
-
-                var interval = setInterval(retrieveCoordinates, 500);
+                        var loader = self.$el.find("#loading-image-view");
+                        callback(loader);
+                    });
+                }
             });
         },
         enabledDevices: function()
@@ -192,11 +188,13 @@ define(["underscore", "jquery", "backbone", "app/views/BaseView", "seiyria-boots
 
             self.createCarousel(function()
             {
-                self.setRegionSelector(function()
+                self.createSlider();
+                self.setDevices();
+                self.setColor();
+
+                self.setRegionSelector(function(loader)
                 {
-                    self.createSlider();
-                    self.setDevices();
-                    self.setColor();
+                    loader.remove();
                     hull.restore();
                 });
             });