From e3c45c4acd0ac004def2ffc177e91cae20c0b711 Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Mon, 23 Jun 2014 02:53:32 +0200
Subject: [PATCH] rename index to home

---
 app/assets/stylesheets/style.css.scss |  5 ++++
 app/controllers/statics_controller.rb |  2 +-
 app/views/layouts/_head.html.erb      |  2 +-
 app/views/statics/home.html.erb       | 33 +++++++++++++++++++++++++++
 app/views/statics/index.html.erb      | 24 -------------------
 config/routes.rb                      |  7 +++---
 6 files changed, 44 insertions(+), 29 deletions(-)
 create mode 100644 app/views/statics/home.html.erb
 delete mode 100644 app/views/statics/index.html.erb

diff --git a/app/assets/stylesheets/style.css.scss b/app/assets/stylesheets/style.css.scss
index 98f87c8..e6bf21f 100644
--- a/app/assets/stylesheets/style.css.scss
+++ b/app/assets/stylesheets/style.css.scss
@@ -177,6 +177,11 @@ a {
 
   p {
     font-size: 16px;
+
+    span {
+      // used to control eventual line breaks a bit
+      display: inline-block;
+    }
   }
 
   img {
diff --git a/app/controllers/statics_controller.rb b/app/controllers/statics_controller.rb
index 8afed77..f211319 100644
--- a/app/controllers/statics_controller.rb
+++ b/app/controllers/statics_controller.rb
@@ -1,6 +1,6 @@
 class StaticsController < ApplicationController
 
-  def index
+  def home
   end
 
   def donate
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 5e64030..8654399 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -3,7 +3,7 @@
     <%= link_to "", root_path, id: "logo" %>
     <ul>
       <% con = params[:controller] %>
-      <li><%= link_to "Home", statics_path, class: ("active" if con == "statics" && params[:action] == "index") %></li>
+      <li><%= link_to "Home", home_statics_path, class: ("active" if con == "statics" && params[:action] == "home") %></li>
       <li><%= link_to "News", blogposts_path, class: ("active" if con == "blogposts" || con == "comments") %></li>
       <li><%= link_to "Info", info_index_path, class: ("active" if con == "info") %></li>
       <li><%= link_to "Forums", forums_path, class: ("active" if con == "forums" || con == "forumgroups" || con == "forumthreads" || con == "threadreplies") %></li>
diff --git a/app/views/statics/home.html.erb b/app/views/statics/home.html.erb
new file mode 100644
index 0000000..d6b1221
--- /dev/null
+++ b/app/views/statics/home.html.erb
@@ -0,0 +1,33 @@
+<% title "Home" %>
+<% content_for :main_class, "front-page" %>
+
+<h1>Community. Circuitry. Creativity.</h1>
+
+<div id="join-now">Join us: redstoner.com</div>
+
+<%= image_tag "logo.svg" %>
+
+<p>
+  <span>Redstoner is an amazing server</span>
+  <span>for all redstoners of any (or no) skill level,</span>
+  <span>beginner to advanced,</span>
+  <span>from combo locks to doors to CPUs!</span>
+</p>
+<p>
+  <span>We have a friendly community</span>
+  <span>and experienced staff</span>
+  <span>who are all kind and welcoming.</span>
+</p>
+<p>
+  <span>A proof for our great community is the ton of</span>
+  <span>welcome messages you get on your first join,</span>
+  <span>from normal members and staff alike.</span>
+</p>
+<p>
+  <span>The Creative plot world is full of amazing plots,</span>
+  <span>where you can build on your own or with friends!</span>
+  <span>There's also a Survival world</span>
+  <span>for those who just want to mine some ore</span>
+  <span>and we have a freebuild world for large projects.</span>
+</p>
+<p>Join us now!</p>
\ No newline at end of file
diff --git a/app/views/statics/index.html.erb b/app/views/statics/index.html.erb
deleted file mode 100644
index b875fde..0000000
--- a/app/views/statics/index.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% title "Home" %>
-<% content_for :main_class, "front-page" %>
-
-<h1>Community. Circuitry. Creativity.</h1>
-
-<div id="join-now">Join us: redstoner.com</div>
-
-<%= image_tag "logo.svg" %>
-
-<p>
-  Redstoner is an amazing server for all redstoners of any (or no) skill level, beginner to advanced,<br>
-  from combo locks to doors to CPUs!
-</p>
-<p>
-  We have a friendly community and an experienced staff who are all kind and welcoming.
-</p>
-<p>
-  A proof for our great community is the ton of welcome messages you get on your first join, from normal members and staff alike.
-</p>
-<p>
-  The dedicated plot world is full of amazing plots, where you can build on your own or with your friends and<br>
-  there is also a survival world for those who just want to mine some ore, and a free build world for large projects
-</p>
-<p>Join us now!</p>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 58e7285..b02bde6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,10 +4,11 @@ Redstoner::Application.routes.draw do
     resources :comments
   end
 
-  resources :statics, only: [:index, :donate], path: '/' do
+  resources :statics, only: [:home, :donate], path: '/' do
     collection do
       get 'donate'
-      get 'index'
+      get 'home'
+      get 'index', to: redirect('/home')
     end
   end
 
@@ -50,5 +51,5 @@ Redstoner::Application.routes.draw do
 
   # post 'paypal' => 'paypal#create'
 
-  root to: 'statics#index'
+  root to: 'statics#home'
 end
\ No newline at end of file