Pickadate works. Added Jquery :(
parent
c4ded8fd3a
commit
756150ee4b
4
Gemfile
4
Gemfile
|
@ -22,7 +22,9 @@ source 'https://rails-assets.org' do
|
|||
gem 'rails-assets-js-data'
|
||||
gem 'rails-assets-js-data-angular'
|
||||
gem 'rails-assets-lodash'
|
||||
gem 'rails-assets-angular-native-picker'
|
||||
gem 'rails-assets-jquery'
|
||||
gem 'rails-assets-pickadate'
|
||||
gem 'rails-assets-ng-pickadate'
|
||||
end
|
||||
|
||||
gem 'figaro' # Store secrets the 12 factor way. TODO: Get off of this gem.
|
||||
|
|
12
Gemfile.lock
12
Gemfile.lock
|
@ -203,15 +203,19 @@ GEM
|
|||
railties (= 4.1.0)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails-assets-angular (1.3.13)
|
||||
rails-assets-angular-native-picker (1.0.4)
|
||||
rails-assets-angular
|
||||
rails-assets-jquery (2.1.3)
|
||||
rails-assets-js-data (1.3.0)
|
||||
rails-assets-js-data-angular (2.1.0)
|
||||
rails-assets-angular (>= 1.0.3)
|
||||
rails-assets-js-data (>= 1.1.0)
|
||||
rails-assets-lodash (3.2.0)
|
||||
rails-assets-ng-pickadate (0.1.6)
|
||||
rails-assets-angular (~> 1.3.12)
|
||||
rails-assets-pickadate (~> 3.5.4)
|
||||
rails-assets-ng-sortable (1.1.9)
|
||||
rails-assets-angular (~> 1.3.0)
|
||||
rails-assets-pickadate (3.5.5)
|
||||
rails-assets-jquery (>= 1.7)
|
||||
rails_12factor (0.0.3)
|
||||
rails_serve_static_assets
|
||||
rails_stdout_logging
|
||||
|
@ -330,11 +334,13 @@ DEPENDENCIES
|
|||
ng-rails-csrf
|
||||
pry
|
||||
rails (= 4.1.0)
|
||||
rails-assets-angular-native-picker!
|
||||
rails-assets-jquery!
|
||||
rails-assets-js-data!
|
||||
rails-assets-js-data-angular!
|
||||
rails-assets-lodash!
|
||||
rails-assets-ng-pickadate!
|
||||
rails-assets-ng-sortable!
|
||||
rails-assets-pickadate!
|
||||
rails_12factor
|
||||
rspec
|
||||
rspec-rails
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
//= require lodash
|
||||
//= require jquery
|
||||
//= require pickadate
|
||||
//= require skynet
|
||||
//= require angular/angular
|
||||
//= require angular/angular-route
|
||||
|
@ -6,6 +8,6 @@
|
|||
//= require js-data
|
||||
//= require js-data-angular
|
||||
//= require ng-rails-csrf
|
||||
//= require angular-native-picker
|
||||
//= require ng-pickadate
|
||||
//= require farmbot_app/farmbot
|
||||
//= require_tree ./farmbot_app
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
controller = ($scope, Data) ->
|
||||
$scope.form = {}
|
||||
$scope.world = 'world'
|
||||
$scope.pickADateOptions = {}
|
||||
|
||||
angular.module('FarmBot').controller "ScheduleController", [
|
||||
'$scope'
|
||||
|
|
|
@ -5,6 +5,7 @@ app = angular.module('FarmBot', [
|
|||
'ng-rails-csrf'
|
||||
'ui.sortable'
|
||||
'js-data'
|
||||
'pickadate'
|
||||
])
|
||||
|
||||
app.config [
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
* compiled file, but it's generally better to create a new file per style scope.
|
||||
*
|
||||
*= require_self
|
||||
*= require pickadate
|
||||
*= require font-awesome
|
||||
*= require_tree ./foundation/
|
||||
*= require_tree ./foundation-icons/
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
.small-4.columns
|
||||
%span.prefix.uppercase Date
|
||||
.small-8.columns
|
||||
%input{:placeholder => "25 August", :type => "text"}
|
||||
%input{'pick-a-date' => "form.dstart", placeholder: "25 August", :type => "text"}
|
||||
.row.collapse.prefix-radius
|
||||
.small-4.columns
|
||||
%span.prefix.uppercase Repeat
|
||||
|
@ -38,7 +38,7 @@
|
|||
.small-6.columns
|
||||
%span.prefix.uppercase Time
|
||||
.small-6.columns
|
||||
%input{:placeholder => "9:00am", :type => "text"}
|
||||
%input{'pick-a-time' => "form.tstart", placeholder: "9:00am", type: "text"}
|
||||
.row.collapse.prefix-radius
|
||||
.small-6.columns
|
||||
%span.prefix.uppercase Ends
|
||||
|
|
Loading…
Reference in New Issue