Merge branch 'master' of https://github.com/SE-Team/project-x into jo…

…rdan

Rakefile

@@ -41,7 +41,7 @@ task :deploy_to_heroku do
 	ENV['DEV_MODE'] = false
 end
 ################################################################################
- 
+
 ################################################################################
 ## RSpec Rake tasks ############################################################
 ## Can be run with:
@@ -76,4 +76,10 @@ class String
     tr("-", "_").
     return downcase
   end
+end
+
+directory "lib/tasks"
+
+task create: "tasks/diagrams.rb" do
+
 end

lib/tasks/diagrams.rb

@@ -0,0 +1,13 @@
+namespace :doc do
+  namespace :diagram do
+    task :models do
+      sh "railroad -i -l -a -m -M | dot -Tsvg | sed 's/font-size:14.00/font-size:11.00/g' > doc/models.svg"
+    end
+
+    task :controllers do
+      sh "railroad -i -l -C | neato -Tsvg | sed 's/font-size:14.00/font-size:11.00/g' > doc/controllers.svg"
+    end
+  end
+
+  task :diagrams => %w(diagram:models diagram:controllers)
+end

lib/views/index.haml

@@ -13,35 +13,36 @@
 		#myCarousel.carousel.slide.offset1.span9.well
 			.carousel-inner
 				.item.active
-					%img{:alt => "", :src => "http://twitter.github.com/bootstrap/assets/img/bootstrap-mdo-sfmoma-01.jpg"}
+					%img{:alt => "", :src => "images/index/project-x_4.png"}
 					.carousel-caption
-						%h4 First Thumbnail label
-						%p Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
+						%h4 Search for upcoming Events
+						%p Use the search option to find out about upcoming events you don't want to miss! We offer you access to olur vast database which is connected with diverse sources such as BG TV and Google. 
 				.item
-					%img{:alt => "", :src => "http://twitter.github.com/bootstrap/assets/img/bootstrap-mdo-sfmoma-02.jpg"}
+					%img{:alt => "", :src => "images/index/calendar4.png"}
 					.carousel-caption
-						%h4 First Thumbnail label
-						%p Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
-				.item
-					%img{:alt => "", :src => "http://twitter.github.com/bootstrap/assets/img/bootstrap-mdo-sfmoma-03.jpg"}
+						%h4 Add events to your Google Calendar
+						%p Want to keep track of what's going on when where and who is joining? You decide which events to add to your personal Calendar to be up-to-date - anywhere, anytime!
+
+				.item	
+					%img{:alt => "", :src => "images/index/login_665x440.png"}
 					.carousel-caption
-						%h4 First Thumbnail label
-						%p Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
+						%h4 Login with your Google account
+						%p Too many accounts and passwords? No problem! Just use our comfortable option of using your Google account to login. Ready to go!		
 			%a.left.carousel-control{"data-slide" => "prev", :href => "#myCarousel"} ‹
 			%a.right.carousel-control{"data-slide" => "next", :href => "#myCarousel"} ›
 		.row-fluid
 			.span4
-				%img{:src => "assets/img/bs-docs-twitter-github.png"}
-					%h2 By nerds, for nerds.
+				%img{:src => "images/index/google_logo.png", :height => 125}
+					%h2 Google integrated.
 					%p
-						Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
+						Login with your existing Google account and sync with your Google Calendars.
 			.span4
-				%img{:src => "assets/img/bs-docs-responsive-illustrations.png"}
-					%h2 Made for everyone.
+				%img{:src => "images/index/thetvdb_logo.png", :height => 125}
+					%h2 TV shows.
 					%p
-						Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
+						Search TheTVDB's tv listings to find showtimes of upcoming shows and add them to your Google Calendar.
 			.span4
-				%img{:src => "assets/img/bs-docs-bootstrap-features.png"}
+				%img{:src => "images/index/eventful_logo.png", :height => 125}
 					%h2 Packed with features.
 					%p
-						Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
+						Search for events and take advantage of our vasr database linked to web services such as Eventful which aims to help users search for, track and share information about events.