Merge branch 'dev' into 555_show_agreement_letter_upload_form_only_wh…

…en_accepted

Conflicts:
	app/views/application_letters/check.html.erb

Gemfile

@@ -81,6 +81,9 @@ gem 'rubocop', '~> 0.29.1'
 # See https://github.com/plataformatec/simple_form
 # gem 'simple_form'
 
+# OWl Carousel for nice Slideshows
+# https://github.com/acrogenesis/owlcarousel-rails
+gem 'owlcarousel-rails', github: 'acrogenesis/owlcarousel-rails', branch: 'OwlCarousel2'
 
 # coveralls.io
 gem 'coveralls', require: false
@@ -119,6 +122,7 @@ group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
   gem 'rspec-rails', '~> 3.2'
+  gem 'rspec-steps', '~> 2.1.1'
   gem 'capybara', '~> 2.5'
   gem 'poltergeist'
   gem 'database_cleaner'

Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: git://github.com/acrogenesis/owlcarousel-rails.git
+  revision: 2dd679c61b795fa08003994c74d140c214781141
+  branch: OwlCarousel2
+  specs:
+    owlcarousel-rails (1.1.3.3)
+      jquery-rails
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -227,6 +235,10 @@ GEM
     ref (2.0.0)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -243,6 +255,8 @@ GEM
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
+    rspec-steps (2.1.1)
+      rspec (>= 3.0, < 3.99)
     rspec-support (3.5.0)
     rubocop (0.29.1)
       astrolabe (~> 1.3)
@@ -338,6 +352,7 @@ DEPENDENCIES
   jquery-ui-rails
   less-rails
   mini_magick
+  owlcarousel-rails!
   parser (~> 2.2.2.5)
   pdf-inspector
   pg
@@ -352,6 +367,7 @@ DEPENDENCIES
   redcarpet
   ref
   rspec-rails (~> 3.2)
+  rspec-steps (~> 2.1.1)
   rubocop (~> 0.29.1)
   rubyzip
   simplecov

app/assets/javascripts/application.js

@@ -16,5 +16,13 @@
 //= require twitter/bootstrap
 //= require bootstrap-datepicker/core
 //= require bootstrap-datepicker/locales/bootstrap-datepicker.de.js
+//= require owl.carousel
+//= require owl.autoplay
+//= require owl.navigation
+//= require owl.animate
+//= require owl.support
+//= require owl.autoheight
+
+
 //= require_tree .
 //= require turbolinks

app/assets/javascripts/events.js

@@ -77,3 +77,21 @@ function flipAllCheckboxes(rootCheckbox, className) {
     });
   }
 }
+
+function ajaxUpdateParticipantColor(form, errorMessage) {
+  if (!window.FormData)
+    return form.submit();
+
+  var xhr = new XMLHttpRequest();
+  xhr.open(form.method, form.action);
+  xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+  xhr.onload = function() {
+    if (xhr.status < 200 || xhr.status >= 300)
+      return alert(errorMessage);
+  };
+  xhr.onerror = function() {
+      alert(errorMessage);
+  };
+
+  xhr.send(new FormData(form));
+}

app/assets/javascripts/requests.js

@@ -1,2 +1,21 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
+
+function enableOwlCarousel() {
+	$(".owl-carousel").owlCarousel({
+		center: false,
+		items: 2,
+		autoplay: false,
+		loop: true,
+		dots: true,
+		margin: 30,
+		nav: true,
+		navText: [
+      "<i class='icon-chevron-left icon-white'><</i>",
+      "<i class='icon-chevron-right icon-white'>></i>" ]
+	});
+}
+
+jQuery(document).on('turbolinks:load', enableOwlCarousel);
+jQuery(enableOwlCarousel);
+

app/assets/stylesheets/application.css

@@ -15,7 +15,9 @@
  *= require_self
  *= require custom_bootstrap/multi-select.css
  *= require bootstrap_and_overrides
- */
+ *= require owl.carousel
+ *= require owl.animate
+**/
 
 label.required:after {
     content:" *";
@@ -27,6 +29,11 @@ body, footer, main, .front-section {
     width: 100%;
 }
 
+.banner {
+    background-position: center;
+    background-size: cover;
+}
+
 .m-l-1 { margin-left: 15px; }
 .m-r-1 { margin-right: 15px; }
 .m-t-1 { margin-top: 15px; }
@@ -48,3 +55,53 @@ body, footer, main, .front-section {
     }
 }
 
+/**
+ * Owl Carousel v2.2.0
+ * Copyright 2013-2016 David Deutsch
+ * Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
+ */
+/*
+ *  Default theme - Owl Carousel CSS File
+ */
+.owl-theme .owl-nav {
+  margin-top: 10px;
+  text-align: center;
+  -webkit-tap-highlight-color: transparent; }
+  .owl-theme .owl-nav [class*='owl-'] {
+    color: #FFF;
+    font-size: 14px;
+    margin: 5px;
+    padding: 4px 7px;
+    background: #D6D6D6;
+    display: inline-block;
+    cursor: pointer;
+    border-radius: 3px; }
+    .owl-theme .owl-nav [class*='owl-']:hover {
+      background: #869791;
+      color: #FFF;
+      text-decoration: none; }
+  .owl-theme .owl-nav .disabled {
+    opacity: 0.5;
+    cursor: default; }
+
+.owl-theme .owl-nav.disabled + .owl-dots {
+  margin-top: 10px; }
+
+.owl-theme .owl-dots {
+  text-align: center;
+  -webkit-tap-highlight-color: transparent; }
+  .owl-theme .owl-dots .owl-dot {
+    display: inline-block;
+    zoom: 1;
+    *display: inline; }
+    .owl-theme .owl-dots .owl-dot span {
+      width: 10px;
+      height: 10px;
+      margin: 5px 7px;
+      background: #D6D6D6;
+      display: block;
+      -webkit-backface-visibility: visible;
+      transition: opacity 200ms ease;
+      border-radius: 30px; }
+    .owl-theme .owl-dots .owl-dot.active span, .owl-theme .owl-dots .owl-dot:hover span {
+      background: #869791; }

app/assets/stylesheets/application_letters.css

@@ -31,10 +31,9 @@ ul#eating-habit--list > li {
 	margin-left: 3px;
 }
 
-.application-details-table.table {
-  table-layout: fixed;
+dl:not(.dl-horizontal) dd {
+  margin-bottom: 30px;
 }
-.application-details-table.table td, .application-details-table.table th {
-  border: none;
-  padding: 5px;
+dl:not(.dl-horizontal) dt {
+  margin-bottom: 5px;
 }

app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less

@@ -74,7 +74,7 @@
 @import "twitter/bootstrap/utilities.less";
 @import "twitter/bootstrap/responsive-utilities.less";
 
-body {
+body:not(.wsp-home), .wsp-home .banner.front-section {
 	padding-top: 120px;
 }
 
@@ -142,10 +142,12 @@ a:hover h1, a:hover h2, a:hover h3, a:hover h4 {
 		padding-bottom: 30px;
 		word-wrap: break-word;
 	}
+
 @media (max-width: @screen-sm-max) {
  h1 { font-size: 5rem; }
  h2 { font-size: 4rem; }
 }
+
 @media (max-width: @screen-xs-max) {
  h1 { font-size: 3.5rem; }
  h2 { font-size: 2.5rem; }
@@ -158,16 +160,34 @@ a:hover h1, a:hover h2, a:hover h3, a:hover h4 {
 }
 
 
-.spacer-20	{
+.spacer-20 {
 	width: 100%;
 	height: 20px;
 	min-height: 20px; 
 }
+
+.spacer-30 {
+	width: 100%;
+	height: 30px;
+	min-height: 30px; 
+}
+
+.spacer-60 {
+	width: 100%;
+	height: 60px;
+	min-height: 60px; 
+}
+
 // Fontpage 
 
 #wsp-welcome {
+
 	padding-top: 0px !important;
 
+    h1, h4, p {
+    	color: #FFF;
+    }
+
 	ul {
 		list-style: none;
 		float: left;
@@ -234,6 +254,9 @@ input.form-control {
 	}
 }
 
+strong, b {
+	font-weight: 700;
+}
 
 @import "multi-select.css";
 
@@ -244,6 +267,52 @@ input.form-control {
     background-position: center;
     border: 3px solid @body-bg;
 }
+
 .image-buttons .btn.active {
     border: 3px solid @brand-primary;
-}
+}
+
+
+
+#requestGallery {
+	.panel {
+		min-height: 500px;
+	}
+}
+
+.title, .page-title {
+	font-size: 64px;
+	line-height: 1;
+}
+
+.line-spacer {
+	border-bottom: 1px solid @gray-lighter;
+	margin-top: 0px;
+	margin-bottom: 30px;
+	width: 100%;
+}
+
+.events-facts {
+	ul {
+		padding-left: 25px;
+	}
+}
+
+.bottom-align-text {
+	position: absolute;
+	bottom: 15px;
+	right: 0;
+}
+
+.bottom-align-text {
+	position: absolute;
+	bottom: 15px;
+	right: 0;
+
+}
+
+.relative-box {
+	position: relative;
+
+}
+

app/assets/stylesheets/custom_bootstrap/variables.less

@@ -322,7 +322,7 @@
 @panel-default-border: rgb(221, 221, 221);
 @panel-default-heading-bg: rgb(245, 245, 245);
 @panel-primary-text: rgb(255, 255, 255);
-@panel-primary-border: @brand-primary;
+@panel-primary-border: none;
 @panel-primary-heading-bg: @brand-primary;
 @panel-success-text: @state-success-text;
 @panel-success-border: @state-success-border;