foreman_datacenter 0.1.54 → 0.1.55

data/app/views/foreman_datacenter/device_types/welcome.html.erb

@@ -1,3 +1,5 @@
+<%= breadcrumbs(items: [{caption: _('Device Types'), url: device_types_path}, {caption: ""}]) %>
+
 <% content_for(:title, _("Device Types")) %>
 <div class="blank-slate-pf">
   <div class="blank-slate-pf-icon">

data/app/views/foreman_datacenter/devices/_aracks.html.erb

@@ -1,5 +1,5 @@
 <%= rack_device_select @site,
-											 url: interfaces_device_interface_connections_path,
-											 target: '#interfaces-container' %>
+                       url: interfaces_device_interface_connections_path,
+                       target: '#interfaces-container' %>
 
 

data/app/views/foreman_datacenter/devices/_console_port.html.erb

@@ -39,7 +39,7 @@
         </button>
       </td>
   <% else %>
-      <td class="text-muted">Not connected</td>
+      <td class="text-muted"><%= _("Not connected") %></td>
       <td></td>
       <td class="text-right">
         <%= link_to new_connection_console_port_path(console_port),

data/app/views/foreman_datacenter/devices/_console_server_port.html.erb

@@ -43,7 +43,7 @@
         <i class="fa fa-fw fa-keyboard-o"></i>
         <%= h console_server_port.name %>
       </td>
-      <td class="text-muted">Not connected</td>
+      <td class="text-muted"><%= _("Not connected") %></td>
       <td></td>
       <td class="text-right">
         <%= link_to new_connection_console_server_port_path(console_server_port),

data/app/views/foreman_datacenter/devices/_device_bay.html.erb

@@ -12,7 +12,7 @@
         <%= link_to device_bay.installed_device.name,
                     device_path(device_bay.installed_device) %>
     <% else %>
-        <span class="text-muted">Vacant</span>
+        <span class="text-muted"><%= _("Vacant") %></span>
     <% end %>
   </td>
   <td class="text-right">

data/app/views/foreman_datacenter/devices/_device_module.html.erb

@@ -3,11 +3,11 @@
   <td><%= h device_module.part_id %></td>
   <td><%= h device_module.serial %></td>
   <td class="text-right">
-    <%= link_to edit_device_module_path,
+    <%= link_to edit_device_module_path(device_module),
                 class: 'btn btn-warning btn-xs', title: 'Edit a module' do %>
         <span class="glyphicon glyphicon-pencil"></span>
     <% end %>
-    <%= link_to device_module_path,
+    <%= link_to device_module_path(device_module),
                 class: 'btn btn-danger btn-xs', title: 'Destroy a module',
                 method: :delete do %>
         <span class="glyphicon glyphicon-trash"></span>

data/app/views/foreman_datacenter/devices/_device_types.html.erb

@@ -1,5 +1,5 @@
 <%= form_for :device do |f| %>
-    <div id="device-types">
-      <%= device_types_for_device_form f, @manufacturer_id %>
-    </div>
+  <div id="device-types">
+    <%= device_types_for_device_form f, @manufacturer_id %>
+  </div>
 <% end %>

data/app/views/foreman_datacenter/devices/_for_rack.html.erb

@@ -1,9 +1,9 @@
 <div class="clearfix">
   <div class="form-group">
-    <label class="col-md-2 control-label required">Device</label>
+    <label class="col-md-2 control-label required"><%= _("Device") %></label>
     <div class="col-md-4">
       <%= devices_list_for_rack @rack %>
     </div>
-    <span class="help-block help-inline">Then choose a device</span>
+    <span class="help-block help-inline"><%= _("Then choose a device") %></span>
   </div>
 </div>

data/app/views/foreman_datacenter/devices/_form.html.erb

@@ -15,7 +15,7 @@
 
     <!-- Hardware -->
     <div class="panel panel-default">
-      <div class="panel-heading"><strong>Hardware</strong></div>
+      <div class="panel-heading"><strong><%= _("Hardware") %></strong></div>
       <div class="panel-body">
         <div class="clearfix">
           <div class="form-group">
@@ -67,14 +67,12 @@
 
     <!-- Management -->
     <div class="panel panel-default">
-      <div class="panel-heading"><strong>Management</strong></div>
+      <div class="panel-heading"><strong><%= _("Management") %></strong></div>
       <div class="panel-body">
         <%= platforms_for_device_form f, @device.platform_id %>
         <%= selectable_f f, :status, ForemanDatacenter::Device.statuses.keys %>
       </div>
     </div>
 
-    <%= f.hidden_field :host_id %>
-
     <%= submit_or_cancel f %>
 <% end %>

data/app/views/foreman_datacenter/devices/_power_outlet.html.erb

@@ -39,7 +39,7 @@
         </button>
       </td>
   <% else %>
-      <td class="text-muted">Not connected</td>
+      <td class="text-muted"><%= _("Not connected") %></td>
       <td></td>
       <td class="text-right">
         <%= link_to new_connection_power_outlet_path(power_outlet),

data/app/views/foreman_datacenter/devices/_racks.html.erb

@@ -1,5 +1,5 @@
 <%= form_for :device do |f| %>
-    <div id="sites">
-      <%= racks_for_device_form f, @site_id %>
-    </div>
+  <div id="sites">
+    <%= racks_for_device_form f, @site_id %>
+  </div>
 <% end %>

data/app/views/foreman_datacenter/devices/edit.html.erb

@@ -1,5 +1,7 @@
 <% javascript 'foreman_datacenter/devices' %>
 
-<% title 'Editing a device' %>
+<% title _("Edit %s") % @device.to_label %>
+
+<%= breadcrumbs(items: [{caption: _('Device %s') % @device.to_label, url: device_path(@device)}, {caption: _('Edit %s') % @device.to_label}]) %>
 
 <%= render 'form' %>

data/app/views/foreman_datacenter/devices/index.html.erb

@@ -1,55 +1,72 @@
 <% javascript 'foreman_datacenter/devices' %>
 <% javascript 'foreman_datacenter/pagination' %>
 <% stylesheet 'foreman_datacenter/comments' %>
+<% stylesheet 'foreman_datacenter/title_filter' %>
+<% stylesheet 'foreman_datacenter/modal' %>
+<% javascript 'foreman_datacenter/modal' %>
 
 <% title _('Devices') %>
-<% title_actions display_link_if_authorized(_('Create device'), hash_for_new_device_path, class: 'btn btn-primary'),
+<% title_actions new_link(_('Create device')),
   display_link_if_authorized(_('Import from host'), hash_for_import_to_device_path, class: 'btn btn-success'),
   help_button
 %>
 
-<table class="<%= table_css_classes 'table-two-pane' %>">
+<table class="<%= table_css_classes 'table-fixed' %>">
+
   <thead>
-  <tr>
-    <th>Name</th>
-    <th>Status</th>
-    <th>Site</th>
-    <th>Rack</th>
-    <th>Role</th>
-    <th>Type</th>
-    <th>Action</th>
-  </tr>
+    <tr>
+      <th><%= sort :name, :as => s_("Device|Name") %></th>
+      <th><%= sort :status, :as => s_("Device|Status") %></th>
+      <th><%= sort :site, :as => s_("Device|Site") %></th>
+      <th><%= sort :rack, :as => s_("Device|Rack") %></th>
+      <th><%= sort :role, :as => s_("Device|Role") %></th>
+      <th><%= sort :type, :as => s_("Device|Type") %></th>
+      <th class="col-md-1"><%= _("Action") %></th>
+    </tr>
   </thead>
+
   <tbody>
-  <% @devices.each do |device| %>
+    <% for device in @devices %>
       <tr>
-        <td><%= link_to device.name, device_path(device) %></td>
-        <td>
+        <td class="ellipsis"><%= link_to device.name, device_path(device) %></td>
+        <td class="ellipsis">
           <% if device.active? %>
               <span class="glyphicon glyphicon-ok-sign text-success" title="Active"></span>
           <% elsif device.offline? %>
               <span class="glyphicon glyphicon-minus-sign text-danger" title="Offline"></span>
           <% end %>
         </td>
-        <td><%= h device.site.name %></td>
-        <td><%= h device.rack.name %></td>
-        <td><%= h device.device_role.name %></td>
-        <td><%= h device.device_type.model %></td>
+        <td class="ellipsis">
+          <%= device.site ? (link_to device.site.name, site_path(device.site)) : "-" %>
+        </td>
+        <td class="ellipsis">
+          <%= device.rack ? (link_to device.rack.name, rack_path(device.rack)) : "-" %>
+        </td>
+        <td class="ellipsis">
+          <%= device.device_role ? (link_to device.device_role.name, device_role_path(device.device_role)) : "-" %>
+        </td>
+        <td class="ellipsis">
+          <%= device.device_type ? (link_to device.device_type.model, device_type_path(device.device_type)) : "-" %>
+        </td>
         <td>
           <%= action_buttons(
                 display_link_if_authorized(
                   _("Edit"),
                   hash_for_edit_device_path(:id => device).merge(:auth_object => device, :authorizer => authorizer)
                 ),
-                display_delete_if_authorized(
-                  hash_for_device_path(:id => device).merge(:auth_object => device, :authorizer => authorizer),
-                  :data => { :confirm => 'Are you sure?' },
-                  :action => :destroy
+                display_fake_delete_if_authorized(
+                   hash_for_site_path(:id => device).merge(:auth_object => device, :authorizer => authorizer),
+                   id: 'init-modal',
+                   href: '#',
+                   data: { objecttype: 'device',
+                           objectid: device.id,
+                           objectname: device.to_label,
+                           associatedobjects: associated_objects('device') }
                 )
               ) %>
         </td>
       </tr>
-  <% end %>
+    <% end %>
   </tbody>
 </table>
 

data/app/views/foreman_datacenter/devices/inventory.html.erb

@@ -1,6 +1,9 @@
 <% javascript 'foreman_datacenter/ajax' %>
+<% stylesheet 'foreman_datacenter/datacenter' %>
 
-<% title @device.name %>
+<% title h(@device.to_label) %>
+
+<%= breadcrumbs(items: [{caption: _('Devices'), url: devices_path}, {caption: _(@device.to_label)}]) %>
 
 <% title_actions display_link_if_authorized(
                    _('Edit'),
@@ -9,28 +12,28 @@
                  ),
                  display_delete_if_authorized(
                    hash_for_device_path(:id => @device).merge(:auth_object => @device, :authorizer => authorizer),
-                   :data => { :confirm => 'Are you sure?' },
+                   :data => { :confirm => _("Delete %s?") % @device.name },
                    :action => :destroy,
                    :class => 'btn btn-danger'
                  )%>
 
 <ul class="nav nav-tabs">
-  <li><%= link_to 'Info', device_path(@device) %></li>
-  <li class="active"><%= link_to 'Inventory', inventory_device_path(@device) %></li>
+  <li><%= link_to _('Info'), device_path(@device) %></li>
+  <li class="active"><%= link_to _('Inventory'), inventory_device_path(@device) %></li>
 </ul>
 
 <div class="row">
   <div class="col-md-4">
     <div class="panel panel-default">
-      <div class="panel-heading"><strong>Chassis</strong></div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <div class="panel-heading"><strong><%= _("Chassis") %></strong></div>
+      <table class="<%= table_css_classes 'table-fixed nonmarginbottom' %>">
         <tbody>
         <tr>
-          <td>Model</td>
+          <td><%= _("Model") %></td>
           <td><%= h @device.device_type.model %></td>
         </tr>
         <tr>
-          <td>Serial Number</td>
+          <td><%= _("Serial Number") %></td>
           <td><%= h @device.serial %></td>
         </tr>
         </tbody>
@@ -39,14 +42,14 @@
   </div>
   <div class="col-md-8">
     <div class="panel panel-default">
-      <div class="panel-heading"><strong>Hardware</strong></div>
-      <table class="<%= table_css_classes 'table-hover table-condensed panel-body' %>">
+      <div class="panel-heading"><strong><%= _("Hardware") %></strong></div>
+      <table class="<%= table_css_classes 'table-fixed nonmarginbottom' %>">
         <thead>
         <tr>
-          <th>Module</th>
-          <th>Part Number</th>
-          <th>Serial Number</th>
-          <th>Action</th>
+          <th><%= _("Module") %></th>
+          <th><%= _("Part Number") %></th>
+          <th><%= _("Serial Number") %></th>
+          <th><%= _("Action") %></th>
         </tr>
         </thead>
         <tbody>

data/app/views/foreman_datacenter/devices/new.html.erb

@@ -1,5 +1,7 @@
 <% javascript 'foreman_datacenter/devices' %>
 
-<% title 'New device' %>
+<% title _("Create Device") %>
+
+<%= breadcrumbs(items: [{caption: _("Devices"), url: devices_path}, {caption: _("Create Device")}]) %>
 
 <%= render 'form' %>

data/app/views/foreman_datacenter/devices/show.html.erb

@@ -1,26 +1,28 @@
 <% javascript 'foreman_datacenter/ajax' %>
 <% javascript 'foreman_datacenter/management_devices' %>
 <% stylesheet 'foreman_datacenter/datacenter' %>
+<% stylesheet 'foreman_datacenter/devices' %>
+<% stylesheet 'foreman_datacenter/modal' %>
+<% javascript 'foreman_datacenter/modal' %>
 
-<% content_for(:title, @device.name) %>
+<% title h(@device.to_label) %>
 
-<div class="row">
-  <div class="col-md-8">
-    <h1>
-      <% if @device.host %>
-          <%= link_to @device.name, host_path(@device.host) %>
-      <% else %>
-          <%= @device.name %>
-      <% end %></h1>
-  </div>
-</div>
+<%= breadcrumbs(items: [{caption: _('Devices'), url: devices_path}, {caption: _(@device.to_label)}]) %>
 
 <div class="row">
   <div class="col-md-offset-4 col-md-8 title_action">
     <div class="btn-toolbar pull-right">
       <%= link_to 'Edit', edit_device_path(@device), class: 'btn btn-warning' %>
-      <%= link_to 'Delete', device_path(@device), class: 'btn btn-danger',
-                  method: :delete, data: { confirm: 'Are you sure?' } %>
+      <%= display_fake_delete_if_authorized(
+                       hash_for_device_path(id: @device),
+                       class: 'btn btn-danger',
+                       id: 'init-modal',
+                       href: '#',
+                       data: { objecttype: 'device',
+                               objectid: @device.id,
+                               objectname: @device.to_label,
+                               associatedobjects: associated_objects('device') }
+      ) %>
       <%= link_to 'Import from hosts',
                   @device.host ?
                     edit_device_path(@device, host_id: @device.host.id) :
@@ -43,37 +45,51 @@
     <!-- Device -->
     <div class="panel panel-default">
       <div class="panel-heading">
-        <strong>Device</strong>
+        <strong><%= _("Device") %></strong>
       </div>
       <!-- table_css_classes removed purposely -->
       <table class="table table-hover panel-body nonmarginbottom">
         <tbody>
+        <% if @device.host %>
+          <tr>
+            <td><%= _("Host") %></td>
+            <td><%= link_to @device.name, host_path(@device.host) %></td>
+          </tr>
+        <% end %>
         <tr>
-          <td>Site</td>
-          <td><%= link_to @device.site.name, site_path(@device.site) %></td>
+          <td><%= _("Site") %></td>
+          <td>
+            <%= @device.site ? (link_to @device.site.name, site_path(@device.site)) : "-" %>
+          </td>
         </tr>
         <tr>
-          <td>Rack</td>
-          <td><%= link_to @device.rack.name, rack_path(@device.rack) %></td>
+          <td><%= _("Rack") %></td>
+          <td>
+            <%= @device.rack ? (link_to @device.rack.name, rack_path(@device.rack)) : "-" %>
+          </td>
         </tr>
         <tr>
-          <td>Position</td>
+          <td><%= _("Position") %></td>
           <td><%= @device.positions.join(", ") %> / <%= @device.face %> / <%= @device.side %></td>
         </tr>
         <tr>
-          <td>Device Type</td>
-          <td><%= link_to @device.device_type.model, device_type_path(@device.device_type) %></td>
+          <td><%= _("Device Type") %></td>
+          <td>
+            <%= @device.device_type ? (link_to @device.device_type.model, device_type_path(@device.device_type)) : "-" %>
+          </td>
         </tr>
         <tr>
-          <td>Serial</td>
-          <td><%= @device.serial %></td>
+          <td><%= _("Serial") %></td>
+          <td>
+            <%= @device.try(:serial) %>
+          </td>
         </tr>
         <tr>
-          <td>Created</td>
+          <td><%= _("Created") %></td>
           <td><%= @device.created_at.to_s(:long) %></td>
         </tr>
         <tr>
-          <td>Last Updated</td>
+          <td><%= _("Last Updated") %></td>
           <td><%= @device.updated_at.to_s(:long) %></td>
         </tr>
         </tbody>
@@ -83,7 +99,7 @@
     <!-- Critical Connections -->
     <div class="panel panel-default">
       <div class="panel-heading">
-        <strong>Critical Connections</strong>
+        <strong><%= _("Critical Connections") %></strong>
       </div>
       <!-- table_css_classes removed purposely -->
       <table class="table table-hover panel-body">
@@ -92,7 +108,7 @@
             <tr class="alert-warning">
               <td>
                 <i class="fa fa-fw fa-warning"></i>
-                No management interfaces defined!
+                <%= _('No management interfaces defined!') %>
               </td>
               <td></td>
               <td></td>
@@ -112,7 +128,7 @@
             <tr class="alert-warning">
               <td>
                 <i class="fa fa-fw fa-warning"></i>
-                No console ports defined!
+                <%= _('No console ports defined!') %>
               </td>
               <td></td>
               <td></td>
@@ -131,7 +147,7 @@
             <tr class="alert-warning">
               <td>
                 <i class="fa fa-fw fa-warning"></i>
-                No power ports defined!
+                <%= _('No power ports defined!') %>
               </td>
               <td></td>
               <td></td>
@@ -172,19 +188,23 @@
     <!-- Management -->
     <div class="panel panel-default">
       <div class="panel-heading">
-        <strong>Management</strong>
+        <strong><%= _("Management") %></strong>
       </div>
       <!-- table_css_classes removed purposely -->
       <table class="table table-hover panel-body nonmarginbottom">
         <tbody>
         <tr>
-          <td>Role</td>
+          <td><%= _("Role") %></td>
           <td>
-            <%= link_to @device.device_role.name, device_role_path(@device.device_role) %>
+            <% if @device.device_role %>
+                <%= link_to @device.device_role.name, device_role_path(@device.device_role) %>
+            <% else %>
+                <%= muted_text("Not defined", "span") %>
+            <% end %>
           </td>
         </tr>
         <tr>
-          <td>Platform</td>
+          <td><%= _("Platform") %></td>
           <td>
             <% if @device.platform %>
                 <%= link_to @device.platform.name, platform_path(@device.platform) %>
@@ -194,7 +214,7 @@
           </td>
         </tr>
         <tr>
-          <td>Status</td>
+          <td><%= _("Status") %></td>
           <td>
             <% if @device.active? %>
                 <span class="label label-success">Active</span>
@@ -204,54 +224,49 @@
           </td>
         </tr>
         <tr>
-          <td>Primary IPv4</td>
-          <td>
-            <% if @device.ip_address.blank? %>
-                Not defined
-            <% else %>
-                <%= @device.ip_address %></td>
-            <% end %>
-            </tr>
+          <td><%= _("Primary IPv4") %></td>
+          <% if @device.ip_address.blank? %>
+            <%= muted_text("Not defined", "td") %>
+          <% else %>
+            <td><%= @device.ip_address %></td>
+          <% end %>
+        </tr>
         <tr>
-          <td>Primary IPv6</td>
-          <td>
-            <% if @device.primary_ip6.blank? %>
-                Not defined
-            <% else %>
-                <%= @device.primary_ip6 %>
-            <% end %>
-          </td>
+          <td><%= _("Primary IPv6") %></td>
+          <% if @device.primary_ip6.blank? %>
+            <%= muted_text("Not defined", "td") %>
+          <% else %>
+            <td><%= @device.primary_ip6 %></td>
+          <% end %>
         </tr>
         <tr>
-          <td>MAC address</td>
-          <td>
-            <% if @device.mac_address.blank? %>
-                Not defined
-            <% else %>
-                <%= @device.mac_address %>
-            <% end %>
-          </td>
+          <td><%= _("MAC address") %></td>
+          <% if @device.mac_address.blank? %>
+            <%= muted_text("Not defined", "td") %>
+          <% else %>
+            <td><%= @device.mac_address %></td>
+          <% end %>
         </tr>
 
         <!-- Management device -->
         <tr>
-          <td><strong>Management device</strong></td>
+          <td><strong><%= _("Management device") %></strong></td>
           <td></td>
         </tr>
         <% if @device.management_device %>
             <tr>
-              <td>Console URL</td>
+              <td><%= _("Console URL") %></td>
               <td><%= h @device.console_url %></td>
             </tr>
             <tr>
-              <td>Login</td>
+              <td><%= _("Login") %></td>
               <td><%= h @device.login %></td>
             </tr>
             <tr>
-              <td>Password</td>
+              <td><%= _("Login") %></td>
               <td>
                 <button class="btn btn-primary btn-xs" data-reveal-password data-password="<%= h @device.password %>">
-                  Reveal
+                  <%= _("Reveal") %>
                 </button>
               </td>
             </tr>
@@ -273,7 +288,7 @@
             </tr>
         <% else %>
             <tr>
-              <td>None</td>
+              <td class="text-muted">None</td>
               <td></td>
             </tr>
             <tr>
@@ -300,17 +315,18 @@
     <% if @device.parent? %>
         <div class="panel panel-default">
           <div class="panel-heading">
-            <strong>Device Bays</strong>
+            <strong><%= _("Device Bays") %></strong>
           </div>
-          <% if @device.device_bays.empty? %>
-              <div class="panel-body">None</div>
-          <% else %>
-              <table class="<%= table_css_classes 'table-hover panel-body' %>">
-                <tbody>
+          <!-- <table class="<%#= table_css_classes 'table-fixed nonmarginbottom' %>"> Hardcoded for a while --> 
+          <table class="table table-hover panel-body nonmarginbottom">
+            <tbody>
+              <% if @device.device_bays.empty? %>
+                <%= muted_text("None", "tr", "td") %>
+              <% else %>
                 <%= render partial: 'device_bay', collection: @device.device_bays %>
-                </tbody>
-              </table>
-          <% end %>
+              <% end %>
+            </tbody>
+          </table>
           <div class="panel-footer text-right">
             <%= link_to 'Add a device bay', new_device_device_bay_path(@device),
                         class: 'btn btn-primary btn-xs' %>
@@ -322,28 +338,28 @@
     <% if @device.is_network_device %>
         <div class="panel panel-default">
           <div class="panel-heading">
-            <strong>Interfaces</strong>
+            <strong><%= _('Interfaces') %></strong>
           </div>
           <%= form_tag destroy_interfaces_device_path(@device), method: :delete do %>
-              <% if @device.non_management_interfaces.empty? %>
-                  <div class="panel-body">None</div>
-              <% else %>
-                  <!-- table_css_classes removed purposely -->
-                  <table class="table table-hover panel-body nonmarginbottom">
-                    <tbody>
-                    <%= render partial: 'interface', collection: @device.non_management_interfaces %>
-                    </tbody>
-                  </table>
-              <% end %>
-              <div class="panel-footer text-right">
-                <%= link_to 'Sync', sync_interfaces_with_host_device_path(@device),
-                            class: 'btn btn-primary btn-xs' if @device.host %>
-                <%= link_to 'Add an interface', new_device_device_interface_path(@device),
-                            class: 'btn btn-primary btn-xs' %>
-                <%= button_tag 'Destroy selected interfaces',
-                               class: 'btn btn-danger btn-xs',
-                               data: {confirm: 'Are you sure?'} %>
-              </div>
+            <!-- table_css_classes removed purposely -->
+            <table class="table table-hover panel-body nonmarginbottom">
+              <tbody>
+                <% if @device.non_management_interfaces.empty? %>
+                  <%= muted_text("None", "tr", "td") %>
+                <% else %>
+                  <%= render partial: 'interface', collection: @device.non_management_interfaces %>
+                <% end %>
+              </tbody>
+            </table>
+            <div class="panel-footer text-right">
+              <%= link_to 'Sync', sync_interfaces_with_host_device_path(@device),
+                          class: 'btn btn-primary btn-xs' if @device.host %>
+              <%= link_to 'Add an interface', new_device_device_interface_path(@device),
+                          class: 'btn btn-primary btn-xs' %>
+              <%= button_tag 'Destroy selected interfaces',
+                             class: 'btn btn-danger btn-xs',
+                             data: {confirm: 'Are you sure?'} unless @device.non_management_interfaces.empty? %>
+            </div>
           <% end %>
         </div>
     <% end %>
@@ -352,17 +368,18 @@
     <% if @device.is_console_server %>
         <div class="panel panel-default">
           <div class="panel-heading">
-            <strong>Console Server Ports</strong>
+            <strong><%= _("Console Server Ports") %></strong>
           </div>
-          <% if @device.console_server_ports.empty? %>
-              <div class="panel-body">None</div>
-          <% else %>
-              <table class="<%= table_css_classes 'table-hover panel-body' %>">
-                <tbody>
+          <!-- <table class="<%#= table_css_classes 'table-fixed nonmarginbottom' %>"> Hardcoded for a while -->
+          <table class="table table-hover panel-body nonmarginbottom">
+            <tbody>
+              <% if @device.console_server_ports.empty? %>
+                 <%= muted_text("None", "tr", "td") %>
+              <% else %>
                 <%= render partial: 'console_server_port', collection: @device.console_server_ports %>
-                </tbody>
-              </table>
-          <% end %>
+              <% end %>
+            </tbody>
+          </table>
           <div class="panel-footer text-right">
             <%= link_to 'Add a console server port', new_device_console_server_port_path(@device),
                         class: 'btn btn-primary btn-xs' %>
@@ -374,17 +391,18 @@
     <% if @device.is_pdu %>
         <div class="panel panel-default">
           <div class="panel-heading">
-            <strong>Power Outlets</strong>
+            <strong><%= _("Power Outlets") %></strong>
           </div>
-          <% if @device.power_outlets.empty? %>
-              <div class="panel-body">None</div>
-          <% else %>
-              <table class="<%= table_css_classes 'table-hover panel-body' %>">
-                <tbody>
+          <!-- <table class="<%#= table_css_classes 'table-fixed nonmarginbottom' %>"> Hardcoded for a while -->
+          <table class="table table-hover panel-body nonmarginbottom">
+            <tbody>
+              <% if @device.power_outlets.empty? %>
+                <%= muted_text("None", "tr", "td") %>
+              <% else %>
                 <%= render partial: 'power_outlet', collection: @device.power_outlets %>
-                </tbody>
-              </table>
-          <% end %>
+              <% end %>
+            </tbody>
+          </table>
           <div class="panel-footer text-right">
             <%= link_to 'Add a power outlet', new_device_power_outlet_path(@device),
                         class: 'btn btn-primary btn-xs' %>
@@ -392,10 +410,10 @@
         </div>
     <% end %>
 
-   <!-- Comments -->
+    <!-- Comments -->
     <div class="panel panel-default">
-      <div class="panel-heading"><strong>Comments</strong></div>
-      <%= render 'foreman_datacenter/comments/comments', comments: @device.comments, commentable_data: @commentable_data %>
+      <div class="panel-heading"><strong><%= _('Comments') %></strong></div>
+        <%= render 'foreman_datacenter/comments/list', comments: @comments %>
     </div>
   </div>
 </div>