cafe-grader-web Commit - r192:f7680fc5e3dd

cafe-grader-web

parent | child

Description:

added announcement refresh, more styling, prep for announcement hiding git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@412 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r192:f7680fc5e3dd - Fri, 14 Aug 2009 23:16:41 - 7 files changed: 106 inserted, 14 deleted

config/.gitignore created 644 ¶ +4

public/javascripts/announcement_refresh.js created 644 ¶ +33

@@ -0,0 +1,33
	1	+
	2	+ var Announcement = {
	3	+
	4	+ mostRecentId: 0,
	5	+
	6	+ setMostRecentId: function(id) {
	7	+ Announcement.mostRecentId = id;
	8	+ },
	9	+
	10	+ updateRecentId: function(id) {
	11	+ if(Announcement.mostRecentId < id)
	12	+ Announcement.mostRecentId = id;
	13	+ },
	14	+
	15	+ refreshAnnouncement: function() {
	16	+ var url = '/main/announcements';
	17	+ new Ajax.Request(url, {
	18	+ method: 'get',
	19	+ parameters: { recent: Announcement.mostRecentId },
	20	+ onSuccess: function(transport) {
	21	+ var announcementBody = $("announcementbox-body");
	22	+ announcementBody.insert({ top: transport.responseText });
	23	+ }
	24	+ });
	25	+ Announcement.registerRefreshEventTimer();
	26	+ },
	27	+
	28	+ registerRefreshEventTimer: function() {
	29	+ setTimeout(function () {
	30	+ Announcement.refreshAnnouncement();
	31	+ }, 30000);
	32	+ }
	33	+ }; No newline at end of file

.gitignore ¶ -2

               *~
               log
-            - config/environment.rb
-            - config/database.yml

app/controllers/main_controller.rb ¶ +27 -5

@@ -163,7 +163,33
163	@user = User.find(session[:user_id])	163	@user = User.find(session[:user_id])
164	end	164	end
165		165
		166	+ # announcement refreshing and hiding methods
		167	+
		168	+ def announcements
		169	+ if params.has_key? 'recent'
		170	+ prepare_announcements(params[:recent])
		171	+ else
		172	+ prepare_announcements
		173	+ end
		174	+ render(:partial => 'announcement',
		175	+ :collection => @announcements,
		176	+ :locals => {:announcement_effect => true})
		177	+ end
		178	+
166	protected	179	protected
		180	+
		181	+ def prepare_announcements(recent=nil)
		182	+ if Configuration.show_tasks_to?(@user)
		183	+ @announcements = Announcement.find_published(true)
		184	+ else
		185	+ @announcements = Announcement.find_published
		186	+ end
		187	+ if recent!=nil
		188	+ recent_id = recent.to_i
		189	+ @announcements = @announcements.find_all { \|a\| a.id > recent_id }
		190	+ end
		191	+ end
		192	+
167	def prepare_list_information	193	def prepare_list_information
168	@problems = Problem.find_available_problems	194	@problems = Problem.find_available_problems
169	@prob_submissions = Array.new	195	@prob_submissions = Array.new
@@ -176,11 +202,7
176	@prob_submissions << { :count => 0, :submission => nil }	202	@prob_submissions << { :count => 0, :submission => nil }
177	end	203	end
178	end	204	end
179	- if Configuration.show_tasks_to?(@user)	205	+ prepare_announcements
180	- @announcements = Announcement.find_published(true)
181	- else
182	- @announcements = Announcement.find_published
183	- end
184	end	206	end
185		207
186	def check_viewability	208	def check_viewability

app/views/main/_announcement.html.haml ¶ +17 -4

@@ -1,4 +1,17
1	- .announcement	1	+ .announcement{:id => "announcement-#{announcement.id}", :style => "#{'opacity: 0;' if (defined? announcement_effect) and announcement_effect }"}
2	- = markdown(announcement.body)	2	+ -# .announcement-title
3	- -#.pub-info	3	+ -# .toggles
4	- -# %p= "#{announcement.author}, #{announcement.created_at}"	4	+ -# %a{:href => '#', :onclick => "$(\"announcement-body-#{announcement.id}\").hide(); return false;"}
		5	+ -# [hide]
		6	+ -# %a{:href => '#', :onclick => "$(\"announcement-body-#{announcement.id}\").show(); return false;"}
		7	+ -# [show]
		8	+ -# Announcement Title
		9	+ .announcement-body{:id => "announcement-body-#{announcement.id}"}
		10	+ = markdown(announcement.body)
		11	+ -#.pub-info
		12	+ -# %p= "#{announcement.author}, #{announcement.created_at}"
		13	+ :javascript
		14	+ Announcement.updateRecentId(#{announcement.id});
		15	+ - if (defined? announcement_effect) and announcement_effect
		16	+ :javascript
		17	+ $("announcement-#{announcement.id}").appear();

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

+            + - content_for :head do
+            +   = javascript_include_tag :defaults
+            +   %script{:type => 'text/javascript', :src => '/javascripts/announcement_refresh.js'}
+            +
               = user_title_bar(@user)
               - if @announcements.length!=0
                 .announcementbox
                   %span{:class => 'title'}
                     Announcements
-            -     = render :partial => 'announcement', :collection => @announcements
+            +     #announcementbox-body
+            +       = render :partial => 'announcement', :collection => @announcements
               - if Configuration.show_submitbox_to?(@user)
                 .submitbox
               %hr/
-            - - if (Configuration.contest_mode) and (@user.site!=nil) and (@user.site.started!=true)
+            + - if (Configuration.contest_mode) and (@user.site!=nil)  |
+            +   and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if Configuration.show_tasks_to?(@user)
               %hr/
+            + :javascript
+            +   Announcement.registerRefreshEventTimer();
+            +

public/stylesheets/application.css ¶ +14 -1

                   padding: 1px;
                   padding-left: 10px;
                   padding-right: 10px;
+            +     padding-top: 5px;
+            +     padding-bottom: 5px;
               }
-            - div.announcement p {
+            + .announcement p {
                   font-size: 12px;
+            +     margin: 2px;
               }
               div.pub-info, div.pub-info p {
                   font-size: 9px;
               }
+            + .announcement .toggles {
+            +     font-weight: normal;
+            +     float: right;
+            +     font-size: 80%;
+            + }
+            +
+            + .announcement .announcement-title {
+            +     font-weight: bold;
+            + }
+            +
               /******************
                  Messages
               ******************/

You need to be logged in to leave comments. Login now

	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