diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-23 10:01:48 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-23 10:01:48 +0100 |
| commit | 387f0949d62121f145f80b017329c83aeffc8355 (patch) | |
| tree | a3449682403027a17887175d9c9e6a8112cc9d93 /app/views | |
| parent | d97896546095722ccd3a2051cdb2c2ab1b364328 (diff) | |
Improved UI.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/conferences/_index_core.html.haml | 55 |
1 files changed, 16 insertions, 39 deletions
diff --git a/app/views/conferences/_index_core.html.haml b/app/views/conferences/_index_core.html.haml index 8670418..6e82316 100644 --- a/app/views/conferences/_index_core.html.haml +++ b/app/views/conferences/_index_core.html.haml @@ -2,20 +2,9 @@ %thead %tr %th= t('conferences.index.name') - - if !conferences.respond_to?('where') || conferences.where(:start => nil).where(:end => nil).count != conferences.count - %th= t('conferences.index.start') - %th= t('conferences.index.end') %th %span.hidden-phone = t('conferences.index.phone_numbers') - - if !conferences.respond_to?('where') || conferences.where(:pin => '').count != conferences.count - %th= t('conferences.index.pin') - %th - %span.hidden-phone - = t('conferences.index.max_members') - %th - %span.hidden-phone - = t('conferences.index.number_of_invitees') %th %span.hidden-phone = t('conferences.index.flags') @@ -24,42 +13,30 @@ - for conference in conferences - parent = conference.conferenceable %tr - %td= conference.name - - if !conferences.respond_to?('where') || conferences.where(:start => nil).where(:end => nil).count != conferences.count - %td - - if conference.start - = l conference.start, :format => :long - - else - = '-' - %td - - if conference.end - = l conference.end, :format => :long - - else - = '-' + %td + %span.hidden-phone + = conference.name + %span.visible-phone + = truncate(conference.name, :length => 8) %td - if conference.phone_numbers.any? = render 'phone_numbers/listing', :phone_numbers => conference.phone_numbers.order(:number) - - if !conferences.respond_to?('where') || conferences.where(:pin => '').count != conferences.count - %td - - if !conference.pin.blank? - = conference.pin - - else - = '-' - %td - %span.hidden-phone - = conference.max_members - %td - %span.hidden-phone - = conference.conference_invitees.count %td + - if !conferences.respond_to?('where') || conferences.where(:pin => '').count != conferences.count + - if !conference.pin.blank? + %span.label.label-info + = "PIN: #{conference.pin}" + %span.hidden-phone - %ul - if conference.open_for_anybody - %li= t('conferences.index.open_for_anybody') + %span.label + = t('conferences.index.open_for_anybody') - if conference.announce_new_member_by_name - %li= t('conferences.index.announce_new_member_by_name') + %span.label + = t('conferences.index.announce_new_member_by_name') - if conference.announce_left_member_by_name - %li= t('conferences.index.announce_left_member_by_name') + %span.label + = t('conferences.index.announce_left_member_by_name') =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => parent, :child => conference}
\ No newline at end of file |