whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject [whimsy] branch master updated: Fixup links on deployment
Date Sun, 11 Jun 2017 16:13:00 GMT
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 af50613  Fixup links on deployment
af50613 is described below

commit af50613f01d7cc965c83b815ad8c0c5e9e7d0401
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Sun Jun 11 12:12:55 2017 -0400

    Fixup links on deployment
---
 www/foundation/orgchart.cgi | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/www/foundation/orgchart.cgi b/www/foundation/orgchart.cgi
index 544f9c6..adfbbc3 100755
--- a/www/foundation/orgchart.cgi
+++ b/www/foundation/orgchart.cgi
@@ -38,7 +38,7 @@ def emit_orgchart(org: {})
         org.sort_by {|key, value| value['info']['role']}.each do |key, value|
           _tr_ do
             _td do
-              _a value['info']['role'], href: "orgchart/#{key}"
+              _a value['info']['role'], href: "/#{key}"
             end
             _td do
               id = value['info']['id'] || value['info']['chair']
@@ -85,7 +85,7 @@ def emit_role(role: {}, oversees: {}, desc: {})
                   if role_inner == 'members'
                     _a 'Apache Membership', href: 'https://www.apache.org/foundation/members'
                   else
-                    _a role_inner, href: "orgchart/#{role_inner}"
+                    _a role_inner, href: "/#{role_inner}"
                   end
                 end
               end
@@ -114,7 +114,7 @@ def emit_role(role: {}, oversees: {}, desc: {})
           _ul style: 'margin-top: 15px; margin-bottom: 15px;' do
             oversees.each do |name, duties|
               _li do
-                _a duties['info']['role'], href: "orgchart/#{name}"
+                _a duties['info']['role'], href: "/#{name}"
               end
             end
           end
@@ -174,11 +174,12 @@ _html do
             _ 'Sorry, the URL you attempted to access '
             _code request
             _ ' is not a valid role.'
-            _a 'Go back to the orgchart', href: ENV['SCRIPT_NAME']
+            _a 'Go back to the orgchart', href: '/orgchart'
           end
         end
       else
-        _p "DEBUG: You are running this script from the command line."
+        _p "DEBUG: You may be running this script from the command line."
+        _a 'Go back to the orgchart', href: '/orgchart'
       end
     end
   end

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

Mime
View raw message