You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2017/07/03 20:37:30 UTC
[whimsy] branch master updated: Use site-relative links where
possible
This is an automated email from the ASF dual-hosted git repository.
sebb 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 06cf4fd Use site-relative links where possible
06cf4fd is described below
commit 06cf4fdcfd16724d3dfb500b2832a8d11720d07f
Author: Sebb <se...@apache.org>
AuthorDate: Mon Jul 3 21:37:28 2017 +0100
Use site-relative links where possible
---
lib/whimsy/asf/themes.rb | 6 +++---
www/apmail/mods.cgi | 2 +-
www/board/agenda/views/layout/header.js.rb | 2 +-
www/board/agenda/views/pages/action-items.js.rb | 2 +-
www/board/agenda/views/pages/adjournment.js.rb | 2 +-
www/board/agenda/views/pages/report.js.rb | 2 +-
www/board/agenda/views/pages/roll-call.js.rb | 2 +-
www/board/posted-reports.cgi | 2 +-
www/committers/subscribe.cgi | 2 +-
www/committers/testauth.cgi | 6 +++---
www/committers/tm-report.cgi | 2 +-
www/events/past.cgi | 2 +-
www/incubator/maillist.cgi | 4 ++--
www/incubator/podling-crosscheck.cgi | 2 +-
www/incubator/signoff.cgi | 4 ++--
www/members/attendance-xcheck.cgi | 6 +++---
www/members/inactive.cgi | 2 +-
www/members/memberless-pmcs.cgi | 4 ++--
www/members/namediff.cgi | 2 +-
www/members/nominations.cgi | 4 ++--
www/members/non-participants.cgi | 8 ++++----
www/members/subscriptions.cgi | 4 ++--
www/members/watch.cgi | 4 ++--
www/officers/acreq.cgi | 2 +-
www/roster/banner.rb | 2 +-
www/roster/views/not_found.html.rb | 2 +-
www/roster/views/pmc/main.js.rb | 2 +-
www/secretary/icla-lint.cgi | 2 +-
www/secretary/public-names.cgi | 6 ++----
www/secretary/workbench/views/parts.html.rb | 8 ++++----
www/site.cgi | 2 +-
www/{test/test.cgi => subshelp.cgi} | 5 ++---
www/test/dataflow.cgi | 2 +-
www/test/icla/views/app.html.rb | 6 +++---
www/test/test.cgi | 2 +-
www/treasurer/bill-upload.cgi | 2 +-
www/treasurer/expenses.cgi | 2 +-
www/treasurer/paypal.cgi | 2 +-
38 files changed, 60 insertions(+), 63 deletions(-)
diff --git a/lib/whimsy/asf/themes.rb b/lib/whimsy/asf/themes.rb
index 643f1a8..463a5a6 100644
--- a/lib/whimsy/asf/themes.rb
+++ b/lib/whimsy/asf/themes.rb
@@ -21,7 +21,7 @@ class Wunderbar::HtmlMarkup
end
_div.col_sm_3.col_xs_3 do
_a href: '/' do
- _img title: 'Whimsy project home', alt: 'Whimsy hat logo', src: 'https://whimsy.apache.org/whimsy.svg', width: 145, height: 101
+ _img title: 'Whimsy project home', alt: 'Whimsy hat logo', src: '/whimsy.svg', width: 145, height: 101
end
end
_div.col_sm_5.col_xs_9.align_bottom do
@@ -141,7 +141,7 @@ class Wunderbar::HtmlMarkup
_span.icon_bar
end
_a.navbar_brand href: '/' do
- _img title: 'Whimsy project home', alt: 'Whimsy hat logo', src: 'https://whimsy.apache.org/whimsy.svg', height: 30
+ _img title: 'Whimsy project home', alt: 'Whimsy hat logo', src: '/whimsy.svg', height: 30
end
end
_div.collapse.navbar_collapse id: "navbar_collapse" do
@@ -243,7 +243,7 @@ class Wunderbar::HtmlMarkup
if breadcrumbs
_ol.breadcrumb do
_li do
- _a href: 'https://whimsy.apache.org/' do
+ _a href: '/' do
_span.glyphicon.glyphicon_home
end
end
diff --git a/www/apmail/mods.cgi b/www/apmail/mods.cgi
index 7fc4b6e..20d604e 100755
--- a/www/apmail/mods.cgi
+++ b/www/apmail/mods.cgi
@@ -40,7 +40,7 @@ _html do
_body? do
# common banner
- _a href: 'https://whimsy.apache.org/' do
+ _a href: '/' do
_img title: "Logo", alt: "Logo",
src: "https://id.apache.org/img/asf_logo_wide.png"
end
diff --git a/www/board/agenda/views/layout/header.js.rb b/www/board/agenda/views/layout/header.js.rb
index a3408fa..016906d 100644
--- a/www/board/agenda/views/layout/header.js.rb
+++ b/www/board/agenda/views/layout/header.js.rb
@@ -50,7 +50,7 @@ class Header < React
_ul.online.dropdown_menu @@item.online do |id|
_li do
- _a id, href: "https://whimsy.apache.org/roster/committer/#{id}"
+ _a id, href: "/roster/committer/#{id}"
end
end
end
diff --git a/www/board/agenda/views/pages/action-items.js.rb b/www/board/agenda/views/pages/action-items.js.rb
index 10946b9..6495f72 100644
--- a/www/board/agenda/views/pages/action-items.js.rb
+++ b/www/board/agenda/views/pages/action-items.js.rb
@@ -61,7 +61,7 @@ class ActionItems < React
href: "../#{action.date}/#{action.pmc.gsub(/\W/, '-')}"
else
_a action.date, href:
- 'https://whimsy.apache.org/board/minutes/' +
+ '/board/minutes/' +
action.pmc.gsub(/\W/, '_') +
"#minutes_#{action.date.gsub('-', '_')}"
end
diff --git a/www/board/agenda/views/pages/adjournment.js.rb b/www/board/agenda/views/pages/adjournment.js.rb
index c7a00c1..522c8ca 100644
--- a/www/board/agenda/views/pages/adjournment.js.rb
+++ b/www/board/agenda/views/pages/adjournment.js.rb
@@ -185,7 +185,7 @@ class TodoActions < React
}
_a person.id,
- href: "https://whimsy.apache.org/roster/committer/#{person.id}"
+ href: "/roster/committer/#{person.id}"
_ " (#{person.name})"
if @@action == 'add' and person.resolution
diff --git a/www/board/agenda/views/pages/report.js.rb b/www/board/agenda/views/pages/report.js.rb
index 8b4f105..a0e8a42 100644
--- a/www/board/agenda/views/pages/report.js.rb
+++ b/www/board/agenda/views/pages/report.js.rb
@@ -140,7 +140,7 @@ class Report < React
# replace ids with committer links
def names(text)
- roster = 'https://whimsy.apache.org/roster/committer/'
+ roster = '/roster/committer/'
for id in @@item.people
person = @@item.people[id]
diff --git a/www/board/agenda/views/pages/roll-call.js.rb b/www/board/agenda/views/pages/roll-call.js.rb
index 67ed9a0..85458b8 100644
--- a/www/board/agenda/views/pages/roll-call.js.rb
+++ b/www/board/agenda/views/pages/roll-call.js.rb
@@ -166,7 +166,7 @@ class Attendee < React
_li onMouseOver: self.focus do
_input type: :checkbox, checked: @checked, onChange: self.click
- roster = 'https://whimsy.apache.org/roster/committer/'
+ roster = '/roster/committer/'
if @@person.id
_a @@person.name, href: "#{roster}#{@@person.id}",
style: {fontWeight: (@@person.member ? 'bold' : 'normal')}
diff --git a/www/board/posted-reports.cgi b/www/board/posted-reports.cgi
index 3159ca5..d78af98 100755
--- a/www/board/posted-reports.cgi
+++ b/www/board/posted-reports.cgi
@@ -46,7 +46,7 @@ _html do
_h1 "Posted PMC reports"
- _a agenda, href: 'https://whimsy.apache.org/board/agenda/' +
+ _a agenda, href: '/board/agenda/' +
agenda[/\d+_\d+_\d+/].gsub('_', '-') + '/'
# attempt to sort reports by PMC name
diff --git a/www/committers/subscribe.cgi b/www/committers/subscribe.cgi
index 53df18d..1dbf12e 100755
--- a/www/committers/subscribe.cgi
+++ b/www/committers/subscribe.cgi
@@ -47,7 +47,7 @@ _html do
related: {
'https://www.apache.org/foundation/mailinglists.html' => 'Apache Mailing List Info Page',
'https://lists.apache.org' => 'Apache Mailing List Archives',
- 'https://whimsy.apache.org/committers/moderationhelper.cgi' => 'Mailing List Moderation Helper'
+ '/committers/moderationhelper.cgi' => 'Mailing List Moderation Helper'
},
helpblock: -> {
_ 'This page allows Apache committers to auto-subscribe to various mailing lists.'
diff --git a/www/committers/testauth.cgi b/www/committers/testauth.cgi
index 8d92816..c7d80da 100755
--- a/www/committers/testauth.cgi
+++ b/www/committers/testauth.cgi
@@ -13,9 +13,9 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
- 'https://whimsy.apache.org/board/minutes/' => 'Board Meeting Minutes (public)',
- 'https://whimsy.apache.org/board/agenda/' => 'Board Agenda Tool (restricted)',
- 'https://whimsy.apache.org/status/' => 'Whimsy Server Status'
+ '/board/minutes/' => 'Board Meeting Minutes (public)',
+ '/board/agenda/' => 'Board Agenda Tool (restricted)',
+ '/status/' => 'Whimsy Server Status'
},
helpblock: -> {
_ 'This script checks your authorization to use the agenda tool, and checks if you are listed as attending the current board meeting in the official agenda.'
diff --git a/www/committers/tm-report.cgi b/www/committers/tm-report.cgi
index 0e5f6b4..7ff3f3d 100755
--- a/www/committers/tm-report.cgi
+++ b/www/committers/tm-report.cgi
@@ -243,7 +243,7 @@ _html do
related: {
'https://www.apache.org/foundation/marks/reporting' => 'Trademark Reporting Guidelines',
'https://www.apache.org/foundation/marks/resources' => 'Apache Trademark Policy Site Map',
- 'https://whimsy.apache.org/brand/list' => 'Comprehensive List Of Apache Trademarks'
+ '/brand/list' => 'Comprehensive List Of Apache Trademarks'
},
helpblock: -> {
_p.bg_danger %{
diff --git a/www/events/past.cgi b/www/events/past.cgi
index c06e06c..9388ff7 100755
--- a/www/events/past.cgi
+++ b/www/events/past.cgi
@@ -23,7 +23,7 @@ _html do
related: {
"https://community.apache.org/calendars/" => "Upcoming Apache-related Event Calendar",
"https://www.apache.org/events/meetups.html" => "Upcoming Apache-related Meetups",
- "https://whimsy.apache.org/events/other" => "Some non-Apache related event listings"
+ "/events/other" => "Some non-Apache related event listings"
},
helpblock: -> {
_p do
diff --git a/www/incubator/maillist.cgi b/www/incubator/maillist.cgi
index 04a63d9..2b576d9 100755
--- a/www/incubator/maillist.cgi
+++ b/www/incubator/maillist.cgi
@@ -12,11 +12,11 @@ _html do
title: PAGETITLE,
related: {
'https://incubator.apache.org/projects/' => 'Incubator Podling List',
- 'https://whimsy.apache.org/incubator/moderators' => 'Incubator Mailing List Moderators'
+ '/incubator/moderators' => 'Incubator Mailing List Moderators'
},
helpblock: -> {
_ 'This provides a complete listing of Incubator podling mailing lists, derived from '
- _a 'https://whimsy.apache.org/test/dataflow.cgi#/lib/whimsy/asf/podlings.rb', href: 'https://whimsy.apache.org/test/dataflow.cgi#/lib/whimsy/asf/podlings.rb'
+ _a 'https://whimsy.apache.org/test/dataflow.cgi#/lib/whimsy/asf/podlings.rb', href: '/test/dataflow.cgi#/lib/whimsy/asf/podlings.rb'
}
) do
lists = ASF::Mail.lists
diff --git a/www/incubator/podling-crosscheck.cgi b/www/incubator/podling-crosscheck.cgi
index 1ab6cc4..4532606 100755
--- a/www/incubator/podling-crosscheck.cgi
+++ b/www/incubator/podling-crosscheck.cgi
@@ -19,7 +19,7 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
- "https://whimsy.apache.org/committers/tools" => "Whimsy Tool Listing",
+ "/committers/tools" => "Whimsy Tool Listing",
"https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" => "Incubator Logo, to show that graphics can appear",
"https://community.apache.org/" => "Get Community Help",
"https://github.com/apache/whimsy/blob/master/www#{ENV['SCRIPT_NAME']}" => "See This Source Code"
diff --git a/www/incubator/signoff.cgi b/www/incubator/signoff.cgi
index 8ef40eb..66ba9a9 100755
--- a/www/incubator/signoff.cgi
+++ b/www/incubator/signoff.cgi
@@ -49,7 +49,7 @@ agendas.each do |file|
end
end
-roster = 'https://whimsy.apache.org/roster/committer/'
+roster = '/roster/committer/'
_html do
# http://bconnelly.net/2013/10/creating-colorblind-friendly-figures/
@@ -61,7 +61,7 @@ _html do
title: PAGETITLE,
related: {
'https://incubator.apache.org/projects/' => 'Incubator Podling List',
- 'https://whimsy.apache.org/incubator/moderators' => 'Incubator Mailing List Moderators'
+ '/incubator/moderators' => 'Incubator Mailing List Moderators'
},
helpblock: -> {
_ do
diff --git a/www/members/attendance-xcheck.cgi b/www/members/attendance-xcheck.cgi
index 6785141..0a129ee 100755
--- a/www/members/attendance-xcheck.cgi
+++ b/www/members/attendance-xcheck.cgi
@@ -35,9 +35,9 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
- 'https://whimsy.apache.org/members/inactive' => 'Inactive Member Feedback Form',
- 'https://whimsy.apache.org/members/proxy' => 'Members Meeting Proxy Assignment',
- 'https://whimsy.apache.org/members/subscriptions' => 'Members@ Mailing List Crosscheck'
+ '/members/inactive' => 'Inactive Member Feedback Form',
+ '/members/proxy' => 'Members Meeting Proxy Assignment',
+ '/members/subscriptions' => 'Members@ Mailing List Crosscheck'
},
helpblock: -> {
_ 'This script cross-checks all people listed in members.txt versus the official attendance.json file that notes which members attended (or proxied) which meetings.'
diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index 205a92f..e45202b 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -131,7 +131,7 @@ _html do
File.basename(latest) + '/agenda.txt'
end
_li do
- _a 'Assign a proxy', href: 'https://whimsy.apache.org/members/proxy'
+ _a 'Assign a proxy', href: '/members/proxy'
end
_li do
_a 'Read Members.txt', href:
diff --git a/www/members/memberless-pmcs.cgi b/www/members/memberless-pmcs.cgi
index 0c8280d..3cdb19d 100755
--- a/www/members/memberless-pmcs.cgi
+++ b/www/members/memberless-pmcs.cgi
@@ -22,8 +22,8 @@ _html do
title: PAGETITLE,
subtitle: subtitle,
related: {
- 'https://whimsy.apache.org/members/watch' => 'Potential Member Watch List',
- 'https://whimsy.apache.org/roster/committee/' => 'All PMC Rosters'
+ '/members/watch' => 'Potential Member Watch List',
+ '/roster/committee/' => 'All PMC Rosters'
},
helpblock: -> {
_p 'This displays PMC names where there are few/no ASF Members listed on the PMC.'
diff --git a/www/members/namediff.cgi b/www/members/namediff.cgi
index 35bb0be..fa5598b 100755
--- a/www/members/namediff.cgi
+++ b/www/members/namediff.cgi
@@ -11,7 +11,7 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
- 'https://whimsy.apache.org/roster/members' => 'Listing Of All Members',
+ '/roster/members' => 'Listing Of All Members',
'https://svn.apache.org/repos/private/foundation/officers/iclas.txt' => 'ICLA.txt Listing',
},
helpblock: -> {
diff --git a/www/members/nominations.cgi b/www/members/nominations.cgi
index 2b489ee..8ff4d6b 100755
--- a/www/members/nominations.cgi
+++ b/www/members/nominations.cgi
@@ -10,7 +10,7 @@ require 'whimsy/asf'
MBOX = 'https://mail-search.apache.org/members/private-arch/members/'
# link to roster page
-ROSTER = 'https://whimsy.apache.org/roster/committer'
+ROSTER = '/roster/committer'
# get a list of current members messages
year = Time.new.year.to_s
@@ -64,7 +64,7 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
- 'https://whimsy.apache.org/members/memberless-pmcs' => 'PMCs with no/few ASF Members',
+ '/members/memberless-pmcs' => 'PMCs with no/few ASF Members',
'https://svn.apache.org/repos/private/foundation/Meetings/' => 'Official Meeting Agenda Directory'
},
helpblock: -> {
diff --git a/www/members/non-participants.cgi b/www/members/non-participants.cgi
index 59e6845..46a6d1f 100755
--- a/www/members/non-participants.cgi
+++ b/www/members/non-participants.cgi
@@ -9,7 +9,7 @@ require 'json'
require 'wunderbar/jquery/stupidtable'
# separator / is added when link is generated
-ROSTER = "https://whimsy.apache.org/roster/committer"
+ROSTER = "/roster/committer"
# locate and read the attendance file
MEETINGS = ASF::SVN['private/foundation/Meetings']
@@ -43,9 +43,9 @@ _html do
title: PAGETITLE,
subtitle: 'Select A Date:',
related: {
- 'https://whimsy.apache.org/members/inactive' => 'Inactive Member Feedback Form',
- 'https://whimsy.apache.org/members/proxy' => 'Members Meeting Proxy Assignment',
- 'https://whimsy.apache.org/members/subscriptions' => 'Members@ Mailing List Crosscheck'
+ '/members/inactive' => 'Inactive Member Feedback Form',
+ '/members/proxy' => 'Members Meeting Proxy Assignment',
+ '/members/subscriptions' => 'Members@ Mailing List Crosscheck'
},
helpblock: -> {
_form_ do
diff --git a/www/members/subscriptions.cgi b/www/members/subscriptions.cgi
index 42a1201..fccd1cd 100755
--- a/www/members/subscriptions.cgi
+++ b/www/members/subscriptions.cgi
@@ -23,8 +23,8 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
- 'https://whimsy.apache.org/roster/members' => 'Listing Of All Members',
- 'https://whimsy.apache.org/committers/subscribe' => 'Committers Self-Subscribe Tool',
+ '/roster/members' => 'Listing Of All Members',
+ '/committers/subscribe' => 'Committers Self-Subscribe Tool',
'https://lists.apache.org' => 'Apache Ponymail List Archives'
},
helpblock: -> {
diff --git a/www/members/watch.cgi b/www/members/watch.cgi
index dc7ceb2..302cd38 100755
--- a/www/members/watch.cgi
+++ b/www/members/watch.cgi
@@ -21,8 +21,8 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
- 'https://whimsy.apache.org/members/memberless-pmcs' => 'PMCs with no/few ASF Members',
- 'https://whimsy.apache.org/members/nominations' => 'Members Meeting Nomination Crosscheck',
+ '/members/memberless-pmcs' => 'PMCs with no/few ASF Members',
+ '/members/nominations' => 'Members Meeting Nomination Crosscheck',
'https://svn.apache.org/repos/private/foundation/Meetings/' => 'Official Meeting Agenda Directory'
},
helpblock: -> {
diff --git a/www/officers/acreq.cgi b/www/officers/acreq.cgi
index fd9e26d..a3f3615 100755
--- a/www/officers/acreq.cgi
+++ b/www/officers/acreq.cgi
@@ -145,7 +145,7 @@ _html do
title: PAGETITLE,
subtitle: 'How To Make Account Requests',
related: {
- 'https://whimsy.apache.org/roster' => 'Whimsy Roster Tool',
+ '/roster' => 'Whimsy Roster Tool',
'https://reference.apache.org/infra' => 'Infra Reference Documentation',
'https://reference.apache.org/pmc/acreq' => 'Infra How To Create New Account Docs'
},
diff --git a/www/roster/banner.rb b/www/roster/banner.rb
index 08822f8..ac56a8b 100644
--- a/www/roster/banner.rb
+++ b/www/roster/banner.rb
@@ -15,7 +15,7 @@ class Wunderbar::HtmlMarkup
end
_div.col_sm_3.col_xs_3 do
_a href: '/' do
- _img title: 'Whimsy logo', alt: 'Whimsy hat', src: 'https://whimsy.apache.org/whimsy.svg', width: 145, height: 101
+ _img title: 'Whimsy logo', alt: 'Whimsy hat', src: '/whimsy.svg', width: 145, height: 101
end
end
_div.col_sm_5.col_xs_9.align_bottom do
diff --git a/www/roster/views/not_found.html.rb b/www/roster/views/not_found.html.rb
index d1360fe..c4ea75d 100644
--- a/www/roster/views/not_found.html.rb
+++ b/www/roster/views/not_found.html.rb
@@ -18,7 +18,7 @@ _html do
We'll double-check our crystal balls, but you should
probably try another
}
- _a 'magic link.', href: 'https://whimsy.apache.org/roster/'
+ _a 'magic link.', href: '/roster/'
_ul do
%w( sinatra.error sinatra.route REQUEST_URI ).each do |k|
_li "#{k} = #{@errors[k]}"
diff --git a/www/roster/views/pmc/main.js.rb b/www/roster/views/pmc/main.js.rb
index d7c0992..88b6da1 100644
--- a/www/roster/views/pmc/main.js.rb
+++ b/www/roster/views/pmc/main.js.rb
@@ -113,7 +113,7 @@ class PMC < React
end
_li do
- _a 'Prior reports', href: 'https://whimsy.apache.org/board/minutes/' +
+ _a 'Prior reports', href: '/board/minutes/' +
@committee.display_name.gsub(/\s+/, '_')
end
diff --git a/www/secretary/icla-lint.cgi b/www/secretary/icla-lint.cgi
index b3b4cc7..43019ba 100755
--- a/www/secretary/icla-lint.cgi
+++ b/www/secretary/icla-lint.cgi
@@ -129,7 +129,7 @@ _html do
if id == 'notinavail' or issue == 'notinldap'
_ id
else
- _a id, href: 'https://whimsy.apache.org/roster/committer/' + id
+ _a id, href: '/roster/committer/' + id
end
end
diff --git a/www/secretary/public-names.cgi b/www/secretary/public-names.cgi
index 7bdb995..f24eeed 100755
--- a/www/secretary/public-names.cgi
+++ b/www/secretary/public-names.cgi
@@ -179,8 +179,7 @@ _html do
_tr_ do
_td! do
- _a icla.id,
- href: "https://whimsy.apache.org/roster/committer/#{icla.id}"
+ _a icla.id, href: "/roster/committer/#{icla.id}"
end
_td icla.legal_name.gsub(' ', "\u00A0"), draggable: 'true'
@@ -231,8 +230,7 @@ _html do
_tr_ do
_td! do
- _a person.id, href:
- "https://whimsy.apache.org/roster/committer/#{person.id}"
+ _a person.id, href: "/roster/committer/#{person.id}"
end
_td person.cn
_td person.mail.first
diff --git a/www/secretary/workbench/views/parts.html.rb b/www/secretary/workbench/views/parts.html.rb
index b0817d5..59b07ed 100644
--- a/www/secretary/workbench/views/parts.html.rb
+++ b/www/secretary/workbench/views/parts.html.rb
@@ -26,7 +26,7 @@ _html do
_ul do
_li do
_a 'Response time', target: 'content',
- href: 'https://whimsy.apache.org/secretary/response-time'
+ href: '/secretary/response-time'
end
_li do
_a 'Mail Search', target: 'content',
@@ -62,15 +62,15 @@ _html do
end
_li do
_a 'ICLA lint', target: 'content',
- href: 'https://whimsy.apache.org/secretary/icla-lint'
+ href: '/secretary/icla-lint'
end
_li do
_a 'Public names', target: 'content',
- href: 'https://whimsy.apache.org/secretary/public-names'
+ href: '/secretary/public-names'
end
_li do
_a 'Board subscriptions', target: 'content',
- href: 'https://whimsy.apache.org/board/subscriptions/'
+ href: '/board/subscriptions/'
end
_li do
_a 'Mail aliases', target: 'content',
diff --git a/www/site.cgi b/www/site.cgi
index 13fdafd..4cee420 100755
--- a/www/site.cgi
+++ b/www/site.cgi
@@ -127,7 +127,7 @@ _html do
title: PAGETITLE,
subtitle: 'Checking TLP Websites For Required Links',
related: {
- "https://whimsy.apache.org/committers/tools" => "Whimsy Tool Listing",
+ "/committers/tools" => "Whimsy Tool Listing",
"https://www.apache.org/foundation/marks/pmcs#navigation" => "Required PMC Links Policy",
"https://github.com/apache/whimsy/" => "Read The Whimsy Code"
},
diff --git a/www/test/test.cgi b/www/subshelp.cgi
similarity index 89%
copy from www/test/test.cgi
copy to www/subshelp.cgi
index 88882d0..25335ca 100755
--- a/www/test/test.cgi
+++ b/www/subshelp.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Example Whimsy Script With Styles" # Wvisible:tools Note: PAGETITLE must be double quoted
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
require 'json'
require 'whimsy/asf'
require 'wunderbar'
@@ -21,8 +21,7 @@ _html do
subtitle: 'About This Example Script',
relatedtitle: 'More Useful Links',
related: {
- "https://whimsy.apache.org/committers/tools" => "Whimsy Tool Listing",
- "https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" => "Incubator Logo, to show that graphics can appear",
+ "/committers/tools" => "Whimsy Tool Listing",
"https://community.apache.org/" => "Get Community Help",
"https://github.com/apache/whimsy/blob/master/www#{ENV['SCRIPT_NAME']}" => "See This Source Code"
},
diff --git a/www/test/dataflow.cgi b/www/test/dataflow.cgi
index eefd30b..3322b12 100755
--- a/www/test/dataflow.cgi
+++ b/www/test/dataflow.cgi
@@ -67,7 +67,7 @@ _html do
else
_span.text_muted 'Maintained by role/PMC: '
# TODO use a public lookup instead of committer-private roster tool
- _a.text_muted "#{info['maintainer']}", href: "https://whimsy.apache.org/roster/orgchart/#{info['maintainer']}"
+ _a.text_muted "#{info['maintainer']}", href: "/roster/orgchart/#{info['maintainer']}"
end
_br
if info.key?('format') then
diff --git a/www/test/icla/views/app.html.rb b/www/test/icla/views/app.html.rb
index 2dcca6a..c693bfe 100755
--- a/www/test/icla/views/app.html.rb
+++ b/www/test/icla/views/app.html.rb
@@ -6,7 +6,7 @@ _html lang: 'en', _width: '80' do
_head_ do
_meta name: 'viewport', content: 'width=device-width, initial-scale=1'
_link rel: 'shortcut icon',
- href: 'https://whimsy.apache.org/favicon.ico'
+ href: '/favicon.ico'
_title 'ASF ICLA demo'
_link href: 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700%7cDroid+Serif:400,700',
rel: 'stylesheet', type: 'text/css'
@@ -55,7 +55,7 @@ _html lang: 'en', _width: '80' do
_ " » "
_a 'Legal', href: 'https://www.apache.org/legal/'
_ " » "
- _a 'ICLA', href: 'https://whimsy.apache.org/test/icla/'
+ _a 'ICLA', href: '/test/icla/'
end
_ul_.nav.navbar_nav.navbar_right do
@@ -190,7 +190,7 @@ _html lang: 'en', _width: '80' do
_div.col_md_9.col_sm_8.col_xs_12 do
_img src: 'https://id.apache.org/img/asf_logo_wide.png',
alt: 'Apache Logo', style: 'max-width: 77%;'
- _img src: 'https://whimsy.apache.org/whimsy.svg',
+ _img src: '/whimsy.svg',
alt: 'Whimsy Logo', style: 'max-width: 22%'
end
diff --git a/www/test/test.cgi b/www/test/test.cgi
index 88882d0..0802c3a 100755
--- a/www/test/test.cgi
+++ b/www/test/test.cgi
@@ -21,7 +21,7 @@ _html do
subtitle: 'About This Example Script',
relatedtitle: 'More Useful Links',
related: {
- "https://whimsy.apache.org/committers/tools" => "Whimsy Tool Listing",
+ "/committers/tools" => "Whimsy Tool Listing",
"https://incubator.apache.org/images/incubator_feather_egg_logo_sm.png" => "Incubator Logo, to show that graphics can appear",
"https://community.apache.org/" => "Get Community Help",
"https://github.com/apache/whimsy/blob/master/www#{ENV['SCRIPT_NAME']}" => "See This Source Code"
diff --git a/www/treasurer/bill-upload.cgi b/www/treasurer/bill-upload.cgi
index 4c2d942..1ef1be0 100755
--- a/www/treasurer/bill-upload.cgi
+++ b/www/treasurer/bill-upload.cgi
@@ -28,7 +28,7 @@ _html do
subtitle: 'How To Upload Bills',
related: {
'https://treasurer.apache.org/' => 'ASF Treasurer Process Documentation',
- 'https://whimsy.apache.org/committers/svn-info' => 'SVN Info helper (to check file status)'
+ '/committers/svn-info' => 'SVN Info helper (to check file status)'
},
helpblock: -> {
_p %{
diff --git a/www/treasurer/expenses.cgi b/www/treasurer/expenses.cgi
index 226a94d..eab93a0 100755
--- a/www/treasurer/expenses.cgi
+++ b/www/treasurer/expenses.cgi
@@ -60,7 +60,7 @@ _html do
_body? do
# common banner
- _a href: 'https://whimsy.apache.org/' do
+ _a href: '/' do
_img title: "Logo", alt: "Logo",
src: "https://id.apache.org/img/asf_logo_wide.png"
end
diff --git a/www/treasurer/paypal.cgi b/www/treasurer/paypal.cgi
index 194420f..5d8d47c 100755
--- a/www/treasurer/paypal.cgi
+++ b/www/treasurer/paypal.cgi
@@ -35,7 +35,7 @@ _html do
_body? do
# common banner
- _a href: 'https://whimsy.apache.org/' do
+ _a href: '/' do
_img alt: "Logo", src: "https://id.apache.org/img/asf_logo_wide.png"
end
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].