summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-16 16:32:59 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-16 16:32:59 +0100
commit0ee17f52f8ad337c1240b4c55dbd8f6c6c74dc90 (patch)
tree1016d6e8f1d35629d82ef462fed20827d17c4e3d /app/views
parent225a812d5f2da7dc205c021a571ff3c6d5307f20 (diff)
Fixed routes and breadcrumbs. #106
Diffstat (limited to 'app/views')
-rw-r--r--app/views/route_elements/_form.html.haml2
-rw-r--r--app/views/route_elements/_form_core.html.haml1
-rw-r--r--app/views/route_elements/_index_core.html.haml4
-rw-r--r--app/views/route_elements/index.html.haml2
-rw-r--r--app/views/route_elements/show.html.haml5
5 files changed, 4 insertions, 10 deletions
diff --git a/app/views/route_elements/_form.html.haml b/app/views/route_elements/_form.html.haml
index cfa4c6b..8feacaa 100644
--- a/app/views/route_elements/_form.html.haml
+++ b/app/views/route_elements/_form.html.haml
@@ -1,4 +1,4 @@
-= simple_form_for(@route_element) do |f|
+= simple_form_for([@call_route, @route_element]) do |f|
= f.error_notification
= render "form_core", :f => f
diff --git a/app/views/route_elements/_form_core.html.haml b/app/views/route_elements/_form_core.html.haml
index 7697cb0..133d1df 100644
--- a/app/views/route_elements/_form_core.html.haml
+++ b/app/views/route_elements/_form_core.html.haml
@@ -1,5 +1,4 @@
.inputs
- = f.input :call_route_id, :label => t('route_elements.form.call_route_id.label'), :hint => conditional_hint('route_elements.form.call_route_id.hint')
= f.input :var_in, :label => t('route_elements.form.var_in.label'), :hint => conditional_hint('route_elements.form.var_in.hint')
= f.input :var_out, :label => t('route_elements.form.var_out.label'), :hint => conditional_hint('route_elements.form.var_out.hint')
= f.input :pattern, :label => t('route_elements.form.pattern.label'), :hint => conditional_hint('route_elements.form.pattern.hint')
diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml
index 63665fd..c1df665 100644
--- a/app/views/route_elements/_index_core.html.haml
+++ b/app/views/route_elements/_index_core.html.haml
@@ -1,6 +1,5 @@
%table
%tr
- %th= t('route_elements.index.call_route_id')
%th= t('route_elements.index.var_in')
%th= t('route_elements.index.var_out')
%th= t('route_elements.index.pattern')
@@ -12,7 +11,6 @@
- reset_cycle
- for route_element in route_elements
%tr{:class => cycle('odd', 'even')}
- %td= route_element.call_route_id
%td= route_element.var_in
%td= route_element.var_out
%td= route_element.pattern
@@ -20,4 +18,4 @@
%td= route_element.action
%td= route_element.mandatory
%td= route_element.position
- =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => route_element} \ No newline at end of file
+ =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @call_route, :child => route_element} \ No newline at end of file
diff --git a/app/views/route_elements/index.html.haml b/app/views/route_elements/index.html.haml
index b05236b..8a6f7bc 100644
--- a/app/views/route_elements/index.html.haml
+++ b/app/views/route_elements/index.html.haml
@@ -3,4 +3,4 @@
- if @route_elements && @route_elements.count > 0
= render "index_core", :route_elements => @route_elements
-= render :partial => 'shared/create_link', :locals => {:child_class => RouteElement} \ No newline at end of file
+= render :partial => 'shared/create_link', :locals => {:parent => @call_route, :child_class => RouteElement} \ No newline at end of file
diff --git a/app/views/route_elements/show.html.haml b/app/views/route_elements/show.html.haml
index a439353..8e41f80 100644
--- a/app/views/route_elements/show.html.haml
+++ b/app/views/route_elements/show.html.haml
@@ -1,9 +1,6 @@
- title t("route_elements.show.page_title")
%p
- %strong= t('route_elements.show.call_route_id') + ":"
- = @route_element.call_route_id
-%p
%strong= t('route_elements.show.var_in') + ":"
= @route_element.var_in
%p
@@ -25,4 +22,4 @@
%strong= t('route_elements.show.position') + ":"
= @route_element.position
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @route_element } \ No newline at end of file
+= render :partial => 'shared/show_edit_destroy_part', :locals => {:parent => @call_route, :child => @route_element } \ No newline at end of file