[whimsy] branch master updated: remove redundant headers

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 251234a  remove redundant headers
251234a is described below

commit 251234ae86b76e7e8c1a876cade2a2b1cbe31428
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Sep 12 14:16:00 2017 -0400

    remove redundant headers
---
 lib/whimsy/asf/themes.rb           | 6 +++---
 www/roster/views/committee.html.rb | 3 ++-
 www/roster/views/group.html.rb     | 3 ++-
 www/roster/views/ppmc.html.rb      | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/whimsy/asf/themes.rb b/lib/whimsy/asf/themes.rb
index 688a5d7..ff56a2e 100644
--- a/lib/whimsy/asf/themes.rb
+++ b/lib/whimsy/asf/themes.rb
@@ -191,7 +191,7 @@ class Wunderbar::HtmlMarkup
   # Emit complete bootstrap theme to wrap cgi output, including nav and footer
   # If helpblock or related, then emit helpblock and related* panels before content
   # If breadcrumbs, emit those immediately before content
-  def _whimsy_body(title: 'MOAR WHIMSY!', 
+  def _whimsy_body(title: nil,
       subtitle: 'About This Script', 
       relatedtitle: 'Related Whimsy Links', 
       related: nil, 
@@ -202,7 +202,7 @@ class Wunderbar::HtmlMarkup
     _div.content.container_fluid do
       _div.row do
         _div.col_sm_12 do
-          _h1 title
+          _h1 title if title
         end
       end
       if helpblock or related
@@ -265,4 +265,4 @@ class Wunderbar::HtmlMarkup
       _whimsy_foot
     end    
   end
-end
\ No newline at end of file
+end
diff --git a/www/roster/views/committee.html.rb b/www/roster/views/committee.html.rb
index d80cda7..968e8c1 100644
--- a/www/roster/views/committee.html.rb
+++ b/www/roster/views/committee.html.rb
@@ -4,10 +4,11 @@
 
 _html do
   _base href: '..'
+  _title @committee[:display_name]
   _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
+
   _body? do
     _whimsy_body(
-      title: @committee[:display_name],
       breadcrumbs: {
         roster: '.',
         committee: 'committee/',
diff --git a/www/roster/views/group.html.rb b/www/roster/views/group.html.rb
index 0e2fd8a..c8c3055 100644
--- a/www/roster/views/group.html.rb
+++ b/www/roster/views/group.html.rb
@@ -5,9 +5,10 @@
 _html do
   _base href: '..'
   _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
+  _title @group[:id]
+
   _body? do
     _whimsy_body(
-      title: @group[:id],
       breadcrumbs: {
         roster: '.',
         group: 'group/',
diff --git a/www/roster/views/ppmc.html.rb b/www/roster/views/ppmc.html.rb
index a61373d..df3fe32 100644
--- a/www/roster/views/ppmc.html.rb
+++ b/www/roster/views/ppmc.html.rb
@@ -5,9 +5,10 @@
 _html do
   _base href: '..'
   _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
+  _title  @ppmc[:display_name]
+
   _body? do
     _whimsy_body(
-      title: @ppmc[:display_name],
       breadcrumbs: {
         roster: '.',
         ppmc: 'ppmc/',

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].