cafe-grader-web Commit - r872:17032a7943cf

cafe-grader-web

Commit `r872:17032a7943cf` public

parent | child

Description:

remove unnecessary gems

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r872:17032a7943cf - Tue, 20 Sep 2022 14:56:09 - 13 files changed: 33 inserted, 75 deleted

Gemfile ¶ +1 -4

               gem "importmap-rails", "~> 1.1"
               # gem 'uglifier'
               gem 'haml'
               gem 'haml-rails'
               # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
               #gem 'turbolinks', '~> 5'
               # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
               gem 'jbuilder'
               #in-place editor
               gem 'best_in_place', git: "https://github.com/mmotherwell/best_in_place"
               # jquery addition
               gem 'jquery-rails'
               #gem 'jquery-ui-rails'
               #gem 'jquery-timepicker-addon-rails'
               #gem 'jquery-tablesorter'
               #gem 'jquery-countdown-rails'
               #syntax highlighter
               gem 'rouge'
               #bootstrap add-ons
               #gem 'bootstrap-sass', '~> 3.4.1'
               gem 'bootstrap', '~> 5.2'
               #gem 'bootstrap-switch-rails'
               #gem 'bootstrap-toggle-rails'
               #gem 'autoprefixer-rails'
               gem 'momentjs-rails'
               #gem 'rails_bootstrap_sortable'
               #gem 'bootstrap-datepicker-rails'
               #gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
               #gem 'jquery-datatables-rails'
               #----------- user interface -----------------
               gem 'simple_form'
               #select 2
               #gem 'select2-rails'
               #ace editor
               gem 'ace-rails-ap'
               #paginator
               #gem 'will_paginate', '~> 3.0.7'
               gem 'mail'
-            - gem 'rdiscount'
+            + gem 'rdiscount'  #markdown
-            - gem 'dynamic_form'
-            - gem 'in_place_editing'
-            - #gem 'verification', :git => 'https://github.com/sikachu/verification.git'
               #---------------- testiing -----------------------
               gem 'minitest-reporters'
               #---------------- for console --------------------
               gem 'fuzzy-string-match'
               group :development, :test do
                 # Call 'byebug' anywhere in the code to stop execution and get a debugger console
                 gem 'byebug'
               end
               group :development do
                 # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
                 gem 'web-console', '>= 3.3.0'
                 gem 'listen', '>= 3.0.5', '< 3.2'
                 # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
                 gem 'spring'
                 gem 'spring-watcher-listen', '~> 2.0.0'
                 # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
                 # gem "rack-mini-profiler"
               end
               group :test do
                 # Adds support for Capybara system testing and selenium driver
                 gem 'capybara'
                 gem 'selenium-webdriver'
                 gem 'webdrivers'
               end

Gemfile.lock ¶ -2

                     rack (>= 2.0.8, < 3)
                     railties (>= 5.2.4.1)
                   activestorage (7.0.4)
                     actionpack (= 7.0.4)
                     activejob (= 7.0.4)
                     activerecord (= 7.0.4)
                     activesupport (= 7.0.4)
                     marcel (~> 1.0)
                     mini_mime (>= 1.1.0)
                   activesupport (7.0.4)
                     concurrent-ruby (~> 1.0, >= 1.0.2)
                     i18n (>= 1.6, < 2)
                     minitest (>= 5.1)
                     tzinfo (~> 2.0)
                   addressable (2.8.1)
                     public_suffix (>= 2.0.2, < 6.0)
                   ansi (1.5.0)
                   autoprefixer-rails (10.4.7.0)
                     execjs (~> 2)
                   bindex (0.8.1)
                   bootsnap (1.13.0)
                     msgpack (~> 1.2)
                   bootstrap (5.2.1)
                     autoprefixer-rails (>= 9.1.0)
                     popper_js (>= 2.11.6, < 3)
                     sassc-rails (>= 2.0.0)
                   builder (3.2.4)
                   byebug (11.1.3)
                   capybara (3.37.1)
                     addressable
                     matrix
                     mini_mime (>= 0.1.3)
                     nokogiri (~> 1.8)
                     rack (>= 1.6.0)
                     rack-test (>= 0.6.3)
                     regexp_parser (>= 1.5, < 3.0)
                     xpath (~> 3.2)
                   childprocess (4.1.0)
                   coffee-rails (5.0.0)
                     coffee-script (>= 2.2.0)
                     railties (>= 5.2.0)
                   coffee-script (2.4.1)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.12.2)
                   concurrent-ruby (1.1.10)
                   crass (1.0.6)
                   digest (3.1.0)
-            -     dynamic_form (1.1.4)
                   erubi (1.11.0)
                   erubis (2.7.0)
                   execjs (2.8.1)
                   ffi (1.15.5)
                   fuzzy-string-match (1.0.1)
                     RubyInline (>= 3.8.6)
                   globalid (1.0.0)
                     activesupport (>= 5.0)
                   haml (5.2.2)
                     temple (>= 0.8.0)
                     tilt
                   haml-rails (2.0.1)
                     actionpack (>= 5.1)
                     activesupport (>= 5.1)
                     haml (>= 4.0.6, < 6.0)
                     html2haml (>= 1.0.1)
                     railties (>= 5.1)
                   html2haml (2.2.0)
                     erubis (~> 2.7.0)
                     haml (>= 4.0, < 6)
                     nokogiri (>= 1.6.0)
                     ruby_parser (~> 3.5)
                   i18n (1.12.0)
                     concurrent-ruby (~> 1.0)
                   importmap-rails (1.1.5)
                     actionpack (>= 6.0.0)
                     railties (>= 6.0.0)
                   in_place_editing (1.2.0)
                   jbuilder (2.11.5)
                     actionview (>= 5.0.0)
                     activesupport (>= 5.0.0)
                   jquery-rails (4.5.0)
                     rails-dom-testing (>= 1, < 3)
                     railties (>= 4.2.0)
                     thor (>= 0.14, < 2.0)
                   listen (3.0.8)
                     rb-fsevent (~> 0.9, >= 0.9.4)
                     rb-inotify (~> 0.9, >= 0.9.7)
                   loofah (2.19.0)
                     crass (~> 1.0.2)
                     nokogiri (>= 1.5.9)
                   mail (2.7.1)
                     mini_mime (>= 0.1.1)
                   marcel (1.0.2)
                   material_icons (2.2.1)
                     railties (>= 3.2)
                   matrix (0.4.2)
                   method_source (1.0.0)
                   spring (2.1.1)
                   spring-watcher-listen (2.0.1)
                     listen (>= 2.7, < 4.0)
                     spring (>= 1.2, < 3.0)
                   sprockets (4.1.1)
                     concurrent-ruby (~> 1.0)
                     rack (> 1, < 3)
                   sprockets-rails (3.4.2)
                     actionpack (>= 5.2)
                     activesupport (>= 5.2)
                     sprockets (>= 3.0.0)
                   sqlite3 (1.5.0-x86_64-linux)
                   strscan (3.0.4)
                   temple (0.8.2)
                   thor (1.2.1)
                   tilt (2.0.11)
                   timeout (0.3.0)
                   tzinfo (2.0.5)
                     concurrent-ruby (~> 1.0)
                   web-console (4.2.0)
                     actionview (>= 6.0.0)
                     activemodel (>= 6.0.0)
                     bindex (>= 0.4.0)
                     railties (>= 6.0.0)
                   webdrivers (5.1.0)
                     nokogiri (~> 1.6)
                     rubyzip (>= 1.3.0)
                     selenium-webdriver (~> 4.0)
                   websocket (1.2.9)
                   websocket-driver (0.7.5)
                     websocket-extensions (>= 0.1.0)
                   websocket-extensions (0.1.5)
                   xpath (3.2.0)
                     nokogiri (~> 1.8)
                   zeitwerk (2.6.0)
               PLATFORMS
                 x86_64-linux
               DEPENDENCIES
                 ace-rails-ap
                 activerecord-session_store
                 best_in_place!
                 bootsnap
                 bootstrap (~> 5.2)
                 byebug
                 capybara
                 coffee-rails
-            -   dynamic_form
                 fuzzy-string-match
                 haml
                 haml-rails
                 importmap-rails (~> 1.1)
                 in_place_editing
                 jbuilder
                 jquery-rails
                 listen (>= 3.0.5, < 3.2)
                 mail
                 material_icons
                 minitest-reporters
                 momentjs-rails
                 mysql2
                 puma
                 rails (~> 7.0)
                 rdiscount
                 rouge
                 sassc-rails
                 selenium-webdriver
                 simple_form
                 spring
                 spring-watcher-listen (~> 2.0.0)
                 sprockets-rails
                 sqlite3
                 web-console (>= 3.3.0)
                 webdrivers
               RUBY VERSION
                  ruby 3.1.2p20
               BUNDLED WITH
 .3.22

app/assets/stylesheets/my_custom.css.scss ¶ +8

               .secondnavbar {
                 top: 50px;
               }
+            +
+            + //for google material design
+            + .mi-bs {
+            +   vertical-align: middle;
+            +   position: relative;
+            +   top: -3px;
+            + }
+            +
               // --------------- bootstrap file upload ----------------------
               .btn-file {
                 position: relative;
                 overflow: hidden;
               }
               .btn-file input[type=file] {
                 position: absolute;
                 top: 0;
                 right: 0;
                 min-width: 100%;
                 min-height: 100%;
                 font-size: 100px;
                 text-align: right;
                 filter: alpha(opacity = 0);
                 opacity: 0;
                 outline: none;
                 background: white;
                 cursor: inherit;
                 display: block;
               }
               body {
                 //font-size: 13px
                 font-family: 'Krub', Tahoma, "sans-serif";
                 margin: 10px;
                 padding: 10px;
                 padding-top: 60px;
               }
               // ------------------ bootstrap sortable --------------------
               table.sortable th {
                 padding-right: 20px !important;
                 span.sign {
                   right: (-15px) !important;
                 }
                 &.text-right {
                   padding-left: 20px !important;
                   padding-right: 8px !important;
                   &:after, span.sign {
                     left: (-15px) !important;
                   }
                 }
               }

app/controllers/announcements_controller.rb ¶ +1 -3

               class AnnouncementsController < ApplicationController
                 before_action :admin_authorization
-            -   in_place_edit_for :announcement, :published
                 # GET /announcements
                 # GET /announcements.xml
                 def index
                   @announcements = Announcement.order(created_at: :desc)
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @announcements }
                   end
                 end
                 # GET /announcements/1
                 # GET /announcements/1.xml
                 def show
                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
                     format.html # show.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/new
                 # GET /announcements/new.xml
                 def new
                   @announcement = Announcement.new
                   respond_to do |format|
                     format.html # new.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/1/edit
                 def edit
                   @announcement = Announcement.find(params[:id])
                 end
                 # POST /announcements
                 # POST /announcements.xml
                 def create
                   @announcement = Announcement.new(announcement_params)
                   respond_to do |format|
                     if @announcement.save
                       flash[:notice] = 'Announcement was successfully created.'
                       format.html { redirect_to(@announcement) }
                       format.xml  { render :xml => @announcement, :status => :created, :location => @announcement }
                     else
                       format.html { render :action => "new" }
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 # PUT /announcements/1
                 # PUT /announcements/1.xml
                 def update
                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
                     if @announcement.update(announcement_params)
                       flash[:notice] = 'Announcement was successfully updated.'
                       format.html { redirect_to(@announcement) }
                       format.js   {}
                       format.xml  { head :ok }
                     else
                       format.html { render :action => "edit" }
                       format.js   {}
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 def toggle
                   @announcement = Announcement.find(params[:id])
                   @announcement.update( published:  !@announcement.published? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#announcement_toggle_#{@announcement.id}",button_on: @announcement.published? } }
                   end
                 end
                 def toggle_front
                   @announcement = Announcement.find(params[:id])
-            -     @announcement.update_attributes( frontpage:  !@announcement.frontpage? )
+            +     @announcement.update( frontpage:  !@announcement.frontpage? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#announcement_toggle_front_#{@announcement.id}",button_on: @announcement.frontpage? } }
                   end
                 end
                 # DELETE /announcements/1
                 # DELETE /announcements/1.xml
                 def destroy
                   @announcement = Announcement.find(params[:id])
                   @announcement.destroy
                   respond_to do |format|
                     format.html { redirect_to(announcements_url) }
                     format.xml  { head :ok }
                   end
                 end
                 private
                   def announcement_params
                     params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only, :title, :on_nav_bar)
                   end
               end

app/controllers/problems_controller.rb ¶ -4

               class ProblemsController < ApplicationController
                 before_action :admin_authorization, except: [:stat]
                 before_action only: [:stat] do
                   authorization_by_roles(['admin','ta'])
                 end
-            -   in_place_edit_for :problem, :name
-            -   in_place_edit_for :problem, :full_name
-            -   in_place_edit_for :problem, :full_score
                 def index
                   @problems = Problem.order(date_added: :desc)
                 end
                 def show
                   @problem = Problem.find(params[:id])
                 end
                 def new
                   @problem = Problem.new
                   @description = nil
                 end
                 def create
                   @problem = Problem.new(problem_params)
                   @description = Description.new(description_params)
                   if @description.body!=''
                     if !@description.save
                       render :action => new and return
                     end
                   else
                     @description = nil
                   end
                   @problem.description = @description
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to action: :index
                   else
                     render :action => 'new'
                   end
                 end
                 def quick_create
                   @problem = Problem.new(problem_params)
                   @problem.full_name = @problem.name if @problem.full_name == ''
                   @problem.full_score = 100
                   @problem.available = false
                   @problem.test_allowed = true
                   @problem.output_only = false
                   @problem.date_added = Time.new
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to action: :index
                   else
                     flash[:notice] = 'Error saving problem'
                   redirect_to action: :index
                   end

app/helpers/application_helper.rb ¶ +2 -2

                   if GraderConfiguration['right.user_hall_of_fame']
                     append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
                   if GraderConfiguration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
                   now = Time.zone.now
                   st = ''
                   if (time.yday != now.yday) or (time.year != now.year)
                     st = time.strftime("%d/%m/%y ")
                   end
                   st + time.strftime("%X")
                 end
                 def format_short_duration(duration)
                   return '' if duration==nil
                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 end
                 def format_full_time_ago(time)
                   st = time_ago_in_words(time) + ' ago (' + format_short_time(time) + ')'
                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def toggle_button(on,toggle_url,id, option={})
-            -     btn_size = option[:size] || 'btn-xs'
+            +     btn_size = option[:size] || 'btn-sm'
                   btn_block = option[:block] || 'btn-block'
                   link_to (on ? "Yes" : "No"), toggle_url,
-            -       {class: "btn #{btn_block} #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
+            +       {class: "btn #{btn_block} #{btn_size} btn-#{on ? 'success' : 'outline-secondary'} ajax-toggle",
                       id: id,
                       data: {remote: true, method: 'get'}}
                 end
                 def get_ace_mode(language)
                   # return ace mode string from Language
                   case language.pretty_name
                     when 'Pascal'
                       'ace/mode/pascal'
                     when 'C++','C'
                       'ace/mode/c_cpp'
                     when 'Ruby'
                       'ace/mode/ruby'
                     when 'Python'
                       'ace/mode/python'
                     when 'Java'
                       'ace/mode/java'
                     else
                       'ace/mode/c_cpp'
                   end
                 end
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
                   if GraderConfiguration.time_limit_mode?
                     if user.contest_finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                     end
                     if !user.contest_started?
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
                     else
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
                         " #{format_short_duration(user.contest_time_left)}"
                     end
                   end
                   #
                   # if the contest is in the anaysis mode

app/views/announcements/edit.html.haml ¶ -39

@@ -1,45 +1,6
1	%h1 Edit Announcement	1	%h1 Edit Announcement
2		2
3	-content_for(:form_buttons) do	3	-content_for(:form_buttons) do
4	= link_to t(:back), announcements_path, class: 'card-link btn btn-secondary'	4	= link_to t(:back), announcements_path, class: 'card-link btn btn-secondary'
5		5
6	= render 'form'	6	= render 'form'
7	- -# old style
8	- .container-fluid
9	- %h1 Editing announcement
10	- = error_messages_for :announcement
11	- .row
12	- .col-md-6
13	- = form_for(@announcement) do \|f\|
14	- .form-group
15	- %label Title
16	- = f.text_field :title, class: 'form-control'
17	- .form-group
18	- %label Notes
19	- (shown internally, used to organize announcements)
20	- = f.text_field :notes, class: 'form-control'
21	- .form-group
22	- %label Body
23	- = f.text_area :body, class: 'form-control', style: 'height: 200px;'
24	- .form-group
25	- %label Author
26	- = f.text_field :author, class: 'form-control'
27	- .checkbox
28	- %label
29	- = f.check_box :published
30	- Published
31	- .checkbox
32	- %label
33	- = f.check_box :frontpage
34	- Show on front page?
35	- .checkbox
36	- %label
37	- = f.check_box :on_nav_bar
38	- Show on top menu bar?
39	- .checkbox
40	- %label
41	- = f.check_box :contest_only
42	- Show only in contest?
43	- = f.submit "Update", class: 'btn btn-primary'
44	- = link_to 'Show', @announcement, class: 'btn btn-default'
45	- = link_to 'Back', announcements_path, class: 'btn btn-default'

app/views/application/_toggle_button.js.haml ¶ +2 -2

               :plain
                 var t = $("#{button_id}");
-            -   t.removeClass('btn-default');
+            +   t.removeClass('btn-outline-secondary');
                 t.removeClass('btn-success');
                 t.removeClass('btn-warning');
-            -   t.addClass("btn-#{button_on ? 'success' : 'default'}");
+            +   t.addClass("btn-#{button_on ? 'success' : 'outline-secondary'}");
                 t.text("#{button_on ? 'Yes' : 'No'}");

app/views/layouts/_header.html.haml ¶ +5 -5

               %header
                 %nav.navbar.fixed-top.navbar-dark.bg-primary.navbar-expand-lg
                   .container-fluid
                     %a.navbar-brand{href: list_main_path}
-            -         %span.glyphicon.glyphicon-home
+            +         %span.mi.mi-bs home
                       MAIN
                     %button.navbar-toggler.collapsed{ type: :button, 'data-bs': {toggle: 'collapse', target: '#navbar-collapse'} }
                       %span.navbar-toggler-icon
                     .collapse.navbar-collapse#navbar-collapse
                       %ul.navbar-nav.me-auto.mb-2.mb-lg-0
                         / submission
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
                           %li.nav-item.dropdown.mx-2
                             %a.nav-link.dropdown-toggle{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {expanded:"false"}, role: "button"}
                               = "#{I18n.t 'menu.submissions'}"
                             %ul.dropdown-menu
                               %li= link_to 'View', submissions_path, class:'dropdown-item'
                               %li= link_to 'Self Test', test_index_path, class:'dropdown-item'
                         / hall of fame
                         - if GraderConfiguration['right.user_hall_of_fame']
                           %li= link_to "#{I18n.t 'menu.hall_of_fame'}", problem_hof_report_path, class: 'nav-link mx-2'
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
                           %div.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
                             %div.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
                             %div.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
                             %div.btn.btn-primary#countdown asdf
                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           / management
                           %li.nav-item.dropdown.mx-2
                             %a.nav-link.dropdown-toggle{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                             %ul.dropdown-menu
                               %li= link_to 'Announcements', announcements_path, class: 'dropdown-item'
                               %li= link_to 'Problems', problems_path, class: 'dropdown-item'
                               %li= link_to 'Tags', tags_path, class: 'dropdown-item'
                               %li= link_to 'Users', user_admin_index_path, class: 'dropdown-item'
                               %li= link_to 'User Groups', groups_path, class: 'dropdown-item'
                               %li= link_to 'Graders', graders_list_path, class: 'dropdown-item'
                               %li= link_to 'Message ', console_messages_path, class: 'dropdown-item'
                               %li
                                 %hr.dropdown-divider
                               %li= link_to 'System config', grader_configuration_index_path, class: 'dropdown-item'
                               %li
                                 %hr.dropdown-divider
                               %li= link_to 'Sites', sites_path, class: 'dropdown-item'
                               %li= link_to 'Contests', contest_management_index_path, class: 'dropdown-item'
                               -#
                           / report
                           %li.nav-item.dropdown.mx-2
                             %a.nav-link.dropdown-toggle{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                             %ul.dropdown-menu
                               %li= link_to 'Current Score', current_score_report_path, class: 'dropdown-item'
                               %li= link_to 'Score Report', max_score_report_path, class: 'dropdown-item'
                               %li= link_to 'Submission Report', submission_report_path, class: 'dropdown-item'
                               %li= link_to 'Login Report', login_report_path, class: 'dropdown-item'
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
                               graders_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                         / announcement
                         - @nav_announcement.each do |ann|
                           %p.navbar-text
                             = ann.body.html_safe
                     %ul.navbar-nav
                       %li.nav-item
                         %a.nav-link{href: help_main_path}
-            -             %span.mi.md-18 help
+            +             %span.mi.mi-bs.md-18 help
                       %li.nav-item
                         %a.nav-link{href: messages_path}
-            -             %span.mi.md-18 chat
+            +             %span.mi.mi-bs.md-18 chat
                       - if GraderConfiguration['system.user_setting_enabled']
                         %li.nav-item
                           %a.nav-link{href: profile_users_path}
-            -               %span.mi.md-18 settings
+            +               %span.mi.mi-bs.md-18 settings
                       %li.nav-item
                         %a.nav-link{href: login_main_path}
-            -             %span.mi.md-18 exit_to_app
+            +             %span.mi.mi-bs.md-18 exit_to_app
                           = @current_user.full_name

app/views/main/_submission_box.html.haml ¶ +2 -2

               = form_with url: submit_main_path, multipart: true, class: 'form' do |form|
                 - if @submission and @submission.errors.any?
                   #error_explanation
                     .alert.alert-danger
                       %h3= "#{pluralize(@submission.errors.count, "error")} prohibited this user from being saved:"
                       %ul
                         - @submission.errors.full_messages.each do |msg|
                           %li= msg
                 .row.mb-2
                   .col-sm-2
-            -       = form.label :submission, 'Problem:', class: 'form-label'
+            +       = form.label :submission, 'Problem:', class: 'col-form-label'
                   .col-sm-10
                     = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]}, {:selected => '-1'}, { class: 'select2 form-control', style: "width: 100%" }
                 .row.mb-2
                   .col-sm-2
-            -       = form.label :file, 'File:', class: 'form-label'
+            +       = form.label :file, 'File:', class: 'col-form-label'
                   .col-sm-10
                     = form.file_field :file, class: 'form-control'
                 = form.submit 'Submit', class: 'btn btn-primary'

app/views/problems/index.html.haml ¶ +7 -7

               - content_for :head do
                 = stylesheet_link_tag 'problems'
               %h1 Problems
               %p
                 = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-success btn-sm'
                 = link_to 'New problem', new_problem_path, class: 'btn btn-success btn-sm'
                 = link_to 'Bulk Manage', { action: 'manage'}, class: 'btn btn-info btn-sm'
                 = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn-default btn-sm'
                 = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-default btn-sm'
               .submitbox
                 = form_tag action: 'quick_create', controller: 'problems' do
                   %b Quick New:
                   %label{:for => "problem_name"} Name
                   = text_field 'problem', 'name'
                   |
                   %label{:for => "problem_full_name"} Full name
                   = text_field 'problem', 'full_name'
                   = submit_tag "Create"
               %table.table.table-condense.table-hover
                 %thead
                   %th Name
                   %th Full name
                   %th.text-right Full score
                   %th Tags
                   %th
                     Submit
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Admin can always submit to any problem' } [?]
                   %th Date added
                   %th.text-center
                     Avail?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user submits to this problem?' } [?]
                   %th.text-center
                     View Data?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user view the testcase of this problem?' } [?]
                   %th.text-center
                     Test?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user uses test interface on this problem?' } [?]
                   - if GraderConfiguration.multicontests?
                     %th Contests
                 - for problem in @problems
-            -     %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
+            +     %tr{:class => "#{(problem.available) ? "bg-success bg-opacity-25" : "bg-opacity-25"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
                     - @problem=problem
                     %td= problem.name #in_place_editor_field :problem, :name, {}, :rows=>1
                     %td
                       = problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
                       = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
                     %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1
                     %td
                       - problem.tags.each do |t|
-            -           - #%button.btn.btn-default.btn-xs= t.name
+            +           - #%button.btn.btn-default.btn-sm= t.name
                         %span.label.label-default= t.name
-            -       %td= link_to "Submit", direct_edit_problem_submissions_path(problem,@current_user.id), class: 'btn btn-xs btn-primary'
+            +       %td= link_to "Submit", direct_edit_problem_submissions_path(problem,@current_user.id), class: 'btn btn-sm btn-primary'
                     %td= problem.date_added
                     %td= toggle_button(@problem.available?, toggle_problem_path(@problem), "problem-avail-#{@problem.id}")
                     %td= toggle_button(@problem.view_testcase?, toggle_view_testcase_problem_path(@problem), "problem-view-testcase-#{@problem.id}")
                     %td= toggle_button(@problem.test_allowed?, toggle_test_problem_path(@problem), "problem-test-#{@problem.id}")
                     - if GraderConfiguration.multicontests?
                       %td
                         = problem.contests.collect { |c| c.name }.join(', ')
-            -       %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block'
+            +       %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-sm btn-block'
-            -       %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block'
+            +       %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-sm btn-block'
-            -       %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-xs btn-block'
+            +       %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-sm btn-block'
-            -       %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-xs btn-block'
+            +       %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-sm btn-block'
               %br/
               = link_to '[New problem]', :action => 'new'

app/views/problems/toggle.js.haml ¶ +3 -3

               = render partial: 'toggle_button',
                                 locals: {button_id: "#problem-avail-#{@problem.id}",button_on: @problem.available }
               :plain
                 r = $("#prob-#{@problem.id}");
-            -   r.removeClass('success');
+            +   r.removeClass('bg-success');
-            -   r.removeClass('danger');
+            +   r.removeClass('bg-danger');
-            -   r.addClass("#{@problem.available? ? 'success' : 'danger'}");
+            +   r.addClass("#{@problem.available? ? 'bg-success' : 'bg-danger-'}");

app/views/testcases/show_problem.html.haml ¶ +2 -2

               %h1 Test cases
               %h2= @problem.long_name
               /navbar
               %ul.nav.nav-pills{role: :tablist}
                 - @problem.testcases.each.with_index do |tc,id|
-            -     %li{role: :presentation, class: ('active' if id == 0)}
+            +     %li.nav-item{role: :presentation, class: ('active' if id == 0)}
-            -       %a{href:"#tc#{tc.id}", role: 'tab', data: {toggle: 'tab'}}= tc.num
+            +       %a.nav-link{href:"#tc#{tc.id}", role: 'tab', 'data-bs': {toggle: 'tab', target: "#tc#{tc.id}"}}= tc.num
               /actual data
               .tab-content
                 - @problem.testcases.each.with_index do |tc,id|
                   .tab-pane{id: "tc#{tc.id}",class: ('active' if id == 0)}
                     .row
                       .col-md-6
                         %h3 Input
                         = link_to "Download",download_input_testcase_path(tc),class: 'btn btn-info btn-sm'
                       .col-md-6
                         %h3 Output
                         = link_to "Download",download_sol_testcase_path(tc),class: 'btn btn-info btn-sm'
                     .row
                       .col-md-6
                         %textarea{ rows: 25,readonly: true,style: "width:100%;resize=none;overflow-y: scroll;"}= tc.input
                       .col-md-6
                         %textarea{ rows: 25,readonly: true,style: "width:100%;resize=none;overflow-y: scroll;"}= tc.sol

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

Commit r872:17032a7943cf public

Author

r872:17032a7943cf - Tue, 20 Sep 2022 14:56:09 - 13 files changed: 33 inserted, 75 deleted

Commit `r872:17032a7943cf` public