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 "
| "; - echo " ".$text['label-members'].": ".escape($member_count)."\n"; - echo " | \n"; - echo "\n";
+ echo " \n";
$recording_dir = $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/archive/'.date("Y").'/'.date("M").'/'.date("d");
$recording_name = '';
@@ -129,34 +121,50 @@
echo " ";
if (permission_exists('conference_interactive_lock')) {
- $action_locked = ($locked == "true") ? 'unlock' : 'lock';
- echo " \n";
+ if ($locked == 'true') {
+ echo button::create(['type'=>'button','label'=>$text['label-unlock'],'icon'=>'unlock','collapse'=>'hide-xs','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=unlock');"]);
+ }
+ else {
+ echo button::create(['type'=>'button','label'=>$text['label-lock'],'icon'=>'lock','collapse'=>'hide-xs','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=lock');"]);
+ }
}
if (permission_exists('conference_interactive_mute')) {
- $action_mute_all = ($mute_all == "true") ? 'unmute' : 'mute';
- echo " \n";
+ if ($mute_all == 'true') {
+ echo button::create(['type'=>'button','label'=>$text['label-unmute-all'],'icon'=>'microphone','collapse'=>'hide-xs','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=unmute+non_moderator');"]);
+ }
+ else {
+ echo button::create(['type'=>'button','label'=>$text['label-mute-all'],'icon'=>'microphone-slash','collapse'=>'hide-xs','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=mute+non_moderator');"]);
+ }
}
- echo " \n";
+ echo button::create(['type'=>'button','label'=>$text['label-end-conference'],'icon'=>'stop','collapse'=>'hide-xs','onclick'=>"send_cmd('conference_exec.php?cmd=conference&name=".urlencode($conference_name)."&data=kick+all');"]);
- echo " | \n";
- echo "
| \n"; - echo " | ".$text['label-cid-name']." | \n"; - echo "".$text['label-cid-num']." | \n"; - echo "".$text['label-capabilities']." | \n"; - echo "".$text['label-joined']." | \n"; - echo "".$text['label-quiet']." | \n"; - echo "".$text['label-floor']." | \n"; + echo "
|---|
| \n"; + echo " | ".$text['label-cid-name']." | \n"; + echo "".$text['label-cid-num']." | \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "".$text['label-capabilities']." | \n"; + if (permission_exists('conference_interactive_energy')) { + echo "".$text['label-energy']." | \n"; + } + if (permission_exists('conference_interactive_volume')) { + echo "".$text['label-volume']." | \n"; + } + if (permission_exists('conference_interactive_gain')) { + echo "".$text['label-gain']." | \n"; + } echo "\n"; echo " | ||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| ".escape($caller_id_name).$talking_icon." | \n"; - echo "".escape($caller_id_number)." | \n"; - echo "";
- 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 " | \n"; + $talking_icon = "".escape($caller_id_name).$talking_icon." | \n"; + echo "".escape($caller_id_number)." | \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + echo ($flag_can_speak == "true") ? "" : ""; + echo ($flag_can_hear == "true") ? "" : ""; + if (permission_exists('conference_interactive_video')) { + echo ($flag_has_video == "true") ? "" : null; } echo " | \n"; - echo "".escape($join_time_formatted)." | \n"; - echo "".escape($last_talking_formatted)." | \n"; - echo "".$text['label-'.(($flag_has_floor == "true") ? 'yes' : 'no')]." | \n"; - echo "\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"; } //volume if (permission_exists('conference_interactive_volume')) { - echo " \n"; - echo " \n"; + 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"; } + //gain if (permission_exists('conference_interactive_gain')) { - echo " \n"; - echo " \n"; + 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"; } + 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 "
| ".$text['label-name']." | \n"; echo "".$text['label-participant-pin']." | \n"; - echo "".$text['label-member-count']." | \n"; + echo "".$text['label-member-count']." | \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 " | ||
|---|---|---|---|---|---|---|
| "; + echo " | "; if (permission_exists('conference_interactive_view')) { echo " ".escape($conference_name).""; } @@ -141,9 +136,9 @@ echo escape($conference_name); } echo " | \n"; - echo "".escape($participant_pin)." | \n"; - echo "".escape($member_count)." | \n"; - if (permission_exists('conference_interactive_view')) { + echo "".escape($participant_pin)." | \n"; + echo "".escape($member_count)." | \n"; + if (permission_exists('conference_interactive_view') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') { echo ""; echo button::create(['type'=>'button','title'=>$text['button-view'],'icon'=>$_SESSION['theme']['button_icon_view'],'link'=>$list_row_url]); echo " | \n";