From 6c3d9c620cafc50de6ea7eff4a1a87c9f53579a2 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Wed, 11 Mar 2015 14:47:42 -0500 Subject: [PATCH] Partial views. --- app/helpers/application_helper.rb | 12 +++++++++++- app/views/layouts/application.html.erb | 12 +++++++++--- app/views/shared/_footer.html.erb | 1 + app/views/shared/_header.html.erb | 1 + app/views/tools/index.html.erb | 12 ++++++++++-- 5 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 app/views/shared/_footer.html.erb create mode 100644 app/views/shared/_header.html.erb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2664dfe..e03bb8d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,7 +1,17 @@ module ApplicationHelper def get_title(title = '') - base = 'Calefaction' # TODO: replace with settings name thing + base = '[Site Name]' title.empty? ? base : "#{title} : #{base}" end + + def get_copyright_year + start = 2015 + year = Time.now.year + year > start ? "#{start}–#{year}" : start + end + + def get_project_version + '0.1' # todo + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 24674fd..29de0ba 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,8 +7,14 @@ <%= csrf_meta_tags %> - -<%= yield %> - + +
+ <%= yield %> +
+ diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb new file mode 100644 index 0000000..98d8bca --- /dev/null +++ b/app/views/shared/_footer.html.erb @@ -0,0 +1 @@ +

Copyright © <%= get_copyright_year %> [copyright holders] • Running Calefaction <%= get_project_version %> • [CCP Copyright Info]

diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb new file mode 100644 index 0000000..c9f2992 --- /dev/null +++ b/app/views/shared/_header.html.erb @@ -0,0 +1 @@ + diff --git a/app/views/tools/index.html.erb b/app/views/tools/index.html.erb index b958c38..b3691c0 100644 --- a/app/views/tools/index.html.erb +++ b/app/views/tools/index.html.erb @@ -1,7 +1,15 @@

Tools#index

-

Users: Signup • Login

-

Admin: Admin

+

+ Users: + <%= link_to "Signup", controller: "users", action: "create" %> + • + <%= link_to "Login", controller: "users", action: "login" %> +

+

+ Admin: + <%= link_to "Admin", controller: "admin", action: "index" %> +

Tools: ...

[Site description]