Skip to content

Commit

Permalink
Widgets updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergejey
sergejey committed Jan 24, 2023
1 parent 21634cc commit 8c49fde
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 30 deletions.
25 changes: 22 additions & 3 deletions languages/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1373,6 +1373,28 @@
'GROUPS' => 'Groups',
'APPLIES_TO' => 'Applies to',

'WIDGET' => 'Widget',
'WIDGETS' => 'Widgets',
'ADD_WIDGET' => 'Add widget',

'WIDGET_TEXT_BLOCK' => 'Text block',
'WIDGET_TEXT_BLOCK_DESCRIPTION' => 'This widget allows you to add text block',
'WIDGET_TEXT_BLOCK_VALUE' => 'Text block',
'WIDGET_TEXT_BLOCK_DEFAULT_VALUE' => 'Hello, world!',
'WIDGET_TEXT_BLOCK_SIZE' => 'Text size (pt)',
'WIDGET_TEXT_ALIGNMENT' => 'Text alignment',
'WIDGET_TEXT_ALIGNMENT_LEFT' => 'Left',
'WIDGET_TEXT_ALIGNMENT_CENTER' => 'Center',
'WIDGET_TEXT_ALIGNMENT_RIGHT' => 'Right',
'WIDGET_TEXT_BLOCK_COLOR' => 'Color',
'WIDGET_TEXT_BLOCK_BACKGROUND_COLOR' => 'Background color',
'WIDGET_TEXT_BLOCK_BACKGROUND_OPACITY' => 'Background opacity, %',

'WIDGET_IMAGE_BLOCK' => 'Image block',
'WIDGET_IMAGE_BLOCK_DESCRIPTION' => 'This widget allows you to add image by URL',
'WIDGET_IMAGE_URL' => 'Image URL',
'WIDGET_IMAGE_REFRESH_INTERVAL' => 'Refresh interval, seconds',

'AUTO_LINK' => 'Execute script automatically',
'FAVORITE_DEVICE' => 'Favorite device',
'SYSTEM_DEVICE' => 'System device',
Expand Down Expand Up @@ -1405,9 +1427,6 @@
'THEME_DARK' => 'Dark',
'THEME_LIGHT' => 'Light',
'DATA_SOURCE' => 'Data source',
'WIDGET' => 'Widget',
'WIDGETS' => 'Widgets',
'ADD_WIDGET' => 'Add widget',
'PANE' => 'Pane',
'COLUMNS' => 'Columns',
'SIZE' => 'Size',
Expand Down
24 changes: 23 additions & 1 deletion languages/ru.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1370,6 +1370,28 @@
'DEVICES_COLLECTION_IS_OPEN' => 'Сейчас открыто',
'DEVICES_COLLECTION_IS_HEATING' => 'Сейчас греет',

'WIDGET' => 'Виджет',
'WIDGETS' => 'Виджеты',
'ADD_WIDGET' => 'Добавить виджет',

'WIDGET_TEXT_BLOCK' => 'Текстовый блок',
'WIDGET_TEXT_BLOCK_DESCRIPTION' => 'Виджет позволяет добавить блок текста',
'WIDGET_TEXT_BLOCK_VALUE' => 'Текст',
'WIDGET_TEXT_BLOCK_DEFAULT_VALUE' => 'Привет, мир!',
'WIDGET_TEXT_BLOCK_SIZE' => 'Размер текста (pt)',
'WIDGET_TEXT_ALIGNMENT' => 'Выравнивание текста',
'WIDGET_TEXT_ALIGNMENT_LEFT' => 'По левому краю',
'WIDGET_TEXT_ALIGNMENT_CENTER' => 'По центру',
'WIDGET_TEXT_ALIGNMENT_RIGHT' => 'По правому краю',
'WIDGET_TEXT_BLOCK_COLOR' => 'Цвет текста',
'WIDGET_TEXT_BLOCK_BACKGROUND_COLOR' => 'Цвет фона',
'WIDGET_TEXT_BLOCK_BACKGROUND_OPACITY' => 'Степень прозрачности фона, %',

'WIDGET_IMAGE_BLOCK' => 'Изображение',
'WIDGET_IMAGE_BLOCK_DESCRIPTION' => 'Виджет позволяет добавить изображение',
'WIDGET_IMAGE_URL' => 'Ссылка на изображение (URL)',
'WIDGET_IMAGE_REFRESH_INTERVAL' => 'Период обновления, секунд',

'AUTO_LINK' => 'Автоматический запуск сценария',
'FAVORITE_DEVICE' => 'В списке быстрого доступа',
'SYSTEM_DEVICE' => 'Системное устройство',
Expand Down Expand Up @@ -1405,7 +1427,7 @@
'THEME_LIGHT' => 'Светлая',

'DATA_SOURCE' => 'Источник данных',
'WIDGET' => 'Виджет',

'PANE' => 'Панель',
'COLUMNS' => 'Колонки',
'SIZE' => 'Размер',
Expand Down
52 changes: 29 additions & 23 deletions modules/scenes/widget_types.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

$this->widget_types = array(
'text' => array(
'TITLE' => 'Text block',
'DESCRIPTION' => 'This widget allows you to add text block',
'TITLE' => LANG_WIDGET_TEXT_BLOCK,
'DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_DESCRIPTION,
'PROPERTIES' => array(
'text_value' => array('DESCRIPTION' => 'Text block', 'DEFAULT_VALUE' => 'Hello, world!', '_CONFIG_TYPE' => 'textarea'),
'text_size' => array('DESCRIPTION' => 'Text size (pt)',
'text_value' => array('DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_VALUE,
'DEFAULT_VALUE' => LANG_WIDGET_TEXT_BLOCK_DEFAULT_VALUE,
'_CONFIG_TYPE' => 'textarea'),
'text_size' => array('DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_SIZE,
'DEFAULT_VALUE' => '10',
'_CONFIG_TYPE' => 'select',
'_CONFIG_OPTIONS' => array(
Expand All @@ -24,18 +26,20 @@
array('VALUE' => '65'),
)
),
'text_align' => array('DESCRIPTION' => 'Text alignment',
'text_align' => array('DESCRIPTION' => LANG_WIDGET_TEXT_ALIGNMENT,
'DEFAULT_VALUE' => 'left',
'_CONFIG_TYPE' => 'select',
'_CONFIG_OPTIONS' => array(
array('VALUE' => 'left'),
array('VALUE' => 'center'),
array('VALUE' => 'right')
array('VALUE' => 'left', 'TITLE'=>LANG_WIDGET_TEXT_ALIGNMENT_LEFT),
array('VALUE' => 'center', 'TITLE'=>LANG_WIDGET_TEXT_ALIGNMENT_CENTER),
array('VALUE' => 'right', 'TITLE'=>LANG_WIDGET_TEXT_ALIGNMENT_RIGHT)
)
),
'text_color' => array('DESCRIPTION' => 'Text color', 'DEFAULT_VALUE' => '#ffffff', '_CONFIG_TYPE' => 'color'),
'text_background' => array('DESCRIPTION' => 'Background color', 'DEFAULT_VALUE' => '#000000', '_CONFIG_TYPE' => 'color'),
'background_opacity' => array('DESCRIPTION' => 'Background opacity, %',
'text_color' => array('DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_COLOR,
'DEFAULT_VALUE' => '#ffffff', '_CONFIG_TYPE' => 'color'),
'text_background' => array('DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_BACKGROUND_COLOR,
'DEFAULT_VALUE' => '#000000', '_CONFIG_TYPE' => 'color'),
'background_opacity' => array('DESCRIPTION' => LANG_WIDGET_TEXT_BLOCK_BACKGROUND_OPACITY,
'DEFAULT_VALUE' => '0.5',
'_CONFIG_TYPE' => 'select',
'_CONFIG_OPTIONS' => array(
Expand All @@ -52,22 +56,24 @@
array('VALUE' => '1', 'TITLE' => '100')
)
),
'text_background_rgba' => array('FUNCTION'=> function($data) {
'text_background_rgba' => array('FUNCTION' => function ($data) {
list($r, $g, $b) = sscanf($data['text_background'], "#%02x%02x%02x");
return "$r, $g, $b, ".$data['background_opacity'];
return "$r, $g, $b, " . $data['background_opacity'];
})
),
'RESIZABLE' => 1,
'DEFAULT_WIDTH' => 200,
'DEFAULT_HEIGHT' => 200,
'TEMPLATE' => 'file:text_block.html'
),
'image'=> array(
'TITLE' => 'Image block',
'DESCRIPTION' => 'This widget allows you to add image by URL',
'image' => array(
'TITLE' => LANG_WIDGET_IMAGE_BLOCK,
'DESCRIPTION' => LANG_WIDGET_IMAGE_BLOCK_DESCRIPTION,
'PROPERTIES' => array(
'image_url' => array('DESCRIPTION' => 'Image URL', 'DEFAULT_VALUE' => '', '_CONFIG_TYPE' => 'text'),
'refresh_interval' => array('DESCRIPTION' => 'Refresh interval, seconds', 'DEFAULT_VALUE' => '0', '_CONFIG_TYPE' => 'text'),
'image_url' => array('DESCRIPTION' => LANG_WIDGET_IMAGE_URL,
'DEFAULT_VALUE' => '', '_CONFIG_TYPE' => 'text'),
'refresh_interval' => array('DESCRIPTION' => LANG_WIDGET_IMAGE_REFRESH_INTERVAL,
'DEFAULT_VALUE' => '0', '_CONFIG_TYPE' => 'text'),
),
'RESIZABLE' => 1,
'DEFAULT_WIDTH' => 200,
Expand All @@ -76,12 +82,12 @@
)
);

$addons_dir=dirname(__FILE__).'/addons';
$addons_dir = dirname(__FILE__) . '/addons';
if (is_dir($addons_dir)) {
$addon_files=scandir($addons_dir);
foreach($addon_files as $file) {
if (preg_match('/\.php$/',$file)) {
require($addons_dir.'/'.$file);
$addon_files = scandir($addons_dir);
foreach ($addon_files as $file) {
if (preg_match('/\.php$/', $file)) {
require($addons_dir . '/' . $file);
}
}
}
16 changes: 14 additions & 2 deletions templates/scenes/scenes.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ $.fn.customContextMenu = function(callBack){
function stateClickedEdit(id) {
if (ignoreClick==1) return false;
var window_url = '{$smarty.const.ROOTHTML}panel/scene/{$SCENE_ID}.html?open='+id+'&print=1'
if (id=='new') {
window_url=window_url+'&top='+contextTop+'&left='+contextLeft;
Expand Down Expand Up @@ -522,9 +523,13 @@ $.fn.customContextMenu = function(callBack){
$.contextMenu({
selector: '.context-menu-one',
zIndex: 1000,
events: {
show: function(options) {
contextLeft=event.pageX;
contextTop=event.pageY;
}
},
callback: function(key, options) {
contextLeft=event.pageX;
contextTop=event.pageY;
if (key == 'add') {
stateClickedEdit('new');
}
Expand Down Expand Up @@ -576,7 +581,13 @@ $(".draggable" ).draggable({ cursor: "move", snap: true , snapTolerance: 5, grid
});
$(".resizable" ).resizable({literal}{grid: 5, {/literal}
start: function(e, ui) {
ignoreClick=1;
},
stop: function(e, ui) {
setTimeout('ignoreClick=0;',500);
var dwidth=ui.size.width;
var dheight=ui.size.height;
Expand All @@ -591,6 +602,7 @@ $(".draggable" ).draggable({ cursor: "move", snap: true , snapTolerance: 5, grid
//alert(data);
});
{/literal}
}});
Expand Down
3 changes: 2 additions & 1 deletion templates/scenes/scenes_edit_widgets.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
[#endif#]

</div>
<h4>Add new widget</h4>
<hr>
<h4><#LANG_ADD_WIDGET#></h4>
<div>
[#begin WIDGET_TYPES#]
<div class="col-md-4">
Expand Down

0 comments on commit 8c49fde

Please sign in to comment.