bookingsync_portal 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bce44a09e365af14bee6025bdbaf505b5cbaa3e
-  data.tar.gz: 672dc73f92f93d0d3e0d9aa18199b73b201d7ded
+  metadata.gz: 29ab3ee00bd840c8750a4e73b1cb838d6b40e081
+  data.tar.gz: c150bf73675d7ac922fb898ab33d1d7b8cc64760
 SHA512:
-  metadata.gz: cb08b602aef04800fd3608c2db757bb2b8d5b8aa0ae62611d4bfe66c4926638511476a4401ebe22684ed15b5c0b434ccab5d8f45f94990038b4d0acfbf44b749
-  data.tar.gz: d0026be5f43c6fe11bd6b240f36f719ef0eecc243468a116433e3b23e179dbe16401dc70cb33d61edb3678913b3bb957be8b1c0049f3b73767d847fccb8d54b9
+  metadata.gz: 50afcce183c586ea3409abd2595b7bbc4f1ffd4c13a8a94b02b94f6fb2a7d857da6f09617f4d6549ec1ab5ea92fea48fe145bc60b5b291b3b51a826c66543dfd
+  data.tar.gz: 4c71e8270a265cc20093062bde77b39c548497dc3757c256654495318632893be76802a624a7d8cc6f74d2842f24c34b34461371b1cef2939989801317228055

data/README.md

@@ -139,6 +139,12 @@ The engine is configured by the following ENV variables:
 You might want to use [dotenv-rails](https://github.com/bkeepers/dotenv)
 to make ENV variables management easy.
 
+Rack::Lock is not recommended with message_bus gem, causing deadlock problems. You might want to add this line to your app `development.rb` file:
+
+```ruby
+config.middleware.delete Rack::Lock
+```
+
 ## Testing
 
 ### RSpec

data/app/assets/javascripts/bookingsync_portal/admin/application.js.coffee

@@ -0,0 +1,23 @@
+# This is a manifest file that'll be compiled into application.js, which will include all the files
+# listed below.
+#
+# Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+# or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+#
+# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+# compiled file.
+#
+# Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+# about supported directives.
+#
+#= require jquery
+#= require jquery_ujs
+#= require jquery-ui/draggable
+#= require jquery-ui/droppable
+#= require handlebars.runtime
+#= require message-bus
+#= require bookingsync/form
+#= require ./vendor/css-contains
+#= require ./lib/list-filter
+#= require_tree ./templates
+#= require_tree .

data/app/assets/javascripts/bookingsync_portal/admin/lib/list-filter.js.coffee

@@ -0,0 +1,28 @@
+class @ListFilter
+  constructor: (header, list, @listElement, @listFilterable, @inputId, formTemplate) ->
+    @header = $(header)
+    @list = $(list)
+    @form = $(formTemplate)
+
+    @insertForm()
+    @observeInputChanges()
+
+  insertForm: ->
+    @form.appendTo(@header)
+    @input = $("#" + @inputId)
+
+  observeInputChanges: ->
+    @input.change( =>
+      filter = $(event.target).val()
+      @showElements @listFilterable + ":not(:Contains(" + filter + "))"
+      @hideElements @listFilterable + ":Contains(" + filter + ")"
+      false
+    ).keyup =>
+      # fire the above change event after every letter
+      @input.change()
+
+  showElements: (elements) ->
+    @list.find(elements).parents(@listElement).slideUp()
+
+  hideElements: (elements) ->
+    @list.find(elements).parents(@listElement).slideDown()

data/app/assets/javascripts/bookingsync_portal/admin/rentals.js.coffee

@@ -19,11 +19,13 @@ $ ->
     greedy: true
     tolerance: "pointer"
     drop: (event, ui) ->
-      rentalId = parseInt($(ui.draggable).attr("id").split("_")[1])
-      remoteRentalId = parseInt($(@).attr("id").split("_")[2])
-      remoteRentalUid = parseInt($(@).data("uid"))
+      remoteRental = $(@)
+
+      rentalId = parseInt($(ui.draggable).attr("id").split("_").pop())
+      remoteRentalId = parseInt(remoteRental.attr("id").split("_").pop())
+      remoteRentalUid = parseInt(remoteRental.data("uid"))
 
-      $(@).replaceWith HandlebarsTemplates["rentals/connected_rental"]
+      remoteRental.replaceWith HandlebarsTemplates["rentals/connected_rental"]
         rentalName: $(ui.draggable).children('.panel-heading').text()
         rentalDescription: $(ui.draggable).children('.panel-body').html()
         rentalId: rentalId
@@ -75,3 +77,15 @@ $ ->
           $(@).addClass('loading')
         success: ->
           $(@).removeClass('loading')
+
+  for rentalsList, index in $(".rentals-list")
+    inputId = "rentals-list-filter-#{index}"
+    new ListFilter(
+      $(rentalsList).children(".rentals-list-header"),
+      $(rentalsList).children(".rentals-list-scroll"),
+      ".panel",
+      ".panel h4",
+      inputId,
+      HandlebarsTemplates["filter_input"]
+        inputId: inputId
+    )

data/app/assets/javascripts/bookingsync_portal/admin/templates/filter_input.hbs

@@ -0,0 +1,6 @@
+<form class="filterform" action="#">
+  <div class="form-group">
+    <label class="control-label" for="{{inputId}}">Search in listings</label>
+    <input class="filterinput form-control" type="text" id="{{inputId}}">
+  </div>
+</form>

data/app/assets/javascripts/bookingsync_portal/admin/vendor/css-contains.js

@@ -0,0 +1,29 @@
+// Copyright (c) 2010 Kilian Valkhof
+
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+!function ($) {
+  // custom css expression for a case-insensitive contains()
+  jQuery.expr[':'].Contains = function(a, i, m) {
+    return (a.textContent || a.innerText || "").toUpperCase().indexOf(m[3].toUpperCase()) >= 0;
+  }
+}(jQuery);

data/app/assets/stylesheets/bookingsync_portal/admin/application.css.scss

@@ -2,9 +2,8 @@ $dropzone-active-bg: #fbf9ee;
 
 @import "font-awesome-sprockets";
 @import "font-awesome";
-@import "bootstrap-sprockets";
-@import "bootstrap";
-@import 'list_filters';
+@import "bootstrap-bookingsync-sprockets";
+@import "bootstrap-bookingsync";
 
 html, body {
   height: 100%;
@@ -16,12 +15,20 @@ body > .footer {
   clear: both;
 }
 
-#remote_account_uid {
-  text-align: center;
+.container-fullscreen {
+  height: 100%;
+  width: 100%;
 }
 
 .rentals-container {
   height: 100%;
+  padding: ceil($grid-gutter-width / 2) 0;
+  margin: 0 (-1 * ceil($grid-gutter-width / 2));
+
+  & > div {
+    height: 100%;
+    min-width: 300px;
+  }
 }
 
 .rentals-list {
@@ -29,19 +36,68 @@ body > .footer {
   display: flex;
   flex-direction: column;
   overflow: auto;
+  padding: ceil($grid-gutter-width / 2);
+  border-radius: 4px;
+  border: 1px solid $gray-lighter;
+
+  legend {
+    border: 0;
+  }
+
+  h3 {
+    border-top: 1px solid $gray-lighter;
+    font-size: 14px;
+    padding: 10px 10px;
+    margin: 0;
+  }
+}
+
+.filterform {
+  margin-bottom: 10px;
+  width: 90%;
+  margin-left: 5%;
+  font-size: small;
 }
 
 .rentals-list-header, .rentals-list-footer {
   flex: 0 0 auto;
 }
 
+.rentals-list-header {
+  img {
+    height: 29px;
+  }
+}
+
+.rentals-list-footer {
+  border-top: 1px solid $gray-lighter;
+  margin-left: (-1 * ceil($grid-gutter-width / 2));
+  margin-right: (-1 * ceil($grid-gutter-width / 2));
+  padding-top: 8px;
+  margin-bottom: (-1 * ceil($grid-gutter-width / 2)) + 8px;
+}
+
 .rentals-list-scroll {
-  flex: 0 0 auto;
+  flex: 1 1 auto;
   overflow-y: auto;
+  margin-left: (-1 * ceil($grid-gutter-width / 2));
+  margin-right: (-1 * ceil($grid-gutter-width / 2));
+
+  .well {
+    border-left: 0;
+    border-right: 0;
+    border-radius: 0;
+    box-shadow: none;
+    background-color: $body-bg;
+
+    i {
+      color: $gray-light;
+    }
+  }
 }
 
 .remote-rentals-list {
-  border: 1px solid transparent;
+  background-color: #fff;
 
   &.dropzone-active {
     border: 1px dashed darken($dropzone-active-bg, 7%);
@@ -66,31 +122,61 @@ body > .footer {
   }
 }
 
-.ui-draggable-helper {
-  opacity: 0.6;
+.rentals-container .panel-bookingsync.ui-draggable-dragging {
+  box-shadow: 0 0 10px $gray-light;
+  background-color: #fff;
+  height: auto;
+  border: 1px solid $gray-lighter;
+  width: 31%;
+  transform: scale(1.1);
+}
+
+.panel {
+  padding: 10px;
+  border-radius: 0;
+  margin-bottom: 0;
+  border-top: 1px solid $gray-lighter;
+  border-bottom: 1px solid $gray-lighter;
+  position: relative;
+
+  & + .panel,
+  & + h3 {
+    border-top: 0;
+  }
 }
 
 .panel-body-grid {
   display: flex;
+  overflow: hidden;
 }
 
 .panel-body-grid-photo {
   min-width: 96px;
+  height: 64px;
   flex-grow: 0;
+  background-color: rgba(255, 255, 255, 0.8);
 }
 
 .panel-body-grid-text {
-  padding: $padding-base-vertical $padding-base-horizontal;
+  padding: 0 $padding-base-horizontal;
   flex-grow: 1;
+  overflow: hidden;
+
+  h4 {
+    margin: 0 0 10px 0;
+  }
+
+  p {
+    margin: 0;
+    font-size: 12px;
+  }
 }
 
 .panel-bookingsync {
-  @extend .panel-info;
+  background-color: $body-bg;
 }
 
 .panel-connected {
-  @extend .panel-success;
-
   &.pending {
     border-color: darken($dropzone-active-bg, 7%);
 
@@ -108,15 +194,36 @@ body > .footer {
     position: absolute;
     right: 3px;
     top: 8px;
+    border-radius: 11px;
+
+    span {
+      display: none;
+    }
+
+    &:hover {
+      background-color: $brand-danger;
+      border-color: $brand-danger;
+      border-radius: $border-radius-small;
+
+      i {
+        display: none;
+      }
+
+      span {
+        display: block;
+      }
+    }
   }
 }
 
 .panel-remote {
-  @extend .panel-default;
+  background-color: $body-bg;
+  opacity: 0.5;
 }
 
 .panel.ui-draggable {
   &:hover {
     cursor: move;
+    background-color: #fff;
   }
 }

data/app/views/bookingsync_portal/admin/remote_accounts/_form.html.erb

@@ -1,11 +1,11 @@
-<div class="col-sm-offset-4 col-sm-4 form-group">
+<div class="col-sm-offset-4 col-sm-4">
   <%= simple_form_for [:admin, remote_account] do |f| -%>
-    <div class="form-group">
-      <%= f.input :uid, input_html: { class: 'input-lg form-control' } -%>
-    </div>
+    <%= f.input :uid, wrapper_html: { class: 'form-group' },
+      label_html: { class: 'label-lg' }, input_html: { class: 'input-lg form-control' } -%>
 
     <div class="form-group">
-      <%= f.submit t('.submit_new'), class: "btn btn-primary btn-lg btn-block" %>
+      <%= f.submit t('.submit_new', portal_name: BookingsyncPortal.portal_name),
+        class: "btn btn-primary btn-lg btn-block" %>
     </div>
   <%- end -%>
 </div>

data/app/views/bookingsync_portal/admin/remote_accounts/new.html.erb

@@ -1,5 +1,5 @@
 <div class="text-center">
-  <h1><%=t '.title' %></h1>
+  <h1><%=t '.title', portal_name: BookingsyncPortal.portal_name %></h1>
   <%= render 'how_to_connect' %>
   <%= render 'form', remote_account: @remote_account %>
 </div>

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

@@ -1,15 +1,10 @@
+<%-
+disconnect_label = content_tag(:i, "", { class: 'fa fa-check' }) + h(" ") +
+  content_tag(:span, t('.disconnect_rental'))
+-%>
 <div
   class="panel panel-connected <%= "pending" unless remote_rental.synchronized? %>"
   id="<%= dom_id rental %>">
-  <div class="panel-heading" title="<%= RemoteRental.human_attribute_name(:uid) %>
-    <%= remote_rental.uid %>">
-    <%= rental.name %>
-    <%= link_to t('.disconnect_rental'),
-          bookingsync_portal.disconnect_admin_rental_path(rental),
-          class: "btn btn-default btn-xs remove-connection",
-          data: {disable_with: t('.disconnecting_rental')},
-          method: :put %>
-  </div>
   <% if rental.remote_rental.synchronized? %>
     <div class="panel-body-grid">
       <div class="panel-body-grid-photo">
@@ -18,7 +13,14 @@
         <%- end -%>
       </div>
       <div class="panel-body-grid-text">
-        <%= rental_details(rental) %>
+        <h4 title="<%= RemoteRental.human_attribute_name(:uid) %>
+          <%= remote_rental.uid %>"><%= remote_rental.name %></h4>
+        <%= link_to disconnect_label,
+          bookingsync_portal.disconnect_admin_rental_path(rental),
+          class: "btn btn-default btn-xs btn-success remove-connection",
+          data: { disable_with: t('.disconnecting_rental') },
+          method: :put %>
+        <p class="text-overflow"><%= rental_details(rental) %></p>
       </div>
     </div>
   <% else %>

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

@@ -1,5 +1,3 @@
-<div>
-  <%= link_to new_admin_remote_account_path, class: "btn btn-primary btn-lg btn-block" do %>
-    <%= icon "plus-circle" %> <%= t '.connect_accounts' %>
-  <% end %>
-</div>
+<%= link_to new_admin_remote_account_path, class: "btn btn-default" do %>
+  <%= icon :plus %> <%= t '.connect_accounts' %>
+<% end %>

data/app/views/bookingsync_portal/admin/rentals/_remote_rental.html.erb

@@ -1,10 +1,12 @@
 <div class="panel panel-remote not-connected-remote-rental" id="<%= dom_id remote_rental %>"
   data-uid="<%= remote_rental.uid %>">
-  <div class="panel-heading" title="<%= RemoteRental.human_attribute_name(:uid) %>
-    <%= remote_rental.uid %>">
-    <%= remote_rental.remote_account.uid %>:
-    <%= remote_rental.name %>
-  </div>
-  <div class="panel-body">
+  <div class="panel-body-grid">
+    <div class="panel-body-grid-photo">
+    </div>
+    <div class="panel-body-grid-text">
+      <h4 title="<%= RemoteRental.human_attribute_name(:uid) %>
+        <%= remote_rental.uid %>"><%= remote_rental.name %></h4>
+      <p class="text-overflow"></p>
+    </div>
   </div>
 </div>

data/app/views/bookingsync_portal/admin/rentals/_rental.html.erb

@@ -1,9 +1,6 @@
 <div class="panel panel-bookingsync bookingsync-rental"
   id="<%= dom_id rental %>"
   data-connect-url="<%= connect_admin_rental_url(rental) %>">
-  <div class="panel-heading">
-    <%= rental.name.presence || t('.no_name') %>
-  </div>
   <div class="panel-body-grid">
     <div class="panel-body-grid-photo">
       <%- if rental.ordered_photos.first -%>
@@ -11,7 +8,8 @@
       <%- end -%>
     </div>
     <div class="panel-body-grid-text">
-      <%= rental_details rental %>
+      <h4><%= rental.name.presence || t('.no_name') %></h4>
+      <p class="text-overflow"><%= rental_details rental %></p>
     </div>
   </div>
 </div>

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

@@ -1,50 +1,58 @@
-<div class="rentals-container row-fluid">
-  <div class="bookingsync-rentals-list rentals-list col-xs-4">
-    <div class="rentals-list-header">
-      <legend><%=t '.bookingsync_header', account_name: current_account.name %></legend>
-    </div>
-    <div class="rentals-list-scroll">
-      <%- if @visible_rentals_count == 0 -%>
-        <div class="lead text-center well">
-          <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>
-        </div>
-      <%- end -%>
-    </div>
-  </div>
-
-  <div class="remote-rentals-list rentals-list col-xs-4">
-    <% @remote_accounts.each do |remote_account| %>
+<div class="rentals-container row">
+  <div class="col-xs-4">
+    <div class="bookingsync-rentals-list rentals-list">
       <div class="rentals-list-header">
-        <legend><%=t '.remote_header', account_name: remote_account.name %></legend>
+        <legend class="text-center"><%= image_tag('bookingsync_portal/bookingsync.png', alt: 'BookingSync') %></legend>
       </div>
-
       <div class="rentals-list-scroll">
-        <%- if Array(@remote_rentals_by_account[remote_account]).length > 0 -%>
-          <% Array(@remote_rentals_by_account[remote_account]).each do |remote_rental| %>
-            <% if remote_rental.connected? %>
-              <%= render "connected_rental", remote_rental: remote_rental, rental: remote_rental.rental %>
-            <% else %>
-              <%= render "remote_rental", remote_rental: remote_rental %>
-            <% end %>
+        <%- if @visible_rentals_count == 0 -%>
+          <div class="lead text-center well">
+            <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 'info fa-lg' %></p>
-            <p><%=t '.create_listings_first' %></p>
+            <p class=""><%= icon 'thumbs-up fa-lg' %></p>
+            <p><%=t '.all_synchronized' %></p>
           </div>
         <%- end -%>
       </div>
-    <% end %>
-    <%= render partial: 'new_remote_account' %>
+    </div>
+  </div>
+  <div class="col-xs-4">
+    <div class="remote-rentals-list rentals-list">
+      <div class="rentals-list-header">
+        <legend class="text-center"><%= image_tag("#{BookingsyncPortal.portal_name.parameterize}.png",
+          alt: BookingsyncPortal.portal_name) %></legend>
+      </div>
+
+      <div class="rentals-list-scroll">
+        <% @remote_accounts.each do |remote_account| %>
+          <h3><%=t '.remote_header', portal_name: BookingsyncPortal.portal_name,
+            account_name: remote_account.name %></h3>
+          <%- if Array(@remote_rentals_by_account[remote_account]).length > 0 -%>
+            <% Array(@remote_rentals_by_account[remote_account]).each do |remote_rental| %>
+              <% if remote_rental.connected? %>
+                <%= render "connected_rental", remote_rental: remote_rental, rental: remote_rental.rental %>
+              <% else %>
+                <%= render "remote_rental", remote_rental: remote_rental %>
+              <% end %>
+            <% end %>
+          <%- else -%>
+            <div class="lead text-center well">
+              <p class=""><%= icon 'info fa-lg' %></p>
+              <p><%=t '.create_listings_first' %></p>
+            </div>
+          <%- end -%>
+        <% end %>
+      </div>
+      <div class="rentals-list-footer text-center">
+        <%= render partial: 'new_remote_account' %>
+      </div>
+    </div>
   </div>
   <%= render partial: 'how_to' %>
 </div>

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

@@ -0,0 +1,11 @@
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container container-fullscreen">
+    <div class="navbar-header">
+      <div>
+        <a class="navbar-brand h1" href="#" data-toggle="dropdown">
+          <i class="fa fa-globe"></i> <%= BookingsyncPortal.portal_name %>
+        </a>
+      </div>
+    </div>
+  </div>
+</nav>

data/app/views/layouts/bookingsync_portal/admin.html.erb

@@ -1,13 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>BookingSync - HolidayLettings integration</title>
-  <%= stylesheet_link_tag 'admin/application', media: 'all', 'data-turbolinks-track' => true %>
+  <title><%=t 'bookingsync_portal.admin.layout.title', portal_name: BookingsyncPortal.portal_name %></title>
+  <%= stylesheet_link_tag 'admin/application', media: 'all' %>
   <%= csrf_meta_tags %>
 </head>
 <body data-messagebus-channel="<%= messagebus_channel %>">
-<%= yield %>
-<%= javascript_include_tag 'admin/application', 'data-turbolinks-track' => true %>
-<div class="footer"></div>
+  <%= render partial: '/layouts/bookingsync_portal/menu' %>
+  <div class="container container-fullscreen">
+    <%= yield %>
+  </div>
+  <%= javascript_include_tag 'admin/application' %>
+  <div class="footer"></div>
 </body>
 </html>

data/config/locales/en.yml

@@ -9,11 +9,13 @@ en:
 
   bookingsync_portal:
     admin:
+      layout:
+        title: Connect BookingSync with %{portal_name}
       remote_accounts:
         new:
-          title: Connect A New Remote Account
+          title: Connect with %{portal_name}
         form:
-          submit_new: Connect This Remote Account
+          submit_new: Connect with %{portal_name}
 
       remote_rentals:
         show:
@@ -29,7 +31,7 @@ en:
           no_published_rentals_html: 'No published rentals present, please make sure to <a href="https://www.bookingsync.com/en/admin/v2/%{id}/rentals" target="_blank">fill all your rentals details</a>.'
           create_listings_first: You must create your rentals on Remote Account before you can synchronize them automatically.
           connect_accounts: Add External Portal Account
-          remote_header: "Remote Account: %{account_name}"
+          remote_header: "%{portal_name}: %{account_name}"
         rental:
           bedrooms_html:
             one: '<strong>1</strong> Bedroom'

data/lib/bookingsync_portal.rb

@@ -17,6 +17,9 @@ require 'turbolinks'
 require 'responders'
 
 module BookingsyncPortal
+  # portal name
+  mattr_accessor :portal_name
+  @@portal_name = 'Portal'
 
   # account model class
   mattr_accessor :account_model

data/lib/bookingsync_portal/version.rb

@@ -1,3 +1,3 @@
 module BookingsyncPortal
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookingsync_portal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Piotr Marciniak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -83,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: bootstrap-bookingsync-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -318,13 +318,15 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/bookingsync_portal/admin/application.js
+- app/assets/images/bookingsync_portal/bookingsync.png
+- app/assets/javascripts/bookingsync_portal/admin/application.js.coffee
 - app/assets/javascripts/bookingsync_portal/admin/handle_remote_errors.js.coffee
-- app/assets/javascripts/bookingsync_portal/admin/list_filters.js
+- app/assets/javascripts/bookingsync_portal/admin/lib/list-filter.js.coffee
 - app/assets/javascripts/bookingsync_portal/admin/live_updates.js.coffee
 - app/assets/javascripts/bookingsync_portal/admin/rentals.js.coffee
+- app/assets/javascripts/bookingsync_portal/admin/templates/filter_input.hbs
 - app/assets/javascripts/bookingsync_portal/admin/templates/rentals/connected_rental.hbs
-- app/assets/stylesheets/bookingsync_portal/admin/_list_filters.scss
+- app/assets/javascripts/bookingsync_portal/admin/vendor/css-contains.js
 - app/assets/stylesheets/bookingsync_portal/admin/application.css.scss
 - app/controllers/bookingsync_portal/admin/base_controller.rb
 - app/controllers/bookingsync_portal/admin/remote_accounts_controller.rb
@@ -356,6 +358,7 @@ files:
 - app/views/bookingsync_portal/admin/rentals/_rental.html.erb
 - app/views/bookingsync_portal/admin/rentals/index.html.erb
 - app/views/bookingsync_portal/admin/rentals/show.js.erb
+- app/views/layouts/bookingsync_portal/_menu.html.erb
 - app/views/layouts/bookingsync_portal/admin.html.erb
 - config/locales/en.yml
 - config/routes.rb
@@ -400,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A common base for creating BookingSync portal applications.

data/app/assets/javascripts/bookingsync_portal/admin/application.js

@@ -1,20 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery
-//= require jquery_ujs
-//= require jquery-ui/draggable
-//= require jquery-ui/droppable
-//= require handlebars.runtime
-//= require message-bus
-//= require_tree ./templates
-//= require_tree .

data/app/assets/javascripts/bookingsync_portal/admin/list_filters.js

@@ -1,67 +0,0 @@
-
-
-// Copyright (c) 2010 Kilian Valkhof
-
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-(function ($) {
-  // custom css expression for a case-insensitive contains()
-  jQuery.expr[':'].Contains = function(a,i,m){
-      return (a.textContent || a.innerText || "").toUpperCase().indexOf(m[3].toUpperCase())>=0;
-  };
-
-
-  function listFilter(header, list, input_id) { // header is any element, list is an unordered list
-    // create and add the filter form to the header
-    var form = $("<form>").attr({"class":"filterform form-inline","action":"#"}),
-        form_group = $("<div>").attr({"class":"form-group form-group-sm"}),
-        label = $("<label>Filter by name:</label>").attr({"class":"control-label","for":input_id}),
-        input = $("<input>").attr({"class":"filterinput form-control","type":"text","id":input_id});
-    $(form).append(form_group.append(label).append(input)).appendTo(header);
-
-    $(input)
-      .change( function () {
-        var filter = $(this).val();
-        // this finds all links in a list that contain the input,
-        // and hide the ones not containing the input while showing the ones that do
-        $(list).find("> div .panel-heading:not(:Contains(" + filter + "))").parent().slideUp();
-        $(list).find("> div .panel-heading:Contains(" + filter + ")").parent().slideDown();
-        return false;
-      })
-    .keyup( function () {
-        // fire the above change event after every letter
-        $(this).change();
-    });
-  }
-
-
-  //ondomready
-  $(function () {
-    listFilter($(".bookingsync-rentals-list .rentals-list-header legend"),
-      $(".bookingsync-rentals-list .rentals-list-scroll"), "bookingsync_filter");
-    $(".remote-rentals-list .rentals-list-header").each(function(index, element) {
-      listFilter($(element).find("legend"), $(element).next(), "remote_filter_" + index);
-    });
-  });
-}(jQuery));

data/app/assets/stylesheets/bookingsync_portal/admin/_list_filters.scss

@@ -1,8 +0,0 @@
-.filterform {
-  margin-bottom: 5px;
-  font-size: small;
-
-  label {
-    margin-right: 10px;
-  }
-}