diff --git a/app/conferences_active/app_languages.php b/app/conferences_active/app_languages.php index ac0e81a565..0e067566f0 100644 --- a/app/conferences_active/app_languages.php +++ b/app/conferences_active/app_languages.php @@ -121,7 +121,7 @@ $text['label-yes']['ru-ru'] = "Да"; $text['label-yes']['sv-se'] = "Ja"; $text['label-yes']['uk-ua'] = "Так"; -$text['label-volume']['en-us'] = "Vol"; +$text['label-volume']['en-us'] = "Volume"; $text['label-volume']['ar-eg'] = ""; $text['label-volume']['de-at'] = "Lautstärke"; //copied from de-de $text['label-volume']['de-ch'] = "Lautstärke"; //copied from de-de diff --git a/app/conferences_active/conference_interactive.php b/app/conferences_active/conference_interactive.php index 164cd09076..f4316b3b7d 100644 --- a/app/conferences_active/conference_interactive.php +++ b/app/conferences_active/conference_interactive.php @@ -26,7 +26,7 @@ */ //includes - include "root.php"; + require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; @@ -48,10 +48,13 @@ $conference_display_name = str_replace("-", " ", $conference_name); $conference_display_name = str_replace("_", " ", $conference_display_name); -//show the header +//include the header + $document['title'] = $text['label-interactive']; require_once "resources/header.php"; -?> \n"; -echo " \n"; -echo " "; -echo " ".$text['label-interactive']."

\n"; -echo " ".$text['description-interactive']."\n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo "
\n"; -echo "
\n"; -echo "
".date('Y-m-d-s')."
\n"; -echo " "; -echo " "; -echo ""; -//show the header +//page header + echo "
\n"; + echo "
".$text['label-interactive']."
\n"; + echo "
\n"; + echo "
\n"; + echo "
\n"; + echo "
\n"; + + echo $text['description-interactive']."\n"; + echo "

\n"; + +//show the content + echo "
\n"; + echo "

\n"; + echo "\n"; + echo "".$text['label-members'].": ".escape($member_count)."\n"; + echo "

\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "
 ".$text['label-cid-name']."".$text['label-cid-num']."".$text['label-capabilities']."".$text['label-joined']."".$text['label-quiet']."".$text['label-floor']."
\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + if (permission_exists('conference_interactive_energy')) { + echo "\n"; + } + if (permission_exists('conference_interactive_volume')) { + echo "\n"; + } + if (permission_exists('conference_interactive_gain')) { + echo "\n"; + } echo "\n"; echo "\n"; - if ($valid_xml) { - if (isset($xml->conference->members->member)) foreach ($xml->conference->members->member as $row) { + if ($valid_xml && isset($xml->conference->members->member)) { + foreach ($xml->conference->members->member as $row) { $id = $row->id; $record_path = $row->record_path; $flag_can_hear = $row->flags->can_hear; @@ -179,60 +187,83 @@ if (strlen($record_path) == 0) { if (permission_exists('conference_interactive_mute')) { $action_mute = ($flag_can_speak == "true") ? 'mute' : 'unmute'; - $td_onclick = "onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".escape($conference_name)."&data=".$action_mute."&id=".escape($id)."');\""; - $td_title = "title=\"".$text['message-click_to_'.$action_mute]."\""; + $list_row_onclick = "onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=".$action_mute."&id=".urlencode($id)."');\""; + $list_row_title = "title=\"".$text['message-click_to_'.$action_mute]."\""; } - echo "\n"; - echo "\n"; - $talking_icon = ($flag_talking == "true") ? "" : null; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + $talking_icon = ""; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; } //volume if (permission_exists('conference_interactive_volume')) { - echo " \n"; - echo " \n"; + echo "\n"; } + //gain if (permission_exists('conference_interactive_gain')) { - echo " \n"; - echo " \n"; + echo "\n"; } + echo "\n"; echo "\n"; } - $c = ($c == 0) ? 1 : 0; } } echo "
 ".$text['label-cid-name']."".$text['label-cid-num']."".$text['label-joined']."".$text['label-quiet']."".$text['label-floor']."".$text['label-capabilities']."".$text['label-energy']."".$text['label-volume']."".$text['label-gain']." 
".escape($caller_id_name).$talking_icon."".escape($caller_id_number).""; - echo ($flag_can_hear == "true") ? "" : null; - echo ($flag_can_speak == "true") ? "" : null; - if (permission_exists('conference_interactive_video')) { - echo ($flag_has_video == "true") ? "" : null; + echo "
"; + if ($is_moderator == 'true') { + echo ""; + } + else { + echo ""; + + } + echo "".escape($caller_id_name).$talking_icon."".escape($caller_id_number)."".escape($join_time_formatted)."".escape($last_talking_formatted)."".$text['label-'.(($flag_has_floor == "true") ? 'yes' : 'no')].""; + echo ($flag_can_speak == "true") ? "" : ""; + echo ($flag_can_hear == "true") ? "" : ""; + if (permission_exists('conference_interactive_video')) { + echo ($flag_has_video == "true") ? "" : null; } echo "".escape($join_time_formatted)."".escape($last_talking_formatted)."".$text['label-'.(($flag_has_floor == "true") ? 'yes' : 'no')]."\n"; //energy if (permission_exists('conference_interactive_energy')) { - echo " \n"; - echo " \n"; + echo "\n"; + echo button::create(['type'=>'button','title'=>$text['label-energy'],'icon'=>'plus','onclick'=>"send_cmd('conference_exec.php?direction=down&cmd=conference&name=".urlencode($conference_name)."&data=energy&id=".urlencode($id)."');"]); + echo button::create(['type'=>'button','title'=>$text['label-energy'],'icon'=>'minus','onclick'=>"send_cmd('conference_exec.php?direction=up&cmd=conference&name=".urlencode($conference_name)."&data=energy&id=".urlencode($id)."');"]); + echo "\n"; + echo button::create(['type'=>'button','title'=>$text['label-volume'],'icon'=>'volume-down','onclick'=>"send_cmd('conference_exec.php?direction=down&cmd=conference&name=".urlencode($conference_name)."&data=volume_in&id=".urlencode($id)."');"]); + echo button::create(['type'=>'button','title'=>$text['label-volume'],'icon'=>'volume-up','onclick'=>"send_cmd('conference_exec.php?direction=up&cmd=conference&name=".urlencode($conference_name)."&data=volume_in&id=".urlencode($id)."');"]); + echo "\n"; + echo button::create(['type'=>'button','title'=>$text['label-volume'],'icon'=>'sort-amount-down','onclick'=>"send_cmd('conference_exec.php?direction=down&cmd=conference&name=".urlencode($conference_name)."&data=volume_out&id=".urlencode($id)."');"]); + echo button::create(['type'=>'button','title'=>$text['label-volume'],'icon'=>'sort-amount-up','onclick'=>"send_cmd('conference_exec.php?direction=up&cmd=conference&name=".urlencode($conference_name)."&data=volume_out&id=".urlencode($id)."');"]); + echo "\n"; //mute and unmute if (permission_exists('conference_interactive_mute')) { - echo " \n"; + if ($action_mute == "mute") { //mute + echo button::create(['type'=>'button','label'=>$text['label-mute'],'icon'=>'microphone-slash','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=mute&id=".urlencode($id)."');"]); + } + else { //unmute + echo button::create(['type'=>'button','label'=>$text['label-unmute'],'icon'=>'microphone','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=unmute&id=".urlencode($id)."');"]); + } } //deaf and undeaf if (permission_exists('conference_interactive_deaf')) { - $action_deaf = ($flag_can_hear == "true") ? 'deaf' : 'undeaf'; - echo " \n"; + if ($flag_can_hear == "true") { //deaf + echo button::create(['type'=>'button','label'=>$text['label-deaf'],'icon'=>'deaf','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=deaf&id=".urlencode($id)."');"]); + } + else { //undeaf + echo button::create(['type'=>'button','label'=>$text['label-undeaf'],'icon'=>'headphones','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=undeaf&id=".urlencode($id)."');"]); + } } //kick someone from the conference if (permission_exists('conference_interactive_kick')) { - echo " \n"; + echo button::create(['type'=>'button','label'=>$text['label-kick'],'icon'=>'ban','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=kick&id=".urlencode($id)."&uuid=".escape($uuid)."');"]); } echo "
\n"; echo "

"; } -?> +?> \ No newline at end of file diff --git a/app/conferences_active/conferences_active.php b/app/conferences_active/conferences_active.php index 84270ecce5..6a6f647fea 100644 --- a/app/conferences_active/conferences_active.php +++ b/app/conferences_active/conferences_active.php @@ -26,7 +26,7 @@ */ //includes - include "root.php"; + require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; @@ -82,6 +82,18 @@ loadXmlHttp.prototype.stateChanged=function () { if (this.xmlHttp.readyState == 4 && (this.xmlHttp.status == 200 || !/^http/.test(window.location.href))) //this.el.innerHTML = this.xmlHttp.responseText; document.getElementById('ajax_response').innerHTML = this.xmlHttp.responseText; + + //link table rows (except the last - the list_control_icons cell) on a table with a class of 'tr_hover', according to the href attribute of the tag + $('.tr_hover tr,.list tr').each(function(i,e) { + $(e).children('td:not(.list_control_icon,.list_control_icons,.tr_link_void,.list-row > .no-link,.list-row > .checkbox,.list-row > .button,.list-row > .action-button)').on('click', function() { + var href = $(this).closest('tr').attr('href'); + var target = $(this).closest('tr').attr('target'); + if (href) { + if (target) { window.open(href, target); } + else { window.location = href; } + } + }); + }); } var requestTime = function() { @@ -102,22 +114,21 @@ else if (window.attachEvent) { \n"; - echo " \n"; - echo " "; - echo " ".$text['title-active_conferences'].""; - echo "

\n"; - echo " ".$text['description-active']."\n"; - echo " \n"; - echo " \n"; - echo "\n"; - echo "
\n"; + echo "
\n"; + echo "
".$text['title-active_conferences']."
\n"; + echo "
\n"; + echo "
\n"; + echo "
\n"; + echo "
\n"; + + echo $text['description-active']."\n"; + echo "

\n"; //show the content - echo "
"; + echo "
"; echo "

"; //include the footer require_once "resources/footer.php"; -?> +?> \ No newline at end of file diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php index 8f7e9ebb49..33f8c5a9f3 100644 --- a/app/conferences_active/conferences_active_inc.php +++ b/app/conferences_active/conferences_active_inc.php @@ -26,7 +26,7 @@ */ //includes - include "root.php"; + require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; @@ -67,15 +67,11 @@ //echo $e->getMessage(); } - $c = 0; - $row_style["0"] = "row_style0"; - $row_style["1"] = "row_style1"; - echo "\n"; echo "\n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; if (permission_exists('conference_interactive_view')) { echo " \n"; } @@ -130,10 +126,9 @@ if (permission_exists('conference_interactive_view')) { $list_row_url = 'conference_interactive.php?c='.urlencode($conference_uuid); - $list_row_onclick = "onclick=\"document.location.href='".$list_row_url."';\""; } echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - if (permission_exists('conference_interactive_view')) { + echo " \n"; + echo " \n"; + if (permission_exists('conference_interactive_view') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') { echo " \n";
".$text['label-name']."".$text['label-participant-pin']."".$text['label-member-count']."".$text['label-member-count']." 
"; + echo " "; if (permission_exists('conference_interactive_view')) { echo " ".escape($conference_name).""; } @@ -141,9 +136,9 @@ echo escape($conference_name); } echo " ".escape($participant_pin)."".escape($member_count)."".escape($participant_pin)."".escape($member_count).""; echo button::create(['type'=>'button','title'=>$text['button-view'],'icon'=>$_SESSION['theme']['button_icon_view'],'link'=>$list_row_url]); echo "