Fix FontAwesome upgrade and rental template

app/views/bookingsync_portal/admin/help/index.html.erb

@@ -1,6 +1,6 @@
 <article>
   <header>
-    <%= link_to icon("times", t('.close')), admin_root_path, class: "pull-right" %>
+    <%= link_to icon("fa", "times", t('.close')), admin_root_path, class: "pull-right" %>
     <h1><%=t '.title' %></h1>
   </header>
   <%= render 'help' %>

app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb

@@ -17,9 +17,9 @@
           class: ["btn", "btn-xs", "remove-connection", rental.remote_rental.synchronized? ? "btn-success" : "btn-warning"],
           data: { disable_with: t('.disconnecting_rental') }, method: :delete, remote: true do %>
           <% unless rental.remote_rental.synchronized? %>
-            <span class="hover_hide"><%= icon('spinner') %></span>
+            <span class="hover_hide"><%= icon("fa", "spinner") %></span>
           <% else %>
-            <span class="hover_hide"><%= icon('check') %></span>
+            <span class="hover_hide"><%= icon("fa", "check") %></span>
           <% end %>
           <span class="hover_show"><%= t('.disconnect_rental') %></span>
         <% end %>

app/views/bookingsync_portal/admin/rentals/_new_remote_account.html.erb

@@ -1,3 +1,3 @@
 <%= link_to new_admin_remote_account_path, class: "btn btn-default" do %>
-  <%= icon :plus %> <%= t '.connect_accounts' %>
+  <%= icon "fa", "plus" %> <%= t '.connect_accounts' %>
 <% end %>

app/views/bookingsync_portal/admin/rentals/_rentals.html.erb

@@ -1,14 +1,14 @@
 <%- if visible_rentals.count == 0 -%>
   <div class="lead text-center well">
-    <p><%= t('.no_published_rentals_html', id: current_account.synced_id) %></p>
+    <p><%= t(".no_published_rentals_html", id: current_account.synced_id) %></p>
   </div>
 <%- elsif not_connected_rentals.count > 0 -%>
   <% not_connected_rentals.each do |rental| %>
     <%= render rental %>
   <% end %>
 <%- else -%>
   <div class="lead text-center well">
-    <p class=""><%= icon 'thumbs-up fa-lg' %></p>
-    <p><%=t '.all_synchronized' %></p>
+    <p class=""><%= icon "fa", "thumbs-up fa-lg" %></p>
+    <p><%=t ".all_synchronized" %></p>
   </div>
 <%- end -%>

app/views/bookingsync_portal/admin/rentals/index.html.erb

@@ -1,6 +1,6 @@
 <%- content_for :navbar_right do -%>
   <ul class="nav navbar-nav">
-    <li><%= link_to icon("life-ring", t('.help')), admin_help_path %></li>
+    <li><%= link_to icon("fa", "life-ring", t('.help')), admin_help_path %></li>
   </ul>
 <%- end -%>
 <div class="rentals-container row">
@@ -39,7 +39,7 @@
             <% end %>
           <%- elsif !BookingsyncPortal.create_remote_rental -%>
             <div class="lead text-center well">
-              <p class=""><%= icon 'info fa-lg' %></p>
+              <p class=""><%= icon "fa", "info fa-lg" %></p>
               <p><%=t '.create_listings_first', portal_name: BookingsyncPortal.portal_name %></p>
             </div>
           <%- end -%>

app/views/layouts/bookingsync_portal/_menu.html.erb

@@ -13,7 +13,7 @@
         </button>
       <%- end -%>
       <div>
-        <%= link_to icon("globe", BookingsyncPortal.portal_name), admin_root_path,
+        <%= link_to icon("fa", "globe", BookingsyncPortal.portal_name), admin_root_path,
           class: "navbar-brand h1",
           data: { toggle: "dropdown" } %>
         </a>

lib/generators/templates/models/rental.rb

@@ -3,7 +3,7 @@ class Rental < BookingsyncPortal::Rental
     local_attributes: [:position, :published_at],
     include: [:availability],
     delegate_attributes: [:name, :sleeps, :sleeps_max, :bedrooms_count, :bathrooms_count,
-      :surface, :surface_symbol]
+      :surface, :surface_unit]
 
   def surface_unit_symbol
     surface_unit == "imperial" ? "ft²" : "m²"