tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New style for modal window Show More. Tabs: Responses, Related, Custom data. - #3613 

Former-commit-id: 48ed0a69416232a9016b6aaff76378954ddacdc1
This commit is contained in:
Tatiana Llorente 2019-04-26 11:57:41 +02:00
parent a930d15d44
commit 77941953a2
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/ajax/events_extended.php
View File

@ -82,11 +82,9 @@ if ($get_extended_info == 1) {
$table->width = '100%'; $table->width = '100%';
$table->data = []; $table->data = [];
$table->head = []; $table->head = [];
$table->style[0] = 'min-width:120px; text-align: left;';
$table->style[1] = 'text-align: left;';
$table->cellspacing = 2; $table->cellspacing = 2;
$table->cellpadding = 2; $table->cellpadding = 2;
$table->class = 'alternate rounded_cells'; $table->class = 'events_show_more_table';
$output = []; $output = [];
$output[] = '<b>'.__('Timestamp').'</b>'; $output[] = '<b>'.__('Timestamp').'</b>';

34
pandora_console/include/functions_events.php
View File

@ -1987,9 +1987,9 @@ function events_page_responses($event, $childrens_ids=[])
$table_responses->width = '100%'; $table_responses->width = '100%';
$table_responses->data = []; $table_responses->data = [];
$table_responses->head = []; $table_responses->head = [];
$table_responses->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;'; $table_responses->style[0] = 'height:30px';
$table_responses->style[1] = 'text-align: left; height: 23px; text-align: right;'; $table_responses->style[2] = 'text-align:right;';
$table_responses->class = 'alternate rounded_cells'; $table_responses->class = 'events_show_more_table';
if (tags_checks_event_acl($config['id_user'], $event['id_grupo'], 'EM', $event['clean_tags'], $childrens_ids)) { if (tags_checks_event_acl($config['id_user'], $event['id_grupo'], 'EM', $event['clean_tags'], $childrens_ids)) {
// Owner. // Owner.
@ -2056,7 +2056,7 @@ function events_page_responses($event, $childrens_ids=[])
-1, -1,
true true
); );
$data[1] .= html_print_button( $data[2] .= html_print_button(
__('Update'), __('Update'),
'owner_button', 'owner_button',
false, false,
@ -2136,7 +2136,7 @@ function events_page_responses($event, $childrens_ids=[])
); );
if (!$status_blocked) { if (!$status_blocked) {
$data[1] .= html_print_button( $data[2] .= html_print_button(
__('Update'), __('Update'),
'status_button', 'status_button',
false, false,
@ -2151,7 +2151,8 @@ function events_page_responses($event, $childrens_ids=[])
// Comments. // Comments.
$data = []; $data = [];
$data[0] = __('Comment'); $data[0] = __('Comment');
$data[1] = html_print_button( $data[1] = '';
$data[2] = html_print_button(
__('Add comment'), __('Add comment'),
'comment_button', 'comment_button',
false, false,
@ -2173,8 +2174,9 @@ function events_page_responses($event, $childrens_ids=[])
// Delete. // Delete.
$data = []; $data = [];
$data[0] = __('Delete event'); $data[0] = __('Delete event');
$data[1] = '<form method="post">'; $data[1] = '';
$data[1] .= html_print_button( $data[2] = '<form method="post">';
$data[2] .= html_print_button(
__('Delete event'), __('Delete event'),
'delete_button', 'delete_button',
false, false,
@ -2182,13 +2184,13 @@ function events_page_responses($event, $childrens_ids=[])
'class="sub cancel"', 'class="sub cancel"',
true true
); );
$data[1] .= html_print_input_hidden('delete', 1, true); $data[2] .= html_print_input_hidden('delete', 1, true);
$data[1] .= html_print_input_hidden( $data[2] .= html_print_input_hidden(
'validate_ids', 'validate_ids',
$event['id_evento'], $event['id_evento'],
true true
); );
$data[1] .= '</form>'; $data[2] .= '</form>';
$table_responses->data[] = $data; $table_responses->data[] = $data;
} }
@ -2229,7 +2231,7 @@ function events_page_responses($event, $childrens_ids=[])
$server_id = 0; $server_id = 0;
} }
$data[1] .= html_print_button( $data[2] .= html_print_button(
__('Execute'), __('Execute'),
'custom_response_button', 'custom_response_button',
false, false,
@ -2249,14 +2251,14 @@ function events_page_responses($event, $childrens_ids=[])
$('.params_rows').remove(); $('.params_rows').remove();
$('#responses_table') $('#responses_table')
.append('<tr class=\"params_rows\"><td style=\"text-align:left; font-weight: bolder;\">".__('Description')."</td><td style=\"text-align:left;\">'+description+'</td></tr>'); .append('<tr class=\"params_rows\"><td>".__('Description')."</td><td style=\"text-align:left; height:30px;\" colspan=\"2\">'+description+'</td></tr>');
if (params.length == 1 && params[0] == '') { if (params.length == 1 && params[0] == '') {
return; return;
} }
$('#responses_table') $('#responses_table')
.append('<tr class=\"params_rows\"><td style=\"text-align:left; padding-left:20px;\" colspan=\"2\">".__('Parameters')."</td></tr>'); .append('<tr class=\"params_rows\"><td style=\"text-align:left; padding-left:20px; height:30px;\" colspan=\"3\">".__('Parameters')."</td></tr>');
for (i = 0; i < params.length; i++) { for (i = 0; i < params.length; i++) {
add_row_param('responses_table',params[i]); add_row_param('responses_table',params[i]);
@ -2981,9 +2983,7 @@ function events_page_custom_data($event)
$table->width = '100%'; $table->width = '100%';
$table->data = []; $table->data = [];
$table->head = []; $table->head = [];
$table->style[0] = 'width:35%; font-weight: bold; text-align: left;'; $table->class = 'events_show_more_table';
$table->style[1] = 'text-align: left;';
$table->class = 'alternate rounded_cells';
$json_custom_data = base64_decode($event['custom_data']); $json_custom_data = base64_decode($event['custom_data']);
$custom_data = json_decode($json_custom_data); $custom_data = json_decode($json_custom_data);

4
pandora_console/include/javascript/pandora_events.js
View File

@ -365,9 +365,9 @@ function get_event_name(event_id, meta, history) {
function add_row_param(id_table, param) { function add_row_param(id_table, param) {
$("#" + id_table).append( $("#" + id_table).append(
'<tr class="params_rows"><td style="text-align:left; padding-left:40px;">' + '<tr class="params_rows"><td style="text-align:left; padding-left:40px; font-weight: normal; font-style: italic;">' +
param + param +
'</td><td style="text-align:left"><input type="text" name="' + '</td><td style="text-align:left" colspan="2"><input type="text" name="' +
param + param +
'" id="' + '" id="' +
param + param +