cafe-grader-web Commit - r193:e9aaeb17b5bc

cafe-grader-web

Commit `r193:e9aaeb17b5bc` public

parent | child

Description:

better announcement effects git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@413 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

r193:e9aaeb17b5bc - Sun, 16 Aug 2009 11:18:07 - 7 files changed: 48 inserted, 7 deleted

db/migrate/20090815171610_add_title_to_announcements.rb created 644 ¶ +9

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

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

               <h1>Editing announcement</h1>
               <%= error_messages_for :announcement %>
               <% form_for(@announcement) do |f| %>
                 <p>
+            +     <b>Title</b><br />
+            +     <%= f.text_field :title %>
+            +   </p>
+            +
+            +   <p>
                   <b>Body</b><br />
                   <%= f.text_area :body %>
                 </p>
                 <p>
                   <b>Author</b><br />
                   <%= f.text_field :author %>
                 </p>
                 <p>
                   <b>Published</b><br />
                   <%= f.check_box :published %>
                 </p>
                 <p>
                   <b>Show on front page?</b><br />
                   <%= f.check_box :frontpage %>
                 </p>
                 <p>
                   <b>Show only in contest?</b><br />
                   <%= f.check_box :contest_only %>
                 </p>

app/views/announcements/index.html.erb ¶ +2

               <% content_for :head do %>
                 <%= javascript_include_tag :defaults %>
               <% end %>
               <h1>Listing announcements</h1>
               <%= link_to 'New announcement', new_announcement_path %>
               <table>
                 <tr>
+            +     <th>Title</th>
                   <th>Body</th>
                   <th>Author</th>
                   <th>Published</th>
                 </tr>
               <% for announcement in @announcements %>
                 <tr>
                   <% @announcement = announcement %>
+            +     <td><%=h announcement.title %></td>
                   <td><%=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>
               <% end %>
               </table>
               <br />
               <%= link_to 'New announcement', new_announcement_path %>

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

               <h1>New announcement</h1>
               <%= error_messages_for :announcement %>
               <% form_for(@announcement) do |f| %>
                 <p>
+            +     <b>Title</b><br />
+            +     <%= f.text_field :title %>
+            +   </p>
+            +
+            +   <p>
                   <b>Body</b><br />
                   <%= f.text_area :body %>
                 </p>
                 <p>
                   <b>Author</b><br />
                   <%= f.text_field :author %>
                 </p>
                 <p>
                   <b>Published</b><br />
                   <%= f.check_box :published %>
                 </p>
                 <p>
                   <b>Show on front page?</b><br />
                   <%= f.check_box :frontpage %>
                 </p>
                 <p>
                   <b>Show only in contest?</b><br />
                   <%= f.check_box :contest_only %>
                 </p>

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

               <p>
                 <b>Author:</b>
                 <%=h @announcement.author %>
               </p>
               <p>
+            +   <b>Title:</b>
+            +   <%=h @announcement.title %>
+            + </p>
+            +
+            + <p>
                 <b>Body:</b>
                 <%=h @announcement.body %>
               </p>
               <p>
                 <b>Published:</b>
                 <%=h @announcement.published %>
               </p>
               <p>
                 <b>Show on front page:</b>
                 <%=h @announcement.frontpage %>
               </p>
               <p>
                 <b>Show only in contest:</b>
                 <%=h @announcement.contest_only %>
               </p>
               <%= link_to 'Edit', edit_announcement_path(@announcement) %> |
               <%= link_to 'Back', announcements_path %>

app/views/main/_announcement.html.haml ¶ +8 -6

-            - .announcement{:id => "announcement-#{announcement.id}", :style => "#{'opacity: 0;' if (defined? announcement_effect) and announcement_effect }"}
-            -   -# .announcement-title
+            + .announcement{:id => "announcement-#{announcement.id}", :style => "#{'display: none; opacity: 0' if (defined? announcement_effect) and announcement_effect }"}
+            +   %div
+            +     .announcement-title
-                -#  .toggles
-            -   -#    %a{:href => '#', :onclick => "$(\"announcement-body-#{announcement.id}\").hide(); return false;"}
+            +       -#  %a{:href => '#', :onclick => "$(\"announcement-body-#{announcement.id}\").blindUp({duration: 0.2}); return false;"}
-                -#      [hide]
-            -   -#    %a{:href => '#', :onclick => "$(\"announcement-body-#{announcement.id}\").show(); return false;"}
+            +       -#  %a{:href => '#', :onclick => "$(\"announcement-body-#{announcement.id}\").blindDown({duration: 0.2}); return false;"}
-                -#      [show]
-            -   -#  Announcement Title
+            +       = announcement.title
                 .announcement-body{:id => "announcement-body-#{announcement.id}"}
                   = markdown(announcement.body)
                   -#.pub-info
                   -#  %p= "#{announcement.author}, #{announcement.created_at}"
                 :javascript
                   Announcement.updateRecentId(#{announcement.id});
                 - if (defined? announcement_effect) and announcement_effect
                   :javascript
-            -       $("announcement-#{announcement.id}").appear();
+            +         $("announcement-#{announcement.id}").blindDown({duration: 0.2});
+            +         $("announcement-#{announcement.id}").appear({duration: 0.5, queue: 'end'});

db/schema.rb ¶ +14 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # 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 => 20090426131044) do
+            + ActiveRecord::Schema.define(:version => 20090815171610) 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"
                 end
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "countries", :force => true do |t|
                   t.string   "name"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "descriptions", :force => true do |t|
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
+            +   create_table "grader_messages", :force => true do |t|
+            +     t.integer  "grader_process_id"
+            +     t.integer  "command"
+            +     t.string   "options"
+            +     t.integer  "target_id"
+            +     t.boolean  "accepted"
+            +     t.boolean  "completed"
+            +     t.integer  "accepting_grader_process_id"
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
+            +   end
+            +
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "task_id"
                   t.string   "task_type"
                   t.boolean  "terminated"
                 end
                 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                   t.string "common_ext"
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"

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 r193:e9aaeb17b5bc public

Author

r193:e9aaeb17b5bc - Sun, 16 Aug 2009 11:18:07 - 7 files changed: 48 inserted, 7 deleted

Commit `r193:e9aaeb17b5bc` public