Skip to content

Commit 8c49fde

Browse files
sergejeysergejey
committed
Widgets updates
1 parent 21634cc commit 8c49fde

5 files changed

Lines changed: 90 additions & 30 deletions

File tree

‎languages/default.php‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,6 +1373,28 @@
13731373
'GROUPS' => 'Groups',
13741374
'APPLIES_TO' => 'Applies to',
13751375

1376+
'WIDGET' => 'Widget',
1377+
'WIDGETS' => 'Widgets',
1378+
'ADD_WIDGET' => 'Add widget',
1379+
1380+
'WIDGET_TEXT_BLOCK' => 'Text block',
1381+
'WIDGET_TEXT_BLOCK_DESCRIPTION' => 'This widget allows you to add text block',
1382+
'WIDGET_TEXT_BLOCK_VALUE' => 'Text block',
1383+
'WIDGET_TEXT_BLOCK_DEFAULT_VALUE' => 'Hello, world!',
1384+
'WIDGET_TEXT_BLOCK_SIZE' => 'Text size (pt)',
1385+
'WIDGET_TEXT_ALIGNMENT' => 'Text alignment',
1386+
'WIDGET_TEXT_ALIGNMENT_LEFT' => 'Left',
1387+
'WIDGET_TEXT_ALIGNMENT_CENTER' => 'Center',
1388+
'WIDGET_TEXT_ALIGNMENT_RIGHT' => 'Right',
1389+
'WIDGET_TEXT_BLOCK_COLOR' => 'Color',
1390+
'WIDGET_TEXT_BLOCK_BACKGROUND_COLOR' => 'Background color',
1391+
'WIDGET_TEXT_BLOCK_BACKGROUND_OPACITY' => 'Background opacity, %',
1392+
1393+
'WIDGET_IMAGE_BLOCK' => 'Image block',
1394+
'WIDGET_IMAGE_BLOCK_DESCRIPTION' => 'This widget allows you to add image by URL',
1395+
'WIDGET_IMAGE_URL' => 'Image URL',
1396+
'WIDGET_IMAGE_REFRESH_INTERVAL' => 'Refresh interval, seconds',
1397+
13761398
'AUTO_LINK' => 'Execute script automatically',
13771399
'FAVORITE_DEVICE' => 'Favorite device',
13781400
'SYSTEM_DEVICE' => 'System device',
@@ -1405,9 +1427,6 @@
14051427
'THEME_DARK' => 'Dark',
14061428
'THEME_LIGHT' => 'Light',
14071429
'DATA_SOURCE' => 'Data source',
1408-
'WIDGET' => 'Widget',
1409-
'WIDGETS' => 'Widgets',
1410-
'ADD_WIDGET' => 'Add widget',
14111430
'PANE' => 'Pane',
14121431
'COLUMNS' => 'Columns',
14131432
'SIZE' => 'Size',

‎languages/ru.php‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1370,6 +1370,28 @@
13701370
'DEVICES_COLLECTION_IS_OPEN' => 'Сейчас открыто',
13711371
'DEVICES_COLLECTION_IS_HEATING' => 'Сейчас греет',
13721372

1373+
'WIDGET' => 'Виджет',
1374+
'WIDGETS' => 'Виджеты',
1375+
'ADD_WIDGET' => 'Добавить виджет',
1376+
1377+
'WIDGET_TEXT_BLOCK' => 'Текстовый блок',
1378+
'WIDGET_TEXT_BLOCK_DESCRIPTION' => 'Виджет позволяет добавить блок текста',
1379+
'WIDGET_TEXT_BLOCK_VALUE' => 'Текст',
1380+
'WIDGET_TEXT_BLOCK_DEFAULT_VALUE' => 'Привет, мир!',
1381+
'WIDGET_TEXT_BLOCK_SIZE' => 'Размер текста (pt)',
1382+
'WIDGET_TEXT_ALIGNMENT' => 'Выравнивание текста',
1383+
'WIDGET_TEXT_ALIGNMENT_LEFT' => 'По левому краю',
1384+
'WIDGET_TEXT_ALIGNMENT_CENTER' => 'По центру',
1385+
'WIDGET_TEXT_ALIGNMENT_RIGHT' => 'По правому краю',
1386+
'WIDGET_TEXT_BLOCK_COLOR' => 'Цвет текста',
1387+
'WIDGET_TEXT_BLOCK_BACKGROUND_COLOR' => 'Цвет фона',
1388+
'WIDGET_TEXT_BLOCK_BACKGROUND_OPACITY' => 'Степень прозрачности фона, %',
1389+
1390+
'WIDGET_IMAGE_BLOCK' => 'Изображение',
1391+
'WIDGET_IMAGE_BLOCK_DESCRIPTION' => 'Виджет позволяет добавить изображение',
1392+
'WIDGET_IMAGE_URL' => 'Ссылка на изображение (URL)',
1393+
'WIDGET_IMAGE_REFRESH_INTERVAL' => 'Период обновления, секунд',
1394+
13731395
'AUTO_LINK' => 'Автоматический запуск сценария',
13741396
'FAVORITE_DEVICE' => 'В списке быстрого доступа',
13751397
'SYSTEM_DEVICE' => 'Системное устройство',
@@ -1405,7 +1427,7 @@
14051427
'THEME_LIGHT' => 'Светлая',
14061428

14071429
'DATA_SOURCE' => 'Источник данных',
1408-
'WIDGET' => 'Виджет',
1430+
14091431
'PANE' => 'Панель',
14101432
'COLUMNS' => 'Колонки',
14111433
'SIZE' => 'Размер',

‎modules/scenes/widget_types.inc.php‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
$this->widget_types = array(
44
'text' => array(
5-
'TITLE' => 'Text block',
6-
'DESCRIPTION' => 'This widget allows you to add text block',
5+
'TITLE' => LANG_WIDGET_TEXT_BLOCK,
6+
'DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_DESCRIPTION,
77
'PROPERTIES' => array(
8-
'text_value' => array('DESCRIPTION' => 'Text block', 'DEFAULT_VALUE' => 'Hello, world!', '_CONFIG_TYPE' => 'textarea'),
9-
'text_size' => array('DESCRIPTION' => 'Text size (pt)',
8+
'text_value' => array('DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_VALUE,
9+
'DEFAULT_VALUE' => LANG_WIDGET_TEXT_BLOCK_DEFAULT_VALUE,
10+
'_CONFIG_TYPE' => 'textarea'),
11+
'text_size' => array('DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_SIZE,
1012
'DEFAULT_VALUE' => '10',
1113
'_CONFIG_TYPE' => 'select',
1214
'_CONFIG_OPTIONS' => array(
@@ -24,18 +26,20 @@
2426
array('VALUE' => '65'),
2527
)
2628
),
27-
'text_align' => array('DESCRIPTION' => 'Text alignment',
29+
'text_align' => array('DESCRIPTION' => LANG_WIDGET_TEXT_ALIGNMENT,
2830
'DEFAULT_VALUE' => 'left',
2931
'_CONFIG_TYPE' => 'select',
3032
'_CONFIG_OPTIONS' => array(
31-
array('VALUE' => 'left'),
32-
array('VALUE' => 'center'),
33-
array('VALUE' => 'right')
33+
array('VALUE' => 'left', 'TITLE'=>LANG_WIDGET_TEXT_ALIGNMENT_LEFT),
34+
array('VALUE' => 'center', 'TITLE'=>LANG_WIDGET_TEXT_ALIGNMENT_CENTER),
35+
array('VALUE' => 'right', 'TITLE'=>LANG_WIDGET_TEXT_ALIGNMENT_RIGHT)
3436
)
3537
),
36-
'text_color' => array('DESCRIPTION' => 'Text color', 'DEFAULT_VALUE' => '#ffffff', '_CONFIG_TYPE' => 'color'),
37-
'text_background' => array('DESCRIPTION' => 'Background color', 'DEFAULT_VALUE' => '#000000', '_CONFIG_TYPE' => 'color'),
38-
'background_opacity' => array('DESCRIPTION' => 'Background opacity, %',
38+
'text_color' => array('DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_COLOR,
39+
'DEFAULT_VALUE' => '#ffffff', '_CONFIG_TYPE' => 'color'),
40+
'text_background' => array('DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_BACKGROUND_COLOR,
41+
'DEFAULT_VALUE' => '#000000', '_CONFIG_TYPE' => 'color'),
42+
'background_opacity' => array('DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_BACKGROUND_OPACITY,
3943
'DEFAULT_VALUE' => '0.5',
4044
'_CONFIG_TYPE' => 'select',
4145
'_CONFIG_OPTIONS' => array(
@@ -52,22 +56,24 @@
5256
array('VALUE' => '1', 'TITLE' => '100')
5357
)
5458
),
55-
'text_background_rgba' => array('FUNCTION'=> function($data) {
59+
'text_background_rgba' => array('FUNCTION' => function ($data) {
5660
list($r, $g, $b) = sscanf($data['text_background'], "#%02x%02x%02x");
57-
return "$r, $g, $b, ".$data['background_opacity'];
61+
return "$r, $g, $b, " . $data['background_opacity'];
5862
})
5963
),
6064
'RESIZABLE' => 1,
6165
'DEFAULT_WIDTH' => 200,
6266
'DEFAULT_HEIGHT' => 200,
6367
'TEMPLATE' => 'file:text_block.html'
6468
),
65-
'image'=> array(
66-
'TITLE' => 'Image block',
67-
'DESCRIPTION' => 'This widget allows you to add image by URL',
69+
'image' => array(
70+
'TITLE' => LANG_WIDGET_IMAGE_BLOCK,
71+
'DESCRIPTION' => LANG_WIDGET_IMAGE_BLOCK_DESCRIPTION,
6872
'PROPERTIES' => array(
69-
'image_url' => array('DESCRIPTION' => 'Image URL', 'DEFAULT_VALUE' => '', '_CONFIG_TYPE' => 'text'),
70-
'refresh_interval' => array('DESCRIPTION' => 'Refresh interval, seconds', 'DEFAULT_VALUE' => '0', '_CONFIG_TYPE' => 'text'),
73+
'image_url' => array('DESCRIPTION' => LANG_WIDGET_IMAGE_URL,
74+
'DEFAULT_VALUE' => '', '_CONFIG_TYPE' => 'text'),
75+
'refresh_interval' => array('DESCRIPTION' => LANG_WIDGET_IMAGE_REFRESH_INTERVAL,
76+
'DEFAULT_VALUE' => '0', '_CONFIG_TYPE' => 'text'),
7177
),
7278
'RESIZABLE' => 1,
7379
'DEFAULT_WIDTH' => 200,
@@ -76,12 +82,12 @@
7682
)
7783
);
7884

79-
$addons_dir=dirname(__FILE__).'/addons';
85+
$addons_dir = dirname(__FILE__) . '/addons';
8086
if (is_dir($addons_dir)) {
81-
$addon_files=scandir($addons_dir);
82-
foreach($addon_files as $file) {
83-
if (preg_match('/\.php$/',$file)) {
84-
require($addons_dir.'/'.$file);
87+
$addon_files = scandir($addons_dir);
88+
foreach ($addon_files as $file) {
89+
if (preg_match('/\.php$/', $file)) {
90+
require($addons_dir . '/' . $file);
8591
}
8692
}
8793
}

‎templates/scenes/scenes.tpl‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ $.fn.customContextMenu = function(callBack){
182182
183183
184184
function stateClickedEdit(id) {
185+
if (ignoreClick==1) return false;
185186
var window_url = '{$smarty.const.ROOTHTML}panel/scene/{$SCENE_ID}.html?open='+id+'&print=1'
186187
if (id=='new') {
187188
window_url=window_url+'&top='+contextTop+'&left='+contextLeft;
@@ -522,9 +523,13 @@ $.fn.customContextMenu = function(callBack){
522523
$.contextMenu({
523524
selector: '.context-menu-one',
524525
zIndex: 1000,
526+
events: {
527+
show: function(options) {
528+
contextLeft=event.pageX;
529+
contextTop=event.pageY;
530+
}
531+
},
525532
callback: function(key, options) {
526-
contextLeft=event.pageX;
527-
contextTop=event.pageY;
528533
if (key == 'add') {
529534
stateClickedEdit('new');
530535
}
@@ -576,7 +581,13 @@ $(".draggable" ).draggable({ cursor: "move", snap: true , snapTolerance: 5, grid
576581
});
577582
578583
$(".resizable" ).resizable({literal}{grid: 5, {/literal}
584+
start: function(e, ui) {
585+
ignoreClick=1;
586+
},
579587
stop: function(e, ui) {
588+
589+
setTimeout('ignoreClick=0;',500);
590+
580591
var dwidth=ui.size.width;
581592
var dheight=ui.size.height;
582593
@@ -591,6 +602,7 @@ $(".draggable" ).draggable({ cursor: "move", snap: true , snapTolerance: 5, grid
591602
//alert(data);
592603
});
593604
{/literal}
605+
594606
}});
595607
596608

‎templates/scenes/scenes_edit_widgets.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181
[#endif#]
8282

8383
</div>
84-
<h4>Add new widget</h4>
84+
<hr>
85+
<h4><#LANG_ADD_WIDGET#></h4>
8586
<div>
8687
[#begin WIDGET_TYPES#]
8788
<div class="col-md-4">

0 commit comments

Comments
 (0)