Updates

* Blockly window update * Minor style fixes
sergejey · Sep 4, 2019 · f331baf · f331baf
1 parent 1f6e15b
commit f331baf
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 9 deletions.
diff --git a/3rdparty/googleblockly/index.php b/3rdparty/googleblockly/index.php
@@ -17,6 +17,13 @@
 <html>
   <head>
     <meta charset="utf-8">
+
+    <script type="text/javascript"  src="<?php echo ROOTHTML;?>3rdparty/jquery/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript"  src="<?php echo ROOTHTML;?>3rdparty/jquery/jquery-migrate-3.0.0.min.js"></script>
+
+    <link rel="stylesheet" href="<?php echo ROOTHTML;?>3rdparty/bootstrap/css/bootstrap.min.css" type="text/css">
+    <script type="text/javascript" src="<?php echo ROOTHTML;?>3rdparty/bootstrap/js/bootstrap.min.js"></script>
+
     <script type="text/javascript" src="blockly_compressed.js"></script>
     <script type="text/javascript" src="blocks_compressed.js"></script>
     <script type="text/javascript" src="blocks/majordomo.js"></script>
@@ -102,6 +109,14 @@ function SaveAndClose() {
         return false;
        }
 
+      function SaveAndRun() {
+        var doc=window.opener.document;
+        var elemRun=doc.getElementById('chkRun');
+        elemRun.checked = true;
+        saveCode();
+        return false;
+      }
+
        function SaveAndContinue() {
         saveCode();
         return false;
@@ -111,7 +126,14 @@ function SaveAndContinue() {
 
       function init() {
         Blockly.inject(document.body,
-            {path: './', toolbox: document.getElementById('toolbox')});
+            {path: './', toolbox: document.getElementById('toolbox'),
+              zoom:
+              {controls: true,
+                wheel: false,
+                startScale: 1.0,
+                maxScale: 3,
+                minScale: 0.3,
+                scaleSpeed: 1.2}});
         // Let the top-level application know that Blockly is ready.
     //    window.parent.blocklyLoaded(Blockly);
 
@@ -141,14 +163,29 @@ function init() {
 
   }
 
+        //setTimeout("alert(window.width);",2000);
+        //alert(document.body.clientWidth);
+        var doc=window.opener.document;
+        var elemRun=doc.getElementById('chkRun');
+        if (elemRun!==null) {
+          $('#btnSaveRun').show();
+        }
+
+        $('#custom_controls').css('left',(document.body.clientWidth-$('#custom_controls').width()-10)+'px');
 
       }
     </script>
   </head>
   <body onload="init()">
-  <div align="right">
-  <input type="button" onClick="return SaveAndClose();" value="OK">
-  <input type="button" onClick="window.close();" value="<?php echo LANG_CANCEL;?>">
+
+  <div id="custom_controls" style="position:absolute;top:10px;left:10px;z-index:1000;">
+    <a href="#"  onClick="return SaveAndClose();" class="btn btn-default btn-primary">
+      <i class="glyphicon glyphicon-floppy-disk"></i>
+      <?php echo LANG_SUBMIT;?></a>
+    <a href="#"  onClick="return SaveAndRun();" class="btn btn-default" style="display:none" id="btnSaveRun">
+      <i class="glyphicon glyphicon-play"></i>
+      <?php echo LANG_RUN_SCRIPT;?></a>
+    <a href="#"  onClick="return window.close();" class="btn btn-default"><?php echo LANG_CANCEL;?></a>
   </div>
 
 

diff --git a/modules/layouts/layouts_widgets.js.php b/modules/layouts/layouts_widgets.js.php
@@ -45,7 +45,7 @@
 
 
 
-            var stateElement = $('<div><div class="clock"><div id="clock_date"></div><ul><li id="clock_hours"> </li><li id="point">:</li><li id="clock_min"> </li></ul></div></div>');
+            var stateElement = $('<div><div class="clock dark"><div id="clock_date"></div><ul><li id="clock_hours"> </li><li id="point">:</li><li id="clock_min"> </li></ul></div></div>');
             //<li id="point">:</li><li id="clock_sec"></li>
 
             self.render = function(element)

diff --git a/templates/classes/views/SDimmers.html b/templates/classes/views/SDimmers.html
@@ -40,7 +40,7 @@
     <!--#
     <a href="#" onclick="return dimmerChange%.object_id%('-');" style="font-weight:bold;text-decoration:none">[-]</a>
     #-->
-    <select id="dimmerSelect%.object_id%" onchange="dimmerSet%.object_id%(this.value);">
+    <select id="dimmerSelect%.object_id%" onchange="dimmerSet%.object_id%(this.value);" style="color:black">
         <option value=""><#LANG_SET#></option>
         <option value="10">10%</option>
         <option value="20">20%</option>

diff --git a/templates/layouts/layouts_widgets.css b/templates/layouts/layouts_widgets.css
@@ -1,9 +1,9 @@
-.clock {margin:0 auto; padding:30px; border:1px solid #333; color:#fff; }
+.clock {margin:0 auto; padding:30px; border:1px solid #333;}
 
-.clock #clock_date { font-family:Arial, Helvetica, sans-serif; font-size:30px; text-align:center; text-shadow:0 0 5px #00c6ff; display:none}
+.clock #clock_date { font-family:Arial, Helvetica, sans-serif; font-size:30px; text-align:center;display:none}
 
 .clock ul { margin:0 auto; padding:0px; list-style:none; text-align:center; }
-.clock ul li { display:inline; font-size:5em; text-align:center; font-family:Arial, Helvetica, sans-serif; text-shadow:0 0 5px #00c6ff; }
+.clock ul li { display:inline; font-size:5em; text-align:center; font-family:Arial, Helvetica, sans-serif;}
 
 .clock #point { position:relative; -moz-animation:mymove 1s ease infinite; -webkit-animation:mymove 1s ease infinite; padding-left:10px; padding-right:10px; }