You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2020/03/19 14:58:47 UTC
[whimsy] branch master updated: WHIMSY-314: Replaced a.o/img/ with
a.o/logos/
This is an automated email from the ASF dual-hosted git repository.
rubys 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 f12b176 WHIMSY-314: Replaced a.o/img/ with a.o/logos/
new 9520c24 Merge pull request #80 from rlenferink/logo-replacement
f12b176 is described below
commit f12b1765cd39d7023f0ec63ab9819ae8f2628c30
Author: Roy Lenferink <le...@gmail.com>
AuthorDate: Thu Feb 20 15:44:55 2020 +0100
WHIMSY-314: Replaced a.o/img/ with a.o/logos/
---
lib/whimsy/sitestandards.rb | 4 ++--
repository.yml | 2 +-
tools/site-scan.rb | 2 +-
www/roster/models/committee.rb | 2 +-
www/roster/models/nonpmc.rb | 2 +-
www/roster/views/nonpmc/main.js.rb | 2 +-
www/roster/views/pmc/main.js.rb | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/whimsy/sitestandards.rb b/lib/whimsy/sitestandards.rb
index 41d80cc..283b1c7 100644
--- a/lib/whimsy/sitestandards.rb
+++ b/lib/whimsy/sitestandards.rb
@@ -115,8 +115,8 @@ module SiteStandards
CHECK_CAPTURE => nil,
CHECK_VALIDATE => %r{.},
CHECK_TYPE => true,
- CHECK_POLICY => 'https://www.apache.org/img/',
- CHECK_DOC => 'Projects SHOULD include a 212px wide copy of their logo in https://www.apache.org/img/ to be included in ASF homepage.',
+ CHECK_POLICY => 'https://www.apache.org/logos/',
+ CHECK_DOC => 'Projects SHOULD add a copy of their logo to https://www.apache.org/logos/ to be included in ASF homepage.',
},
}
diff --git a/repository.yml b/repository.yml
index d44b17c..2826dda 100644
--- a/repository.yml
+++ b/repository.yml
@@ -125,7 +125,7 @@
depth: files
site-img:
- url: asf/infrastructure/site/trunk/content/img
+ url: asf/comdev/project-logos/originals
site-root:
url: asf/infrastructure/site/trunk/content
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 234f070..ebfcd1f 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -146,7 +146,7 @@ def parse(id, site, name)
end
# THIRD: see if an image has been uploaded
if IMAGE_DIR
- data[:image] = Dir[File.join(IMAGE_DIR, "#{id}.*")].
+ data[:image] = Dir[File.join(IMAGE_DIR, "#{id}*.{svg,eps,ai,pdf}")].
map {|path| File.basename(path)}.first
end
diff --git a/www/roster/models/committee.rb b/www/roster/models/committee.rb
index 286af26..99358c0 100644
--- a/www/roster/models/committee.rb
+++ b/www/roster/models/committee.rb
@@ -20,7 +20,7 @@ class Committee
info = JSON.parse(File.read(File.join(comdev, 'projects.json')))[id]
image_dir = ASF::SVN.find('site-img')
- image = Dir[File.join(image_dir, "#{id}.*")].map {|path| File.basename(path)}.last
+ image = Dir[File.join(image_dir, "#{id}*.{svg,eps,ai,pdf}")].map {|path| File.basename(path)}.first
moderators = nil
modtime = nil
diff --git a/www/roster/models/nonpmc.rb b/www/roster/models/nonpmc.rb
index c38cd2e..66ee897 100644
--- a/www/roster/models/nonpmc.rb
+++ b/www/roster/models/nonpmc.rb
@@ -21,7 +21,7 @@ class NonPMC
end
image_dir = ASF::SVN.find('site-img') # Probably not relevant to nonPMCS; leave for now
- image = Dir[File.join(image_dir, "#{id}.*")].map {|path| File.basename(path)}.last
+ image = Dir[File.join(image_dir, "#{id}*.{svg,eps,ai,pdf}")].map {|path| File.basename(path)}.first
moderators = nil
modtime = nil
diff --git a/www/roster/views/nonpmc/main.js.rb b/www/roster/views/nonpmc/main.js.rb
index a1feb64..678cf97 100644
--- a/www/roster/views/nonpmc/main.js.rb
+++ b/www/roster/views/nonpmc/main.js.rb
@@ -33,7 +33,7 @@ class NonPMC < Vue
_a @nonpmc.display_name, href: @nonpmc.site
_small " established #{@nonpmc.established}" if @nonpmc.established
if @nonpmc.image
- _img src: "https://apache.org/img/#{@nonpmc.image}"
+ _img src: "https://apache.org/logos/res/#{@nonpmc.id}/default.png"
end
end
diff --git a/www/roster/views/pmc/main.js.rb b/www/roster/views/pmc/main.js.rb
index f82fb0d..40c5f17 100644
--- a/www/roster/views/pmc/main.js.rb
+++ b/www/roster/views/pmc/main.js.rb
@@ -39,7 +39,7 @@ class PMC < Vue
_a @committee.display_name, href: @committee.site
_small " established #{@committee.established}" if @committee.established
if @committee.image
- _img src: "https://apache.org/img/#{@committee.image}"
+ _img src: "https://apache.org/logos/res/#{@committee.id}/default.png"
end
end