From 972715475c0451740785282da81a193cce25b7ae Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@gmail.com>
Date: Fri, 13 Mar 2015 12:54:15 -0500
Subject: [PATCH] Add corp logo, cleanup.

---
 app/assets/stylesheets/application.css |  5 +++++
 app/helpers/admin_helper.rb            |  5 +++--
 app/helpers/application_helper.rb      | 13 ++++++++-----
 app/helpers/tools_helper.rb            |  4 ----
 app/views/admin/index.html.erb         |  2 +-
 app/views/shared/_footer.html.erb      |  2 +-
 app/views/shared/_header.html.erb      |  4 ++++
 app/views/tools/index.html.erb         |  2 +-
 db/seeds.rb                            |  8 +++++---
 9 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index f9cd5b3..657a180 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,3 +13,8 @@
  *= require_tree .
  *= require_self
  */
+
+img#corp_logo {
+    width:  64px;
+    height: 64px;
+}
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 31a55a0..38ce4fa 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -1,8 +1,9 @@
 module AdminHelper
   SETTINGS = [
     {:key => 'site_name',   :label => 'Site name'},
-    {:key => 'corporation', :label => 'Corporation'},
-    {:key => 'description', :label => 'Home page description', :textarea => true},
+    {:key => 'corp_name',   :label => 'Corporation name'},
+    {:key => 'corp_id',     :label => 'Corporation ID', :size => 10},
+    {:key => 'description', :label => 'Welcome message', :textarea => true},
     {:key => 'copyright',   :label => 'Copyright'},
   ]
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 36f54af..c8700c9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -7,13 +7,16 @@ module ApplicationHelper
     title.empty? ? base : "#{title} : #{base}"
   end
 
-  def get_copyright_year
+  def corp_logo_tag
+    corp_id = AdminSetting.get('corp_id')
+    corp_name = AdminSetting.get('corp_name')
+    image_tag("https://image.eveonline.com/Corporation/#{corp_id}_256.png",
+              id: 'corp_logo', title: corp_name, alt: "#{corp_name} Logo")
+  end
+
+  def copyright_year
     start = 2015
     year = Time.now.year
     year > start ? "#{start}–#{year}" : start
   end
-
-  def get_copyright_holders
-    AdminSetting.get('copyright')
-  end
 end
diff --git a/app/helpers/tools_helper.rb b/app/helpers/tools_helper.rb
index 55d1fb9..6f87959 100644
--- a/app/helpers/tools_helper.rb
+++ b/app/helpers/tools_helper.rb
@@ -1,6 +1,2 @@
 module ToolsHelper
-
-  def get_description
-    AdminSetting.get('description')
-  end
 end
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index 0b15a36..103ae36 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -10,7 +10,7 @@
         <% if s[:textarea] %>
           <td><%= text_area_tag("settings[#{s[:key]}]", AdminSetting.get(s[:key]), size: "60x5") %></td>
         <% else %>
-          <td><%= text_field_tag("settings[#{s[:key]}]", AdminSetting.get(s[:key]), size: 40) %></td>
+          <td><%= text_field_tag("settings[#{s[:key]}]", AdminSetting.get(s[:key]), size: s[:size] || 40) %></td>
         <% end %>
       </tr>
     <% end %>
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index 3a7050e..f28bc22 100644
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -1,6 +1,6 @@
 <div id="footer">
   <p>
-    Copyright &copy; <%= get_copyright_year %> <%= get_copyright_holders %>
+    Copyright &copy; <%= copyright_year %> <%= AdminSetting.get('copyright') %>
     &bull;
     Running <a href="//github.com/earwig/calefaction">Calefaction</a> <%= Calefaction::Version::VERSION_STRING %>
     &bull;
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
index fc1552c..49c08c3 100644
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -1,4 +1,8 @@
 <div id="header">
+  <h1>
+    <%= corp_logo_tag %>
+    <%= AdminSetting.get('corp_name') %>
+  </h1>
   <p>
     <%= link_to 'Home', controller: 'tools', action: 'index' %>
   </p>
diff --git a/app/views/tools/index.html.erb b/app/views/tools/index.html.erb
index c817397..8027295 100644
--- a/app/views/tools/index.html.erb
+++ b/app/views/tools/index.html.erb
@@ -2,4 +2,4 @@
 
 <p>Tools: ...</p>
 
-<p><%= get_description %></p>
+<p><%= AdminSetting.get('description') %></p>
diff --git a/db/seeds.rb b/db/seeds.rb
index 1a4caa5..17bca8d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -6,7 +6,9 @@
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
 
-AdminSetting.add('site_name',   'Your Corporation Site')
-AdminSetting.add('corporation', 'Your Corporation')
-AdminSetting.add('description', 'Your corporation\'s description goes here!')
+AdminSetting.add('site_name',   'Your Corporation\'s Site')
+AdminSetting.add('corp_name',   'Your Corporation')
+AdminSetting.add('corp_id',     '1')
 AdminSetting.add('copyright',   'Your Corporation/Your Name')
+AdminSetting.add('description',
+  'Welcome to your corporation\'s website! This message can be changed in the admin settings panel.')