FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bootstrap-datetimepicker

This commit is contained in:
Yuki 2015-04-24 00:37:39 +05:30
parent f4b5289d3a
commit 4d5d7fdcc1
5 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -33,6 +33,8 @@ gem 'font-awesome-rails', '~> 4.3.0.0'
gem 'rails-assets-growl' gem 'rails-assets-growl'
gem "paperclip", "~> 4.2" gem "paperclip", "~> 4.2"
gem 'delayed_paperclip' gem 'delayed_paperclip'
gem 'momentjs-rails', '>= 2.9.0'
gem 'bootstrap3-datetimepicker-rails', '~> 4.7.14'
gem 'ruby-progressbar' gem 'ruby-progressbar'
@ -78,4 +80,3 @@ group :development, :test do
gem 'simplecov-rcov', require: false gem 'simplecov-rcov', require: false
gem 'database_cleaner' gem 'database_cleaner'
end end

6
Gemfile.lock
View File

@ -48,6 +48,8 @@ GEM
bcrypt (3.1.10) bcrypt (3.1.10)
bootstrap-sass (3.2.0.2) bootstrap-sass (3.2.0.2)
sass (~> 3.2) sass (~> 3.2)
bootstrap3-datetimepicker-rails (4.7.14)
momentjs-rails (>= 2.8.1)
bootstrap_form (2.3.0) bootstrap_form (2.3.0)
bootswatch-rails (3.2.4) bootswatch-rails (3.2.4)
railties (>= 3.1) railties (>= 3.1)
@ -149,6 +151,8 @@ GEM
mime-types (2.4.3) mime-types (2.4.3)
mini_portile (0.6.2) mini_portile (0.6.2)
minitest (5.6.0) minitest (5.6.0)
momentjs-rails (2.9.0)
railties (>= 3.1)
multi_json (1.11.0) multi_json (1.11.0)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.3.18) mysql2 (0.3.18)
@ -362,6 +366,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
bcrypt (~> 3.1.7) bcrypt (~> 3.1.7)
bootstrap-sass (~> 3.2.0.1) bootstrap-sass (~> 3.2.0.1)
bootstrap3-datetimepicker-rails (~> 4.7.14)
bootstrap_form bootstrap_form
bootswatch-rails bootswatch-rails
capybara capybara
@ -380,6 +385,7 @@ DEPENDENCIES
jbuilder (~> 2.2.4) jbuilder (~> 2.2.4)
jquery-rails jquery-rails
jquery-turbolinks jquery-turbolinks
momentjs-rails (>= 2.9.0)
mysql2 mysql2
nprogress-rails nprogress-rails
omniauth omniauth

2
app/assets/javascripts/moderation.js.erb.coffee
View File

@ -1 +1,3 @@
#= require moment
#= require bootstrap-datetimepicker
#= require_tree ./moderation #= require_tree ./moderation

12
app/assets/javascripts/moderation/ban.coffee
View File

@ -13,6 +13,18 @@ $(document).on "DOMContentLoaded", ->
else else
$("#ban-controls-time").show() $("#ban-controls-time").show()
$("#until").addClass("remove-native-picker").datetimepicker
icons:
time: "fa fa-clock-o"
date: "fa fa-calendar"
up: "fa fa-chevron-up"
down: "fa fa-chevron-down"
previous: "fa fa-chevron-left"
next: "fa fa-chevron-right"
today: "fa fa-home"
clear: "fa fa-trash-o"
close: "fa fa-times"
parent.parent()[0].addEventListener "submit", (event) -> parent.parent()[0].addEventListener "submit", (event) ->
event.preventDefault(); event.preventDefault();

7
app/assets/stylesheets/application.css.scss
View File

@ -45,7 +45,14 @@ $navbar-inverse-toggle-border-color: #512da8;
@import "bootswatch/cosmo/variables"; @import "bootswatch/cosmo/variables";
@import "bootstrap"; @import "bootstrap";
body { padding-top: $navbar-height; } body { padding-top: $navbar-height; }
@import 'bootstrap-datetimepicker';
.remove-native-picker::-webkit-calendar-picker-indicator{
display: none
}
@import "bootswatch/cosmo/bootswatch"; @import "bootswatch/cosmo/bootswatch";
@import "base"; @import "base";