cafe-grader-web Commit - r693:8edec20582c5

cafe-grader-web

Commit `r693:8edec20582c5` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r693:8edec20582c5 - Thu, 02 Nov 2017 10:37:50 - 7 files changed: 58 inserted, 30 deleted

Gemfile ¶ +2 -1

               gem 'bootstrap-sass', '~> 3.2.0'
               gem 'bootstrap-switch-rails'
               gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
               gem 'momentjs-rails'
               gem 'rails_bootstrap_sortable'
-            - gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
+            + gem 'bootstrap-datepicker-rails'
+            + gem 'bootstrap3-datetimepicker-rails'
               gem 'jquery-datatables-rails'
               #----------- user interface -----------------
               #select 2
               gem 'select2-rails'
               #ace editor

Gemfile.lock ¶ +4 -1

                   arel (6.0.4)
                   autoprefixer-rails (6.6.0)
                     execjs
                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
+            +     bootstrap-datepicker-rails (1.7.1.1)
+            +       railties (>= 3.0)
                   bootstrap-sass (3.2.0.2)
                     sass (~> 3.2)
                   bootstrap-switch-rails (3.3.3)
                   bootstrap-toggle-rails (2.2.1.0)
                   bootstrap3-datetimepicker-rails (4.17.47)
                     momentjs-rails (>= 2.8.1)
               DEPENDENCIES
                 ace-rails-ap
                 activerecord-session_store
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
+            +   bootstrap-datepicker-rails
                 bootstrap-sass (~> 3.2.0)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
-            -   bootstrap3-datetimepicker-rails (~> 4.17.47)
+            +   bootstrap3-datetimepicker-rails
                 coffee-rails
                 dynamic_form
                 fuzzy-string-match
                 haml
                 haml-rails
                 in_place_editing

app/assets/javascripts/application.js ¶ +2

               //= require jquery.countdown
               //-------------- addition from local_jquery -----------
               //= require jquery-tablesorter
               //= require best_in_place
               //= require best_in_place.jquery-ui
               //= require brython
+            + //= require bootstrap-datepicker
+            + //= require bootstrap-datetimepicker
               // since this is after blank line, it is not downloaded
               //x= require prototype
               //x= require prototype_ujs
               //x= require effects
               //x= require dragdrop

app/assets/stylesheets/application.css.scss ¶ +1

               @import "select2";
               @import "select2-bootstrap";
               //@import bootstrap3-switch
               @import "bootstrap-toggle";
               @import "bootstrap-sortable";
+            + @import "bootstrap-datepicker3";
               @import "bootstrap-datetimepicker";
               @import "dataTables/bootstrap/3/jquery.dataTables.bootstrap";
               //bootstrap navbar color (from)
               $bgDefault: #19197b;
               $bgHighlight: #06064b;

app/controllers/problems_controller.rb ¶ +1 -4

                     return false
                   end
                 end
                 def change_date_added
                   problems = get_problems_from_params
-            -     year = params[:date_added][:year].to_i
+            +     date = Date.parse(params[:date_added])
-            -     month = params[:date_added][:month].to_i
-            -     day = params[:date_added][:day].to_i
-            -     date = Date.new(year,month,day)
                   problems.each do |p|
                     p.date_added = date
                     p.save
                   end
                 end

app/views/problems/manage.html.haml ¶ +19 -6

                     Action
                   .panel-body
                     .submit-box
                       What do you want to do to the selected problem?
                       %br/
                       (You can shift-click to select a range of problems)
-            -         %ul
+            +         %ul.form-inline
                         %li
                           Change date added to
-            -             = select_date Date.current, :prefix => 'date_added'
+            +             .input-group.date
+            +               = text_field_tag :date_added, class: 'form-control'
+            +               %span.input-group-addon
+            +                 %span.glyphicon.glyphicon-calendar
+            +             -# = select_date Date.current, :prefix => 'date_added'
                           &nbsp;&nbsp;&nbsp;
-            -             = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-default'
+            +             = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-primary btn-sm'
                         %li
                           Set available to
-            -             = submit_tag 'True', :name => 'enable_problem', class: 'btn btn-default'
+            +             = submit_tag 'True', :name => 'enable_problem', class: 'btn btn-primary btn-sm'
-            -             = submit_tag 'False', :name => 'disable_problem', class: 'btn btn-default'
+            +             = submit_tag 'False', :name => 'disable_problem', class: 'btn btn-primary btn-sm'
                         - if GraderConfiguration.multicontests?
                           %li
                             Add to
                             = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
-            -               = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-default'
+            +               = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-primary btn-sm'
                         %li
                           Add problems to group
                           = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
                           = submit_tag 'Add', name: 'add_group', class: 'btn btn-default'
                       %td= problem.available
                       %td= problem.date_added
                       - if GraderConfiguration.multicontests?
                         %td
                           - problem.contests.each do |contest|
                             = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"
+            +
+            + :javascript
+            +   $('.input-group.date').datetimepicker({
+            +     format: 'DD/MMM/YYYY',
+            +     showTodayButton: true,
+            +     widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
+            +
+            +   });
+            +

app/views/sites/edit.html.haml ¶ +29 -18

@@ -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	+

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r693:8edec20582c5 - Thu, 02 Nov 2017 10:37:50 - 7 files changed: 58 inserted, 30 deleted

Sign in to your account

Commit r693:8edec20582c5 public

Author

r693:8edec20582c5 - Thu, 02 Nov 2017 10:37:50 - 7 files changed: 58 inserted, 30 deleted

Commit `r693:8edec20582c5` public