From f0363a03be5a37b792009749fe846b7e93525683 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sun, 22 Jun 2014 02:18:58 +0000 Subject: [PATCH] CDR: Added View icon to right column. CDR: List row Edit clicking disabled for Click-2-Call column cells. Themes: New style to accommodate width of single control icon (as currently used on CDR) --- app/xml_cdr/app_languages.php | 5 +++++ app/xml_cdr/xml_cdr.php | 23 +++++++++++++++++------ themes/accessible/template.php | 11 +++++++++++ themes/classic/template.php | 11 +++++++++++ themes/default/template.php | 11 +++++++++++ themes/enhanced/template.php | 13 ++++++++++++- themes/nature/template.php | 11 +++++++++++ 7 files changed, 78 insertions(+), 7 deletions(-) diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index e1fa128eca..2228a2915d 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -135,6 +135,11 @@ $text['button-search']['pt-pt'] = "Pesquisa"; $text['button-search']['fr-fr'] = "Recherche"; + $text['button-view']['en-us'] = "View"; + $text['button-view']['es-cl'] = "Ver"; + $text['button-view']['pt-pt'] = "Vista"; + $text['button-view']['fr-fr'] = "Voir"; + $text['button-advanced_search']['en-us'] = "Advanced Search"; $text['button-advanced_search']['es-cl'] = "Búsqueda Avanzada"; $text['button-advanced_search']['pt-pt'] = "Pesquisa Avançada"; diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index 059c19bb5e..d206f5f441 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -282,7 +282,7 @@ else { } //show the results - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; //echo th_order_by('direction', 'Direction', $order_by, $order); @@ -303,6 +303,9 @@ else { echo th_order_by('rtp_audio_in_mos', 'MOS', $order_by, $order); } echo th_order_by('hangup_cause', $text['label-status'], $order_by, $order); + if (if_group("admin") || if_group("superadmin")) { + echo "\n"; + } echo "\n"; if ($result_count > 0) { @@ -339,7 +342,8 @@ else { elseif (file_exists($tmp_dir.'/'.$row['uuid'].'_1.mp3')) { $tmp_name = $row['uuid']."_1.mp3"; } - echo "\n"; + $tr_link = (if_group("admin") || if_group("superadmin")) ? "href='xml_cdr_details.php?uuid=".$row['uuid']."'" : null; + echo "\n"; if ( file_exists($_SERVER["DOCUMENT_ROOT"]."/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_missed.png") && file_exists($_SERVER["DOCUMENT_ROOT"]."/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_connected.png") && @@ -382,7 +386,7 @@ else { echo $row['caller_id_name'].' '; echo " \n"; - echo " \n"; - echo " \n"; } + echo " \n"; + echo "".$hangup_cause.""; } else { - echo " \n"; + echo $hangup_cause; + } + echo " \n"; + if (if_group("admin") || if_group("superadmin")) { + echo " \n"; } echo "\n"; if ($c==0) { $c=1; } else { $c=0; } diff --git a/themes/accessible/template.php b/themes/accessible/template.php index b7ff97d397..27120de03f 100644 --- a/themes/accessible/template.php +++ b/themes/accessible/template.php @@ -70,6 +70,7 @@ form { } td.list_control_icons { + /* multiple icons exist (horizontally) */ padding: none; padding-left: 3px; width: 50px; @@ -78,6 +79,16 @@ td.list_control_icons { white-space: nowrap; } +td.list_control_icon { + /* a single icon exists */ + padding: none; + padding-left: 3px; + width: 25px; + text-align: right; + vertical-align: top; + white-space: nowrap; +} + INPUT.btn { font-family: verdana; font-size: 11px; diff --git a/themes/classic/template.php b/themes/classic/template.php index b5ed1f2091..3cdbb73631 100644 --- a/themes/classic/template.php +++ b/themes/classic/template.php @@ -70,6 +70,7 @@ form { } td.list_control_icons { + /* multiple icons exist (horizontally) */ padding: none; padding-left: 3px; width: 50px; @@ -78,6 +79,16 @@ td.list_control_icons { white-space: nowrap; } +td.list_control_icon { + /* a single icon exists */ + padding: none; + padding-left: 3px; + width: 25px; + text-align: right; + vertical-align: top; + white-space: nowrap; +} + INPUT.btn { font-family: verdana; font-size: 11px; diff --git a/themes/default/template.php b/themes/default/template.php index a7634cb1f5..eb6824065b 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -84,6 +84,7 @@ form { } td.list_control_icons { + /* multiple icons exist (horizontally) */ padding: none; padding-left: 3px; width: 50px; @@ -92,6 +93,16 @@ td.list_control_icons { white-space: nowrap; } +td.list_control_icon { + /* a single icon exists */ + padding: none; + padding-left: 3px; + width: 25px; + text-align: right; + vertical-align: top; + white-space: nowrap; +} + INPUT.btn { font-family: verdana; font-size: 11px; diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php index 73b7eba709..444122e166 100644 --- a/themes/enhanced/template.php +++ b/themes/enhanced/template.php @@ -109,6 +109,7 @@ td { } td.list_control_icons { + /* multiple icons exist (horizontally) */ padding: none; padding-left: 3px; width: 50px; @@ -117,6 +118,16 @@ td.list_control_icons { white-space: nowrap; } +td.list_control_icon { + /* a single icon exists */ + padding: none; + padding-left: 3px; + width: 25px; + text-align: right; + vertical-align: top; + white-space: nowrap; +} + img.list_control_icon { margin: 2px; width: 21px; @@ -804,7 +815,7 @@ legend { // on a table with a class of 'tr_hover', according to the href // attribute of the tag $('.tr_hover tr').each(function(i,e) { - $(e).children('td:not(:last)').click(function() { + $(e).children('td:not(.list_control_icon,.list_control_icons,.tr_link_void)').click(function() { var href = $(this).closest("tr").attr("href"); if (href) { window.location = href; } }); diff --git a/themes/nature/template.php b/themes/nature/template.php index 5625601d66..4cb050a8b7 100644 --- a/themes/nature/template.php +++ b/themes/nature/template.php @@ -103,6 +103,7 @@ form { } td.list_control_icons { + /* multiple icons exist (horizontally) */ padding: none; padding-left: 3px; width: 50px; @@ -111,6 +112,16 @@ td.list_control_icons { white-space: nowrap; } +td.list_control_icon { + /* a single icon exists */ + padding: none; + padding-left: 3px; + width: 25px; + text-align: right; + vertical-align: top; + white-space: nowrap; +} + INPUT.btn { font-family: verdana; font-size: 11px;
  
"; + echo " "; echo " \n"; if (is_numeric($row['caller_id_number'])) { echo " ".format_phone($row['caller_id_number']).' '; @@ -393,7 +397,7 @@ else { echo " "; echo " "; + echo " "; echo " \n"; if (is_numeric($row['destination_number'])) { echo format_phone($row['destination_number'])."\n"; @@ -432,11 +436,18 @@ else { if (permission_exists("xml_cdr_mos")) { echo " 0) ? "title='".($row['rtp_audio_in_mos'] / 5 * 100)."%'" : null).">".((strlen($row['rtp_audio_in_mos']) > 0) ? $row['rtp_audio_in_mos'] : " ").""; if (if_group("admin") || if_group("superadmin")) { - echo " ".$hangup_cause."".$hangup_cause.""; + echo " $v_link_label_view"; + echo "