diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-10 08:45:30 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-10 08:45:30 +0100 |
commit | e2a03b5d20253d7a1eb10b8c110d9feec79e995f (patch) | |
tree | cc36cbb2572e549ce59388654d358cb1e2771ecd /app/views/switchboard_entries/_index_core.html.haml | |
parent | 595a48a91f8549b20109942e0b80df4f891d5999 (diff) | |
parent | 21d0843117c0962bd962fc50fccaf276a5b3067f (diff) |
Fixed a merging conflict.
Merge branch 'switchboard' into develop
Conflicts:
app/models/sip_account.rb
Diffstat (limited to 'app/views/switchboard_entries/_index_core.html.haml')
-rw-r--r-- | app/views/switchboard_entries/_index_core.html.haml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/app/views/switchboard_entries/_index_core.html.haml b/app/views/switchboard_entries/_index_core.html.haml new file mode 100644 index 0000000..406db71 --- /dev/null +++ b/app/views/switchboard_entries/_index_core.html.haml @@ -0,0 +1,16 @@ +%table.table.table-striped + %tr + %th + %th= t('switchboard_entries.index.sip_account_id') + %th= t('switchboard_entries.index.name') + %th + + %tbody{ :id => "switchboard_entries", :'data-update-url' => sort_switchboard_switchboard_entries_path(switchboard_entries.first.switchboard) } + - for switchboard_entry in switchboard_entries + = content_tag_for :tr, switchboard_entry do + %td + %span.handle + %i.icon-resize-vertical + %td= switchboard_entry.sip_account + %td= switchboard_entry.name + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => switchboard_entry.switchboard, :child => switchboard_entry}
\ No newline at end of file |