From 6d049b8f5bbe709554a88c1bc0304e1550778f3b Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Thu, 11 Sep 2014 03:14:52 +0000 Subject: [PATCH] CDR: Added new HTML5 recording playback and download controls. --- app/xml_cdr/app_languages.php | 5 +++ app/xml_cdr/xml_cdr.php | 39 ++++++++++++---------- app/xml_cdr/xml_cdr_inc.php | 1 + themes/enhanced/config.php | 3 ++ themes/enhanced/images/icon_download.png | Bin 0 -> 1550 bytes themes/enhanced/images/icon_pause.png | Bin 0 -> 1424 bytes themes/enhanced/images/icon_play.png | Bin 0 -> 1496 bytes themes/enhanced/template.php | 37 +++++++++++++++++++- themes/minimized/config.php | 11 +++--- themes/minimized/images/icon_download.png | Bin 0 -> 1550 bytes themes/minimized/images/icon_pause.png | Bin 0 -> 1424 bytes themes/minimized/images/icon_play.png | Bin 0 -> 1496 bytes themes/minimized/template.php | 37 +++++++++++++++++++- 13 files changed, 109 insertions(+), 24 deletions(-) create mode 100644 themes/enhanced/images/icon_download.png create mode 100644 themes/enhanced/images/icon_pause.png create mode 100644 themes/enhanced/images/icon_play.png create mode 100644 themes/minimized/images/icon_download.png create mode 100644 themes/minimized/images/icon_pause.png create mode 100644 themes/minimized/images/icon_play.png diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index 296deaaf73..b36c35db59 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -115,6 +115,11 @@ $text['label-play']['pt-pt'] = "Tocar"; $text['label-play']['fr-fr'] = "Jouer"; + $text['label-pause']['en-us'] = "Pause"; + $text['label-pause']['es-cl'] = "Pausa"; + $text['label-pause']['pt-pt'] = "Pausa"; + $text['label-pause']['fr-fr'] = "Pause"; + $text['label-download']['en-us'] = "Download"; $text['label-download']['es-cl'] = "Descargar"; $text['label-download']['pt-pt'] = "Descarregar"; diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index f7354bfbe0..b7e49f705b 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -348,7 +348,6 @@ else { echo th_order_by('caller_id_name', $text['label-cid-name'], $order_by, $order); echo th_order_by('caller_id_number', $text['label-source'], $order_by, $order); echo th_order_by('destination_number', $text['label-destination'], $order_by, $order); - echo "".$text['label-tools']."\n"; echo th_order_by('start_stamp', $text['label-start'], $order_by, $order); echo th_order_by('tta', 'TTA', $order_by, $order); //echo th_order_by('end_stamp', 'End', $order_by, $order); @@ -364,6 +363,7 @@ 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); + echo "".$text['label-tools']."\n"; if (if_group("admin") || if_group("superadmin") || if_group("cdr")) { echo " \n"; } @@ -486,22 +486,6 @@ else { } echo " \n"; echo " \n"; - - echo " "; - if (strlen($tmp_name) > 0 && file_exists($_SESSION['switch']['recordings']['dir'].'/archive/'.$tmp_year.'/'.$tmp_month.'/'.$tmp_day.'/'.$tmp_name)) { - echo " \n"; - echo " ".$text['label-play']."\n"; - echo " \n"; - echo "  \n"; - echo " \n"; - echo " ".$text['label-download']."\n"; - echo " \n"; - } - else { - echo "  \n"; - } - echo " \n"; - echo " ".$tmp_start_epoch."\n"; //echo " ".$row['end_stamp']."\n"; @@ -551,9 +535,28 @@ else { echo $hangup_cause; } echo " \n"; + if (strlen($tmp_name) > 0 && file_exists($_SESSION['switch']['recordings']['dir'].'/archive/'.$tmp_year.'/'.$tmp_month.'/'.$tmp_day.'/'.$tmp_name)) { + echo " "; + $recording_file_path = '/archive/'.$tmp_year.'/'.$tmp_month.'/'.$tmp_day.'/'.$tmp_name; + $recording_file_name = strtolower(pathinfo($tmp_name, PATHINFO_BASENAME)); + $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); + switch ($recording_file_ext) { + case "wav" : $recording_type = "audio/wave"; break; + case "mp3" : $recording_type = "audio/mpeg"; break; + case "ogg" : $recording_type = "audio/ogg"; break; + } + echo ""; + echo "".$v_link_label_play.""; + echo "".$v_link_label_download.""; + } + else { + echo " "; + echo " "; + } + echo " \n"; if (if_group("admin") || if_group("superadmin") || if_group("cdr")) { echo " "; - echo " $v_link_label_view"; + echo " $v_link_label_view"; echo " \n"; } echo "\n"; diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php index 91b9ceff01..97bf9a68ea 100644 --- a/app/xml_cdr/xml_cdr_inc.php +++ b/app/xml_cdr/xml_cdr_inc.php @@ -267,5 +267,6 @@ else { $c = 0; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; + $row_style["2"] = "row_style2"; ?> \ No newline at end of file diff --git a/themes/enhanced/config.php b/themes/enhanced/config.php index 7accb1ec0c..e7c9d3a35c 100644 --- a/themes/enhanced/config.php +++ b/themes/enhanced/config.php @@ -5,5 +5,8 @@ $v_link_label_add = ""; $v_link_label_delete = ""; $v_link_label_view = ""; + $v_link_label_play = ""; + $v_link_label_pause = ""; + $v_link_label_download = ""; ?> diff --git a/themes/enhanced/images/icon_download.png b/themes/enhanced/images/icon_download.png new file mode 100644 index 0000000000000000000000000000000000000000..931554ec64d9483f7f53fbf03c4bc2a2164aee71 GIT binary patch literal 1550 zcmbVMeM}Q~7(T5q)RHg;qZNYZAsZTL@7i+hbrfuS?PykzAV#)0;qH2rQ+ijgS9@Yi zL^hq7W{eF82@KI}bD0s{%)+J<6j}UAFq%xpL_2Vd+KF5uGsuHEQ(W!UIX# zcvq>h0Jksbl2#_DOc1gYD5LAJ)V$XbJ9Mcfd1Ev7fSmI zcX?@b0qx`bJSF9$G$jm{V)t@IAwkI+;|89Ql0uZ@9Od`Wtl+>+kaVJQF)pLks;J?| zEg7Q@6~}*yCA=k7U}*Zh^rgk~=Al`sV|b}GV(uT4dUSD?12-3nz2sCdm|b<|jPP?y zi=*>EV5L%_R4Q{Kg25ma6BkPw0?!I%)xTd(OHJL>dh)Bjj_x-*I=a=DJFZ@|eAm(* zoFOL1|CDu3PdrkveLw!%p?IxnBzSG8RSsP|D*t?+o-5XljPP36w0kV>p=BFTjdeF? zyGx!vnbyC%^_R%?4`yaYKdX$0y%Fq>bvm8$_)T5%o0TEu^X=Tkj?L^tRiYF^Nzv$bo+|suN z9z@xmOWujU-)}r$a^^HY85|f2oTwp5Qa-FdL6=a}hac~GI^M7f2BVymEa_omPiI_Y za%NliDRGqCKRCF$t!JFMrQCW>th`klWo=K9KN%l)RoB)=47p<_NBU*3e`fJdb%*;O zyN?X-wOIw{>g&hkt;OwR&nY5hOMCT^s7uom$#?cGzuUH>s}SUO)yUta+Gn_3^AWbVECAdH6|7 H$-aL89X>`; literal 0 HcmV?d00001 diff --git a/themes/enhanced/images/icon_pause.png b/themes/enhanced/images/icon_pause.png new file mode 100644 index 0000000000000000000000000000000000000000..c3aea46eb5c78f97cfa81c8645d2a486805a1e67 GIT binary patch literal 1424 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RYBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFsEgPM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWv2L<~p`n7AnVzAE zshOFfj)IYap^?4;5Si&3npl~dSs9rtK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh zUb(Seeo?xx^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr> zm4GgVcpk{1iHq`zbF$JDTz5Q`N^fZsd*)yF1AWQ8NHOu6f0+E6E`y# zOILGOOIKH8LqjK1S5p@^GXokk2Xf$A5=Ovf8!vx&!l5#LXJqPJ7x2y6rR5$b8fG3u{+mc0iVk{ z;@#fYieIy;csA7uw#8oHW$yFuTcfeY<7dsjJpmD0E=93j%9IUpeHne_b8SU!ZClxH z)~mN#Rdd(mx4qBjOHnWW5N~5=d*Fu)SIX~wezJVbF3T@wH1yc!FPP-2V6~#z;iain zirDk#&l9q%g+oFc6*v;g)A{}U&m~pLg@_~{nKtpF!tB|9`gom}TNdsKxKb+HRuVhC zb8g1nrSoTqch_y;<|x0R{5Wxz@bTjosj>+zH|HBJ1FL-K^`f9J;7P}mBOmPzXUPbE z7g65!bB0w>Qsu@M>*p!0D}S+idD1_19$Rg@pndNPH~JSps*v0CB2D8CZ*b^W|F|82 zHnYyEU3p#lOSmxk_P6;q{F$jcMdI#P!CuvQZeVSK#sOf3=KA3Skrw=hUJa|2gL`#7FtDZt>R-4tjI zlYYuUk={)kzob?IfXEkcHgFBL=Wq`lmXQS;SuD&5XaHELk1?btNO7Q>@&_V1D1ABs zfdQ`$s#n<%8)KrH0@a&Ys%~?w)3Z6~!Mu?EX>er>7YM=>M}o0%C=$hEI%u317v_a+ z7y`#lxS$TY=Tw8u4w`6|0#!1F)PtZXs8-8RrAnk;zdTU-PSv3s~s!BFr9U(E)Dq>v$k_B4m72xld9knlz34R~>rNoi3N zm|0`S%w`3O8dYW$VNoM;EoLDIt-8qZAS|jiYY;@GRA7h&Ma@dBR<1B(2Bq3)QecE! zRm55&QI3pwsG@E_(4D|49*V_HEJboO>!j&Wu>$N(G)G69Xa+RZsllc7fryvpqm_m9 z+&e8nv4IxKYhmdyI38a-@Bn>Gqm&zzS_~l+m|2OU2CY(QL{UVG8VNaSG(Zzr@BfJz zEI0!fisL`UQrr?MurR$}`oiLV^H33?V_2azZe3F<0ATV|D`9ZPuDD0@d42nd6Wpf< z4p>ti{6dLXB9T--lF#Qov*$kM*79RcQTNcm((>}PM|%!mOAancCI{hxG`nGd8+NuekEL%anL2*SYBT^mRQVUA`n`cdSb?ch2eJho0R%hti%opKhGC z%(-rj`$+JJ@8rgt6{*qQN5!(n&)Vvw2fN-#wfcNtSATyjIA1hn%8J^q+k=g+w^Y%Y zsjlBN!{oHdt@*Kb;@kTDcP^kvHgoFg`SV-J?DopiH5ba7vYA&Z7csZbEr?gv9Y#ln zPS5(~RD#(!v!(Vb**Q|~%?$U6;(Pb5k1tr!vR_;xGPXe{U!RMgwQcU9U4(AnOZ zN4EQaym`|%eB;)^nhR6p9jmwQcv-T`RbKx7f@DuF_s&n5_TKIt^;-@0XI{OL?OHwq zY}NeG8tdrmyVN_$nH;M~4TVNRNr$bIygv5AFg_hj0#EKKyZG9MW$wbi)@rULdW^2N Fe*g`pDY5_n literal 0 HcmV?d00001 diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php index ff86add45f..6947864411 100644 --- a/themes/enhanced/template.php +++ b/themes/enhanced/template.php @@ -209,7 +209,7 @@ td { td.list_control_icons { /* multiple icons exist (horizontally) */ padding: none; - padding-left: 3px; + padding-left: 2px; width: 50px; text-align: right; vertical-align: top; @@ -432,6 +432,16 @@ table.tr_hover tr:hover td a { padding: 5px 7px; } +.row_style2 { + border-bottom: 1px solid #c5d1e5; + background-color: #fff; + color: #000; + text-align: left; + padding: 0 0 0 2px; + width: 42px; + white-space: nowrap; +} + .row_stylebg { border-bottom: 1px solid #b9c5d8; background-color: #f0f2f6; @@ -1065,6 +1075,31 @@ legend { } + + "; - $v_link_label_add = ""; - $v_link_label_delete = ""; - $v_link_label_view = ""; + $v_link_label_edit = ""; + $v_link_label_add = ""; + $v_link_label_delete = ""; + $v_link_label_view = ""; + $v_link_label_play = ""; + $v_link_label_pause = ""; + $v_link_label_download = ""; ?> diff --git a/themes/minimized/images/icon_download.png b/themes/minimized/images/icon_download.png new file mode 100644 index 0000000000000000000000000000000000000000..931554ec64d9483f7f53fbf03c4bc2a2164aee71 GIT binary patch literal 1550 zcmbVMeM}Q~7(T5q)RHg;qZNYZAsZTL@7i+hbrfuS?PykzAV#)0;qH2rQ+ijgS9@Yi zL^hq7W{eF82@KI}bD0s{%)+J<6j}UAFq%xpL_2Vd+KF5uGsuHEQ(W!UIX# zcvq>h0Jksbl2#_DOc1gYD5LAJ)V$XbJ9Mcfd1Ev7fSmI zcX?@b0qx`bJSF9$G$jm{V)t@IAwkI+;|89Ql0uZ@9Od`Wtl+>+kaVJQF)pLks;J?| zEg7Q@6~}*yCA=k7U}*Zh^rgk~=Al`sV|b}GV(uT4dUSD?12-3nz2sCdm|b<|jPP?y zi=*>EV5L%_R4Q{Kg25ma6BkPw0?!I%)xTd(OHJL>dh)Bjj_x-*I=a=DJFZ@|eAm(* zoFOL1|CDu3PdrkveLw!%p?IxnBzSG8RSsP|D*t?+o-5XljPP36w0kV>p=BFTjdeF? zyGx!vnbyC%^_R%?4`yaYKdX$0y%Fq>bvm8$_)T5%o0TEu^X=Tkj?L^tRiYF^Nzv$bo+|suN z9z@xmOWujU-)}r$a^^HY85|f2oTwp5Qa-FdL6=a}hac~GI^M7f2BVymEa_omPiI_Y za%NliDRGqCKRCF$t!JFMrQCW>th`klWo=K9KN%l)RoB)=47p<_NBU*3e`fJdb%*;O zyN?X-wOIw{>g&hkt;OwR&nY5hOMCT^s7uom$#?cGzuUH>s}SUO)yUta+Gn_3^AWbVECAdH6|7 H$-aL89X>`; literal 0 HcmV?d00001 diff --git a/themes/minimized/images/icon_pause.png b/themes/minimized/images/icon_pause.png new file mode 100644 index 0000000000000000000000000000000000000000..c3aea46eb5c78f97cfa81c8645d2a486805a1e67 GIT binary patch literal 1424 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RYBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFsEgPM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWv2L<~p`n7AnVzAE zshOFfj)IYap^?4;5Si&3npl~dSs9rtK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh zUb(Seeo?xx^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr> zm4GgVcpk{1iHq`zbF$JDTz5Q`N^fZsd*)yF1AWQ8NHOu6f0+E6E`y# zOILGOOIKH8LqjK1S5p@^GXokk2Xf$A5=Ovf8!vx&!l5#LXJqPJ7x2y6rR5$b8fG3u{+mc0iVk{ z;@#fYieIy;csA7uw#8oHW$yFuTcfeY<7dsjJpmD0E=93j%9IUpeHne_b8SU!ZClxH z)~mN#Rdd(mx4qBjOHnWW5N~5=d*Fu)SIX~wezJVbF3T@wH1yc!FPP-2V6~#z;iain zirDk#&l9q%g+oFc6*v;g)A{}U&m~pLg@_~{nKtpF!tB|9`gom}TNdsKxKb+HRuVhC zb8g1nrSoTqch_y;<|x0R{5Wxz@bTjosj>+zH|HBJ1FL-K^`f9J;7P}mBOmPzXUPbE z7g65!bB0w>Qsu@M>*p!0D}S+idD1_19$Rg@pndNPH~JSps*v0CB2D8CZ*b^W|F|82 zHnYyEU3p#lOSmxk_P6;q{F$jcMdI#P!CuvQZeVSK#sOf3=KA3Skrw=hUJa|2gL`#7FtDZt>R-4tjI zlYYuUk={)kzob?IfXEkcHgFBL=Wq`lmXQS;SuD&5XaHELk1?btNO7Q>@&_V1D1ABs zfdQ`$s#n<%8)KrH0@a&Ys%~?w)3Z6~!Mu?EX>er>7YM=>M}o0%C=$hEI%u317v_a+ z7y`#lxS$TY=Tw8u4w`6|0#!1F)PtZXs8-8RrAnk;zdTU-PSv3s~s!BFr9U(E)Dq>v$k_B4m72xld9knlz34R~>rNoi3N zm|0`S%w`3O8dYW$VNoM;EoLDIt-8qZAS|jiYY;@GRA7h&Ma@dBR<1B(2Bq3)QecE! zRm55&QI3pwsG@E_(4D|49*V_HEJboO>!j&Wu>$N(G)G69Xa+RZsllc7fryvpqm_m9 z+&e8nv4IxKYhmdyI38a-@Bn>Gqm&zzS_~l+m|2OU2CY(QL{UVG8VNaSG(Zzr@BfJz zEI0!fisL`UQrr?MurR$}`oiLV^H33?V_2azZe3F<0ATV|D`9ZPuDD0@d42nd6Wpf< z4p>ti{6dLXB9T--lF#Qov*$kM*79RcQTNcm((>}PM|%!mOAancCI{hxG`nGd8+NuekEL%anL2*SYBT^mRQVUA`n`cdSb?ch2eJho0R%hti%opKhGC z%(-rj`$+JJ@8rgt6{*qQN5!(n&)Vvw2fN-#wfcNtSATyjIA1hn%8J^q+k=g+w^Y%Y zsjlBN!{oHdt@*Kb;@kTDcP^kvHgoFg`SV-J?DopiH5ba7vYA&Z7csZbEr?gv9Y#ln zPS5(~RD#(!v!(Vb**Q|~%?$U6;(Pb5k1tr!vR_;xGPXe{U!RMgwQcU9U4(AnOZ zN4EQaym`|%eB;)^nhR6p9jmwQcv-T`RbKx7f@DuF_s&n5_TKIt^;-@0XI{OL?OHwq zY}NeG8tdrmyVN_$nH;M~4TVNRNr$bIygv5AFg_hj0#EKKyZG9MW$wbi)@rULdW^2N Fe*g`pDY5_n literal 0 HcmV?d00001 diff --git a/themes/minimized/template.php b/themes/minimized/template.php index bfc3ef81bb..9a3c9137b0 100644 --- a/themes/minimized/template.php +++ b/themes/minimized/template.php @@ -209,7 +209,7 @@ td { td.list_control_icons { /* multiple icons exist (horizontally) */ padding: none; - padding-left: 3px; + padding-left: 2px; width: 50px; text-align: right; vertical-align: top; @@ -432,6 +432,16 @@ table.tr_hover tr:hover td a { padding: 5px 7px; } +.row_style2 { + border-bottom: 1px solid #c5d1e5; + background-color: #fff; + color: #000; + text-align: left; + padding: 0 0 0 2px; + width: 42px; + white-space: nowrap; +} + .row_stylebg { border-bottom: 1px solid #b9c5d8; background-color: #f0f2f6; @@ -1079,6 +1089,31 @@ legend { } + +