[gentoo-commits] proj/infra-status:master commit in: /, views/

[gentoo-commits] proj/infra-status:master commit in: /, views/

[Alex Legler]

commit:     4eaeb77dd3e494f10c848848df7b4814e98c11b6
Author:     Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Tue Jan 14 16:41:58 2014 +0000
Commit:     Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 16:41:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/infra-status.git;a=commit;h=4eaeb77d

Rework footer

Make it 2014 and include the node that served the page.

---
 infra-status.rb  |  1 +
 views/layout.erb | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/infra-status.rb b/infra-status.rb
index 0029579..2bff57c 100644
--- a/infra-status.rb
+++ b/infra-status.rb
@@ -7,6 +7,7 @@ require 'sinatra'
 require 'sinatra/partial'
 require 'redcarpet'
 require 'rss'
+require 'socket'
 
 require_relative 'lib/notice_store'
 require_relative 'lib/service_registry'

diff --git a/views/layout.erb b/views/layout.erb
index 4b779ec..ca92c8e 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -78,9 +78,14 @@
   <div class="container">
     <div class="row">
       <div class="col-md-8">
-        Status data updated at <%= date_format ServiceRegistry.instance.load_date %>.<br />
-        Notices updated at <%= date_format NoticeStore.instance.load_date %>.<br />
-        Fugue iconset by <a href="http://p.yusukekamiyamane.com/">Yusuke Kamiyamane</a>.
+        <p>
+          Status data updated at <em><%= date_format ServiceRegistry.instance.load_date %>.</em><br />
+          Notices updated at <em><%= date_format NoticeStore.instance.load_date %>.</em><br />
+          Served by <em><%= Socket.gethostname == 'avocet' ? 'infra-status1' : 'infra-status2' %></em>
+        </p>
+        <p>
+          Fugue iconset by <a href="http://p.yusukekamiyamane.com/">Yusuke Kamiyamane</a>.
+        </p>
       </div>
       <div class="col-md-4">
         <strong>Questions or comments?</strong><br/>
@@ -89,7 +94,7 @@
     </div>
     <div class="row">
       <div class="col-md-12">
-        <strong>&copy; 2001-2013 Gentoo Foundation, Inc.</strong><br/>
+        <strong>&copy; 2001-2014 Gentoo Foundation, Inc.</strong><br/>
         <small>
           Gentoo is a trademark of the Gentoo Foundation, Inc.
           The contents of this document, unless otherwise expressly stated, are licensed under the

[gentoo-commits] proj/infra-status:master commit in: /, views/

[Alex Legler]

commit:     4eaeb77dd3e494f10c848848df7b4814e98c11b6
Author:     Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Tue Jan 14 16:41:58 2014 +0000
Commit:     Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 16:41:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/infra-status.git;a=commit;h=4eaeb77d

Rework footer

Make it 2014 and include the node that served the page.

---
 infra-status.rb  |  1 +
 views/layout.erb | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/infra-status.rb b/infra-status.rb
index 0029579..2bff57c 100644
--- a/infra-status.rb
+++ b/infra-status.rb
@@ -7,6 +7,7 @@ require 'sinatra'
 require 'sinatra/partial'
 require 'redcarpet'
 require 'rss'
+require 'socket'
 
 require_relative 'lib/notice_store'
 require_relative 'lib/service_registry'

diff --git a/views/layout.erb b/views/layout.erb
index 4b779ec..ca92c8e 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -78,9 +78,14 @@
   <div class="container">
     <div class="row">
       <div class="col-md-8">
-        Status data updated at <%= date_format ServiceRegistry.instance.load_date %>.<br />
-        Notices updated at <%= date_format NoticeStore.instance.load_date %>.<br />
-        Fugue iconset by <a href="http://p.yusukekamiyamane.com/">Yusuke Kamiyamane</a>.
+        <p>
+          Status data updated at <em><%= date_format ServiceRegistry.instance.load_date %>.</em><br />
+          Notices updated at <em><%= date_format NoticeStore.instance.load_date %>.</em><br />
+          Served by <em><%= Socket.gethostname == 'avocet' ? 'infra-status1' : 'infra-status2' %></em>
+        </p>
+        <p>
+          Fugue iconset by <a href="http://p.yusukekamiyamane.com/">Yusuke Kamiyamane</a>.
+        </p>
       </div>
       <div class="col-md-4">
         <strong>Questions or comments?</strong><br/>
@@ -89,7 +94,7 @@
     </div>
     <div class="row">
       <div class="col-md-12">
-        <strong>&copy; 2001-2013 Gentoo Foundation, Inc.</strong><br/>
+        <strong>&copy; 2001-2014 Gentoo Foundation, Inc.</strong><br/>
         <small>
           Gentoo is a trademark of the Gentoo Foundation, Inc.
           The contents of this document, unless otherwise expressly stated, are licensed under the

[gentoo-commits] proj/infra-status:master commit in: /, views/

[Alex Legler]

commit:     d91d7be69ed627d7c5c9e733da0aad5732407967
Author:     Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Thu Apr 17 14:05:31 2014 +0000
Commit:     Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Thu Apr 17 14:05:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/infra-status.git;a=commit;h=d91d7be6

Set <title> when displaying a notice

---
 infra-status.rb  | 1 +
 views/layout.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/infra-status.rb b/infra-status.rb
index 2bff57c..b332df6 100644
--- a/infra-status.rb
+++ b/infra-status.rb
@@ -35,6 +35,7 @@ get '/notice/:id' do
       '<h1>No such notice</h1><p>The notice you have requested does not exist or has been removed as it was resolved long ago.</p>'
     end
   else
+    @title = notice['title']
     erb :notice, :locals => { :notice => notice }
   end
 end

diff --git a/views/layout.erb b/views/layout.erb
index be50e02..d43b914 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Gentoo Infrastructure Status</title>
+  <title><%= "#{h @title} - " if @title %>Gentoo Infrastructure Status</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="">