From e19ee6b92850814146a70c42d6f82eaa8c3a1484 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 26 Nov 2015 15:11:29 +0100
Subject: [PATCH] Added support of form-control--small for date and datetime.

---
 .../app/controllers/_ui_element/date.coffee   | 20 ++++++++++------
 .../controllers/_ui_element/datetime.coffee   | 23 ++++++++++++-------
 .../_ui_element/holiday_selector.coffee       |  2 ++
 .../app/views/generic/date.jst.eco            |  2 +-
 .../app/views/generic/datetime.jst.eco        |  4 ++--
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_ui_element/date.coffee b/app/assets/javascripts/app/controllers/_ui_element/date.coffee
index f5967f614..63665cdcc 100644
--- a/app/assets/javascripts/app/controllers/_ui_element/date.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/date.coffee
@@ -87,10 +87,13 @@ class App.UiElement.date
   @validation: (item, attribute, runtime) ->
 
     # remove old validation
-    item.closest('.form-group').removeClass('has-error')
-    item.find('.has-error').removeClass('has-error')
-    item.find('.help-inline').html('')
-    item.closest('.form-group').find('.help-inline').html('')
+    if attribute.validationContainer is 'self'
+      item.find('.js-datepicker').removeClass('has-error')
+    else
+      item.closest('.form-group').removeClass('has-error')
+      item.find('.has-error').removeClass('has-error')
+      item.find('.help-inline').html('')
+      item.closest('.form-group').find('.help-inline').html('')
 
     timestamp = item.find("[name=\"#{attribute.name}\"]").val()
 
@@ -103,10 +106,13 @@ class App.UiElement.date
       timeObject = new Date( Date.parse( timestamp ) )
 
 
-    formGroup = item.closest('.form-group')
     App.Log.debug 'UiElement.date.validation', errors
     return if _.isEmpty(errors)
 
     # show invalid options
-    for key, value of errors
-      formGroup.addClass('has-error')
+    if attribute.validationContainer is 'self'
+      item.find('.js-datepicker').addClass('has-error')
+    else
+      formGroup = item.closest('.form-group')
+      for key, value of errors
+        formGroup.addClass('has-error')
diff --git a/app/assets/javascripts/app/controllers/_ui_element/datetime.coffee b/app/assets/javascripts/app/controllers/_ui_element/datetime.coffee
index 7391903e3..3f6b46436 100644
--- a/app/assets/javascripts/app/controllers/_ui_element/datetime.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/datetime.coffee
@@ -99,10 +99,13 @@ class App.UiElement.datetime
   @validation: (item, attribute, runtime) ->
 
     # remove old validation
-    item.closest('.form-group').removeClass('has-error')
-    item.find('.has-error').removeClass('has-error')
-    item.find('.help-inline').html('')
-    item.closest('.form-group').find('.help-inline').html('')
+    if attribute.validationContainer is 'self'
+      item.find('.js-datepicker').removeClass('has-error')
+    else
+      item.closest('.form-group').removeClass('has-error')
+      item.find('.has-error').removeClass('has-error')
+      item.find('.help-inline').html('')
+      item.closest('.form-group').find('.help-inline').html('')
 
     timestamp = item.find("[name=\"#{attribute.name}\"]").val()
 
@@ -114,11 +117,15 @@ class App.UiElement.datetime
     else
       timeObject = new Date( Date.parse( timestamp ) )
 
-
-    formGroup = item.closest('.form-group')
     App.Log.debug 'UiElement.datetime.validation', errors
     return if _.isEmpty(errors)
 
     # show invalid options
-    for key, value of errors
-      formGroup.addClass('has-error')
+    if attribute.validationContainer is 'self'
+      item.find('.js-datepicker').addClass('has-error')
+    else
+      formGroup = item.closest('.form-group')
+      for key, value of errors
+        formGroup.addClass('has-error')
+
+
diff --git a/app/assets/javascripts/app/controllers/_ui_element/holiday_selector.coffee b/app/assets/javascripts/app/controllers/_ui_element/holiday_selector.coffee
index cd278bfa9..dd645ec12 100644
--- a/app/assets/javascripts/app/controllers/_ui_element/holiday_selector.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/holiday_selector.coffee
@@ -16,6 +16,8 @@ class App.UiElement.holiday_selector
     attributeDatepicket =
       name: "#{attribute.name}_date"
       disable_feature: true
+      class: 'form-control--small'
+      validationContainer: 'self'
     datePicker = App.UiElement.date.render(attributeDatepicket)
     item.find('.js-datePicker').html(datePicker)
 
diff --git a/app/assets/javascripts/app/views/generic/date.jst.eco b/app/assets/javascripts/app/views/generic/date.jst.eco
index 5e27f401d..2318af8ba 100644
--- a/app/assets/javascripts/app/views/generic/date.jst.eco
+++ b/app/assets/javascripts/app/views/generic/date.jst.eco
@@ -1,4 +1,4 @@
 <div class="u-positionOrigin" data-name="<%= @attribute.nameRaw %>">
   <input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>">
-  <input type="text" value="" class="form-control js-datepicker" data-item="date">
+  <input type="text" value="" class="form-control js-datepicker <%= @attribute.class %>" data-item="date">
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/datetime.jst.eco b/app/assets/javascripts/app/views/generic/datetime.jst.eco
index 2afebf1fe..51f281020 100644
--- a/app/assets/javascripts/app/views/generic/datetime.jst.eco
+++ b/app/assets/javascripts/app/views/generic/datetime.jst.eco
@@ -1,6 +1,6 @@
 <div class="horizontal u-positionOrigin" data-name="<%= @attribute.nameRaw %>">
   <input type="hidden" value="<%= @attribute.value %>" name="<%= @attribute.name %>">
-  <input type="text" value="" class="form-control flex-shrink-horizontal js-datepicker" data-item="date">
+  <input type="text" value="" class="form-control flex-shrink-horizontal js-datepicker <%= @attribute.class %>" data-item="date">
   <div class="controls-label"><%- @T('at') %></div>
-  <input type="text" value="" class="form-control time js-timepicker" data-item="time">
+  <input type="text" value="" class="form-control time js-timepicker <%= @attribute.class %>" data-item="time">
 </div>
\ No newline at end of file