summaryrefslogtreecommitdiff
path: root/app/views/conferences
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/conferences')
-rw-r--r--app/views/conferences/_index_members.html.haml40
-rw-r--r--app/views/conferences/show.html.haml23
2 files changed, 63 insertions, 0 deletions
diff --git a/app/views/conferences/_index_members.html.haml b/app/views/conferences/_index_members.html.haml
new file mode 100644
index 0000000..3837f25
--- /dev/null
+++ b/app/views/conferences/_index_members.html.haml
@@ -0,0 +1,40 @@
+%table.table.table-striped
+ %thead
+ %tr
+ %th= t('conferences.index_members.caller')
+ %th= t('conferences.index_members.join_time')
+ %th= t('conferences.index_members.talking')
+ %th= t('conferences.index_members.flags')
+
+
+ %tbody
+ - for member in members
+ %tr
+ %td
+ -if member[:call]
+ - if member[:call_bleg]
+ = member[:call].b_caller_id_name
+ = member[:call].b_caller_id_number
+ - else
+ = member[:call].caller_id_name
+ = member[:call].caller_id_number
+ %td
+ = member['join_time']
+ %td
+ = member['flags']['talking']
+ %td
+ - if member['flags']['can_hear'] == 'true'
+ %span.label
+ = t('conferences.index_members.can_hear')
+ - if member['flags']['can_speak'] == 'true'
+ %span.label
+ = t('conferences.index_members.can_speak')
+ - if member['flags']['is_moderator'] == 'true'
+ %span.label
+ = t('conferences.index_members.moderator')
+ - if member['flags']['has_floor'] == 'true'
+ %span.label
+ = t('conferences.index_members.has_floor')
+ - if member['flags']['has_video'] == 'true'
+ %span.label
+ = t('conferences.index_members.video')
diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml
index 302f294..fcebb88 100644
--- a/app/views/conferences/show.html.haml
+++ b/app/views/conferences/show.html.haml
@@ -45,6 +45,24 @@
%strong= t('conferences.show.announce_left_member_by_name') + ":"
%td
= @conference.announce_left_member_by_name
+ - conference_data = @conference.list_conference
+ - if conference_data
+ %tr
+ %td
+ %strong= t('conferences.show.identifier') + ":"
+ %td
+ = conference_data['name']
+ %tr
+ %td
+ %strong= t('conferences.show.member_count') + ":"
+ %td
+ = conference_data['member_count']
+ %tr
+ %td
+ %strong= t('conferences.show.run_time') + ":"
+ %td
+ = conference_data['run_time']
+
= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @parent, :child => @conference }
@@ -54,6 +72,11 @@
= render :partial => 'shared/create_link', :locals => {:parent => @conference, :child_class => PhoneNumber}
+- members = @conference.list_members(conference_data)
+- if members && members.count > 0
+ %h2= t("conferences.show.members")
+ = render "index_members", :members => members
+
%h2= t("conference_invitees.index.page_title")
- if @conference.conference_invitees.count > 0
= render "conference_invitees/index_core", :conference_invitees => @conference.conference_invitees