Permalink
Browse files

Rename activities to comments

  • Loading branch information...
1 parent 80129e4 commit 8d92508835019edce2b3fe7591fbdce6b75dbb6b @amesel amesel committed Jul 8, 2012
@@ -2,7 +2,7 @@
word-break: break-all
word-wrap: break-word
-=activities
+=comments
width: 300px
overflow: visible
z-index: 97
@@ -237,8 +237,8 @@ body.parties_show
+border-radius(0 4px 4px 0)
border-left: $label_text_shadow 1px solid
- .activities
- +activities
+ .comments
+ +comments
.comments
clear: both
+clearfix
@@ -273,7 +273,6 @@ body.parties_show
font-size: 13px
line-height: 1.6
->>>>>>> 3a87896a141829a5ffa448b42fb14071609b7eec
.backlog
clear: both
+clearfix
@@ -313,7 +312,7 @@ body.parties_show
padding: 0
border: none
+border-radius(4px)
- .activities
+ .comments
.activity
clear: both
padding: 0 0 14px 0
@@ -448,5 +447,5 @@ body.parties_show
a
display: block
float: left
- .activities
- +activities
+ .comments
+ +comments
@@ -1,10 +1,10 @@
= content_tag_for :li, task, :class => "task" do
- .activities
+ .comments
%ul
- = render task.activities
+ = render task.comments
- if user_signed_in?
.add
- = form_tag "/activities", :remote => true do
+ = form_tag "/comments", :remote => true do
= hidden_field_tag :task_id, task.id
= text_area_tag :content, nil, :rows => 3, :cols => 15, :id => "new_activity_#{dom_id(task)}"
= submit_tag "new activity"
View
@@ -71,18 +71,21 @@
create_table "users", :force => true do |t|
t.string "name"
t.string "image"
- t.string "email", :default => "", :null => false
- t.string "encrypted_password", :limit => 128, :default => "", :null => false
+ t.string "email", :default => "", :null => false
+ t.string "encrypted_password", :default => "", :null => false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
- t.integer "sign_in_count", :default => 0
+ t.integer "sign_in_count", :default => 0
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
+ add_index "users", ["email"], :name => "index_users_on_email", :unique => true
+ add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+
end

0 comments on commit 8d92508

Please sign in to comment.