Description:
new front page
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r573:0d0613111067 - - 3 files changed: 18 inserted, 14 deleted
@@ -6,7 +6,7 | |||||
|
6 | = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem |
|
6 | = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem |
|
7 | %td |
|
7 | %td |
|
8 | = @prob_submissions[problem.id][:count] |
|
8 | = @prob_submissions[problem.id][:count] |
|
9 |
- = link_to "[ |
|
9 | + = link_to "[subs]", main_submission_path(problem.id) |
|
10 | %td |
|
10 | %td |
|
11 | = render :partial => 'submission_short', |
|
11 | = render :partial => 'submission_short', |
|
12 | :locals => {:submission => @prob_submissions[problem.id][:submission], :problem_name => problem.name } |
|
12 | :locals => {:submission => @prob_submissions[problem.id][:submission], :problem_name => problem.name } |
@@ -1,4 +1,4 | |||||
|
1 |
- = form_tag({:action => 'submit'}, :multipart => true, class: 'form |
|
1 | + = form_tag({:action => 'submit'}, :multipart => true, class: 'form') do |
|
2 | - if @submission and @submission.errors.any? |
|
2 | - if @submission and @submission.errors.any? |
|
3 | #error_explanation |
|
3 | #error_explanation |
|
4 | .alert.alert-danger |
|
4 | .alert.alert-danger |
@@ -3,22 +3,14 | |||||
|
3 |
|
3 | ||
|
4 | = user_title_bar(@user) |
|
4 | = user_title_bar(@user) |
|
5 |
|
5 | ||
|
6 | - .panel.panel-info |
|
6 | + - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true) |
|
7 | - .panel-heading |
|
7 | + %p=t 'main.start_soon' |
|
8 | - Announcement |
|
||
|
9 | - %ul.list-group |
|
||
|
10 | - = render :partial => 'announcement', :collection => @announcements |
|
||
|
11 |
|
8 | ||
|
12 | - |
|
9 | + .row |
|
|
10 | + .col-md-7 | ||
|
13 | - if GraderConfiguration.show_submitbox_to?(@user) |
|
11 | - if GraderConfiguration.show_submitbox_to?(@user) |
|
14 | .submitbox |
|
12 | .submitbox |
|
15 | = render :partial => 'submission_box' |
|
13 | = render :partial => 'submission_box' |
|
16 | - |
|
||
|
17 | - %hr/ |
|
||
|
18 | - |
|
||
|
19 | - - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true) |
|
||
|
20 | - %p=t 'main.start_soon' |
|
||
|
21 | - |
|
||
|
22 | - if GraderConfiguration.show_tasks_to?(@user) |
|
14 | - if GraderConfiguration.show_tasks_to?(@user) |
|
23 | - if not GraderConfiguration.multicontests? |
|
15 | - if not GraderConfiguration.multicontests? |
|
24 | %table.table.table-striped.table-condensed |
|
16 | %table.table.table-striped.table-condensed |
@@ -44,6 +36,18 | |||||
|
44 | %th Results |
|
36 | %th Results |
|
45 | %th |
|
37 | %th |
|
46 | = render :partial => 'problem', :collection => cp[:problems] |
|
38 | = render :partial => 'problem', :collection => cp[:problems] |
|
|
39 | + .col-md-5 | ||
|
|
40 | + .panel.panel-info | ||
|
|
41 | + .panel-heading | ||
|
|
42 | + Announcement | ||
|
|
43 | + %ul.list-group | ||
|
|
44 | + = render :partial => 'announcement', :collection => @announcements | ||
|
|
45 | + | ||
|
|
46 | + | ||
|
|
47 | + | ||
|
|
48 | + %hr/ | ||
|
|
49 | + | ||
|
|
50 | + | ||
|
47 |
|
51 | ||
|
48 | %hr/ |
|
52 | %hr/ |
|
49 |
|
53 |
You need to be logged in to leave comments.
Login now