Merge branch 'develop'

Author: toastercup

.cloud66/deploy_hooks.yml

@@ -7,20 +7,50 @@ default: &default
       sudo: true
       target: any
       execute: true
+
+development:
+  <<: *default
   after_rails:
-    - source: /.cloud66/scripts/rake_task.sh
-      destination: /tmp/rake_task.sh
+    - source: /.cloud66/scripts/reseed_custom_content.sh
+      destination: /tmp/reseed_custom_content.sh
+      target: rails
+      execute: true
+      run_on: single_server
+      apply_during: all
+      sudo: false
+    - source: /.cloud66/scripts/rebuild_indexes.sh
+      destination: /tmp/rebuild_indexes.sh
       target: rails
       execute: true
       run_on: single_server
       apply_during: all
       sudo: false
-
-development:
-  <<: *default
 
 staging:
   <<: *default
+  after_rails:
+    - source: /.cloud66/scripts/reseed_custom_content.sh
+      destination: /tmp/reseed_custom_content.sh
+      target: rails
+      execute: true
+      run_on: single_server
+      apply_during: all
+      sudo: false
+    - source: /.cloud66/scripts/rebuild_indexes.sh
+      destination: /tmp/rebuild_indexes.sh
+      target: rails
+      execute: true
+      run_on: single_server
+      apply_during: all
+      sudo: false
 
 production:
   <<: *default
+  after_rails:
+    - source: /.cloud66/scripts/rebuild_indexes.sh
+      destination: /tmp/rebuild_indexes.sh
+      target: rails
+      execute: true
+      run_on: single_server
+      apply_during: all
+      sudo: false

.cloud66/scripts/rake_task.sh .cloud66/scripts/rebuild_indexes.sh.cloud66/scripts/rake_task.sh renamed to .cloud66/scripts/rebuild_indexes.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 cd $STACK_PATH
 bundle exec rake cortex:rebuild_indexes
-

.cloud66/scripts/reseed_custom_content.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd $STACK_PATH
+bundle exec rake cortex:custom_content_core:db:reseed

Gemfile

@@ -42,6 +42,7 @@ gem 'pg', '~> 0.18.4'
 gem 'hashie-forbidden_attributes', '~> 0.1.1'
 gem 'ranked-model', '~> 0.4.0'
 gem 'redis-rails', '~> 4.0'
+gem 'pomona', '~> 0.6.0'
 
 # Middleware
 gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
@@ -75,11 +76,13 @@ gem 'uglifier', '~> 2.7.2'
 
 # View
 gem 'haml', '~> 4.1.0.beta'
+gem 'cells', git: 'git://github.com/samstickland/cells', branch: 'collection_fix' # remove explicit 'cells' dependency when collection_fix is merged in. See: https://github.com/apotonick/cells/pull/415
 gem 'cells-rails', '~> 0.0.6'
 gem 'cells-haml', '~> 0.0.10'
 gem 'breadcrumbs_on_rails', '~> 2.3.1'
 gem 'wice_grid', '~> 3.6.2'
 gem 'jquery-ui-rails', '~> 5.0.5'
+gem 'bootstrap-tagsinput-rails', '~> 0.4.2'
 
 # Style
 gem 'sass-rails', '~> 5.0'

Gemfile.lock

@@ -7,6 +7,15 @@ GIT
       execjs
       rails (>= 3.1)
 
+GIT
+  remote: git://github.com/samstickland/cells
+  revision: e5634e25b472d41913030eb82463b015f429f2ca
+  branch: collection_fix
+  specs:
+    cells (4.1.1)
+      tilt (>= 1.4, < 3)
+      uber (>= 0.0.9)
+
 GIT
   remote: git://github.com/toastercup/grape-kaminari
   revision: 8d3f48e04c35cd6b85d4707a5b7f7356d305bf8c
@@ -87,6 +96,8 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    bootstrap-tagsinput-rails (0.4.2.1)
+      railties (>= 3.1)
     bourbon (5.0.0.beta.5)
       sass (~> 3.4)
       thor (~> 0.19)
@@ -101,9 +112,6 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    cells (4.1.1)
-      tilt (>= 1.4, < 3)
-      uber (>= 0.0.9)
     cells-haml (0.0.10)
       cells (>= 4.0.1, <= 6.0.0)
       haml (>= 4.1.0.beta.1)
@@ -503,6 +511,7 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
+    pomona (0.6.0)
     progress (3.1.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -719,11 +728,13 @@ DEPENDENCIES
   bcrypt (~> 3.1.11)
   better_errors
   binding_of_caller
+  bootstrap-tagsinput-rails (~> 0.4.2)
   bourbon (~> 5.0.0.beta.5)
   bower-rails (~> 0.10.0)
   breadcrumbs_on_rails (~> 2.3.1)
   byebug
   capybara
+  cells!
   cells-haml (~> 0.0.10)
   cells-rails (~> 0.0.6)
   codeclimate-test-reporter (~> 0.4.8)
@@ -775,6 +786,7 @@ DEPENDENCIES
   pg (~> 0.18.4)
   phantomjs (~> 1.9.8)
   poltergeist
+  pomona (~> 0.6.0)
   pry-doc
   pry-nav
   pry-rails

app/assets/javascripts/application.js

@@ -6,7 +6,9 @@
 //= require material
 //= require wice_grid
 //= require jquery-ui/datepicker
+//= require bootstrap-tagsinput
 
 //= require base
+//= require forms
 
 //= require turbolinks

app/assets/javascripts/forms.js

@@ -0,0 +1,11 @@
+$(function() {
+  $(".datepicker").datepicker({
+    dateFormat: "dd/mm/yy"
+  });
+
+  $(".datepicker").on("click", function(ev){
+    if ($(this).val() == "") {
+      $(this).closest('div').addClass('is-dirty');
+    }
+  })
+});

app/assets/stylesheets/application.scss

@@ -5,6 +5,13 @@
 @import "font-awesome-sprockets"; // TODO: Remove once we style Wice with Material Design
 @import "font-awesome"; // TODO: Remove once we style Wice with Material Design
 @import 'jquery-ui/datepicker'; // TODO: Remove once we style Wice with Material Design
+@import 'bootstrap-tagsinput.scss'; // TODO: Remove once we find a permanent library for tags
 
 @import 'base';
+@import 'helpers';
+
+@import 'components/card';
+@import 'components/form';
+@import 'components/header';
+
 @import 'demo';

app/assets/stylesheets/components/card.scss

@@ -0,0 +1,27 @@
+// Overrides
+
+.mdl-card {
+  width: auto;
+  border-radius: 3px;
+  overflow: visible;
+  z-index: auto;
+}
+
+// Extras
+
+// Dirty trick to only style first instance of a class
+// See: http://stackoverflow.com/a/8539107
+form > .mdl-grid {
+  .card-holder {
+    margin-top: -81px;
+
+    @media (max-width: $screen-md-min) {
+      margin-top:0px;
+    }
+  }
+}
+form > .mdl-grid ~ .mdl-grid {
+  .card-holder {
+    margin-top: 0;
+  }
+}

app/assets/stylesheets/components/form.scss

@@ -0,0 +1,26 @@
+// Overrides
+
+.mdl-textfield {
+  width: auto;
+  display: block;
+}
+
+form {
+  .mdl-button {
+    float: right;
+  }
+}
+
+div.bootstrap-tagsinput input {
+  width: 100% !important;
+}
+
+.ui-datepicker {
+  background-color: #FEFEFE;
+  border-radius: 3px;
+  padding: 5px;
+  padding-right: 10px;
+  box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.25);
+}
+
+// Extras