mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-24 22:35:58 +02:00
Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round See merge request artica/pandorafms!5645
This commit is contained in:
commit
99a352ac47
@ -261,12 +261,11 @@ function agents_modules_load_js()
|
||||
}
|
||||
|
||||
function select_selected () {
|
||||
$('#id_agents2 option').each(function(){
|
||||
if($(this).attr('selected') === 'selected'){
|
||||
$(this).prop('selected', true);
|
||||
}
|
||||
});
|
||||
|
||||
// $('#id_agents2 option').each(function(){
|
||||
// if($(this).attr('selected') === 'selected'){
|
||||
// $(this).prop('selected', true);
|
||||
// }
|
||||
// });
|
||||
}
|
||||
</script>
|
||||
<?php
|
||||
|
@ -39,7 +39,6 @@ if (!empty($news)) {
|
||||
|
||||
// Prints news dialog template
|
||||
echo '<div id="news_dialog" class="invisible">';
|
||||
|
||||
echo '<div class="parent_new_dialog_tmplt">';
|
||||
echo '<span id="new_text"></span>';
|
||||
echo '<span id="new_author"></span>';
|
||||
@ -48,14 +47,22 @@ echo '<div id="news_dialog" class="invisible">';
|
||||
|
||||
echo '<div id="div_btn_new_dialog">';
|
||||
echo '<div class="float-right w20p">';
|
||||
html_print_submit_button('Ok', 'hide-news-help', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok w100px";"');
|
||||
html_print_submit_button(
|
||||
'Ok',
|
||||
'hide-news-help',
|
||||
false,
|
||||
[
|
||||
'mode' => 'ui-widget ok mini',
|
||||
'icon' => 'wand',
|
||||
]
|
||||
);
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
|
||||
ui_require_javascript_file('encode_decode_base64');
|
||||
?>
|
||||
ui_require_javascript_file('encode_decode_base64');
|
||||
?>
|
||||
|
||||
<script type="text/javascript" language="javascript">
|
||||
/* <![CDATA[ */
|
||||
@ -82,22 +89,22 @@ $(document).ready (function () {
|
||||
width: 630,
|
||||
title: news[inew].subject,
|
||||
overlay: {
|
||||
opacity: 0.5,
|
||||
background: "black"
|
||||
}
|
||||
opacity: 0.5,
|
||||
background: "black"
|
||||
}
|
||||
});
|
||||
|
||||
$('.ui-dialog-titlebar-close').hide();
|
||||
}
|
||||
}
|
||||
|
||||
$("#submit-hide-news-help").click (function () {
|
||||
$("#button-hide-news-help").click (function () {
|
||||
$("#news_dialog" ).dialog('close');
|
||||
inew++;
|
||||
show_new ();
|
||||
show_new();
|
||||
});
|
||||
|
||||
show_new ();
|
||||
show_new();
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -1257,11 +1257,11 @@ echo '<h3 class="error invisible" id="message"> </h3>';
|
||||
|
||||
html_print_input_hidden('id_agente', $id_agente);
|
||||
|
||||
echo '</div>';
|
||||
attachActionButton('update_agents', 'update', $table->width, false, $SelectAction);
|
||||
echo '</form>';
|
||||
|
||||
// Shown and hide div.
|
||||
echo '</div></form>';
|
||||
|
||||
ui_require_jquery_file('form');
|
||||
ui_require_jquery_file('pandora.controls');
|
||||
ui_require_jquery_file('ajaxqueue');
|
||||
|
@ -555,6 +555,7 @@ echo sprintf(
|
||||
$status
|
||||
);
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
|
||||
attachActionButton('edit_users', 'update', '100%', false, $SelectAction);
|
||||
|
||||
|
@ -249,6 +249,8 @@ $table->data[5][1] .= '</form>';
|
||||
|
||||
html_print_table($table);
|
||||
|
||||
html_print_action_buttons('', ['right_content' => $SelectAction, 'class' => 'pdd_b_10px_important pdd_t_10px_important']);
|
||||
|
||||
echo '<h3 class="error invisible" id="message"> </h3>';
|
||||
|
||||
ui_require_jquery_file('form');
|
||||
|
@ -448,7 +448,9 @@ if ($option === 'edit_agents' || $option === 'edit_modules') {
|
||||
$tip = ui_print_help_tip(__('The blank fields will not be updated'), true);
|
||||
}
|
||||
|
||||
$SelectAction = '<form method="post" id="form_options" action="'.$url.'">';
|
||||
global $SelectAction;
|
||||
|
||||
$SelectAction = '<form id="form_necesario" method="post" id="form_options" action="'.$url.'">';
|
||||
$SelectAction .= '<span class="mrgn_lft_10px mrgn_right_10px">'._('Action').'</span>';
|
||||
$SelectAction .= html_print_select(
|
||||
$options,
|
||||
|
@ -277,6 +277,8 @@ $table->data[5][1] .= '</form>';
|
||||
|
||||
html_print_table($table);
|
||||
|
||||
html_print_action_buttons('', ['right_content' => $SelectAction, 'class' => 'pdd_b_10px_important pdd_t_10px_important']);
|
||||
|
||||
echo '<h3 class="error invisible" id="message"> </h3>';
|
||||
|
||||
ui_require_jquery_file('form');
|
||||
|
@ -204,9 +204,142 @@ if ($count_module_array > $config['items_combined_charts']) {
|
||||
);
|
||||
}
|
||||
|
||||
$table = new stdClass();
|
||||
$table->width = '100%';
|
||||
$table->colspan[0][0] = 3;
|
||||
$table->size = [];
|
||||
|
||||
if (defined('METACONSOLE')) {
|
||||
$table->class = 'databox data';
|
||||
$table->head[0] = __('Sort items');
|
||||
$table->head_colspan[0] = 4;
|
||||
$table->headstyle[0] = 'text-align: center';
|
||||
$table->size[0] = '25%';
|
||||
$table->size[1] = '25%';
|
||||
$table->size[2] = '25%';
|
||||
$table->size[3] = '25%';
|
||||
} else {
|
||||
$table->class = 'filter-table-adv';
|
||||
$table->size[0] = '50%';
|
||||
$table->size[1] = '50%';
|
||||
}
|
||||
|
||||
$table->data[0][0] = html_print_label_input_block(
|
||||
__('Sort selected items'),
|
||||
html_print_select_style(
|
||||
[
|
||||
'before' => __('before to'),
|
||||
'after' => __('after to'),
|
||||
],
|
||||
'move_to',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
0,
|
||||
true
|
||||
)
|
||||
);
|
||||
$table->data[0][1] = html_print_label_input_block(
|
||||
__('Position'),
|
||||
html_print_input_text_extended(
|
||||
'position_to_sort',
|
||||
1,
|
||||
'text-position_to_sort',
|
||||
'',
|
||||
3,
|
||||
10,
|
||||
false,
|
||||
"only_numbers('position_to_sort');",
|
||||
'',
|
||||
true
|
||||
).html_print_input_hidden('ids_items_to_sort', '', true)
|
||||
);
|
||||
|
||||
|
||||
$SortItems = "<form action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&edit_graph=1&id=".$id_graph."' method='post' onsubmit='return added_ids_sorted_items_to_hidden_input();'>";
|
||||
$SortItems .= html_print_table($table, true);
|
||||
$SortItems .= html_print_input_hidden('action', 'sort_items', true);
|
||||
$SortItems .= html_print_div(
|
||||
[
|
||||
'class' => 'action-buttons',
|
||||
'content' => html_print_submit_button(
|
||||
__('Sort'),
|
||||
'srcbutton',
|
||||
false,
|
||||
[
|
||||
'class' => 'mini',
|
||||
'icon' => 'search',
|
||||
'mode' => 'secondary',
|
||||
],
|
||||
true
|
||||
),
|
||||
],
|
||||
true
|
||||
);
|
||||
$SortItems .= '</form>';
|
||||
|
||||
ui_toggle(
|
||||
$SortItems,
|
||||
'<span class="subsection_header_title">'.__('Sort items').'</span>',
|
||||
'',
|
||||
'',
|
||||
false,
|
||||
false,
|
||||
'',
|
||||
'white-box-content no_border',
|
||||
'filter-datatable-main box-flat white_table_graph max_floating_element_size'
|
||||
);
|
||||
|
||||
|
||||
// Configuration form.
|
||||
echo '<span id ="none_text" class="invisible">'.__('None').'</span>';
|
||||
echo "<form id='agentmodules' method='post' action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&add_module=1&edit_graph=1&id=".$id_graph."'>";
|
||||
|
||||
echo "<table width='100%' cellpadding='4' cellpadding='4' class='databox filters max_floating_element_size'>";
|
||||
echo '<tr>';
|
||||
echo '<td class="w50p pdd_50px" id="select_multiple_modules_filtered">'.html_print_input(
|
||||
[
|
||||
'type' => 'select_multiple_modules_filtered',
|
||||
'uniqId' => 'modules',
|
||||
'class' => 'flex flex-row',
|
||||
'searchBar' => true,
|
||||
]
|
||||
).'</td>';
|
||||
echo '</tr><tr>';
|
||||
echo "<td colspan='3'>";
|
||||
echo "<table cellpadding='4' class='filter-table-adv'><tr>";
|
||||
echo '<td>';
|
||||
echo html_print_label_input_block(
|
||||
__('Weight'),
|
||||
'<input type="text" name="weight" value="1" size=3>'
|
||||
);
|
||||
echo '</td>';
|
||||
echo '</tr></table>';
|
||||
echo '</td>';
|
||||
echo '</tr><tr>';
|
||||
echo "<td colspan='3' align='right'></td>";
|
||||
echo '</tr></table>';
|
||||
$ActionButtons[] = html_print_submit_button(
|
||||
__('Add'),
|
||||
'submit-add',
|
||||
false,
|
||||
[
|
||||
'class' => 'sub ok',
|
||||
'icon' => 'next',
|
||||
],
|
||||
true
|
||||
);
|
||||
html_print_action_buttons(
|
||||
implode('', $ActionButtons),
|
||||
['type' => 'form_action']
|
||||
);
|
||||
|
||||
echo '</form>';
|
||||
|
||||
// Modules table.
|
||||
if ($count_module_array > 0) {
|
||||
echo "<table width='100%' cellpadding=4 cellpadding=4 class='databox filters'>";
|
||||
echo "<table width='100%' cellpadding=4 cellpadding=4 class='databox filters info_table'>";
|
||||
echo '<tr>
|
||||
<th>'.__('P.').'</th>
|
||||
<th>'.__('Agent').'</th>
|
||||
@ -290,124 +423,6 @@ if ($count_module_array > 0) {
|
||||
echo '</table>';
|
||||
}
|
||||
|
||||
|
||||
$table = new stdClass();
|
||||
$table->width = '100%';
|
||||
$table->colspan[0][0] = 3;
|
||||
$table->size = [];
|
||||
|
||||
if (defined('METACONSOLE')) {
|
||||
$table->class = 'databox data';
|
||||
$table->head[0] = __('Sort items');
|
||||
$table->head_colspan[0] = 4;
|
||||
$table->headstyle[0] = 'text-align: center';
|
||||
$table->size[0] = '25%';
|
||||
$table->size[1] = '25%';
|
||||
$table->size[2] = '25%';
|
||||
$table->size[3] = '25%';
|
||||
} else {
|
||||
$table->class = 'filter-table-adv';
|
||||
$table->size[0] = '50%';
|
||||
$table->size[1] = '50%';
|
||||
}
|
||||
|
||||
$table->data[0][0] = html_print_label_input_block(
|
||||
__('Sort selected items'),
|
||||
html_print_select_style(
|
||||
[
|
||||
'before' => __('before to'),
|
||||
'after' => __('after to'),
|
||||
],
|
||||
'move_to',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
0,
|
||||
true
|
||||
)
|
||||
);
|
||||
$table->data[0][1] = html_print_label_input_block(
|
||||
__('Position'),
|
||||
html_print_input_text_extended(
|
||||
'position_to_sort',
|
||||
1,
|
||||
'text-position_to_sort',
|
||||
'',
|
||||
3,
|
||||
10,
|
||||
false,
|
||||
"only_numbers('position_to_sort');",
|
||||
'',
|
||||
true
|
||||
).html_print_input_hidden('ids_items_to_sort', '', true)
|
||||
);
|
||||
|
||||
|
||||
$SortItems = "<form action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&edit_graph=1&id=".$id_graph."' method='post' onsubmit='return added_ids_sorted_items_to_hidden_input();'>";
|
||||
$SortItems .= html_print_table($table, true);
|
||||
$SortItems .= html_print_input_hidden('action', 'sort_items', true);
|
||||
$SortItems .= html_print_div(
|
||||
[
|
||||
'class' => 'action-buttons',
|
||||
'content' => html_print_submit_button(
|
||||
__('Sort'),
|
||||
'srcbutton',
|
||||
false,
|
||||
[
|
||||
'class' => 'mini',
|
||||
'icon' => 'search',
|
||||
'mode' => 'secondary',
|
||||
],
|
||||
true
|
||||
),
|
||||
],
|
||||
true
|
||||
);
|
||||
$SortItems .= '</form>';
|
||||
|
||||
ui_toggle($SortItems, __('Sort items'), '', '', false);
|
||||
|
||||
|
||||
// Configuration form.
|
||||
echo '<span id ="none_text" class="invisible">'.__('None').'</span>';
|
||||
echo "<form id='agentmodules' method='post' action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&add_module=1&edit_graph=1&id=".$id_graph."'>";
|
||||
|
||||
echo "<table width='100%' cellpadding='4' cellpadding='4' class='databox filters'>";
|
||||
echo '<tr>';
|
||||
echo '<td class="w50p pdd_50px" id="select_multiple_modules_filtered">'.html_print_input(
|
||||
[
|
||||
'type' => 'select_multiple_modules_filtered',
|
||||
'uniqId' => 'modules',
|
||||
'class' => 'flex flex-row',
|
||||
'searchBar' => true,
|
||||
]
|
||||
).'</td>';
|
||||
echo '</tr><tr>';
|
||||
echo "<td colspan='3'>";
|
||||
echo "<table cellpadding='4'><tr>";
|
||||
echo '<td>'.__('Weight').'</td>';
|
||||
echo "<td><input type='text' name='weight' value='1' size=3></td>";
|
||||
echo '</tr></table>';
|
||||
echo '</td>';
|
||||
echo '</tr><tr>';
|
||||
echo "<td colspan='3' align='right'></td>";
|
||||
echo '</tr></table>';
|
||||
$ActionButtons[] = html_print_submit_button(
|
||||
__('Add'),
|
||||
'submit-add',
|
||||
false,
|
||||
[
|
||||
'class' => 'sub ok',
|
||||
'icon' => 'next',
|
||||
],
|
||||
true
|
||||
);
|
||||
html_print_action_buttons(
|
||||
implode('', $ActionButtons),
|
||||
['type' => 'form_action']
|
||||
);
|
||||
|
||||
ui_require_jquery_file('pandora.controls');
|
||||
ui_require_jquery_file('ajaxqueue');
|
||||
ui_require_jquery_file('bgiframe');
|
||||
|
@ -289,7 +289,7 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
|
||||
'text',
|
||||
25,
|
||||
100,
|
||||
$text,
|
||||
io_safe_output($text),
|
||||
'',
|
||||
true,
|
||||
'w100p'
|
||||
@ -442,9 +442,19 @@ ui_require_javascript_file('pandora');
|
||||
dateFormat: "<?php echo DATE_FORMAT_JS; ?>",
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
showAnim: "slideDown"});
|
||||
showAnim: "slideDown"}
|
||||
);
|
||||
|
||||
defineTinyMCE({"elements": "textarea_text",});
|
||||
var added_config = {
|
||||
"elements":"textarea_text",
|
||||
"plugins": "preview, print, table, searchreplace, nonbreaking, xhtmlxtras, noneditable",
|
||||
"theme_advanced_buttons1": "bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect",
|
||||
"theme_advanced_buttons2": "search,replace,|,bullist,numlist,|,undo,redo,|,link,unlink,image,|,cleanup,code,preview,|,forecolor,backcolor",
|
||||
"valid_children": "+body[style]",
|
||||
"width": "90%",
|
||||
}
|
||||
|
||||
defineTinyMCE(added_config);
|
||||
|
||||
$("#checkbox-expire").click(function() {
|
||||
check_expire();
|
||||
|
9
pandora_console/images/alerts.svg
Normal file
9
pandora_console/images/alerts.svg
Normal file
@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
|
||||
<title>Dark / 20 / Menu Alerts@svg</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g id="Dark-/-20-/-Menu-Alerts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<path d="M10,20 C11.4190985,20 12.5702076,18.6570313 12.5702076,17 L7.42979244,17 C7.42979244,18.6570313 8.5809015,20 10,20 Z M18.6540098,13.9342308 C17.8777645,13.1357692 16.425318,11.9346154 16.425318,8 C16.425318,5.01153846 14.2364028,2.61923077 11.2849029,2.03230769 L11.2849029,1.23076923 C11.2849029,0.551153846 10.7095493,0 10,0 C9.29045075,0 8.71509711,0.551153846 8.71509711,1.23076923 L8.71509711,2.03230769 C5.76359722,2.61923077 3.57468198,5.01153846 3.57468198,8 C3.57468198,11.9346154 2.12223547,13.1357692 1.3459902,13.9342308 C1.10492023,14.1823077 0.998045886,14.4788462 1.00002702,14.7692308 C1.00447442,15.4 1.52156948,16 2.28977909,16 L17.7102209,16 C18.4784305,16 18.9959274,15.4 18.999973,14.7692308 C19.0019541,14.4788462 18.8950798,14.1819231 18.6540098,13.9342308 L18.6540098,13.9342308 Z" id="Shape" fill="#a6adb2"></path>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 1.3 KiB |
@ -1559,6 +1559,7 @@ function html_print_select_multiple_modules_filtered(array $data):string
|
||||
$output .= html_print_input(
|
||||
[
|
||||
'label' => __('Group'),
|
||||
'label_class' => 'font-title-font',
|
||||
'name' => 'filtered-module-group-'.$uniqId,
|
||||
'returnAllGroup' => $return_all_group,
|
||||
'privilege' => 'AR',
|
||||
@ -1572,14 +1573,15 @@ function html_print_select_multiple_modules_filtered(array $data):string
|
||||
// Recursion.
|
||||
$output .= html_print_input(
|
||||
[
|
||||
'label' => __('Recursion'),
|
||||
'type' => 'switch',
|
||||
'name' => 'filtered-module-recursion-'.$uniqId,
|
||||
'value' => (empty($data['mRecursion']) === true) ? false : true,
|
||||
'checked' => (empty($data['mRecursion']) === true) ? false : true,
|
||||
'return' => true,
|
||||
'id' => 'filtered-module-recursion-'.$uniqId,
|
||||
'onchange' => 'fmAgentChange(\''.$uniqId.'\')',
|
||||
'label' => __('Recursion'),
|
||||
'label_class' => 'font-title-font',
|
||||
'type' => 'switch',
|
||||
'name' => 'filtered-module-recursion-'.$uniqId,
|
||||
'value' => (empty($data['mRecursion']) === true) ? false : true,
|
||||
'checked' => (empty($data['mRecursion']) === true) ? false : true,
|
||||
'return' => true,
|
||||
'id' => 'filtered-module-recursion-'.$uniqId,
|
||||
'onchange' => 'fmAgentChange(\''.$uniqId.'\')',
|
||||
]
|
||||
);
|
||||
|
||||
@ -1598,6 +1600,7 @@ function html_print_select_multiple_modules_filtered(array $data):string
|
||||
$output .= html_print_input(
|
||||
[
|
||||
'label' => __('Module group'),
|
||||
'label_class' => 'font-title-font',
|
||||
'type' => 'select',
|
||||
'fields' => $module_groups,
|
||||
'name' => 'filtered-module-module-group-'.$uniqId,
|
||||
@ -1682,15 +1685,16 @@ function html_print_select_multiple_modules_filtered(array $data):string
|
||||
|
||||
$output .= html_print_input(
|
||||
[
|
||||
'label' => __('Agents'),
|
||||
'type' => 'select',
|
||||
'fields' => $agents,
|
||||
'name' => 'filtered-module-agents-'.$uniqId,
|
||||
'selected' => explode(',', $data['mAgents']),
|
||||
'return' => true,
|
||||
'multiple' => true,
|
||||
'style' => 'min-width: 200px;max-width:200px;',
|
||||
'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
|
||||
'label' => __('Agents'),
|
||||
'label_class' => 'font-title-font',
|
||||
'type' => 'select',
|
||||
'fields' => $agents,
|
||||
'name' => 'filtered-module-agents-'.$uniqId,
|
||||
'selected' => explode(',', $data['mAgents']),
|
||||
'return' => true,
|
||||
'multiple' => true,
|
||||
'style' => 'min-width: 200px;max-width:200px;',
|
||||
'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
|
||||
]
|
||||
);
|
||||
|
||||
@ -1701,14 +1705,15 @@ function html_print_select_multiple_modules_filtered(array $data):string
|
||||
|
||||
$output .= html_print_input(
|
||||
[
|
||||
'label' => __('Only common modules'),
|
||||
'type' => 'switch',
|
||||
'checked' => $commonModules,
|
||||
'value' => $commonModules,
|
||||
'name' => 'filtered-module-show-common-modules-'.$uniqId,
|
||||
'id' => 'filtered-module-show-common-modules-'.$uniqId,
|
||||
'return' => true,
|
||||
'onchange' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
|
||||
'label' => __('Only common modules'),
|
||||
'label_class' => 'font-title-font',
|
||||
'type' => 'switch',
|
||||
'checked' => $commonModules,
|
||||
'value' => $commonModules,
|
||||
'name' => 'filtered-module-show-common-modules-'.$uniqId,
|
||||
'id' => 'filtered-module-show-common-modules-'.$uniqId,
|
||||
'return' => true,
|
||||
'onchange' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
|
||||
]
|
||||
);
|
||||
|
||||
@ -1742,14 +1747,15 @@ function html_print_select_multiple_modules_filtered(array $data):string
|
||||
|
||||
$output .= html_print_input(
|
||||
[
|
||||
'label' => __('Modules'),
|
||||
'type' => 'select',
|
||||
'fields' => $all_modules,
|
||||
'name' => 'filtered-module-modules-'.$uniqId,
|
||||
'selected' => $result,
|
||||
'return' => true,
|
||||
'multiple' => true,
|
||||
'style' => 'min-width: 200px;max-width:200px;',
|
||||
'label' => __('Modules'),
|
||||
'label_class' => 'font-title-font',
|
||||
'type' => 'select',
|
||||
'fields' => $all_modules,
|
||||
'name' => 'filtered-module-modules-'.$uniqId,
|
||||
'selected' => $result,
|
||||
'return' => true,
|
||||
'multiple' => true,
|
||||
'style' => 'min-width: 200px;max-width:200px;',
|
||||
]
|
||||
);
|
||||
|
||||
|
@ -1287,38 +1287,44 @@ function ui_format_alert_row(
|
||||
$additionUrl = '';
|
||||
}
|
||||
|
||||
$forceExecButtons[] = html_print_button(
|
||||
$forceTitle,
|
||||
'force_execution_'.$alert['id'],
|
||||
false,
|
||||
'window.location.assign("'.$url.'&id_alert='.$alert['id'].'&refr=60'.$additionUrl.'");',
|
||||
[ 'mode' => 'link' ],
|
||||
$forceExecButtons[] = html_print_anchor(
|
||||
[
|
||||
'href' => $url.'&id_alert='.$alert['id'].'&refr=60'.$additionUrl,
|
||||
'content' => html_print_image(
|
||||
'images/force@svg.svg',
|
||||
true,
|
||||
[
|
||||
'title' => $forceTitle,
|
||||
'class' => 'main_menu_icon invert_filter',
|
||||
]
|
||||
),
|
||||
],
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
$forceExecButtons[] = html_print_button(
|
||||
__('View'),
|
||||
'view_template_'.$alert['id'],
|
||||
false,
|
||||
'',
|
||||
$forceExecButtons[] = html_print_anchor(
|
||||
[
|
||||
'mode' => 'link',
|
||||
'class' => 'template_details',
|
||||
'href' => 'ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$template['id'],
|
||||
'href' => 'ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$template['id'],
|
||||
'class' => 'template_details',
|
||||
'content' => html_print_image(
|
||||
'images/details.svg',
|
||||
true,
|
||||
['class' => 'main_menu_icon invert_filter']
|
||||
),
|
||||
],
|
||||
true
|
||||
);
|
||||
} else {
|
||||
$forceExecButtons[] = html_print_button(
|
||||
__('View'),
|
||||
'view_template_'.$alert['id'],
|
||||
false,
|
||||
'',
|
||||
$forceExecButtons[] = html_print_anchor(
|
||||
[
|
||||
'mode' => 'link',
|
||||
'class' => 'template_details',
|
||||
'href' => ui_get_full_url('/', false, false, false).'/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template='.$template['id'].'&server_name='.$alert['server_data']['server_name'],
|
||||
'href' => ui_get_full_url('/', false, false, false).'/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template='.$template['id'].'&server_name='.$alert['server_data']['server_name'],
|
||||
'class' => 'template_details',
|
||||
'content' => html_print_image(
|
||||
'images/details.svg',
|
||||
true,
|
||||
['class' => 'main_menu_icon invert_filter']
|
||||
),
|
||||
],
|
||||
true
|
||||
);
|
||||
|
@ -351,11 +351,86 @@ function load_modal(settings) {
|
||||
AJAX_RUNNING = 0;
|
||||
}
|
||||
} else {
|
||||
// No onsumbit configured. Directly close.
|
||||
if (document.getElementById(settings.form) != undefined) {
|
||||
document.getElementById(settings.form).submit();
|
||||
if (Array.isArray(settings.form) === false) {
|
||||
$("#" + settings.form + " :input").each(function() {
|
||||
if (this.checkValidity() === false) {
|
||||
var select2 = $(this).attr("data-select2-id");
|
||||
if (typeof select2 !== typeof undefined && select2 !== false) {
|
||||
$(this)
|
||||
.next()
|
||||
.attr("title", this.validationMessage);
|
||||
$(this)
|
||||
.next()
|
||||
.tooltip({
|
||||
tooltipClass: "uitooltip",
|
||||
position: {
|
||||
my: "right bottom",
|
||||
at: "right top",
|
||||
using: function(position, feedback) {
|
||||
$(this).css(position);
|
||||
$("<div>")
|
||||
.addClass("arrow")
|
||||
.addClass(feedback.vertical)
|
||||
.addClass(feedback.horizontal)
|
||||
.appendTo(this);
|
||||
}
|
||||
}
|
||||
});
|
||||
$(this)
|
||||
.next()
|
||||
.tooltip("open");
|
||||
|
||||
var element = $(this).next();
|
||||
setTimeout(
|
||||
function(element) {
|
||||
element.tooltip("destroy");
|
||||
element.removeAttr("title");
|
||||
},
|
||||
3000,
|
||||
element
|
||||
);
|
||||
} else {
|
||||
$(this).attr("title", this.validationMessage);
|
||||
$(this).tooltip({
|
||||
tooltipClass: "uitooltip",
|
||||
position: {
|
||||
my: "right bottom",
|
||||
at: "right top",
|
||||
using: function(position, feedback) {
|
||||
$(this).css(position);
|
||||
$("<div>")
|
||||
.addClass("arrow")
|
||||
.addClass(feedback.vertical)
|
||||
.addClass(feedback.horizontal)
|
||||
.appendTo(this);
|
||||
}
|
||||
}
|
||||
});
|
||||
$(this).tooltip("open");
|
||||
|
||||
var element = $(this);
|
||||
setTimeout(
|
||||
function(element) {
|
||||
element.tooltip("destroy");
|
||||
element.removeAttr("title");
|
||||
},
|
||||
3000,
|
||||
element
|
||||
);
|
||||
}
|
||||
|
||||
flagError = true;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (!flagError) {
|
||||
// No onsumbit configured. Directly close.
|
||||
if (document.getElementById(settings.form) != undefined) {
|
||||
document.getElementById(settings.form).submit();
|
||||
}
|
||||
d.dialog("close");
|
||||
}
|
||||
d.dialog("close");
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -287,7 +287,7 @@ class Manager implements PublicLogin
|
||||
|
||||
$this->dashboardId = (int) \get_parameter('dashboardId', 0);
|
||||
if ($this->slides === 1) {
|
||||
$this->slidesIds = (array) \get_parameter('slidesIds', [get_user_dashboards($config['id_user'])[0]['id']]);
|
||||
$this->slidesIds = (array) \get_parameter('slidesIds');
|
||||
$this->cellModeSlides = (int) \get_parameter(
|
||||
'cellModeSlides',
|
||||
0
|
||||
|
@ -340,3 +340,28 @@ div.ui-tooltip.ui-corner-all.ui-widget-shadow.ui-widget.ui-widget-content.uitool
|
||||
top: auto;
|
||||
}
|
||||
/* END Tooltip message errors*/
|
||||
|
||||
form.modal {
|
||||
position: initial !important;
|
||||
display: initial !important;
|
||||
}
|
||||
|
||||
form#modal_form_feedback > ul > li {
|
||||
visibility: initial !important;
|
||||
|
||||
display: initial !important;
|
||||
flex-direction: initial !important;
|
||||
width: initial !important;
|
||||
margin: initial !important;
|
||||
justify-items: initial !important;
|
||||
align-items: initial !important;
|
||||
flex-wrap: initial !important;
|
||||
}
|
||||
|
||||
form#modal_form_feedback > ul > li > textarea {
|
||||
width: 575px !important;
|
||||
}
|
||||
|
||||
form#modal_form_feedback > ul > li:not(:first-child) > label {
|
||||
margin-top: 20px !important;
|
||||
}
|
||||
|
@ -931,6 +931,10 @@ select:-internal-list-box {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
.flex-align-start {
|
||||
align-items: start;
|
||||
}
|
||||
|
||||
.flex-baseline {
|
||||
align-self: baseline;
|
||||
}
|
||||
@ -7404,6 +7408,10 @@ div.graph div.legend table {
|
||||
/*
|
||||
* PADDING RIGHT
|
||||
*/
|
||||
.pdd_r_0px {
|
||||
padding-right: 0px !important;
|
||||
}
|
||||
|
||||
.pdd_r_2px {
|
||||
padding-right: 2px;
|
||||
}
|
||||
@ -7475,6 +7483,10 @@ div.graph div.legend table {
|
||||
/*
|
||||
* PADDING LEFT
|
||||
*/
|
||||
.pdd_l_0px {
|
||||
padding-left: 0px !important;
|
||||
}
|
||||
|
||||
.pdd_l_4px {
|
||||
padding-left: 4px;
|
||||
}
|
||||
@ -7546,6 +7558,10 @@ div.graph div.legend table {
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
.pdd_b_10px_important {
|
||||
padding-bottom: 10px !important;
|
||||
}
|
||||
|
||||
.pdd_b_20px {
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
@ -7616,6 +7632,10 @@ div.graph div.legend table {
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.pdd_t_10px_important {
|
||||
padding-top: 10px !important;
|
||||
}
|
||||
|
||||
.pdd_t_15px {
|
||||
padding-top: 15px;
|
||||
}
|
||||
@ -11792,9 +11812,9 @@ span.help_icon_15px > img {
|
||||
|
||||
/* ==== Spinner ==== */
|
||||
.spinner-fixed {
|
||||
position: fixed;
|
||||
left: 50%;
|
||||
bottom: 50%;
|
||||
position: absolute;
|
||||
left: 40%;
|
||||
top: 40%;
|
||||
z-index: 1;
|
||||
width: 100px;
|
||||
height: 100px;
|
||||
|
@ -233,6 +233,7 @@ if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) che
|
||||
[
|
||||
'title' => __('Operations'),
|
||||
'text' => __('Operations'),
|
||||
'class' => 'left pdd_l_0px pdd_r_0px w100p',
|
||||
],
|
||||
);
|
||||
|
||||
@ -317,6 +318,7 @@ if (is_metaconsole() === true) {
|
||||
$no_sortable_columns = [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
5,
|
||||
];
|
||||
} else {
|
||||
@ -514,10 +516,14 @@ function alerts_table_controls() {
|
||||
attribute: 'href',
|
||||
cluetipClass: 'default'
|
||||
}).click (function () {
|
||||
console.log('click aqui');
|
||||
return false;
|
||||
});
|
||||
|
||||
$("a.template_details").cluetip ({
|
||||
arrows: true,
|
||||
attribute: 'href',
|
||||
cluetipClass: 'default'
|
||||
});
|
||||
|
||||
$('[id^=checkbox-all_validate]').change(function(){
|
||||
if ($("#checkbox-all_validate").prop("checked")) {
|
||||
|
@ -81,6 +81,7 @@ $inputs[] = [
|
||||
'return' => true,
|
||||
'multiple' => true,
|
||||
'sort' => false,
|
||||
'required' => 'required',
|
||||
],
|
||||
];
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user