From 9f225a1e1b3e0ad4b52b9a7df3d1a3525c298073 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 9 Jun 2015 11:15:26 +0200 Subject: [PATCH] Add datepicker functionality --- app/assets/javascripts/cmtool/application.js.coffee | 4 ++++ .../cmtool/{application.css.sass => application.sass} | 5 +++-- .../cmtool/{form_errors.css.sass => form_errors.sass} | 0 .../stylesheets/cmtool/{locale.css.sass => locale.sass} | 0 .../cmtool/{structure.css.sass => structure.sass} | 0 .../cmtool/{twittered.css.sass => twittered.sass} | 0 .../cmtool/{user_info.css.sass => user_info.sass} | 0 cmtool.gemspec | 1 + 8 files changed, 8 insertions(+), 2 deletions(-) rename app/assets/stylesheets/cmtool/{application.css.sass => application.sass} (53%) rename app/assets/stylesheets/cmtool/{form_errors.css.sass => form_errors.sass} (100%) rename app/assets/stylesheets/cmtool/{locale.css.sass => locale.sass} (100%) rename app/assets/stylesheets/cmtool/{structure.css.sass => structure.sass} (100%) rename app/assets/stylesheets/cmtool/{twittered.css.sass => twittered.sass} (100%) rename app/assets/stylesheets/cmtool/{user_info.css.sass => user_info.sass} (100%) diff --git a/app/assets/javascripts/cmtool/application.js.coffee b/app/assets/javascripts/cmtool/application.js.coffee index 56d8caa..45da285 100644 --- a/app/assets/javascripts/cmtool/application.js.coffee +++ b/app/assets/javascripts/cmtool/application.js.coffee @@ -8,6 +8,9 @@ #= require ace/mode-yaml #= require ace/mode-haml #= require tinymce-jquery +#= require pickadate/picker +#= require pickadate/picker.date +#= require pickadate/picker.time #= require_directory . #= require_self @@ -16,6 +19,7 @@ $ -> collapsible.setup() html_edit.setup() yml_edit.setup() + $('.datepicker').pickadate() $('.preview-page').click (ev)-> ev.preventDefault() url = $(@).attr('href') diff --git a/app/assets/stylesheets/cmtool/application.css.sass b/app/assets/stylesheets/cmtool/application.sass similarity index 53% rename from app/assets/stylesheets/cmtool/application.css.sass rename to app/assets/stylesheets/cmtool/application.sass index ec42c37..d40852d 100644 --- a/app/assets/stylesheets/cmtool/application.css.sass +++ b/app/assets/stylesheets/cmtool/application.sass @@ -1,5 +1,6 @@ -// require 'bootstrap-devise-rails' -// require_directory . +//= require pickadate/default +//= require pickadate/default.date +//= require pickadate/default.time @import font-awesome @import ./foundation_and_overrides @import ./structure diff --git a/app/assets/stylesheets/cmtool/form_errors.css.sass b/app/assets/stylesheets/cmtool/form_errors.sass similarity index 100% rename from app/assets/stylesheets/cmtool/form_errors.css.sass rename to app/assets/stylesheets/cmtool/form_errors.sass diff --git a/app/assets/stylesheets/cmtool/locale.css.sass b/app/assets/stylesheets/cmtool/locale.sass similarity index 100% rename from app/assets/stylesheets/cmtool/locale.css.sass rename to app/assets/stylesheets/cmtool/locale.sass diff --git a/app/assets/stylesheets/cmtool/structure.css.sass b/app/assets/stylesheets/cmtool/structure.sass similarity index 100% rename from app/assets/stylesheets/cmtool/structure.css.sass rename to app/assets/stylesheets/cmtool/structure.sass diff --git a/app/assets/stylesheets/cmtool/twittered.css.sass b/app/assets/stylesheets/cmtool/twittered.sass similarity index 100% rename from app/assets/stylesheets/cmtool/twittered.css.sass rename to app/assets/stylesheets/cmtool/twittered.sass diff --git a/app/assets/stylesheets/cmtool/user_info.css.sass b/app/assets/stylesheets/cmtool/user_info.sass similarity index 100% rename from app/assets/stylesheets/cmtool/user_info.css.sass rename to app/assets/stylesheets/cmtool/user_info.sass diff --git a/cmtool.gemspec b/cmtool.gemspec index d467815..c93c5ab 100644 --- a/cmtool.gemspec +++ b/cmtool.gemspec @@ -26,4 +26,5 @@ Gem::Specification.new do |s| s.add_runtime_dependency "foundation-rails", ">= 0" s.add_runtime_dependency "ace-rails-ap", ">= 0" s.add_runtime_dependency "font-awesome-rails", ">= 0" + s.add_runtime_dependency "pickadate-rails", ">= 0" end