diff --git a/.gitignore b/.gitignore index 85e0cbb75..ed8b4423a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ #trademark sillyness -app/views/home/_show.html.haml -app/views/home/_show.mobile.haml -public/images/ball_small.png -public/images/ball.png +app/views/home/_show.* +app/assets/images/custom/* + + # Configuration files config/app_config.yml config/app.yml diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index de552e342..df57d3d28 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -16,7 +16,7 @@ class HomeController < ApplicationController redirect_to user_session_path else @landing_page = true - render :show + render :show, :layout => 'post' end end diff --git a/app/views/home/show.html.haml b/app/views/home/show.html.haml index e66163ca1..0af6b4df3 100644 --- a/app/views/home/show.html.haml +++ b/app/views/home/show.html.haml @@ -3,18 +3,12 @@ -# the COPYRIGHT file. - - content_for :page_title do - DIASPORA* ALPHA + Diaspora* + - begin = render :partial => 'home/show' + - rescue - :css - header{ - display:none; - } - body{ - margin-top: 20px; - } :erb <%= File.open(File.join(Rails.root, 'public/default.html')).read %> diff --git a/public/default.html b/public/default.html index 14de22a10..3851095ad 100644 --- a/public/default.html +++ b/public/default.html @@ -1,163 +1,120 @@ - - - - Diaspora: Getting Started + - + - -
-
-
@@ -165,8 +122,41 @@
-
- This page can be changed to a custom landing page by creating app/views/home/_show.html.haml -
- - +
+ + +

Useful Resources

+
+ + +
+
+ +
+ +
+ This page can be changed to a custom landing page by creating app/views/home/_show.html.haml +
+
\ No newline at end of file