tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'

Browse Source 
Added a pending translation

See merge request artica/pandorafms!2083

Former-commit-id: 2ea6499b990e08750210593f2b4882044da392ed
This commit is contained in:
vgilc 2018-12-14 10:21:40 +01:00
commit f2f88579fa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -3681,7 +3681,7 @@ function createItem(type, values, id_data) {
var diameter = values["diameter"] || values["width"] || 100;
item = $('<div id="' + id_data + '" class="item color_cloud" style="text-align: left; position: absolute; width: ' + diameter + 'px; height: ' + diameter + 'px; top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
'<img id="image_' + id_data + '" class="image" src="images/spinner.gif" width="' + diameter + '" height="' + diameter + '" /><br />' +
'<img id="image_' + id_data + '" class="image" src="images/spinner.gif" width="' + diameter + '" height="' + diameter + '" />' +
'</div>'
);
setColorCloud(id_visual_console, id_data, item);

2
pandora_console/include/functions_visual_map_editor.php
View File

@ -612,7 +612,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
"</td>";
// Color ranges
$color_range_tip = __("TODO");
$color_range_tip = __("The color of the element will be the one selected in the first range created in which the value of the module is found (with the initial and final values of the range included)") . ".";
$form_items["color_cloud_color_ranges_row"] = array();
$form_items["color_cloud_color_ranges_row"]["items"] = array("color_cloud");
$form_items["color_cloud_color_ranges_row"]["html"] =