cafe-grader-web Commit - r613:e3dfadbca639

cafe-grader-web

Commit `r613:e3dfadbca639` public

parent | child

Description:

- fix various ui issues

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r613:e3dfadbca639 - Wed, 26 Oct 2016 04:25:56 - 5 files changed: 13 inserted, 9 deleted

app/controllers/configurations_controller.rb ¶ +1

               class ConfigurationsController < ApplicationController
                 before_filter :authenticate
                 before_filter { |controller| controller.authorization_by_roles(['admin'])}
                 def index
                   @configurations = GraderConfiguration.find(:all,
                                                        :order => '`key`')
+            +     @group = GraderConfiguration.pluck("grader_configurations.key").map{ |x| x[0...(x.index('.'))] }.uniq.sort
                 end
                 def reload
                   GraderConfiguration.reload
                   redirect_to :action => 'index'
                 end
                 def update
                   @config = GraderConfiguration.find(params[:id])
                   User.clear_last_login if @config.key == GraderConfiguration::MULTIPLE_IP_LOGIN_KEY and @config.value == 'true' and params[:grader_configuration][:value] == 'false'
                   respond_to do |format|
                     if @config.update_attributes(params[:grader_configuration])
                       format.json { head :ok }
                     else
                       format.json { respond_with_bip(@config) }
                     end
                   end
                 end
               end

app/views/application/_submission_short.html.haml ¶ +1 -1

               - if submission.nil?
                 = "-"
               - else
-            -   - if submission.graded_at.nil?
+            +   - unless submission.graded_at
                   = t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
                   = t 'main.graded_at'
                   = "#{format_short_time(submission.graded_at.localtime)}, "
                   - if GraderConfiguration['ui.show_score']
                     = t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   - if GraderConfiguration.show_grading_result
                     = " | "
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
                   = " | "
                   = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
                 = " | "
                 = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
                 //= " | "
                 //= link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id)

app/views/configurations/index.html.haml ¶ +9 -6

               /- content_for :header do
               /  = javascript_include_tag 'local_jquery'
               %h1 System configuration
-            - %table.info
+            + - @group.each do |g|
-            -   %tr.info-head
+            +   %h2= g
-            -     %th Key
+            +   %table.table.table-striped
-            -     %th Type
+            +     %thead
-            -     %th Value
+            +       %th{style: 'width: 25%'} Key
+            +       %th{style: 'width: 10%'}Type
+            +       %th{style: 'width: 15%'} Value
                     %th Description
                   - @configurations.each do |conf|
+            +       - next if conf.key[0...(conf.key.index('.'))] != g
                     - @grader_configuration = conf
-            -     %tr{:class => cycle("info-odd", "info-even")}
+            +       %tr
                       %td
                         /= in_place_editor_field :grader_configuration, :key, {}, :rows=>1
                         = @grader_configuration.key
                       %td
                         /= in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1
                         = @grader_configuration.value_type
                       %td
                         = best_in_place @grader_configuration, :value, ok_button: "ok", cancel_button: "cancel"
                       %td= conf.description
               - if GraderConfiguration.config_cached?
                 %br/
                 Your config is saved, but it does not automatically take effect.
                 %br/
                 If you have one mongrel process running, you can
                 = link_to '[click]', :action => 'reload'
                 here to reload.
                 %br/
                 If you have more than one process running, you should restart
                 them manually.

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

               = form_tag({:action => 'submit'}, :multipart => true, class: 'form') do
                 - 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
                 .form-group
                   = label_tag :submission, 'Problem:'
-            -     = 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' }
+            +     = 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%" }
                 .form-group
                   = label_tag :file, 'File:'
                   .input-group
                     %span.input-group-btn
                       %span.btn.btn-default.btn-file
                         Browse
                         = file_field_tag 'file'
                     = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
                 = submit_tag 'Submit', class: 'btn btn-default'

app/views/main/_submission_short.html.haml ¶ +1 -1

               - if submission.nil?
                 = "-"
               - else
                 - unless submission.graded_at
                   = t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
                   %strong= t 'main.graded_at'
                   = "#{format_short_time(submission.graded_at.localtime)} "
                   %br
                   - if GraderConfiguration['ui.show_score']
-            -       =t 'main.score'
+            +       %strong=t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   %br
                   %strong View:
                   - if GraderConfiguration.show_grading_result
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
                   = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
                 = link_to "#{t 'main.src_link'}",{:action => 'source', :id => submission.id}, class: 'btn btn-xs btn-info'
                 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'

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

r613:e3dfadbca639 - Wed, 26 Oct 2016 04:25:56 - 5 files changed: 13 inserted, 9 deleted

Sign in to your account

Commit r613:e3dfadbca639 public

Author

r613:e3dfadbca639 - Wed, 26 Oct 2016 04:25:56 - 5 files changed: 13 inserted, 9 deleted

Commit `r613:e3dfadbca639` public