[whimsy] branch master updated: Use top-level shared assets

[sebb]

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 523674a9 Use top-level shared assets
523674a9 is described below

commit 523674a91ebb97196ac69f184ec90bcb18f6a44c
Author: Sebb <s...@apache.org>
AuthorDate: Thu Dec 15 17:35:09 2022 +0000

    Use top-level shared assets
---
 .gitignore                                       |  2 +-
 www/{committers => }/assets/bootstrap-select.css | 14 +++++++-------
 www/{committers => }/assets/bootstrap-select.js  |  0
 www/committers/moderate.cgi                      |  4 ++--
 www/committers/subscribe.cgi                     |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 28edd679..11bf4474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,6 @@ work
 .idea/
 .subversion
 .rakeTasks
-assets/
+/assets/
 maintenance.txt
 .ruby-version
diff --git a/www/committers/assets/bootstrap-select.css 
b/www/assets/bootstrap-select.css
old mode 100755
new mode 100644
similarity index 99%
rename from www/committers/assets/bootstrap-select.css
rename to www/assets/bootstrap-select.css
index d6cf7152..67b9c5a2
--- a/www/committers/assets/bootstrap-select.css
+++ b/www/assets/bootstrap-select.css
@@ -1,10 +1,10 @@
-/*!
- * Bootstrap-select v1.12.2 (http://silviomoreto.github.io/bootstrap-select)
- *
- * Copyright 2013-2017 bootstrap-select
- * Licensed under MIT 
(https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
- */
-
+/*!
+ * Bootstrap-select v1.12.2 (http://silviomoreto.github.io/bootstrap-select)
+ *
+ * Copyright 2013-2017 bootstrap-select
+ * Licensed under MIT 
(https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
+ */
+
 select.bs-select-hidden,
 select.selectpicker {
   display: none !important;
diff --git a/www/committers/assets/bootstrap-select.js 
b/www/assets/bootstrap-select.js
old mode 100755
new mode 100644
similarity index 100%
rename from www/committers/assets/bootstrap-select.js
rename to www/assets/bootstrap-select.js
diff --git a/www/committers/moderate.cgi b/www/committers/moderate.cgi
index 5e53558a..f7f3974b 100755
--- a/www/committers/moderate.cgi
+++ b/www/committers/moderate.cgi
@@ -44,8 +44,8 @@ moderates = response[:moderates].transform_values { |v| 
v.join(' ')}
 _html do
   # better system output styling (errors in red)
   _style :system
-  _script src: 'assets/bootstrap-select.js'
-  _link rel: 'stylesheet', href: 'assets/bootstrap-select.css'
+  _script src: '/assets/bootstrap-select.js'
+  _link rel: 'stylesheet', href: '/assets/bootstrap-select.css'
   _body? do
     _whimsy_body(
       title: PAGETITLE,
diff --git a/www/committers/subscribe.cgi b/www/committers/subscribe.cgi
index c41dd1f6..deb4b72b 100755
--- a/www/committers/subscribe.cgi
+++ b/www/committers/subscribe.cgi
@@ -61,8 +61,8 @@ lists = ASF::Mail.cansub(user.asf_member?, 
ASF.pmc_chairs.include?(user), ldap_p
 _html do
   # better system output styling (errors in red)
   _style :system
-  _script src: 'assets/bootstrap-select.js'
-  _link rel: 'stylesheet', href: 'assets/bootstrap-select.css'
+  _script src: '/assets/bootstrap-select.js'
+  _link rel: 'stylesheet', href: '/assets/bootstrap-select.css'
   _body? do
     _whimsy_body(
       title: PAGETITLE,