cafe-grader-web

Commit r227:eda4ffd09089 public

parent | child
Description:
Merge branch 'master' into codejom (bug fix)
Commit status:
[Not Reviewed]
References:
merge default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r227:eda4ffd09089 - - 2 files changed: 14 inserted, 10 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,34 +1,33
1 1 - content_for :head do
2 2 = javascript_include_tag :defaults
3 - %script{:type => 'text/javascript', :src => '/javascripts/announcement_refresh.js'}
3 + = javascript_include_tag 'announcement_refresh.js'
4 4
5 5 = user_title_bar(@user)
6 6
7 - - if @announcements.length!=0
8 - .announcementbox
9 - %span{:class => 'title'}
10 - Announcements
11 - #announcementbox-body
12 - = render :partial => 'announcement', :collection => @announcements
7 + .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
8 + %span{:class => 'title'}
9 + Announcements
10 + #announcementbox-body
11 + = render :partial => 'announcement', :collection => @announcements
13 12
14 13 %hr/
15 14
16 15 - if (Configuration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
17 16 %p=t 'main.start_soon'
18 17
19 18 - if Configuration.show_tasks_to?(@user)
20 19 .problem-list
21 20 = render :partial => 'problem_title', :collection => @problems, :as => :problem
22 21 .problem-content
23 22 %span{:id => "problem-panel-filler", :style => (@current_problem_id!=nil) ? "display:none" : ""}
24 23 %b Welcome to Code Jom
25 24 %br/
26 25 Choose problems from the list on the right.
27 26 = render :partial => 'problem', :collection => @problems
28 27
29 28 %br{:clear=>'both'}/
30 29 %hr/
31 30
32 31 :javascript
33 32 Announcement.registerRefreshEventTimer();
34 33
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,33 +1,38
1 1
2 2 var Announcement = {
3 3
4 4 mostRecentId: 0,
5 5
6 6 setMostRecentId: function(id) {
7 7 Announcement.mostRecentId = id;
8 8 },
9 9
10 10 updateRecentId: function(id) {
11 11 if(Announcement.mostRecentId < id)
12 12 Announcement.mostRecentId = id;
13 13 },
14 14
15 15 refreshAnnouncement: function() {
16 16 var url = '/main/announcements';
17 17 new Ajax.Request(url, {
18 18 method: 'get',
19 19 parameters: { recent: Announcement.mostRecentId },
20 20 onSuccess: function(transport) {
21 - var announcementBody = $("announcementbox-body");
22 - announcementBody.insert({ top: transport.responseText });
21 + if(transport.responseText.match(/\S/)!=null) {
22 + var announcementBody = $("announcementbox-body");
23 + announcementBody.insert({ top: transport.responseText });
24 + var announcementBoxes = $$(".announcementbox");
25 + if(announcementBoxes.length!=0)
26 + announcementBoxes[0].show();
27 + }
23 28 }
24 29 });
25 30 Announcement.registerRefreshEventTimer();
26 31 },
27 32
28 33 registerRefreshEventTimer: function() {
29 34 setTimeout(function () {
30 35 Announcement.refreshAnnouncement();
31 36 }, 30000);
32 37 }
33 - }; No newline at end of file
38 + };
You need to be logged in to leave comments. Login now