Merge branch 'develop' of github.com:amooma/GS5 into develop

Conflicts:
	misc/freeswitch/scripts/dialplan/router.lua

7 files changed, 61 insertions, 0 deletions

diff --git a/app/views/call_routes/_form.html.haml b/app/views/call_routes/_form.html.haml
new file mode 100644
index 0000000..1415852
--- /dev/null
+++ b/app/views/call_routes/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for(@call_route) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .actions
+    = f.button :submit, conditional_t('call_routes.form.submit')
\ No newline at end of file
diff --git a/app/views/call_routes/_form_core.html.haml b/app/views/call_routes/_form_core.html.haml
new file mode 100644
index 0000000..4b97434
--- /dev/null
+++ b/app/views/call_routes/_form_core.html.haml
@@ -0,0 +1,6 @@
+.inputs
+  = f.input :table, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint')
+  = f.input :name, :label => t('call_routes.form.name.label'), :hint => conditional_hint('call_routes.form.name.hint')
+  = f.input :endpoint_type, :label => t('call_routes.form.endpoint_type.label'), :hint => conditional_hint('call_routes.form.endpoint_type.hint')
+  = f.input :endpoint_id, :label => t('call_routes.form.endpoint_id.label'), :hint => conditional_hint('call_routes.form.endpoint_id.hint')
+  = f.input :position, :label => t('call_routes.form.position.label'), :hint => conditional_hint('call_routes.form.position.hint')
diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
new file mode 100644
index 0000000..6ea3af7
--- /dev/null
+++ b/app/views/call_routes/_index_core.html.haml
@@ -0,0 +1,17 @@
+%table
+  %tr
+    %th= t('call_routes.index.table')
+    %th= t('call_routes.index.name')
+    %th= t('call_routes.index.endpoint_type')
+    %th= t('call_routes.index.endpoint_id')
+    %th= t('call_routes.index.position')
+
+  - reset_cycle
+  - for call_route in call_routes
+    %tr{:class => cycle('odd', 'even')}
+      %td= call_route.table
+      %td= call_route.name
+      %td= call_route.endpoint_type
+      %td= call_route.endpoint_id
+      %td= call_route.position
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
\ No newline at end of file
diff --git a/app/views/call_routes/edit.html.haml b/app/views/call_routes/edit.html.haml
new file mode 100644
index 0000000..0ad46c5
--- /dev/null
+++ b/app/views/call_routes/edit.html.haml
@@ -0,0 +1,3 @@
+- title t("call_routes.edit.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml
new file mode 100644
index 0000000..687a9dc
--- /dev/null
+++ b/app/views/call_routes/index.html.haml
@@ -0,0 +1,6 @@
+- title t("call_routes.index.page_title")
+
+- if @call_routes && @call_routes.count > 0
+  = render "index_core", :call_routes => @call_routes
+
+= render :partial => 'shared/create_link', :locals => {:child_class => CallRoute}
\ No newline at end of file
diff --git a/app/views/call_routes/new.html.haml b/app/views/call_routes/new.html.haml
new file mode 100644
index 0000000..0796d7f
--- /dev/null
+++ b/app/views/call_routes/new.html.haml
@@ -0,0 +1,3 @@
+- title t("call_routes.new.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml
new file mode 100644
index 0000000..31c3cb0
--- /dev/null
+++ b/app/views/call_routes/show.html.haml
@@ -0,0 +1,19 @@
+- title t("call_routes.show.page_title")
+
+%p
+  %strong= t('call_routes.show.table') + ":"
+  = @call_route.table
+%p
+  %strong= t('call_routes.show.name') + ":"
+  = @call_route.name
+%p
+  %strong= t('call_routes.show.endpoint_type') + ":"
+  = @call_route.endpoint_type
+%p
+  %strong= t('call_routes.show.endpoint_id') + ":"
+  = @call_route.endpoint_id
+%p
+  %strong= t('call_routes.show.position') + ":"
+  = @call_route.position
+
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @call_route }
\ No newline at end of file