From 113e3c6c6117fbeca7b9bf1f0e6dc26b0db9c407 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Wed, 16 Jan 2013 08:33:45 -0500
Subject: call_routes added

---
 app/views/call_routes/_form.html.haml       |  7 +++++++
 app/views/call_routes/_form_core.html.haml  |  6 ++++++
 app/views/call_routes/_index_core.html.haml | 17 +++++++++++++++++
 app/views/call_routes/edit.html.haml        |  3 +++
 app/views/call_routes/index.html.haml       |  6 ++++++
 app/views/call_routes/new.html.haml         |  3 +++
 app/views/call_routes/show.html.haml        | 19 +++++++++++++++++++
 7 files changed, 61 insertions(+)
 create mode 100644 app/views/call_routes/_form.html.haml
 create mode 100644 app/views/call_routes/_form_core.html.haml
 create mode 100644 app/views/call_routes/_index_core.html.haml
 create mode 100644 app/views/call_routes/edit.html.haml
 create mode 100644 app/views/call_routes/index.html.haml
 create mode 100644 app/views/call_routes/new.html.haml
 create mode 100644 app/views/call_routes/show.html.haml

(limited to 'app/views/call_routes')

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
-- 
cgit v1.2.3


From 046ce09895a08778c971052f6d22ecd6422aee6d Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Wed, 16 Jan 2013 21:24:24 +0100
Subject: list route elements in route view

---
 app/views/call_routes/show.html.haml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml
index 31c3cb0..c5c7397 100644
--- a/app/views/call_routes/show.html.haml
+++ b/app/views/call_routes/show.html.haml
@@ -16,4 +16,10 @@
   %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
+= 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
+
+= render :partial => 'shared/create_link', :locals => { :parent =>  @call_route, :child_class => RouteElement }
-- 
cgit v1.2.3


From 4ba228de6ecbfa0eeca20f8f7b70aee78fde9385 Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Wed, 16 Jan 2013 23:08:53 +0100
Subject: position removed

---
 app/views/call_routes/show.html.haml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml
index c5c7397..8be64e6 100644
--- a/app/views/call_routes/show.html.haml
+++ b/app/views/call_routes/show.html.haml
@@ -12,9 +12,6 @@
 %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 }
 
-- 
cgit v1.2.3


From ae8ce84e44d776b3c2318795ceff611f0639b7ec Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Thu, 17 Jan 2013 12:31:10 +0100
Subject: call route views

---
 app/views/call_routes/_form_core.html.haml  | 3 +--
 app/views/call_routes/_index_core.html.haml | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/_form_core.html.haml b/app/views/call_routes/_form_core.html.haml
index 4b97434..4712e2f 100644
--- a/app/views/call_routes/_form_core.html.haml
+++ b/app/views/call_routes/_form_core.html.haml
@@ -1,6 +1,5 @@
 .inputs
-  = f.input :table, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint')
+  = f.input :table, :collection => CallRoute::ROUTING_TABLES, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint'), :include_blank => false
   = 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
index 6ea3af7..9e7b94e 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -4,7 +4,6 @@
     %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
@@ -13,5 +12,4 @@
       %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
-- 
cgit v1.2.3


From 24e47521f1a57c73dc349de35909af7e1f8a4a1f Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Thu, 17 Jan 2013 17:50:47 +0100
Subject: group by table

---
 app/views/call_routes/_index_core.html.haml |  2 --
 app/views/call_routes/index.html.haml       | 11 ++++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index 9e7b94e..aa22437 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -1,6 +1,5 @@
 %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')
@@ -8,7 +7,6 @@
   - 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
diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml
index 687a9dc..c83606b 100644
--- a/app/views/call_routes/index.html.haml
+++ b/app/views/call_routes/index.html.haml
@@ -1,6 +1,11 @@
 - 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
+  %table
+    - @tables.each do |table|
+      %tr
+        %td{:colspan => 3}
+          %h3= table
+      = render "index_core", :call_routes => @call_routes.where(:table => table)
+ 
+= render :partial => 'shared/create_link', :locals => {:child_class => CallRoute}
-- 
cgit v1.2.3


From 17206a20e5bcb44fa4d90f0e176f7aa0fe43bca3 Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Thu, 17 Jan 2013 21:51:58 +0100
Subject: rename_column table to routing_table

---
 app/views/call_routes/_form_core.html.haml | 2 +-
 app/views/call_routes/index.html.haml      | 6 +++---
 app/views/call_routes/show.html.haml       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/_form_core.html.haml b/app/views/call_routes/_form_core.html.haml
index 4712e2f..2eee795 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 :table, :collection => CallRoute::ROUTING_TABLES, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint'), :include_blank => false
+  = 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
   = 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')
diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml
index c83606b..151fc0e 100644
--- a/app/views/call_routes/index.html.haml
+++ b/app/views/call_routes/index.html.haml
@@ -2,10 +2,10 @@
 
 - if @call_routes && @call_routes.count > 0
   %table
-    - @tables.each do |table|
+    - @routing_tables.each do |routing_table|
       %tr
         %td{:colspan => 3}
-          %h3= table
-      = render "index_core", :call_routes => @call_routes.where(:table => table)
+          %h3= routing_table
+      = render "index_core", :call_routes => @call_routes.where(: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 8be64e6..bada227 100644
--- a/app/views/call_routes/show.html.haml
+++ b/app/views/call_routes/show.html.haml
@@ -2,7 +2,7 @@
 
 %p
   %strong= t('call_routes.show.table') + ":"
-  = @call_route.table
+  = @call_route.routing_table
 %p
   %strong= t('call_routes.show.name') + ":"
   = @call_route.name
-- 
cgit v1.2.3


From 5efd9bdd2f78a15569fb7d1569dceff3bb4f8800 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Fri, 18 Jan 2013 10:19:09 +0100
Subject: Fixed a strange strong_parameter cancan bug.

---
 app/views/call_routes/_form_core.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/_form_core.html.haml b/app/views/call_routes/_form_core.html.haml
index 2eee795..b64d660 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
+  = 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')
-- 
cgit v1.2.3


From 525e7ad4cac6fff7bd0370828b06159d610573ef Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 20 Jan 2013 19:45:36 +0100
Subject: Added caching.

---
 app/views/call_routes/_index_core.html.haml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index aa22437..124f4d0 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -1,13 +1,15 @@
-%table
-  %tr
-    %th= t('call_routes.index.name')
-    %th= t('call_routes.index.endpoint_type')
-    %th= t('call_routes.index.endpoint_id')
+- cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do 
+  %table
+    %tr
+      %th= t('call_routes.index.name')
+      %th= t('call_routes.index.endpoint_type')
+      %th= t('call_routes.index.endpoint_id')
 
-  - reset_cycle
-  - for call_route in call_routes
-    %tr{:class => cycle('odd', 'even')}
-      %td= call_route.name
-      %td= call_route.endpoint_type
-      %td= call_route.endpoint_id
-      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
\ No newline at end of file
+    - reset_cycle
+    - for call_route in call_routes
+      %tr{:class => cycle('odd', 'even')}
+        - cache(['call_route_single_table_row', call_route]) do 
+          %td= call_route.name
+          %td= call_route.endpoint_type
+          %td= call_route.endpoint_id
+          =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
\ No newline at end of file
-- 
cgit v1.2.3


From 93a839b41f7172eecd1aeb497ccec6c73d2c4c1e Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 20 Jan 2013 19:46:13 +0100
Subject: Better cache key.

---
 app/views/call_routes/_index_core.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index 124f4d0..32877b2 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -8,7 +8,7 @@
     - reset_cycle
     - for call_route in call_routes
       %tr{:class => cycle('odd', 'even')}
-        - cache(['call_route_single_table_row', call_route]) do 
+        - cache(['call_route_single_table_row_within_tr', call_route]) do 
           %td= call_route.name
           %td= call_route.endpoint_type
           %td= call_route.endpoint_id
-- 
cgit v1.2.3


From 5b5cbfddd9fa3a26de90ca8aa42668eb95648605 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 20 Jan 2013 19:48:19 +0100
Subject: Small logic fix.

---
 app/views/call_routes/_index_core.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index 32877b2..12e89ee 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -8,7 +8,7 @@
     - reset_cycle
     - for call_route in call_routes
       %tr{:class => cycle('odd', 'even')}
-        - cache(['call_route_single_table_row_within_tr', call_route]) do 
+        - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do 
           %td= call_route.name
           %td= call_route.endpoint_type
           %td= call_route.endpoint_id
-- 
cgit v1.2.3


From 18ed88c7e3c789366f6e5443dc4ee0bc981a4b88 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 21 Jan 2013 20:18:16 +0100
Subject: Started the migration to Twitter Bootstrap.

---
 app/views/call_routes/_index_core.html.haml | 4 ++--
 app/views/call_routes/edit.html.haml        | 2 +-
 app/views/call_routes/index.html.haml       | 4 ++--
 app/views/call_routes/new.html.haml         | 2 +-
 app/views/call_routes/show.html.haml        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index 12e89ee..e0ca39b 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -1,5 +1,5 @@
 - cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do 
-  %table
+  %table{:class => 'table table-striped'}
     %tr
       %th= t('call_routes.index.name')
       %th= t('call_routes.index.endpoint_type')
@@ -7,7 +7,7 @@
 
     - reset_cycle
     - for call_route in call_routes
-      %tr{:class => cycle('odd', 'even')}
+      %tr
         - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do 
           %td= call_route.name
           %td= call_route.endpoint_type
diff --git a/app/views/call_routes/edit.html.haml b/app/views/call_routes/edit.html.haml
index 0ad46c5..6048200 100644
--- a/app/views/call_routes/edit.html.haml
+++ b/app/views/call_routes/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("call_routes.edit.page_title")
+- content_for :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
index 151fc0e..bd4468c 100644
--- a/app/views/call_routes/index.html.haml
+++ b/app/views/call_routes/index.html.haml
@@ -1,7 +1,7 @@
-- title t("call_routes.index.page_title")
+- content_for :title, t("call_routes.index.page_title")
 
 - if @call_routes && @call_routes.count > 0
-  %table
+  %table{:class => 'table table-striped'}
     - @routing_tables.each do |routing_table|
       %tr
         %td{:colspan => 3}
diff --git a/app/views/call_routes/new.html.haml b/app/views/call_routes/new.html.haml
index 0796d7f..28aead9 100644
--- a/app/views/call_routes/new.html.haml
+++ b/app/views/call_routes/new.html.haml
@@ -1,3 +1,3 @@
-- title t("call_routes.new.page_title")
+- content_for :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
index bada227..70fe13e 100644
--- a/app/views/call_routes/show.html.haml
+++ b/app/views/call_routes/show.html.haml
@@ -1,4 +1,4 @@
-- title t("call_routes.show.page_title")
+- content_for :title, t("call_routes.show.page_title")
 
 %p
   %strong= t('call_routes.show.table') + ":"
-- 
cgit v1.2.3


From d8fe3b636cab1504cb5d3cb5dc57ed818749ccf5 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 21 Jan 2013 21:30:48 +0100
Subject: Twitter Bootstrap stuff.

---
 app/views/call_routes/_index_core.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index e0ca39b..222303b 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -5,7 +5,7 @@
       %th= t('call_routes.index.endpoint_type')
       %th= t('call_routes.index.endpoint_id')
 
-    - reset_cycle
+    
     - for call_route in call_routes
       %tr
         - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do 
-- 
cgit v1.2.3


From c52babd4346b1a52c28bb7437d0434ecfb9ab70f Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 21 Jan 2013 22:25:32 +0100
Subject: Twitter Bootstrap stuff.

---
 app/views/call_routes/_index_core.html.haml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'app/views/call_routes')

diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index 222303b..5dc7c21 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -2,14 +2,20 @@
   %table{:class => 'table table-striped'}
     %tr
       %th= t('call_routes.index.name')
+      %th= t('route_elements.index.pattern')
       %th= t('call_routes.index.endpoint_type')
-      %th= t('call_routes.index.endpoint_id')
-
+      %th{:colspan => '3'}
     
     - for call_route in call_routes
-      %tr
-        - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do 
+      - cache(['call_route_single_table_row', call_route, call_routes.count]) do 
+        %tr
           %td= call_route.name
+          %td
+            - if call_route.route_elements.any?
+              = call_route.route_elements.first.pattern
+              - if call_route.route_elements.count > 1
+                = ', ...'
+            - else
+              = '-'
           %td= call_route.endpoint_type
-          %td= call_route.endpoint_id
           =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
\ No newline at end of file
-- 
cgit v1.2.3