Merge branch 'develop'5.1-beta2

3 files changed, 59 insertions, 36 deletions

diff --git a/app/views/gateways/_form_core.html.haml b/app/views/gateways/_form_core.html.haml
index 13ed8b1..604c223 100644
--- a/app/views/gateways/_form_core.html.haml
+++ b/app/views/gateways/_form_core.html.haml
@@ -1,6 +1,6 @@
 .inputs
   = f.input :name, :label => t('gateways.form.name.label'), :hint => conditional_hint('gateways.form.name.hint'), :autofocus => true
-  = f.input :technology, :label => t('gateways.form.technology.label'), :hint => conditional_hint('gateways.form.technology.hint')
+  = f.input :technology, :collection => @technologies, :label => t('gateways.form.technology.label'), :hint => conditional_hint('gateways.form.technology.hint'), :include_blank => false
   = f.input :inbound, :label => t('gateways.form.inbound.label'), :hint => conditional_hint('gateways.form.inbound.hint')
   = f.input :outbound, :label => t('gateways.form.outbound.label'), :hint => conditional_hint('gateways.form.outbound.hint')
   = f.input :description, :label => t('gateways.form.description.label'), :hint => conditional_hint('gateways.form.description.hint')
diff --git a/app/views/gateways/_index_core.html.haml b/app/views/gateways/_index_core.html.haml
index 0eec67f..1750212 100644
--- a/app/views/gateways/_index_core.html.haml
+++ b/app/views/gateways/_index_core.html.haml
@@ -1,19 +1,28 @@
 - cache(['gateways_table', gateways.count, gateways.first, gateways.last]) do 
-  %table{:class => 'table table-striped'}
-    %tr
-      %th= t('gateways.index.name')
-      %th= t('gateways.index.technology')
-      %th= t('gateways.index.inbound')
-      %th= t('gateways.index.outbound')
-      %th= t('gateways.index.description')
-      %th{:colspan => '3'}
-    
-    - for gateway in gateways
+  %table.table.table-striped
+    %thead
       %tr
-        - cache(['gateway_single_table_row_within_tr', gateway, gateways.count]) do 
-          %td= gateway.name
-          %td= gateway.technology
-          %td= gateway.inbound
-          %td= gateway.outbound
-          %td= gateway.description
-          =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gateway}
\ No newline at end of file
+        %th= t('gateways.index.name')
+        %th
+          %span.hidden-phone
+            = t('gateways.index.technology')
+        %th= t('gateways.index.inbound')
+        %th= t('gateways.index.outbound')
+        %th
+          %span.hidden-phone
+            = t('gateways.index.description')
+
+    %tbody
+      - for gateway in gateways
+        %tr
+          - cache(['gateway_single_table_row_within_tr', gateway, gateways.count]) do 
+            %td= gateway.name
+            %td
+              %span.hidden-phone
+                = gateway.technology
+            %td= gateway.inbound
+            %td= gateway.outbound
+            %td
+              %span.hidden-phone
+                = gateway.description
+            =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gateway}
\ No newline at end of file
diff --git a/app/views/gateways/show.html.haml b/app/views/gateways/show.html.haml
index 9a3e1c4..6cf09ec 100644
--- a/app/views/gateways/show.html.haml
+++ b/app/views/gateways/show.html.haml
@@ -1,23 +1,37 @@
 - content_for :title, t("gateways.show.page_title")
 
-%p
-  %strong= t('gateways.show.id') + ":"
-  = @gateway.id
-%p
-  %strong= t('gateways.show.name') + ":"
-  = @gateway.name
-%p
-  %strong= t('gateways.show.technology') + ":"
-  = @gateway.technology
-%p
-  %strong= t('gateways.show.inbound') + ":"
-  = @gateway.inbound
-%p
-  %strong= t('gateways.show.outbound') + ":"
-  = @gateway.outbound
-%p
-  %strong= t('gateways.show.description') + ":"
-  = @gateway.description
+%table.table.table-striped
+  %tbody
+    %tr
+      %td
+        %strong= t('gateways.show.name') + ":"
+      %td
+        = @gateway.name
+    %tr
+      %td
+        %strong= t('gateways.show.id') + ":"
+      %td
+        = @gateway.id
+    %tr
+      %td
+        %strong= t('gateways.show.technology') + ":"
+      %td
+        = @gateway.technology
+    %tr
+      %td
+        %strong= t('gateways.show.inbound') + ":"
+      %td
+        = @gateway.inbound
+    %tr
+      %td
+        %strong= t('gateways.show.outbound') + ":"
+      %td
+        = @gateway.outbound
+    %tr
+      %td
+        %strong= t('gateways.show.description') + ":"
+      %td
+        = @gateway.description
 
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @gateway }