[whimsy] 02/02: Improve committer/tools listing and update categories

[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

commit 142397135e39e4d4625ccc2821e1827c1499d303
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Thu Jul 6 18:16:37 2017 -0400

    Improve committer/tools listing and update categories
---
 www/committers/test.cgi              |  2 +-
 www/committers/testauth.cgi          |  2 +-
 www/committers/tools.cgi             | 36 +++++++++++++++++++++++++++++-------
 www/events/past.cgi                  |  2 +-
 www/incubator/podling-crosscheck.cgi |  2 +-
 5 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/www/committers/test.cgi b/www/committers/test.cgi
index 74cd88d..ca7ead2 100755
--- a/www/committers/test.cgi
+++ b/www/committers/test.cgi
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-PAGETITLE = "Whimsy Environment Tester" # Wvisible:debug
+PAGETITLE = "Whimsy Environment Tester" # Wvisible:tools
 # __dir__ requires 2.0
 #load "#{__dir__}/../test.cgi" 
 load File.expand_path('../../test.cgi',__FILE__)
diff --git a/www/committers/testauth.cgi b/www/committers/testauth.cgi
index 28cba0c..71f563d 100755
--- a/www/committers/testauth.cgi
+++ b/www/committers/testauth.cgi
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-PAGETITLE = "Board Agenda Auth Tester" # Wvisible:agenda debug
+PAGETITLE = "Board Agenda Auth Tester" # Wvisible:board tools
 #
 # Small CGI to help debug board agenda authentication issues
 #
diff --git a/www/committers/tools.cgi b/www/committers/tools.cgi
index 6b17234..a2b9bd2 100755
--- a/www/committers/tools.cgi
+++ b/www/committers/tools.cgi
@@ -8,6 +8,17 @@ require 'wunderbar'
 require 'wunderbar/bootstrap'
 require '../../tools/wwwdocs.rb'
 
+NONCGIS = {
+  '/board/agenda/' => 
+    [ 'Board Agenda Tool', 
+      ['board', 'meeting'],
+    'text-primary'],
+  '/roster/' => 
+    [ 'ASF Roster Tool', 
+      ['orgchart'],
+    'text-muted']
+}
+
 _html do
   _body? do
     _whimsy_body(
@@ -15,12 +26,15 @@ _html do
       related: {
         "https://projects.apache.org/" => "Apache Project Listing",
         "https://reference.apache.org/" => "Infra Reference Pages",
-        "https://github.com/apache/whimsy/blob/master/www/committers/tools.cgi" => "See This Code"
+        "https://github.com/apache/whimsy/blob/master/www/committers/tools.cgi" => "See This Code",
+        "mailto:dev@whimsical.apache.org?subject=[FEEDBACK] committers/tools idea" => "Email Feedback To dev@whimsical"
       },
       helpblock: -> {
-        _ 'This page shows a '
-        _em 'partial'
-        _ ' listing of tools that Whimsy provides. If you find this useful, please email dev@whimsical!'
+        _p.pull_right do
+          _ 'This page shows a '
+          _em 'partial'
+          _ ' listing of tools that Whimsy provides.'
+        end
         _ul do
           _li do
             _span.glyphicon :aria_hidden, class: "#{AUTHPUBLIC}"
@@ -36,11 +50,19 @@ _html do
       }
     ) do
       scan = get_annotated_scan("../#{SCANDIR}")
-      scan.group_by{ |k, v| v[1][0] }
-        .each do | category, links |
+      scan.merge!(NONCGIS)
+      scan_by = scan.group_by{ |k, v| v[1][0] }
+      _ul.list_inline do
+        scan_by.each do |cat, l|
+          _li do
+            _a "#{cat.capitalize}", href: "##{cat}"
+          end
+        end
+      end
+      scan_by.each do | category, links |
         _ul.list_group do
           _li.list_group_item.active do
-            _ category.capitalize
+            _span category.capitalize, id: category
           end
           links.each do |l, desc|
             _li.list_group_item do
diff --git a/www/events/past.cgi b/www/events/past.cgi
index 9388ff7..5706b3c 100755
--- a/www/events/past.cgi
+++ b/www/events/past.cgi
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-PAGETITLE = "ApacheCon Historical Listing" # Wvisible:apachecon
+PAGETITLE = "ApacheCon Historical Listing" # Wvisible:events,apachecon
 
 $LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
 require 'csv'
diff --git a/www/incubator/podling-crosscheck.cgi b/www/incubator/podling-crosscheck.cgi
index 4532606..f82a0b0 100755
--- a/www/incubator/podling-crosscheck.cgi
+++ b/www/incubator/podling-crosscheck.cgi
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-PAGETITLE = "Incubator/Podling crosscheck" # Wvisible:tools
+PAGETITLE = "Incubator/Podling crosscheck" # Wvisible:incubator
 
 $LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
 require 'json'

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