From b8eeb44fca02fbdd55e33e59a49e3f075ffe483f Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Wed, 25 Feb 2015 20:38:24 +0000 Subject: [PATCH] Interactive Conference: Simplified layout a bit, added icons. --- app/conferences_active/app_languages.php | 63 +++++--- .../conference_interactive_inc.php | 144 +++++------------- .../resources/images/hear.png | Bin 0 -> 472 bytes .../resources/images/moderator.png | Bin 0 -> 347 bytes .../resources/images/participant.png | Bin 0 -> 348 bytes .../resources/images/speak.png | Bin 0 -> 413 bytes .../resources/images/talking.png | Bin 0 -> 573 bytes .../resources/images/video.png | Bin 0 -> 257 bytes 8 files changed, 85 insertions(+), 122 deletions(-) create mode 100644 app/conferences_active/resources/images/hear.png create mode 100644 app/conferences_active/resources/images/moderator.png create mode 100644 app/conferences_active/resources/images/participant.png create mode 100644 app/conferences_active/resources/images/speak.png create mode 100644 app/conferences_active/resources/images/talking.png create mode 100644 app/conferences_active/resources/images/video.png diff --git a/app/conferences_active/app_languages.php b/app/conferences_active/app_languages.php index b22c642c20..591de07890 100644 --- a/app/conferences_active/app_languages.php +++ b/app/conferences_active/app_languages.php @@ -90,12 +90,12 @@ $text['label-id']['pt-pt'] = "ID"; $text['label-id']['fr-fr'] = "ID"; - $text['label-cid-name']['en-us'] = "Caller ID Name"; + $text['label-cid-name']['en-us'] = "CID Name"; $text['label-cid-name']['es-cl'] = "Nombre de Caller ID"; $text['label-cid-name']['pt-pt'] = "Nome do Chamador"; $text['label-cid-name']['fr-fr'] = "Nom d'appelant"; - $text['label-cid-num']['en-us'] = "Caller ID Number"; + $text['label-cid-num']['en-us'] = "CID Number"; $text['label-cid-num']['es-cl'] = "Número de Caller ID"; $text['label-cid-num']['pt-pt'] = "Número do Chamador"; $text['label-cid-num']['fr-fr'] = "Numéro d'appelant"; @@ -105,11 +105,21 @@ $text['label-moderator']['pt-pt'] = "Moderador"; $text['label-moderator']['fr-fr'] = "Modérateur"; + $text['label-participant']['en-us'] = "Participant"; + $text['label-participant']['es-cl'] = "Participante"; + $text['label-participant']['pt-pt'] = "Participante"; + $text['label-participant']['fr-fr'] = "Participant"; + $text['label-joined']['en-us'] = "Joined"; $text['label-joined']['es-cl'] = "Unido"; $text['label-joined']['pt-pt'] = "Entrou"; $text['label-joined']['fr-fr'] = "a joint"; + $text['label-capabilities']['en-us'] = "Capabilities"; + $text['label-capabilities']['es-cl'] = "Capacidades"; + $text['label-capabilities']['pt-pt'] = "Capacidades"; + $text['label-capabilities']['fr-fr'] = "Capacités"; + $text['label-hear']['en-us'] = "Hear"; $text['label-hear']['es-cl'] = "Escuchar"; $text['label-hear']['pt-pt'] = "Ouvir"; @@ -120,20 +130,20 @@ $text['label-speak']['pt-pt'] = "Falar"; $text['label-speak']['fr-fr'] = "parler"; + $text['label-video']['en-us'] = "Video"; + $text['label-video']['es-cl'] = "Video"; + $text['label-video']['pt-pt'] = "Vídeo"; + $text['label-video']['fr-fr'] = "Vidéo"; + $text['label-talking']['en-us'] = "Talking"; $text['label-talking']['es-cl'] = "Hablando"; $text['label-talking']['pt-pt'] = "Falando"; $text['label-talking']['fr-fr'] = "parle"; - $text['label-last-talk']['en-us'] = "Last Talked"; - $text['label-last-talk']['es-cl'] = "Último Hablando"; - $text['label-last-talk']['pt-pt'] = "Último a falar"; - $text['label-last-talk']['fr-fr'] = "dernier parlant"; - - $text['label-video']['en-us'] = "Video"; - $text['label-video']['es-cl'] = "Video"; - $text['label-video']['pt-pt'] = "Vídeo"; - $text['label-video']['fr-fr'] = "Vidéo"; + $text['label-quiet']['en-us'] = "Quiet"; + $text['label-quiet']['es-cl'] = "Tranquilo"; + $text['label-quiet']['pt-pt'] = "Tranquilo"; + $text['label-quiet']['fr-fr'] = "Calme"; $text['label-floor']['en-us'] = "Has Floor"; $text['label-floor']['es-cl'] = "Tiene Piso"; @@ -145,14 +155,14 @@ $text['label-tool']['pt-pt'] = "Ferramentas"; $text['label-tool']['fr-fr'] = "Outils"; - $text['label-yes']['en-us'] = "yes"; - $text['label-yes']['es-cl'] = "si"; - $text['label-yes']['pt-pt'] = "sim"; + $text['label-yes']['en-us'] = "Yes"; + $text['label-yes']['es-cl'] = "Si"; + $text['label-yes']['pt-pt'] = "Sim"; $text['label-yes']['fr-fr'] = "Oui"; - $text['label-no']['en-us'] = "no"; - $text['label-no']['es-cl'] = "no"; - $text['label-no']['pt-pt'] = "não"; + $text['label-no']['en-us'] = "No"; + $text['label-no']['es-cl'] = "No"; + $text['label-no']['pt-pt'] = "Não"; $text['label-no']['fr-fr'] = "Non"; $text['label-energy']['en-us'] = "Energy"; @@ -185,7 +195,7 @@ $text['label-mute-all']['pt-pt'] = "Silenciar tudo"; $text['label-mute-all']['fr-fr'] = "tous muets"; - $text['label-mute-all-alt']['en-us'] = "Mute all but moderator."; + $text['label-mute-all-alt']['en-us'] = "Mute all Participants."; $text['label-mute-all-alt']['es-cl'] = "Silenciar a todos excepto al moderador."; $text['label-mute-all-alt']['pt-pt'] = "Silenciar tudo menos o moderador."; $text['label-mute-all-alt']['fr-fr'] = "muets sauf le moderateur."; @@ -195,6 +205,16 @@ $text['label-unmute-all']['pt-pt'] = "Todos com som"; $text['label-unmute-all']['fr-fr'] = "tous sonore"; + $text['message-click_to_mute']['en-us'] = "Click to mute Member"; + $text['message-click_to_mute']['es-cl'] = "Haga clic en silencio miembro"; + $text['message-click_to_mute']['pt-pt'] = "Clique para silenciar Estados"; + $text['message-click_to_mute']['fr-fr'] = "Cliquez sur muet Membres"; + + $text['message-click_to_unmute']['en-us'] = "Click to Unmute Member"; + $text['message-click_to_unmute']['es-cl'] = "Haga clic para desactivar el silencio miembro"; + $text['message-click_to_unmute']['pt-pt'] = "Clique para microf Estados"; + $text['message-click_to_unmute']['fr-fr'] = "Cliquez pour Réactiver membres"; + $text['label-end-conference']['en-us'] = "End Conference"; $text['label-end-conference']['es-cl'] = "Terminar Conferencia"; $text['label-end-conference']['pt-pt'] = "Terminar conferência"; @@ -245,4 +265,11 @@ $text['label-participant-pin']['pt-pt'] = "Participante PIN"; $text['label-participant-pin']['fr-fr'] = "Code Participant"; + $text['label-members']['en-us'] = "Members"; + $text['label-members']['es-cl'] = "Miembros"; + $text['label-members']['pt-pt'] = "Deputados"; + $text['label-members']['fr-fr'] = "Membres"; + + + ?> diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php index 6c69e6be5e..6790f0ba66 100644 --- a/app/conferences_active/conference_interactive_inc.php +++ b/app/conferences_active/conference_interactive_inc.php @@ -99,15 +99,10 @@ else { echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "
\n"; - echo " \n"; - echo " Members: ".$member_count."\n"; - echo " \n"; - echo "\n"; - echo "  \n"; - echo "\n"; + echo " "; + echo " ".$text['label-members'].": ".$member_count."\n"; + echo " \n"; $recording_dir = $_SESSION['switch']['recordings']['dir'].'/archive/'.date("Y").'/'.date("M").'/'.date("d"); $recording_name = ''; @@ -121,43 +116,30 @@ else { echo "  "; if (permission_exists('conference_interactive_lock')) { - if ($locked == "true") { - echo " \n"; - } - else { - echo " \n"; - } + $action_locked = ($locked == "true") ? 'unlock' : 'lock'; + echo " \n"; } - - if ($mute_all == "true") { - echo " \n"; + if (permission_exists('conference_interactive_mute')) { + $action_mute_all = ($mute_all == "true") ? 'unmute' : 'mute'; + echo " \n"; } - else { - echo " \n"; - } - - echo " \n"; + echo " \n"; echo "
 
\n"; + echo "
\n"; + echo "\n"; echo "\n"; - echo "\n"; - //echo "\n"; + echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - if (permission_exists('conference_interactive_video')) { - echo "\n"; - } + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; foreach ($xml->conference->members->member as $row) { @@ -180,106 +162,60 @@ else { //format the seconds $join_time_formatted = sprintf("%02s", floor($join_time/3600)).":".sprintf("%02s",floor($join_time/60)).":".sprintf("%02s",($join_time - (floor($join_time/60))*60)); $last_talking_formatted = sprintf("%02s",floor($last_talking/3600)).":".sprintf("%02s",floor($last_talking/60)).":".sprintf("%02s",($last_talking - (floor($last_talking/60))*60)); - +$flag_has_video = 'true'; 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=".$conference_name."&data=".$action_mute."&id=".$id."');\""; + $td_title = "title=\"".$text['message-click_to_'.$action_mute]."\""; + } echo "\n"; - echo "\n"; - //echo "\n"; - echo "\n"; - echo "\n"; - if ($is_moderator == "true") { - echo "\n"; - } - else { - echo "\n"; - } - echo "\n"; - if ($flag_can_hear == "true") { - echo "\n"; - } - else { - echo "\n"; - } - if ($flag_can_speak == "true") { - echo "\n"; - } - else { - echo "\n"; - } - if ($flag_talking == "true") { - echo "\n"; - } - else { - echo "\n"; - } - echo "\n"; + echo "\n"; + $talking_icon = ($flag_talking == "true") ? "" : null; + echo "\n"; + echo "\n"; + echo "\n"; - } - else { - echo "\n"; - } + echo ($flag_has_video == "true") ? "" : null; } - if ($flag_has_floor == "true") { - echo "\n"; - } - else { - echo "\n"; - } - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; } - if ($c==0) { $c=1; } else { $c=0; } + $c = ($c == 0) ? 1 : 0; } echo "
".$text['label-id']."UUID ".$text['label-cid-name']."".$text['label-cid-num']."".$text['label-moderator']."".$text['label-capabilities']."".$text['label-joined']."".$text['label-hear']."".$text['label-speak']."".$text['label-talking']."".$text['label-last-talk']."".$text['label-video']."".$text['label-quiet']."".$text['label-floor']."".$text['label-tool']." 
$id$uuid$caller_id_name$caller_id_number".$text['label-yes']."".$text['label-no']."".$join_time_formatted."".$text['label-yes']."".$text['label-no']."".$text['label-yes']."".$text['label-no']."".$text['label-yes']."".$text['label-no']."$last_talking_formatted".$caller_id_name.$talking_icon."".$caller_id_number.""; + echo ($flag_can_hear == "true") ? "" : null; + echo ($flag_can_speak == "true") ? "" : null; if (permission_exists('conference_interactive_video')) { - if ($flag_has_video == "true") { - echo "".$text['label-yes']."".$text['label-no']."".$text['label-yes']."".$text['label-no']."\n"; + echo "".$join_time_formatted."".$last_talking_formatted."".$text['label-'.(($flag_has_floor == "true") ? 'yes' : 'no')]."\n"; //energy if (permission_exists('conference_interactive_energy')) { echo " \n"; echo " \n"; - //echo " +".$text['label-energy']." \n"; - //echo " -".$text['label-energy']." \n"; } //volume if (permission_exists('conference_interactive_volume')) { echo " \n"; echo " \n"; - //echo " +".$text['label-volume']." \n"; - //echo " -".$text['label-volume']." \n"; } if (permission_exists('conference_interactive_gain')) { echo " \n"; echo " \n"; - //echo " +".$text['label-gain']." \n"; - //echo " -".$text['label-gain']." \n"; } //mute and unmute if (permission_exists('conference_interactive_mute')) { - if ($flag_can_speak == "true") { - echo " \n"; - //echo " ".$text['label-mute']." \n"; - } - else { - echo " \n"; - //echo " ".$text['label-unmute']." \n"; - } + echo " \n"; } //deaf and undeaf if (permission_exists('conference_interactive_deaf')) { - if ($flag_can_hear == "true") { - echo " \n"; - //echo " ".$text['label-deaf']." \n"; - } - else { - echo " \n"; - //echo " ".$text['label-undeaf']." \n"; - } + $action_deaf = ($flag_can_hear == "true") ? 'deaf' : 'undeaf'; + echo " \n"; } //kick someone from the conference if (permission_exists('conference_interactive_kick')) { echo " \n"; - //echo " ".$text['label-kick']." \n"; } - echo "  "; echo "
\n"; echo "

"; diff --git a/app/conferences_active/resources/images/hear.png b/app/conferences_active/resources/images/hear.png new file mode 100644 index 0000000000000000000000000000000000000000..0cce769800c08a5940f3aa762098d9efd2e42d81 GIT binary patch literal 472 zcmV;}0Vn>6P)8X5m^tWyQh0+cNG9T4FQ#wEFFMQ{!sK`or(+({*se2>8a`){MQXLyBjs{qa(!IEVMDj;IqUBVZiRoYVE z5F^^ZtQdk}V@49(sB^LlXvw`gtR|>8u1Db!_HqZVV_y?c3!ag^8#4uQlDrpsNHRcq zC?#-=b311-Eqj^$c)^#bB1tWM5ec43(8*&u;G0R{l4dWwOAxp=hz O0000Bt`d literal 0 HcmV?d00001 diff --git a/app/conferences_active/resources/images/moderator.png b/app/conferences_active/resources/images/moderator.png new file mode 100644 index 0000000000000000000000000000000000000000..ec244dfb99610a7123bddc6cb470c3768387c324 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X{(8DNhE&{2dJ_589qiP zEfQqWV=7b-C|0cGO<(YUX^q1l`OaR^1-l&tJDL}q3uQ>M%UIF;=RZfsccza~3j3P# z7^F>JK3jO)Sj2;Aqm{sJr>nlrYCG~3m@678LY09i literal 0 HcmV?d00001 diff --git a/app/conferences_active/resources/images/participant.png b/app/conferences_active/resources/images/participant.png new file mode 100644 index 0000000000000000000000000000000000000000..78889529c91ede2ed87a4c1f2f28fe1b36c8f149 GIT binary patch literal 348 zcmV-i0i*tjP)5UK*0rAf%rcX8!JF}fg%tGL7l4r#C*_D2l@XI5bp)z zwLp9a-2gUd(#=DUXDE;aVs#*Pg{qqdO>o~p2Jis!Dj@b`AP#`kmjSUU5C?<8U4%P)F--crge$4X5pHZzf=% zWuE#p-FxSp=bZbT>-oMPDQ8uzZydVU)fmPAx=^G0?>NW4d;|eeC)fh-F@zm-qDkV| z#fbhh_)~#?XEBZhvWTG_jo8G4?4em3SmI?%(1R4(@P#?N;S|>>{A&9S-FkLw38pcl zK9_V|Eb;Chk+!&~c0R!<=0gMr>)6_~3O-S(z6yUmMyuck{r?E=!=+WQfGwOMA2PTB zi`KSPaD^3Qbl#;_2QIK`vB4ayY4>eR;s|wkadvFci*Cgf4%|VCXheH8AeMasRq*hn zQMN%Eb4S@tP>ZCFF^77*hB<{`S@5&kNrVZu<(2z6e+w`G=afr5Zr)#+00000NkvXX Hu0mjfIWM^s literal 0 HcmV?d00001 diff --git a/app/conferences_active/resources/images/talking.png b/app/conferences_active/resources/images/talking.png new file mode 100644 index 0000000000000000000000000000000000000000..9f80a4fb7647292cf110ff2d5e235ff69ec5c0d1 GIT binary patch literal 573 zcmV-D0>b@?P)Bwnvq zrXcJLgTVl{4LX|7=abc_Fs#>Wg4Kx8XnfZSX(85NFtjU`%I$l>wOWnn_4?lgMf3&& z0e(0fZcTqQ8UcDnpxFC09?>F=Mq~39xY=w%C=?P9^WzC6G|++H@8`?qvXY37gVk!K zT2d?&yF#v+|bXcp%w00000 LNkvXXu0mjfa$^L- literal 0 HcmV?d00001 diff --git a/app/conferences_active/resources/images/video.png b/app/conferences_active/resources/images/video.png new file mode 100644 index 0000000000000000000000000000000000000000..67ea73752a6422d250277ef66ec2893f0d946d67 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X7JIrlhE&{2`t$$4J+o> CyjofS literal 0 HcmV?d00001