diff options
| author | Peter Kozak <spag@golwen.net> | 2013-06-22 10:22:48 +0200 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-06-22 10:22:48 +0200 |
| commit | 08ecc91d89a2b6a83daee4a1ffda5520e38e53c6 (patch) | |
| tree | 2f15799d3948eaa26abacef033c687b4362f602b /app/views | |
| parent | d21bf5513aa28187deb6b6c1ba21635b97ff82a4 (diff) | |
| parent | 4ce04ec03bc8f362d48ded43833645e7f454cb5c (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/switchboard_entries/_form_core.html.haml | 1 | ||||
| -rw-r--r-- | app/views/switchboard_entries/show.html.haml | 5 | ||||
| -rw-r--r-- | app/views/switchboards/show.html.erb | 22 |
3 files changed, 17 insertions, 11 deletions
diff --git a/app/views/switchboard_entries/_form_core.html.haml b/app/views/switchboard_entries/_form_core.html.haml index 6f340c2..2caaba5 100644 --- a/app/views/switchboard_entries/_form_core.html.haml +++ b/app/views/switchboard_entries/_form_core.html.haml @@ -1,3 +1,4 @@ .inputs = f.association :sip_account, :collection => @sip_accounts, :label => t('switchboard_entries.form.sip_account_id.label'), :hint => conditional_hint('switchboard_entries.form.sip_account_id.hint'), :autofocus => true, :include_blank => false = f.input :name, :label => t('switchboard_entries.form.name.label'), :hint => conditional_hint('switchboard_entries.form.name.hint') + = f.input :switchable, :as => :boolean, :label => t('switchboard_entries.form.switchable.label'), :hint => conditional_hint('switchboard_entries.form.switchable.hint')
\ No newline at end of file diff --git a/app/views/switchboard_entries/show.html.haml b/app/views/switchboard_entries/show.html.haml index b519781..85b8166 100644 --- a/app/views/switchboard_entries/show.html.haml +++ b/app/views/switchboard_entries/show.html.haml @@ -18,5 +18,10 @@ %strong= t('switchboard_entries.show.position') + ":" %td = @switchboard_entry.position + %tr + %td + %strong= t('switchboard_entries.show.switchable') + ":" + %td + = @switchboard_entry.switchable = render :partial => 'shared/show_edit_destroy_part', :locals => {:parent => @switchboard, :child => @switchboard_entry }
\ No newline at end of file diff --git a/app/views/switchboards/show.html.erb b/app/views/switchboards/show.html.erb index 2a2765f..4877613 100644 --- a/app/views/switchboards/show.html.erb +++ b/app/views/switchboards/show.html.erb @@ -26,16 +26,27 @@ {{avatar_img switchboardEntry.avatar_src}} <small> <p> + {{#if switchboardEntry.name}} <span class="label">{{switchboardEntry.name}}</span> + {{/if}} {{#each phoneNumber in switchboardEntry.sipAccount.phoneNumberShortList}} <span class="label"> {{phoneNumber.number}} </span> + + {{#if activeCalls.length}} + <p> + {{#each activeCall in activeCalls}} + <button {{action transfer_blind activeCall.id phoneNumber.number}} class="btn btn-small">Blind Transfer ({{activeCall.b_caller_id_number}})</button> + {{/each}} + </p> + {{/if}} {{/each}} </p> {{show_callstate switchboardEntry.callstate}} + {{#if switchboardEntry.sipAccount.calls.length}} <p> Anrufe: @@ -51,17 +62,6 @@ </p> {{/if}} - {{#if activeCalls.length}} - <p> - Verbinden mit: - <br> - {{#each activeCall in activeCalls}} - <button {{action blind_transfer}}> - {{activeCall.b_caller_id_number}} - </button> - {{/each}} - </p> - {{/if}} </small> </div> </li> |