Description:
- bootstrapize problem/edit
- bootstrapize announcement/edit
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r650:72b80e42fb9b - - 5 files changed: 5 inserted, 116 deleted
@@ -67,67 +67,67 | |||
|
67 | 67 | if (params['file']) and (params['file']!='') |
|
68 | 68 | @submission.source = File.open(params['file'].path,'r:UTF-8',&:read) |
|
69 | 69 | @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '') |
|
70 | 70 | @submission.source_filename = params['file'].original_filename |
|
71 | 71 | end |
|
72 | 72 | |
|
73 | 73 | if (params[:editor_text]) |
|
74 | 74 | language = Language.find_by_id(params[:language_id]) |
|
75 | 75 | @submission.source = params[:editor_text] |
|
76 | 76 | @submission.source_filename = "live_edit.#{language.ext}" |
|
77 | 77 | @submission.language = language |
|
78 | 78 | end |
|
79 | 79 | |
|
80 | 80 | @submission.submitted_at = Time.new.gmtime |
|
81 | 81 | @submission.ip_address = request.remote_ip |
|
82 | 82 | |
|
83 | 83 | if GraderConfiguration.time_limit_mode? and user.contest_finished? |
|
84 | 84 | @submission.errors.add(:base,"The contest is over.") |
|
85 | 85 | prepare_list_information |
|
86 | 86 | render :action => 'list' and return |
|
87 | 87 | end |
|
88 | 88 | |
|
89 | 89 | if @submission.valid? |
|
90 | 90 | if @submission.save == false |
|
91 |
- |
|
|
91 | + flash[:notice] = 'Error saving your submission' | |
|
92 | 92 | elsif Task.create(:submission_id => @submission.id, |
|
93 | 93 | :status => Task::STATUS_INQUEUE) == false |
|
94 |
- |
|
|
94 | + flash[:notice] = 'Error adding your submission to task queue' | |
|
95 | 95 | end |
|
96 | 96 | else |
|
97 | 97 | prepare_list_information |
|
98 | 98 | render :action => 'list' and return |
|
99 | 99 | end |
|
100 | 100 | redirect_to :action => 'list' |
|
101 | 101 | end |
|
102 | 102 | |
|
103 | 103 | def source |
|
104 | 104 | submission = Submission.find(params[:id]) |
|
105 | 105 | if ((submission.user_id == session[:user_id]) and |
|
106 | 106 | (submission.problem != nil) and |
|
107 | 107 | (submission.problem.available)) |
|
108 | 108 | send_data(submission.source, |
|
109 |
- |
|
|
109 | + {:filename => submission.download_filename, | |
|
110 | 110 | :type => 'text/plain'}) |
|
111 | 111 | else |
|
112 | 112 | flash[:notice] = 'Error viewing source' |
|
113 | 113 | redirect_to :action => 'list' |
|
114 | 114 | end |
|
115 | 115 | end |
|
116 | 116 | |
|
117 | 117 | def compiler_msg |
|
118 | 118 | @submission = Submission.find(params[:id]) |
|
119 | 119 | if @submission.user_id == session[:user_id] |
|
120 | 120 | render :action => 'compiler_msg', :layout => 'empty' |
|
121 | 121 | else |
|
122 | 122 | flash[:notice] = 'Error viewing source' |
|
123 | 123 | redirect_to :action => 'list' |
|
124 | 124 | end |
|
125 | 125 | end |
|
126 | 126 | |
|
127 | 127 | def result |
|
128 | 128 | if !GraderConfiguration.show_grading_result |
|
129 | 129 | redirect_to :action => 'list' and return |
|
130 | 130 | end |
|
131 | 131 | @user = User.find(session[:user_id]) |
|
132 | 132 | @submission = Submission.find(params[:id]) |
|
133 | 133 | if @submission.user!=@user |
@@ -1,68 +1,68 | |||
|
1 | 1 | %h2 Live submit |
|
2 | 2 | %br |
|
3 | 3 | |
|
4 |
- %textarea#text_ |
|
|
4 | + %textarea#text_sourcecode{style: "display:none"}~ @source | |
|
5 | 5 | .container |
|
6 | 6 | .row |
|
7 | 7 | .col-md-12 |
|
8 | 8 | .alert.alert-info |
|
9 | 9 | Write your code in the following box, choose language, and click submit button when finished |
|
10 | 10 | .row |
|
11 | 11 | .col-md-8 |
|
12 | 12 | %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'} |
|
13 | 13 | .col-md-4 |
|
14 | 14 | = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do |
|
15 | 15 | |
|
16 | 16 | = hidden_field_tag 'editor_text', @source |
|
17 | 17 | = hidden_field_tag 'submission[problem_id]', @problem.id |
|
18 | 18 | .form-group |
|
19 | 19 | = label_tag "Task:" |
|
20 | 20 | = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true |
|
21 | 21 | |
|
22 | 22 | .form-group |
|
23 | 23 | = label_tag 'Language' |
|
24 | 24 | = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.find_by_pretty_name("Python").id || Language.first.id), class: 'form-control select', style: "width: 100px" |
|
25 | 25 | .form-group |
|
26 | 26 | = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit', |
|
27 | 27 | data: {confirm: "Submitting this source code for task #{@problem.long_name}?"} |
|
28 | 28 | .panel.panel-info |
|
29 | 29 | .panel-heading |
|
30 | 30 | Latest Submission Status |
|
31 | 31 | = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission |
|
32 | 32 | .panel-body |
|
33 | 33 | - if @submission |
|
34 | 34 | = render :partial => 'submission_short', |
|
35 | 35 | :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id } |
|
36 | 36 | .row |
|
37 | 37 | .col-md-12 |
|
38 | 38 | %h2 Console |
|
39 | 39 | %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20} |
|
40 | 40 | |
|
41 | 41 | :javascript |
|
42 | 42 | $(document).ready(function() { |
|
43 | 43 | e = ace.edit("editor") |
|
44 |
- e.setValue($("#text_ |
|
|
44 | + e.setValue($("#text_sourcecode").val()); | |
|
45 | 45 | e.gotoLine(1); |
|
46 | 46 | $("#language_id").trigger('change'); |
|
47 | 47 | brython(); |
|
48 | 48 | }); |
|
49 | 49 | |
|
50 | 50 | |
|
51 | 51 | %script#__main__{type:'text/python3'} |
|
52 | 52 | :plain |
|
53 | 53 | import sys |
|
54 | 54 | import traceback |
|
55 | 55 | |
|
56 | 56 | from browser import document as doc |
|
57 | 57 | from browser import window, alert, console |
|
58 | 58 | |
|
59 | 59 | _credits = """ Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands |
|
60 | 60 | for supporting Python development. See www.python.org for more information.""" |
|
61 | 61 | |
|
62 | 62 | _copyright = """Copyright (c) 2012, Pierre Quentel pierre.quentel@gmail.com |
|
63 | 63 | All Rights Reserved. |
|
64 | 64 | |
|
65 | 65 | Copyright (c) 2001-2013 Python Software Foundation. |
|
66 | 66 | All Rights Reserved. |
|
67 | 67 | |
|
68 | 68 | Copyright (c) 2000 BeOpen.com. |
deleted file |
deleted file |
deleted file |
You need to be logged in to leave comments.
Login now