whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject [whimsy] branch public-orgchart updated: Move directory; minor text updates; fix website displays
Date Sun, 11 Jun 2017 15:58:01 GMT
This is an automated email from the ASF dual-hosted git repository.

curcuru pushed a commit to branch public-orgchart
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/public-orgchart by this push:
     new 1f6b91e  Move directory; minor text updates; fix website displays
1f6b91e is described below

commit 1f6b91e78d4010cb932a66a2cc093940a7c03db2
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Sun Jun 11 11:57:56 2017 -0400

    Move directory; minor text updates; fix website displays
---
 www/{docs => foundation}/orgchart.cgi | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/www/docs/orgchart.cgi b/www/foundation/orgchart.cgi
similarity index 92%
rename from www/docs/orgchart.cgi
rename to www/foundation/orgchart.cgi
index a822f35..544f9c6 100755
--- a/www/docs/orgchart.cgi
+++ b/www/foundation/orgchart.cgi
@@ -23,7 +23,9 @@ def emit_orgchart(org: {})
     _em 'corporate'
     _ ' officers and roles at the ASF. This does '
     _strong 'not'
-    _ ' include the VP of each Apache PMC that provide software products.' 
+    _ ' include the many Apache '
+    _em 'Project'
+    _ ' VPs that help build Apache software products in our communities.' 
   }
   ) do
     _table.table.table_striped do
@@ -40,11 +42,11 @@ def emit_orgchart(org: {})
             end
             _td do
               id = value['info']['id'] || value['info']['chair']
-              __ ASF::Person.find(id).public_name
+              _ ASF::Person.find(id).public_name
             end
             _td do
               web = value['info']['website']
-              web.nil? ? _('')  : _a(web.sub(%r{http(s)?//}, ''), href: web)
+              web.nil? ? _('')  : _a(web.sub(%r{http(s)?://}, ''), href: web)
             end
           end
         end
@@ -62,11 +64,11 @@ def emit_role(role: {}, oversees: {}, desc: {})
     _table.table.table_striped do
       _tbody do
         role['info'].each do |k, value|
-          next if k == 'role'
-          next if k == 'roster' # No purpose in public display
-          next if k =~ /private/i
-          next unless value
           key = k.downcase # Prevent case mismatches
+          next if key == 'role'
+          next if key == 'roster' # No purpose in public display yet
+          next if key =~ /private/i
+          next unless value
           _tr_ do
             # Different output than www/roster/orgchart
             _td do
@@ -91,7 +93,7 @@ def emit_role(role: {}, oversees: {}, desc: {})
               _td do
                 _a value, href: "mailto:#{value}"
               end
-            elsif %w(roster resolution).include? key
+            elsif %w(resolution website).include? key
               _td do
                 _a value, href: value
               end

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

Mime
View raw message