cafe-grader-web Commit - r624:8852e6128763

cafe-grader-web

Commit `r624:8852e6128763` public

parent | child

Description:

render compiler message as modal

Commit status:

[Not Reviewed]

References:

toRails40

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r624:8852e6128763 - Mon, 02 Jan 2017 05:05:51 - 3 files changed: 16 inserted, 4 deleted

app/views/main/list.html.haml ¶ +11

               - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               .row
                 .col-md-7
                   - if GraderConfiguration.show_submitbox_to?(@user)
                     .panel.panel-primary
                       .panel-heading
                         Submission
                       .panel-body
                         = render :partial => 'submission_box'
                   - if GraderConfiguration.show_tasks_to?(@user)
                     - if not GraderConfiguration.multicontests?
                       %table.table.table-striped.table-condensed
                         %thead
                           %tr
                             %th Task name
                             %th Full name
                             %th # of sub(s)
                             %th Results
                             %th
                         %tbody
                           = render :partial => 'problem', :collection => @problems
                     - else
                       - @contest_problems.each do |cp|
                         - if cp[:problems].length > 0
                           %h2{:class =>'contest-title'}
                             = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
                           %table.info
                             %tr.info-head
                               %th Task name
                               %th Full name
                               %th # of sub(s)
                               %th Results
                               %th
                             = render :partial => 'problem', :collection => cp[:problems]
                 .col-md-5
                   .panel.panel-info
                     .panel-heading
                       Announcement
                     %ul.list-group
                       = render :partial => 'announcement', :collection => @announcements
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();
+            + .modal.fade#compiler{tabindex: -1,role: 'dialog'}
+            +   .modal-dialog.modal-lg{role:'document'}
+            +     .modal-content
+            +       .modal-header
+            +         %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
+            +           %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} &times;
+            +         %h4 Compiler message
+            +       .modal-body
+            +         %pre#compiler_msg
+            +       .modal-footer
+            +         %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close

app/views/submissions/compiler_msg.js.haml ¶ +4 -3

@@ -1,3 +1,4
1	- :javascript	1	+ :plain
2	- $("#compiler_msg").html("#{j @submissionhcompiler_msg}")	2	+ $("#compiler_msg").html("#{j @submission.compiler_message}");
3	-	3	+ $("#compiler").modal();
		4	+

app/views/submissions/get_latest_submission_status.js.haml ¶ +1 -1

@@ -1,2 +1,2
1	- :javascript	1	+ :plain
2	$("#latest_status").html("#{j render({partial: 'submission_short', locals: {submission: @submission, problem_name: @problem.name}})}")	2	$("#latest_status").html("#{j render({partial: 'submission_short', locals: {submission: @submission, problem_name: @problem.name}})}")

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

r624:8852e6128763 - Mon, 02 Jan 2017 05:05:51 - 3 files changed: 16 inserted, 4 deleted

Sign in to your account

Commit r624:8852e6128763 public

Author

r624:8852e6128763 - Mon, 02 Jan 2017 05:05:51 - 3 files changed: 16 inserted, 4 deleted

Commit `r624:8852e6128763` public