Description:
merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r693:8edec20582c5 - - 7 files changed: 58 inserted, 30 deleted
| @@ -66,7 +66,8 | |||||
|
|
66 | gem 'autoprefixer-rails' |
|
66 | gem 'autoprefixer-rails' |
|
|
67 | gem 'momentjs-rails' |
|
67 | gem 'momentjs-rails' |
|
|
68 | gem 'rails_bootstrap_sortable' |
|
68 | gem 'rails_bootstrap_sortable' |
|
|
69 |
- gem 'bootstrap |
|
69 | + gem 'bootstrap-datepicker-rails' |
|
|
|
70 | + gem 'bootstrap3-datetimepicker-rails' | ||
|
|
70 | gem 'jquery-datatables-rails' |
|
71 | gem 'jquery-datatables-rails' |
|
|
71 |
|
72 | ||
|
|
72 | #----------- user interface ----------------- |
|
73 | #----------- user interface ----------------- |
| @@ -61,6 +61,8 | |||||
|
|
61 | best_in_place (3.0.3) |
|
61 | best_in_place (3.0.3) |
|
|
62 | actionpack (>= 3.2) |
|
62 | actionpack (>= 3.2) |
|
|
63 | railties (>= 3.2) |
|
63 | railties (>= 3.2) |
|
|
|
64 | + bootstrap-datepicker-rails (1.7.1.1) | ||
|
|
|
65 | + railties (>= 3.0) | ||
|
|
64 | bootstrap-sass (3.2.0.2) |
|
66 | bootstrap-sass (3.2.0.2) |
|
|
65 | sass (~> 3.2) |
|
67 | sass (~> 3.2) |
|
|
66 | bootstrap-switch-rails (3.3.3) |
|
68 | bootstrap-switch-rails (3.3.3) |
| @@ -208,10 +210,11 | |||||
|
|
208 | activerecord-session_store |
|
210 | activerecord-session_store |
|
|
209 | autoprefixer-rails |
|
211 | autoprefixer-rails |
|
|
210 | best_in_place (~> 3.0.1) |
|
212 | best_in_place (~> 3.0.1) |
|
|
|
213 | + bootstrap-datepicker-rails | ||
|
|
211 | bootstrap-sass (~> 3.2.0) |
|
214 | bootstrap-sass (~> 3.2.0) |
|
|
212 | bootstrap-switch-rails |
|
215 | bootstrap-switch-rails |
|
|
213 | bootstrap-toggle-rails |
|
216 | bootstrap-toggle-rails |
|
|
214 |
- bootstrap3-datetimepicker-rails |
|
217 | + bootstrap3-datetimepicker-rails |
|
|
215 | coffee-rails |
|
218 | coffee-rails |
|
|
216 | dynamic_form |
|
219 | dynamic_form |
|
|
217 | fuzzy-string-match |
|
220 | fuzzy-string-match |
| @@ -36,6 +36,8 | |||||
|
|
36 | //= require best_in_place |
|
36 | //= require best_in_place |
|
|
37 | //= require best_in_place.jquery-ui |
|
37 | //= require best_in_place.jquery-ui |
|
|
38 | //= require brython |
|
38 | //= require brython |
|
|
|
39 | + //= require bootstrap-datepicker | ||
|
|
|
40 | + //= require bootstrap-datetimepicker | ||
|
|
39 |
|
41 | ||
|
|
40 | // since this is after blank line, it is not downloaded |
|
42 | // since this is after blank line, it is not downloaded |
|
|
41 | //x= require prototype |
|
43 | //x= require prototype |
| @@ -33,6 +33,7 | |||||
|
|
33 | //@import bootstrap3-switch |
|
33 | //@import bootstrap3-switch |
|
|
34 | @import "bootstrap-toggle"; |
|
34 | @import "bootstrap-toggle"; |
|
|
35 | @import "bootstrap-sortable"; |
|
35 | @import "bootstrap-sortable"; |
|
|
|
36 | + @import "bootstrap-datepicker3"; | ||
|
|
36 | @import "bootstrap-datetimepicker"; |
|
37 | @import "bootstrap-datetimepicker"; |
|
|
37 | @import "dataTables/bootstrap/3/jquery.dataTables.bootstrap"; |
|
38 | @import "dataTables/bootstrap/3/jquery.dataTables.bootstrap"; |
|
|
38 |
|
39 | ||
| @@ -258,10 +258,7 | |||||
|
|
258 |
|
258 | ||
|
|
259 | def change_date_added |
|
259 | def change_date_added |
|
|
260 | problems = get_problems_from_params |
|
260 | problems = get_problems_from_params |
|
|
261 |
- |
|
261 | + date = Date.parse(params[:date_added]) |
|
|
262 | - month = params[:date_added][:month].to_i |
|
||
|
|
263 | - day = params[:date_added][:day].to_i |
|
||
|
|
264 | - date = Date.new(year,month,day) |
|
||
|
|
265 | problems.each do |p| |
|
262 | problems.each do |p| |
|
|
266 | p.date_added = date |
|
263 | p.date_added = date |
|
|
267 | p.save |
|
264 | p.save |
| @@ -47,22 +47,26 | |||||
|
|
47 | What do you want to do to the selected problem? |
|
47 | What do you want to do to the selected problem? |
|
|
48 | %br/ |
|
48 | %br/ |
|
|
49 | (You can shift-click to select a range of problems) |
|
49 | (You can shift-click to select a range of problems) |
|
|
50 | - %ul |
|
50 | + %ul.form-inline |
|
|
51 | %li |
|
51 | %li |
|
|
52 | Change date added to |
|
52 | Change date added to |
|
|
53 | - = select_date Date.current, :prefix => 'date_added' |
|
53 | + .input-group.date |
|
|
|
54 | + = text_field_tag :date_added, class: 'form-control' | ||
|
|
|
55 | + %span.input-group-addon | ||
|
|
|
56 | + %span.glyphicon.glyphicon-calendar | ||
|
|
|
57 | + -# = select_date Date.current, :prefix => 'date_added' | ||
|
|
54 | |
|
58 | |
|
|
55 |
- = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn- |
|
59 | + = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-primary btn-sm' |
|
|
56 | %li |
|
60 | %li |
|
|
57 | Set available to |
|
61 | Set available to |
|
|
58 |
- = submit_tag 'True', :name => 'enable_problem', class: 'btn btn- |
|
62 | + = submit_tag 'True', :name => 'enable_problem', class: 'btn btn-primary btn-sm' |
|
|
59 |
- = submit_tag 'False', :name => 'disable_problem', class: 'btn btn- |
|
63 | + = submit_tag 'False', :name => 'disable_problem', class: 'btn btn-primary btn-sm' |
|
|
60 |
|
64 | ||
|
|
61 | - if GraderConfiguration.multicontests? |
|
65 | - if GraderConfiguration.multicontests? |
|
|
62 | %li |
|
66 | %li |
|
|
63 | Add to |
|
67 | Add to |
|
|
64 | = select("contest","id",Contest.all.collect {|c| [c.title, c.id]}) |
|
68 | = select("contest","id",Contest.all.collect {|c| [c.title, c.id]}) |
|
|
65 |
- = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn- |
|
69 | + = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-primary btn-sm' |
|
|
66 | %li |
|
70 | %li |
|
|
67 | Add problems to group |
|
71 | Add problems to group |
|
|
68 | = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2' |
|
72 | = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2' |
| @@ -92,3 +96,12 | |||||
|
|
92 | %td |
|
96 | %td |
|
|
93 | - problem.contests.each do |contest| |
|
97 | - problem.contests.each do |contest| |
|
|
94 | = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])" |
|
98 | = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])" |
|
|
|
99 | + | ||
|
|
|
100 | + :javascript | ||
|
|
|
101 | + $('.input-group.date').datetimepicker({ | ||
|
|
|
102 | + format: 'DD/MMM/YYYY', | ||
|
|
|
103 | + showTodayButton: true, | ||
|
|
|
104 | + widgetPositioning: {horizontal: 'auto', vertical: 'bottom'}, | ||
|
|
|
105 | + | ||
|
|
|
106 | + }); | ||
|
|
|
107 | + | ||
| @@ -1,24 +1,35 | |||||
|
|
1 | %h1 Editing site |
|
1 | %h1 Editing site |
|
|
2 | = error_messages_for :site |
|
2 | = error_messages_for :site |
|
|
3 | = form_for(@site) do |f| |
|
3 | = form_for(@site) do |f| |
|
|
4 | - %p |
|
4 | + .row |
|
|
5 | - %b Name |
|
5 | + .col-md-4 |
|
|
6 | - %br/ |
|
6 | + .form-group.field |
|
|
7 | - = f.text_field :name |
|
7 | + = f.label :name, "Name" |
|
|
8 | - %p |
|
8 | + = f.text_field :name, class: 'form-control' |
|
|
9 | - %b Password |
|
9 | + .form-group.field |
|
|
10 | - %br/ |
|
10 | + = f.label :password, "Password" |
|
|
11 | - = f.text_field :password |
|
11 | + = f.text_field :password, class: 'form-control' |
|
|
12 | - %p |
|
12 | + .form-group.field |
|
|
13 | - %b Started |
|
13 | + = f.label :started, "Started" |
|
|
14 | - %br/ |
|
14 | + = f.check_box :started, class: 'form-control' |
|
|
15 | - = f.check_box :started |
|
15 | + .form-group.field |
|
|
16 | - %p |
|
16 | + = f.label :start_time, "Start time" |
|
|
17 | - %b Start time |
|
17 | + -# = f.datetime_select :start_time, :include_blank => true |
|
|
18 | - %br/ |
|
18 | + .input-group.date |
|
|
19 | - = f.datetime_select :start_time, :include_blank => true |
|
19 | + = f.text_field :start_time, class:'form-control' , value: (@site.start_time ? @site.start_time.strftime('%d/%b/%Y %H:%M') : '') |
|
|
20 | - %p |
|
20 | + %span.input-group-addon |
|
|
21 | - = f.submit "Update" |
|
21 | + %span.glyphicon.glyphicon-calendar |
|
|
|
22 | + .actions | ||
|
|
|
23 | + = f.submit "Update", class: 'btn btn-primary' | ||
|
|
|
24 | + .col-md-8 | ||
|
|
|
25 | + | ||
|
|
22 | = link_to 'Show', @site |
|
26 | = link_to 'Show', @site |
|
|
23 | | |
|
27 | | |
|
|
24 | = link_to 'Back', sites_path |
|
28 | = link_to 'Back', sites_path |
|
|
|
29 | + | ||
|
|
|
30 | + | ||
|
|
|
31 | + :javascript | ||
|
|
|
32 | + $('.input-group.date').datetimepicker({ | ||
|
|
|
33 | + format: 'DD/MMM/YYYY HH:mm', | ||
|
|
|
34 | + }); | ||
|
|
|
35 | + | ||
You need to be logged in to leave comments.
Login now