fix

Alexandr-logrus · Jul 19, 2023 · c6ade04 · c6ade04
1 parent 61202b3
commit c6ade04
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/modules/devices/addons/SPhilipsDimmers_structure.php b/modules/devices/addons/SPhilipsDimmers_structure.php
@@ -1,5 +1,11 @@
 <?php
 
+if (SETTINGS_SITE_LANGUAGE && file_exists(ROOT . 'languages/SPhilipsDimmers_' . SETTINGS_SITE_LANGUAGE . '.php')) {
+ include_once(ROOT . 'languages/SPhilipsDimmers_' . SETTINGS_SITE_LANGUAGE . '.php');
+} else {
+ include_once(ROOT . 'languages/SPhilipsDimmers_default.php');//
+}
+
 $this->device_types['dimmerph'] = array(
     'TITLE'=>'Philips light',
     'PARENT_CLASS'=>'SControllers',
@@ -18,6 +24,3 @@
         'turnOff'=>array('DESCRIPTION'=>'Dimmer turnOff')
     )
 );
-
-@include_once(ROOT . 'languages/SPhilipsDimmers_' . SETTINGS_SITE_LANGUAGE . '.php');
-@include_once(ROOT . 'languages/SPhilipsDimmers_default' . '.php');
diff --git a/templates/classes/views/SPhilipsDimmers_mini.html b/templates/classes/views/SPhilipsDimmers_mini.html
@@ -55,13 +55,21 @@
         return false;
     }
 </script>
-<div class="device-widget mini loadtype_%.loadType%">
- <div onClick='$("#icon%.object_id%_light").addClass("pressed");setTimeout("$(\"#icon%.object_id%_light\").removeClass(\"pressed\");",300);callMethod("%.object_title%.switch");'>
-  <div class="device-icon %.status|"off;on"%" id="icon%.object_id%_light" style='%.icon|"background-image:url(%.icon%)"%'></div>
-  <div class="device-header">%.object_description%</div>
- </div>
+
+<div class="device-widget mini controller loadtype_%.loadType%"
+     onClick='$(".icon%.object_id%_light").addClass("pressed");
+     setTimeout("$(\".icon%.object_id%_light\").removeClass(\"pressed\");",300);
+     callMethod("%.object_title%.switch");
+     $.get("<#ROOTHTML#>ajax/devices.html?op=clicked&object="+encodeURIComponent("%.object_title%"));
+     'title="%.object_description%">
+    <div class="device-icon %.status|"off;on"% icon%.object_id%_light"
+         id="icon%.object_id%_light"
+         style='%.icon|"background-image:url(%.icon%)"%'></div>
+
 </div>
-<div class="device-details"> <span id="dimmer%.object_id%_bright">%.bright%</span>%
+<div class="device-header"><span>%.object_description%</span></div>
+<div class="device-details">
+    <span id="dimmer%.object_id%_bright">%.bright%</span>%
     <select id="dimmerSelect%.object_id%" onchange="dimmerSetLevel%.object_id%(this.value);" style="color:black">
         <option value=""><#LANG_SET#></option>
         <option value="1">1%</option>
@@ -76,8 +84,8 @@
         <option value="90">90%</option>
         <option value="100">100%</option>
     </select>
- </div>
- <div class="device-details"> <span id="dimmer%.object_id%_cct">%.cct%</span>%
+
+    <span id="dimmer%.object_id%_cct">%.cct%</span>%
     <select id="dimmerSelect%.object_id%" onchange="dimmerSetCCT%.object_id%(this.value);" style="color:black">
         <option value=""><#LANG_SET#></option>
         <option value="1">1%</option>