cafe-grader-web Commit - r873:a7f456a02c5b

cafe-grader-web

Commit `r873:a7f456a02c5b` public

parent | child

Description:

wip

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

r873:a7f456a02c5b - Wed, 21 Sep 2022 16:47:46 - 5 files changed: 26 inserted, 9 deleted

app/assets/stylesheets/my_custom.css.scss ¶ +1 -1

               .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";
+            +   font-family: 'Noto Sans Thai', 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;
                   }
                 }
               }
               input {
                 font-family: Tahoma, "sans-serif";
               }
               h1 {
                 color: #334488;
               }
               h2 {
                 color: #5566bb;
               }
               hr {
                 border-top: 1px solid #dddddd;
                 border-bottom: 1px solid #eeeeee;
               }
               //#a
               //  color: #6666cc
               //  text-decoration: none
               //
               //  &:link, &:visited
               //    color: #6666cc
               //    text-decoration: none
               //
               //  &:hover, &:focus
               //    color: #111166
               //    text-decoration: none
               div {
                 &.userbar {
                   line-height: 1.5em;
                   text-align: right;
                   font-size: 12px;
                 }
                 &.title {
                   padding: 10px 0px;
                   line-height: 1.5em;
                   font-size: 13px;
                   span.contest-over-msg {
                     font-size: 15px;
                     color: red;
                   }
                   table {
                     width: 100%;
                     font-weight: bold;
                   }
                   td {
                     &.left-col {
                       text-align: left;
                       vertical-align: top;
                       color: #444444;
                     }
                     &.right-col {
                       text-align: right;
                       vertical-align: top;
                       font-size: 18px;
                       color: #116699;
                     }
                   }
                 }
               }
               table.info {
                 margin: 10px 0;
                 border: 1px solid #666666;
                 border-collapse: collapse;
                 font-size: 12px;
                 th {
                   border: 1px solid #666666;
                   line-height: 1.5em;
                   padding: 0 0.5em;
                 }
                 td {
                   border-left: 1px solid #666666;
                   border-right: 1px solid #666666;
                   line-height: 1.5em;
                   padding: 0 0.5em;
                 }
               }
               tr {
                 &.info-head {
                   background: #777777;
                   color: white;
                 }
                 &.info-odd {
                   background: #eeeeee;
                 }
                 &.info-even {
                   background: #fcfcfc;
                 }
               }
               @mixin basicbox {
                 background: #eeeeff;
                 border: 1px dotted #99aaee;
                 padding: 5px;
                 margin: 10px 0px;
                 color: black;
                 font-size: 13px;
               }
               .infobox {
                 @include basicbox;
               }
               .submitbox {
                 @include basicbox;
               }
               .errorExplanation {
                 border: 1px dotted gray;
                 color: #bb2222;
                 padding: 5px 15px 5px 15px;
                 margin-bottom: 5px;
                 background-color: white;
                 font-weight: normal;
                 h2 {
                   color: #cc1111;
                   font-weight: bold;
                 }
               }
               table.uinfo {
                 border-collapse: collapse;
                 border: 1px solid black;
                 font-size: 13px;
               }
               td.uinfo {
                 vertical-align: top;
                 border: 1px solid black;
                 padding: 5px;
               }
               th.uinfo {
                 background: lightgreen;
                 vertical-align: top;
                 text-align: right;
                 border: 1px solid black;
                 padding: 5px;
               }
               div {
                 &.compilermsgbody {
                   font-family: monospace;
                 }
                 &.task-menu {
                   text-align: center;
                   font-size: 13px;
                   line-height: 1.75em;
                   font-weight: bold;
                   border-top: 1px dashed gray;
                   border-bottom: 1px dashed gray;
                   margin-top: 2px;
                   margin-bottom: 4px;
                 }

app/views/layouts/application.html.haml ¶ +7 -1

               <!DOCTYPE html>
               %html
               %head
                 %title= GraderConfiguration['contest.name']
                 = stylesheet_link_tag "application", params[:controller], :media => "all"
                 = csrf_meta_tags
                 = csp_meta_tag
                 = javascript_include_tag :my_app
                 -# = javascript_import_module_tag('prepend_jquery')
                 = javascript_importmap_tags
                 = content_for :header
                 = yield :head
                 -# %link{href:"https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css",rel:"stylesheet",integrity:"sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT",crossorigin:"anonymous"}
                 -# %script{src:"https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js",integrity:"sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3",crossorigin:"anonymous"}
                 -# %script{src:"https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/js/bootstrap.bundle.min.js",integrity:"sha384-7VPbUDkoPSGFnVtYi0QogXtr74QeVeeIs99Qfg5YCF+TidwNdjvaKZX19NZ/e6oz",crossorigin:"anonymous"}
                 <link rel="preconnect" href="https://fonts.googleapis.com">
                 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-            -   <link href="https://fonts.googleapis.com/css2?family=Bai+Jamjuree:ital@0;1&family=Krub:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Sarabun:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
+            +   -#
+            +     <link href="https://fonts.googleapis.com/css2?family=Bai+Jamjuree:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Krub:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Sarabun:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
+            +     <link href="https://fonts.googleapis.com/css2?family=Mitr:ital,wght@0,300;1,300&family=Kodchasan:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Serif+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Sans+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
+            +     <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Sans+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
+            +   <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+Thai:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
+            +   <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Thai:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
+            +   <link href="https://fonts.googleapis.com/css2?family=Sarabun:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
               %body
                 - unless local_assigns[:skip_header]
                   = render 'layouts/header'
                 /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
                 = flash_messages
                 = yield

app/views/main/login.html.haml ¶ +5 -4

               %h1= GraderConfiguration['ui.front.title']
               .row
                 .col-md-6
-            -     - if @announcements.length!=0
+            +     .card
-            -       .announcementbox{:style => 'margin-top: 0px'}
+            +       .card-header
-            -         %span{:class => 'title'}
+            +         Announcement
-            -           Announcements
+            +         = link_to 'Manage', announcements_path, class: 'btn btn-secondary btn-sm'
+            +       %ul.list-group.list-group-flush
                       = render :partial => 'announcement', :collection => @announcements
                 .col-md-4{style: "padding-left: 20px;"}
                   = render :partial => 'login_box'
                   = "current ip is #{@remote_ip}"

app/views/problems/import.html.haml ¶ +11 -1

               - content_for :head do
                 = stylesheet_link_tag 'problems'
               %h1 Import problems
               %p= link_to '[Back to problem list]', problems_path
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
-            - = form_tag do_import_problems_path, :multipart => true  do |f|
+            + = form_with url: do_import_problems_path, :multipart => true  do |f|
+            +   .row.mb-2
+            +     .col-md-1
+            +       = f.label :name, 'Name'
+            +     .col-md-11
+            +       = f.text_field :name, class: 'form-control'
+            +   .row.mb-2
+            +     .col-md-1
+            +       = f.label :full_name, 'Full Name'
+            +     .col-md-11
+            +       = f.text_field :full_name, class: 'form-control'
                 .submitbox
                   %table
                     %tr
                       %td Name:
                       %td= text_field_tag 'name'
                     %tr
                       %td Full name:
                       %td
                         = text_field_tag 'full_name'
                         %span{:class => 'help'} Leave blank to use the same value as the name above.
                     %tr
                       %td Testdata file:
                       %td= file_field_tag 'file'
                     %tr
                       %td
                       %td
                         %span{:class => 'help'}
                           In .zip, .tgz, tar.gz, .tar format.
                           It should includes inputs (e.g., 1.in, 2a.in, 2b.in)
                           and solutions (e.g., 1.sol, 2a.sol, 2b.sol).
                           %br/
                           You may put task description in *.html for raw html
                           and *.md or *.markdown for markdown.
                           %br/
                           You may also put a pdf file for the task description
                     %tr
                       %td Checker:
                       %td= select_tag 'checker', options_for_select([['Text checker','text'],['Float checker','float']], 'text')
                     %tr
                       %td
                       %td
                         %span{:class => 'help'}
                           "Text" checker checks if the text (including numbers) is the same, ignoring any whitespace
                           %br/
                           "Float" checker checks if all numbers is within EPSILON error using formula |a-b| < EPSILON * max(|a|,|b|)
                     - if @allow_test_pair_import
                       %tr
                         %td
                         %td
                           = check_box_tag 'import_to_db'
                           Import test data to database (for a test-pair task)
                     %tr
                       %td Time limit:
                       %td
                         = text_field_tag 'time_limit'
                         %span{:class => 'help'} In seconds. Leave blank to use 1 sec.
                     %tr
                       %td Memory limit:
                       %td
                         = text_field_tag 'memory_limit'
                         %span{:class => 'help'} In MB. Leave blank to use 32MB.
                     %tr
                       %td
                       %td= submit_tag 'Import problem'
               - if @log
                 %h3 Import log
                 %pre.import-log
                   = @log

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

               - 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 off all problems', {:action => 'turn_all_off'}, class: 'btn btn-secondary btn-sm'
-            -   = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-default btn-sm'
+            +   = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-secondary 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) ? "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-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-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-sm 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-sm 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'

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

r873:a7f456a02c5b - Wed, 21 Sep 2022 16:47:46 - 5 files changed: 26 inserted, 9 deleted

Sign in to your account

Commit r873:a7f456a02c5b public

Author

r873:a7f456a02c5b - Wed, 21 Sep 2022 16:47:46 - 5 files changed: 26 inserted, 9 deleted

Commit `r873:a7f456a02c5b` public