Merge branch 'develop'

6 files changed, 44 insertions, 0 deletions

diff --git a/app/views/phone_sip_accounts/_form.html.haml b/app/views/phone_sip_accounts/_form.html.haml
new file mode 100644
index 0000000..c2558b8
--- /dev/null
+++ b/app/views/phone_sip_accounts/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for([@phone, @phone_sip_account]) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .actions
+    = f.button :submit, conditional_t('phone_sip_accounts.form.submit')
\ No newline at end of file
diff --git a/app/views/phone_sip_accounts/_form_core.html.haml b/app/views/phone_sip_accounts/_form_core.html.haml
new file mode 100644
index 0000000..81f1121
--- /dev/null
+++ b/app/views/phone_sip_accounts/_form_core.html.haml
@@ -0,0 +1,2 @@
+.inputs
+  = f.association :sip_account, :collection => @available_sip_accounts, :label => t('phone_sip_accounts.form.sip_account_id.label'), :hint => conditional_hint('phone_sip_accounts.form.sip_account_id.hint'), :include_blank => false
diff --git a/app/views/phone_sip_accounts/_index_core.html.haml b/app/views/phone_sip_accounts/_index_core.html.haml
new file mode 100644
index 0000000..89afb2b
--- /dev/null
+++ b/app/views/phone_sip_accounts/_index_core.html.haml
@@ -0,0 +1,13 @@
+%table
+  %tr
+    %th= t('phone_sip_accounts.index.phone_id')
+    %th= t('phone_sip_accounts.index.sip_account_id')
+    %th= t('phone_sip_accounts.index.position')
+
+  - reset_cycle
+  - for phone_sip_account in phone_sip_accounts
+    %tr{:class => cycle('odd', 'even')}
+      %td= phone_sip_account.phone
+      %td= phone_sip_account.sip_account
+      %td= phone_sip_account.position
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_sip_account.phone, :child => phone_sip_account}
\ No newline at end of file
diff --git a/app/views/phone_sip_accounts/index.html.haml b/app/views/phone_sip_accounts/index.html.haml
new file mode 100644
index 0000000..a9e3f85
--- /dev/null
+++ b/app/views/phone_sip_accounts/index.html.haml
@@ -0,0 +1,6 @@
+- title t("phone_sip_accounts.index.page_title")
+
+- if @phone_sip_accounts.count > 0
+  =render "index_core", :phone_sip_accounts => @phone_sip_accounts
+
+= render :partial => 'shared/create_link', :locals => {:parent => @phone, :child_class => PhoneSipAccount}
\ No newline at end of file
diff --git a/app/views/phone_sip_accounts/new.html.haml b/app/views/phone_sip_accounts/new.html.haml
new file mode 100644
index 0000000..bfe40b8
--- /dev/null
+++ b/app/views/phone_sip_accounts/new.html.haml
@@ -0,0 +1,3 @@
+- title t("phone_sip_accounts.new.page_title")
+
+= render "form"
diff --git a/app/views/phone_sip_accounts/show.html.haml b/app/views/phone_sip_accounts/show.html.haml
new file mode 100644
index 0000000..0dd5a9b
--- /dev/null
+++ b/app/views/phone_sip_accounts/show.html.haml
@@ -0,0 +1,13 @@
+- title t("phone_sip_accounts.show.page_title")
+
+%p
+  %strong= t('phone_sip_accounts.show.phone_id') + ":"
+  = @phone_sip_account.phone
+%p
+  %strong= t('phone_sip_accounts.show.sip_account_id') + ":"
+  = @phone_sip_account.sip_account
+%p
+  %strong= t('phone_sip_accounts.show.position') + ":"
+  = @phone_sip_account.position
+
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @phone, :child => @phone_sip_account }
\ No newline at end of file