summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-12 13:27:08 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-12 13:27:08 +0100
commit421249fc702fa76fe68530a1ab8bdde910814c6f (patch)
treeaa6ed467ba56ea74b0061af4d06cfb9b853da489 /app/views
parentaa5a2b806d117ffde9888e282c7100066156d94b (diff)
parentf8f35f666613eff24d3988bda1a22cc40ef2ab30 (diff)
Merge branch 'call_routes' into develop
Diffstat (limited to 'app/views')
-rw-r--r--app/views/call_routes/show.html.haml2
-rw-r--r--app/views/route_elements/_form_core.html.haml1
-rw-r--r--app/views/route_elements/_index_core.html.haml12
3 files changed, 9 insertions, 6 deletions
diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml
index 998558e..7c695c8 100644
--- a/app/views/call_routes/show.html.haml
+++ b/app/views/call_routes/show.html.haml
@@ -22,7 +22,7 @@
- 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 }
.row
.span12
diff --git a/app/views/route_elements/_form_core.html.haml b/app/views/route_elements/_form_core.html.haml
index d22467e..a9a38a7 100644
--- a/app/views/route_elements/_form_core.html.haml
+++ b/app/views/route_elements/_form_core.html.haml
@@ -4,5 +4,4 @@
= f.input :pattern, :label => t('route_elements.form.pattern.label'), :hint => conditional_hint('route_elements.form.pattern.hint')
= f.input :replacement, :label => t('route_elements.form.replacement.label'), :hint => conditional_hint('route_elements.form.replacement.hint')
= f.input :action, :collection => RouteElement::ELEMENT_ACTIONS, :label => t('route_elements.form.action.label'), :hint => conditional_hint('route_elements.form.action.hint'), :include_blank => false
- = f.input :position, :label => t('route_elements.form.position.label'), :hint => conditional_hint('route_elements.form.position.hint')
= f.input :mandatory, :label => t('route_elements.form.mandatory.label'), :hint => conditional_hint('route_elements.form.mandatory.hint')
diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml
index f68a9ba..a88602f 100644
--- a/app/views/route_elements/_index_core.html.haml
+++ b/app/views/route_elements/_index_core.html.haml
@@ -1,7 +1,8 @@
%table.table.table-striped
%thead
%tr
- %th
+ - if route_elements.count > 1
+ %th
%th= t('route_elements.index.var_in')
%th= t('route_elements.index.var_out')
%th= t('route_elements.index.pattern')
@@ -9,10 +10,13 @@
%th= t('route_elements.index.action')
%th= t('route_elements.index.mandatory')
- %tbody
+ %tbody{ :id => "route_elements", :'data-update-url' => sort_call_route_route_elements_url(route_elements.first.call_route)}
- for route_element in route_elements
- %tr
- %td= route_element.position
+ = content_tag_for :tr, route_element do
+ - if route_elements.count > 1
+ %td
+ %span.handle
+ %i.icon-resize-vertical
%td= route_element.var_in
%td= route_element.var_out
%td= route_element.pattern