cafe-grader-web Commit - r306:fbe0e6c466af

cafe-grader-web

Commit `r306:fbe0e6c466af` public

parent | child

Description:

styling announcements, added notes

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

r306:fbe0e6c466af - Thu, 06 May 2010 16:37:13 - 8 files changed: 47 inserted, 11 deleted

db/migrate/20100506163112_add_notes_to_announcements.rb created 644 ¶ +9

			@@ -0,0 +1,9
		1	+ class AddNotesToAnnouncements < ActiveRecord::Migration
		2	+ def self.up
		3	+ add_column :announcements, :notes, :string
		4	+ end
		5	+
		6	+ def self.down
		7	+ remove_column :announcements, :notes
		8	+ end
		9	+ end

app/views/announcements/edit.html.erb ¶ +5

                 <p>
                   <b>Title</b><br />
                   <%= f.text_field :title %>
                 </p>
                 <p>
+            +     <b>Notes</b> (shown internally, used to organize announcements)<br />
+            +     <%= f.text_field :notes %>
+            +   </p>
+            +
+            +   <p>
                   <b>Body</b><br />
                   <%= f.text_area :body %>
                 </p>
                 <p>
                   <b>Author</b><br />

app/views/announcements/index.html.erb ¶ +19 -8

               <% end %>
               <h1>Listing announcements</h1>
               <%= link_to 'New announcement', new_announcement_path %>
-            - <table>
-            -   <tr>
-            -     <th>Title</th>
-            -     <th>Body</th>
+            + <table class="info">
+            +   <tr class="info-head">
+            +     <th>Updated</th>
+            +     <th>Announcement</th>
                   <th>Author</th>
-            -     <th>Published</th>
+            +     <th>Published</th>
+            +     <th></th>
+            +     <th></th>
+            +     <th></th>
                 </tr>
               <% for announcement in @announcements %>
-            -   <tr>
+            +   <tr class="info-<%= cycle 'odd', 'even' %>">
                   <% @announcement = announcement %>
-            -     <td><%=h announcement.title %></td>
-            -     <td><%=h announcement.body %></td>
+            +     <td><%= time_ago_in_words announcement.updated_at %></td>
+            +     <td>
+            +       <% if !announcement.title.blank? %>
+            +         <b>Title:</b> <%=h announcement.title %><br/>
+            +       <% end %>
+            +       <% if !announcement.notes.blank? %>
+            +         <b>Notes: <%=h announcement.notes %></b><br/>
+            +       <% end %>
+            +       <%=h announcement.body %>
+            +     </td>
                   <td><%=h announcement.author %></td>
                   <td><%= in_place_editor_field :announcement, :published, {}, :rows => 1 %></td>
                   <td><%= link_to 'Show', announcement %></td>
                   <td><%= link_to 'Edit', edit_announcement_path(announcement) %></td>
                   <td><%= link_to 'Destroy', announcement, :confirm => 'Are you sure?', :method => :delete %></td>
                 </tr>

app/views/announcements/new.html.erb ¶ +5

                 <p>
                   <b>Title</b><br />
                   <%= f.text_field :title %>
                 </p>
                 <p>
+            +     <b>Notes</b> (shown internally, used to organize announcements)<br />
+            +     <%= f.text_field :notes %>
+            +   </p>
+            +
+            +   <p>
                   <b>Body</b><br />
                   <%= f.text_area :body %>
                 </p>
                 <p>
                   <b>Author</b><br />

app/views/announcements/show.html.erb ¶ +5

               <p>
                 <b>Title:</b>
                 <%=h @announcement.title %>
               </p>
               <p>
+            +   <b>Notes:</b>
+            +   <%=h @announcement.notes %>
+            + </p>
+            +
+            + <p>
                 <b>Body:</b>
                 <%=h @announcement.body %>
               </p>
               <p>
                 <b>Published:</b>

db/schema.rb ¶ +2 -1

               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20100328123325) do
+            + ActiveRecord::Schema.define(:version => 20100506163112) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
+            +     t.string   "notes"
                 end
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"

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

               tr.info-head {
                 background: #777777;
                 color: white; }
               tr.info-odd {
                 background: #eeeeee; }
               tr.info-even {
-            -   background: #f9f9f9; }
+            +   background: #fcfcfc; }
               .infobox {
                 background: #eeeeff;
                 border: 1px dotted #99aaee;
                 padding: 5px;
                 margin: 10px 0px;

public/stylesheets/sass/application.sass ¶ +1 -1

                   color: white
                 &.info-odd
                   background: #eeeeee
                 &.info-even
-            -     background: #f9f9f9
+            +     background: #fcfcfc
               =basicbox
                 background: #eeeeff
                 border: 1px dotted #99aaee
                 padding: 5px
                 margin: 10px 0px

Write
Preview

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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	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

Sign in to your account

Commit r306:fbe0e6c466af public

Author

r306:fbe0e6c466af - Thu, 06 May 2010 16:37:13 - 8 files changed: 47 inserted, 11 deleted

Commit `r306:fbe0e6c466af` public