diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-20 19:54:11 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-20 19:54:11 +0100 |
commit | 4ea0e252683d89794deff7b1b3689d2cdf61e0d0 (patch) | |
tree | 152fe2bb04e50974c6ccd05b9280603c4235f62a | |
parent | 5b5cbfddd9fa3a26de90ca8aa42668eb95648605 (diff) |
Added a gateways table to tenant#view.
-rw-r--r-- | app/views/gateways/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/tenants/_admin_area.de.html.haml | 4 | ||||
-rw-r--r-- | app/views/tenants/_admin_area.html.haml | 4 | ||||
-rw-r--r-- | app/views/tenants/_call_routes.html.haml | 2 | ||||
-rw-r--r-- | app/views/tenants/_gateways.html.haml | 8 | ||||
-rw-r--r-- | config/locales/views/gateways/de.yml | 8 |
6 files changed, 20 insertions, 8 deletions
diff --git a/app/views/gateways/show.html.haml b/app/views/gateways/show.html.haml index a9b0d18..9d0ee53 100644 --- a/app/views/gateways/show.html.haml +++ b/app/views/gateways/show.html.haml @@ -28,8 +28,8 @@ %br = render :partial => 'shared/create_link', :locals => { :parent => @gateway, :child_class => GatewaySetting } +%h3= t('gateway_parameters.index.page_title') - if @gateway.gateway_parameters.any? - %h3= t('gateway_parameters.index.page_title') = render "gateway_parameters/index_core", :gateway_parameters => @gateway.gateway_parameters %br = render :partial => 'shared/create_link', :locals => { :parent => @gateway, :child_class => GatewayParameter } diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml index ba64e9a..6a4bef9 100644 --- a/app/views/tenants/_admin_area.de.html.haml +++ b/app/views/tenants/_admin_area.de.html.haml @@ -27,4 +27,6 @@ = succeed '.' do =link_to manufacturer, manufacturer_path(manufacturer) -= render :partial => 'call_routes', :locals => {:tenant => @tenant}
\ No newline at end of file += render :partial => 'call_routes', :locals => {:tenant => @tenant} + += render :partial => 'gateways', :locals => {:tenant => @tenant}
\ No newline at end of file diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index 50ed372..b974c02 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -25,4 +25,6 @@ =link_to manufacturer, manufacturer_path(manufacturer) - else = succeed '.' do - =link_to manufacturer, manufacturer_path(manufacturer)
\ No newline at end of file + =link_to manufacturer, manufacturer_path(manufacturer) + += render :partial => 'call_routes', :locals => {:tenant => @tenant}
\ No newline at end of file diff --git a/app/views/tenants/_call_routes.html.haml b/app/views/tenants/_call_routes.html.haml index ade24c9..41066ae 100644 --- a/app/views/tenants/_call_routes.html.haml +++ b/app/views/tenants/_call_routes.html.haml @@ -1,7 +1,7 @@ %h2= t("call_routes.index.page_title") - if CallRoute.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') - = render "call_routes/index_core", :call_routes => CallRoute.call + = render "call_routes/index_core", :call_routes => CallRoute.all = render :partial => 'shared/create_link', :locals => {:child_class => CallRoute} - else %p diff --git a/app/views/tenants/_gateways.html.haml b/app/views/tenants/_gateways.html.haml new file mode 100644 index 0000000..c861ad3 --- /dev/null +++ b/app/views/tenants/_gateways.html.haml @@ -0,0 +1,8 @@ +%h2= t("gateways.index.page_title") + +- if Gateway.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') + = render "gateways/index_core", :gateways => Gateway.all + = render :partial => 'shared/create_link', :locals => {:child_class => Gateway} +- else + %p + = link_to t("gateways.index.page_title"), gateways_path
\ No newline at end of file diff --git a/config/locales/views/gateways/de.yml b/config/locales/views/gateways/de.yml index 28bc46c..befe6b6 100644 --- a/config/locales/views/gateways/de.yml +++ b/config/locales/views/gateways/de.yml @@ -6,9 +6,9 @@ de: successfuly_updated: 'Gateway wurde aktualisiert.' successfuly_destroyed: 'Gateway wurde gelöscht.' index: - page_title: 'Übersicht von Gateway' + page_title: 'Liste aller Gateways' name: 'Name' - technology: 'Technology' + technology: 'Technologie' inbound: 'Inbound' outbound: 'Outbound' description: 'Description' @@ -23,7 +23,7 @@ de: page_title: 'Gateway' id: 'ID' name: 'Name' - technology: 'Technology' + technology: 'Technologie' inbound: 'Inbound' outbound: 'Outbound' description: 'Description' @@ -47,7 +47,7 @@ de: label: 'Name' hint: '' technology: - label: 'Technology' + label: 'Technologie' hint: '' inbound: label: 'Inbound' |