Add red 'add to my schedule' button when you click a guy's activity

acarrillo · Jun 24, 2012 · f664a4f · f664a4f
1 parent 3b704f8
commit f664a4f
Show file tree

Hide file tree

Showing 28 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
diff --git a/app/controllers/timeline_followships_controller.rb b/app/controllers/timeline_followships_controller.rb
diff --git a/app/controllers/timelines_controller.rb b/app/controllers/timelines_controller.rb
diff --git a/app/models/event.rb b/app/models/event.rb
diff --git a/app/models/event_assignment.rb b/app/models/event_assignment.rb
diff --git a/app/models/timeline.rb b/app/models/timeline.rb
diff --git a/app/models/timeline_followship.rb b/app/models/timeline_followship.rb
diff --git a/app/views/events/json.dryml b/app/views/events/json.dryml
diff --git a/app/views/front/script.js b/app/views/front/script.js
diff --git a/app/views/timelines/json.dryml b/app/views/timelines/json.dryml
diff --git a/app/views/timelines/ship_javascript.dryml b/app/views/timelines/ship_javascript.dryml
diff --git a/app/views/timelines/show.dryml b/app/views/timelines/show.dryml
diff --git a/app/views/users/json.dryml b/app/views/users/json.dryml
diff --git a/app/views/users/show.dryml b/app/views/users/show.dryml
diff --git a/public/javascripts/timelines.html b/public/javascripts/timelines.html
@@ -9,7 +9,7 @@
 	<body>
 		<meta charset="utf-8">
 		<div class="container rounded_left rounded_right" pointTime="0" dx="0" sppx="20"></div>
-		<a id = "clickme" style="display: none">click</a>
+		<a id = "clickme" style="display: none;">Add to my schedule</a>
 		<script>
 			function draw()
 			{
@@ -98,7 +98,7 @@
 
 			function makeClickable()
 			{
-				$("#clickme").attr("style", "display: block;").bind("click", function()
+				$("#clickme").attr("style", "display: inline; background-color: red; padding: 2px").bind("click", function()
 				{
 					$($("div.timelineholder1 > ul.sortable > li > div.timeline").get(0)).append($($("div.activity").get(0)).clone());
 				});

diff --git a/script.js b/script.js
diff --git a/test/fixtures/event_assignments.yml b/test/fixtures/event_assignments.yml
diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
diff --git a/test/fixtures/timeline_followships.yml b/test/fixtures/timeline_followships.yml
diff --git a/test/fixtures/timelines.yml b/test/fixtures/timelines.yml
diff --git a/test/functional/events_controller_test.rb b/test/functional/events_controller_test.rb
diff --git a/test/functional/timeline_followships_controller_test.rb b/test/functional/timeline_followships_controller_test.rb
diff --git a/test/functional/timelines_controller_test.rb b/test/functional/timelines_controller_test.rb
diff --git a/test/unit/event_assignment_test.rb b/test/unit/event_assignment_test.rb
diff --git a/test/unit/event_test.rb b/test/unit/event_test.rb
diff --git a/test/unit/timeline_followship_test.rb b/test/unit/timeline_followship_test.rb
diff --git a/test/unit/timeline_test.rb b/test/unit/timeline_test.rb