Description:
added announcement to frontpage
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@290 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
jittat
-
r151:2e9ddcc1b233 - - 7 files changed: 38 inserted, 5 deleted
| @@ -43,6 +43,7 | |||
|
|
43 | 43 | end |
|
|
44 | 44 | end |
|
|
45 | 45 | |
|
|
46 | + @announcements = Announcement.find_for_frontpage | |
|
|
46 | 47 | render :action => 'login', :layout => 'empty' |
|
|
47 | 48 | end |
|
|
48 | 49 | |
| @@ -183,10 +184,7 | |||
|
|
183 | 184 | @prob_submissions << { :count => 0, :submission => nil } |
|
|
184 | 185 | end |
|
|
185 | 186 | end |
|
|
186 | - | |
|
|
187 | - @announcements = Announcement.find(:all, | |
|
|
188 | - :conditions => "published = 1", | |
|
|
189 | - :order => "created_at DESC") | |
|
|
187 | + @announcements = Announcement.find_published | |
|
|
190 | 188 | end |
|
|
191 | 189 | |
|
|
192 | 190 | def check_viewability |
| @@ -1,2 +1,15 | |||
|
|
1 | 1 | class Announcement < ActiveRecord::Base |
|
|
2 | + | |
|
|
3 | + def self.find_published | |
|
|
4 | + Announcement.find(:all, | |
|
|
5 | + :conditions => "(published = 1) AND (frontpage = 0)", | |
|
|
6 | + :order => "created_at DESC") | |
|
|
2 | 7 | end |
|
|
8 | + | |
|
|
9 | + def self.find_for_frontpage | |
|
|
10 | + Announcement.find(:all, | |
|
|
11 | + :conditions => "(published = 1) AND (frontpage = 1)", | |
|
|
12 | + :order => "created_at DESC") | |
|
|
13 | + end | |
|
|
14 | + | |
|
|
15 | + end | |
| @@ -19,6 +19,11 | |||
|
|
19 | 19 | </p> |
|
|
20 | 20 | |
|
|
21 | 21 | <p> |
|
|
22 | + <b>Show on front page?</b><br /> | |
|
|
23 | + <%= f.check_box :frontpage %> | |
|
|
24 | + </p> | |
|
|
25 | + | |
|
|
26 | + <p> | |
|
|
22 | 27 | <%= f.submit "Update" %> |
|
|
23 | 28 | </p> |
|
|
24 | 29 | <% end %> |
| @@ -19,6 +19,11 | |||
|
|
19 | 19 | </p> |
|
|
20 | 20 | |
|
|
21 | 21 | <p> |
|
|
22 | + <b>Show on front page?</b><br /> | |
|
|
23 | + <%= f.check_box :frontpage %> | |
|
|
24 | + </p> | |
|
|
25 | + | |
|
|
26 | + <p> | |
|
|
22 | 27 | <%= f.submit "Create" %> |
|
|
23 | 28 | </p> |
|
|
24 | 29 | <% end %> |
| @@ -13,6 +13,11 | |||
|
|
13 | 13 | <%=h @announcement.published %> |
|
|
14 | 14 | </p> |
|
|
15 | 15 | |
|
|
16 | + <p> | |
|
|
17 | + <b>Show on front page:</b> | |
|
|
18 | + <%=h @announcement.frontpage %> | |
|
|
19 | + </p> | |
|
|
20 | + | |
|
|
16 | 21 | |
|
|
17 | 22 | <%= link_to 'Edit', edit_announcement_path(@announcement) %> | |
|
|
18 | 23 | <%= link_to 'Back', announcements_path %> |
| @@ -1,5 +1,11 | |||
|
|
1 | 1 | %h1= Configuration['ui.front.title'] |
|
|
2 | 2 | |
|
|
3 | + - if @announcements.length!=0 | |
|
|
4 | + .announcementbox | |
|
|
5 | + %span{:class => 'title'} | |
|
|
6 | + Announcements | |
|
|
7 | + = render :partial => 'announcement', :collection => @announcements | |
|
|
8 | + | |
|
|
3 | 9 | %b= Configuration['ui.front.welcome_message'] |
|
|
4 | 10 | %br/ |
|
|
5 | 11 | Please login to see the problem list. |
| @@ -9,7 +9,7 | |||
|
|
9 | 9 | # |
|
|
10 | 10 | # It's strongly recommended to check this file into your version control system. |
|
|
11 | 11 | |
|
|
12 |
- ActiveRecord::Schema.define(:version => 20081 |
|
|
|
12 | + ActiveRecord::Schema.define(:version => 20081107145815) do | |
|
|
13 | 13 | |
|
|
14 | 14 | create_table "announcements", :force => true do |t| |
|
|
15 | 15 | t.string "author" |
| @@ -17,6 +17,7 | |||
|
|
17 | 17 | t.boolean "published" |
|
|
18 | 18 | t.datetime "created_at" |
|
|
19 | 19 | t.datetime "updated_at" |
|
|
20 | + t.boolean "frontpage", :default => false | |
|
|
20 | 21 | end |
|
|
21 | 22 | |
|
|
22 | 23 | create_table "configurations", :force => true do |t| |
You need to be logged in to leave comments.
Login now