Release a new beta.5.1-beta4

6 files changed, 60 insertions, 31 deletions

diff --git a/app/views/call_routes/_form_core.html.haml b/app/views/call_routes/_form_core.html.haml
index b64d660..926c985 100644
--- a/app/views/call_routes/_form_core.html.haml
+++ b/app/views/call_routes/_form_core.html.haml
@@ -1,5 +1,5 @@
 .inputs
   = f.input :routing_table, :collection => CallRoute::ROUTING_TABLES, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint'), :include_blank => false, :autofocus => true
   = 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 :endpoint_str, :collection => @endpoints, :label => t('call_routes.form.endpoint.label'), :hint => conditional_hint('call_routes.form.endpoint.hint'), :include_blank => false
+  = f.input :position, :label => t('call_routes.form.position.label'), :hint => conditional_hint('call_routes.form.position.hint')
\ No newline at end of file
diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index f0acebb..a62a9c4 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -1,15 +1,19 @@
-- cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do 
+- cache(['call_routes_table', I18n.locale, call_routes.count, call_routes.reorder(:updated_at).last]) do 
   %table.table.table-striped
     %thead
       %tr
+        %th
         %th= t('call_routes.index.name')
         %th= t('route_elements.index.pattern')
         %th= t('call_routes.index.endpoint')
 
-    %tbody
+    %tbody{ :class => "call_routes", :id => "call_routes_#{routing_table}", :'data-update-url' => sort_call_routes_url}
       - for call_route in call_routes
-        - cache(['call_route_single_table_row', call_route, call_routes.count]) do 
-          %tr
+        - cache(['call_route_single_table_row', I18n.locale, call_route]) do
+          = content_tag_for :tr, call_route do
+            %td
+              %span.handle
+                %i.icon-resize-vertical
             %td= call_route.name
             %td
               - if call_route.route_elements.any?
diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml
index 488e1c7..0108322 100644
--- a/app/views/call_routes/index.html.haml
+++ b/app/views/call_routes/index.html.haml
@@ -1,11 +1,8 @@
 - content_for :title, t("call_routes.index.page_title")
 
-- if @call_routes && @call_routes.count > 0
-  %table.table.table-striped
-    - @routing_tables.each do |routing_table|
-      %tr
-        %td{:colspan => 3}
-          %h3= routing_table
-      = render "index_core", :call_routes => @call_routes.where(:routing_table => routing_table)
+- if @call_routes && @call_routes.any?
+  - @routing_tables.each do |routing_table|
+    %h3= routing_table
+    = render "index_core", :call_routes => @call_routes.where(:routing_table => routing_table), :routing_table => routing_table
  
 = render :partial => 'shared/create_link', :locals => {:child_class => CallRoute}
diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml
index 09daf53..7c695c8 100644
--- a/app/views/call_routes/show.html.haml
+++ b/app/views/call_routes/show.html.haml
@@ -1,23 +1,33 @@
 - content_for :title, t("call_routes.show.page_title")
 
-%p
-  %strong= t('call_routes.show.table') + ":"
-  = @call_route.routing_table
-%p
-  %strong= t('call_routes.show.name') + ":"
-  = @call_route.name
-%p
-  %strong= t('call_routes.show.endpoint') + ":"
-  - endpoint = @call_route.endpoint
-  - if endpoint
-    = endpoint
-  - else
-    = @call_route.endpoint_type
+.row
+  .span5
+    %table.table.table-striped
+      %tr
+        %td
+          %strong= t('call_routes.show.table') + ":"
+        %td
+          = @call_route.routing_table
+      %tr
+        %td
+          %strong= t('call_routes.show.name') + ":"
+        %td
+          = @call_route.name
+      %tr
+        %td
+          %strong= t('call_routes.show.endpoint') + ":"
+        %td
+          - if @call_route.endpoint.blank?
+            = @call_route.endpoint_type
+          - else
+            = @call_route.endpoint
 
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @call_route }
+    = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @call_route }
 
-%h3= t('route_elements.index.page_title')
-- if @call_route.route_elements && @call_route.route_elements.count > 0
-  = render "route_elements/index_core", :route_elements => @call_route.route_elements
+.row
+  .span12
+    %h3= t('route_elements.index.page_title')
+    - if @call_route.route_elements && @call_route.route_elements.count > 0
+      = render "route_elements/index_core", :route_elements => @call_route.route_elements
 
-= render :partial => 'shared/create_link', :locals => { :parent =>  @call_route, :child_class => RouteElement }
+    = render :partial => 'shared/create_link', :locals => { :parent =>  @call_route, :child_class => RouteElement }
diff --git a/app/views/call_routes/show.xml.haml b/app/views/call_routes/show.xml.haml
new file mode 100644
index 0000000..5800816
--- /dev/null
+++ b/app/views/call_routes/show.xml.haml
@@ -0,0 +1,5 @@
+!!! XML
+%call_route{ :name => @call_route.name, :routing_table =>  @call_route.routing_table, :position => @call_route.position, :endpoint => @call_route.endpoint, :endpoint_type => @call_route.endpoint_type }
+  %route_elements{ :count => @call_route.route_elements.count }
+    - @call_route.route_elements.each do |route_element|
+      %route_element{ :var_in => route_element.var_in, :var_out => route_element.var_out, :pattern => route_element.pattern, :replacement => route_element.replacement, :action => route_element.action, :mandatory => route_element.mandatory.to_s, :position => route_element.position }
diff --git a/app/views/call_routes/show_variables.html.haml b/app/views/call_routes/show_variables.html.haml
new file mode 100644
index 0000000..4bec39d
--- /dev/null
+++ b/app/views/call_routes/show_variables.html.haml
@@ -0,0 +1,13 @@
+%h3= 'Channel Variables'
+
+%table.table.table-striped
+  %thead
+    %tr
+      %th= 'Variable'
+      %th= 'Value'
+
+  %tbody{ :id => "show_variables" }
+    - @channel_variables.each do |key, value|
+      %tr
+        %td= key
+        %td= value.gsub(/\n/, '<br/>').html_safe