[whimsy] branch master updated: Use helpblock/related and add note about Members

[cu...@apache.org]

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

curcuru 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 747ec2b  Use helpblock/related and add note about Members
747ec2b is described below

commit 747ec2b576fabdc108c83c009ad127895f35ad59
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Sun Mar 10 12:47:15 2019 -0400

    Use helpblock/related and add note about Members
---
 www/roster/views/committees.html.rb | 52 +++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/www/roster/views/committees.html.rb b/www/roster/views/committees.html.rb
index 15e43b9..5928a28 100644
--- a/www/roster/views/committees.html.rb
+++ b/www/roster/views/committees.html.rb
@@ -7,33 +7,41 @@ _html do
   _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
   _whimsy_body(
     title: 'ASF PMC Listing',
+    subtitle: 'List of all Top Level Projects',
+    relatedtitle: 'More Useful Links',
+    related: {
+      "/committers/tools" => "Whimsy All Tools Listing",
+      "https://svn.apache.org/repos/private/committers/" => "Checkout the private 'committers' repo for Committers",
+      "https://github.com/apache/whimsy/blob/master/www#{ENV['SCRIPT_NAME']}" => "See This Source Code",
+      "mailto:dev@whimsical.apache.org?subject=[FEEDBACK] members/index idea" => "Email Feedback To dev@whimsical"
+    },
+    helpblock: -> {
+      _p do
+        _ 'A full list of Apache PMCs; click on the name for a detail page about that PMC. '
+        _ 'You can also view (Member-private) '
+        _a href: '/roster/nonpmc/' do
+          _span.glyphicon.glyphicon_lock :aria_hidden, class: 'text-primary', aria_label: 'ASF Members Private'
+          _ 'Non-PMC Committees (Brand, Legal, etc.)'
+        end
+        _ ' and '
+        _a href: '/roster/group/' do
+          _span.glyphicon.glyphicon_lock :aria_hidden, class: 'text-primary', aria_label: 'ASF Members Private'
+          _ 'Other Groups of various kinds (from LDAP or auth).'
+        end
+      end
+      _p do
+        _ 'Chair names in BOLD below are also ASF Members.  Click on column names in table to sort; jump to A-Z project listings here:'
+        _br 
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ".each_char do |c|
+          _a c, href: "committee/##{c}"
+        end
+      end
+    },
     breadcrumbs: {
       roster: '.',
       committee: 'committee/'
     }
   ) do
-    _p do
-      _ 'A full list of Apache PMCs; click on the name for a detail page about that PMC.'
-      _br
-      _ 'Non-PMC committees of various kinds '
-      _a href: '/roster/nonpmc/' do
-        _span.glyphicon.glyphicon_lock :aria_hidden, class: 'text-primary', aria_label: 'ASF Members Private'
-        _ 'are listed privately.'
-      end
-      _br
-      _ 'Other groups of various kinds '
-      _a href: '/roster/group/' do
-        _span.glyphicon.glyphicon_lock :aria_hidden, class: 'text-primary', aria_label: 'ASF Members Private'
-        _ 'are listed privately.'
-      end
-    end
-    _p do
-      _ 'Click on column names to sort.'
-      _{"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"}
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZ".each_char do |c|
-        _a c, href: "committee/##{c}"
-      end
-    end
 
     _table.table.table_hover do
       _thead do