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 2017/09/11 02:30:01 UTC
[whimsy] branch master updated: force browser to reload CSS when it
changes
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 0e46ccd force browser to reload CSS when it changes
0e46ccd is described below
commit 0e46ccd1fc8f25ed3aab077529478aeab3342bfb
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sun Sep 10 22:29:26 2017 -0400
force browser to reload CSS when it changes
(yes, Safari, I'm looking at you)
---
www/roster/main.rb | 6 ++++++
www/roster/views/committee.html.rb | 2 +-
www/roster/views/committees.html.rb | 2 +-
www/roster/views/committer.html.rb | 2 +-
www/roster/views/committers.html.rb | 2 +-
www/roster/views/duties.html.rb | 2 +-
www/roster/views/errors.html.rb | 2 +-
www/roster/views/group.html.rb | 2 +-
www/roster/views/groups.html.rb | 2 +-
www/roster/views/index.html.rb | 2 +-
www/roster/views/members.html.rb | 2 +-
www/roster/views/not_found.html.rb | 2 +-
www/roster/views/orgchart.html.rb | 2 +-
www/roster/views/podlings.html.rb | 2 +-
www/roster/views/ppmc.html.rb | 2 +-
www/roster/views/ppmcs.html.rb | 2 +-
16 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/www/roster/main.rb b/www/roster/main.rb
index a6000da..442a3f0 100755
--- a/www/roster/main.rb
+++ b/www/roster/main.rb
@@ -25,6 +25,12 @@ disable :logging # suppress log of requests to stderr/error.log
ASF::Mail.configure
+helpers do
+ def cssmtime
+ File.mtime('public/stylesheets/app.css').to_i
+ end
+end
+
get '/' do
if env['REQUEST_URI'].end_with? '/'
@committers = ASF::Person.list
diff --git a/www/roster/views/committee.html.rb b/www/roster/views/committee.html.rb
index 3aef11c..d80cda7 100644
--- a/www/roster/views/committee.html.rb
+++ b/www/roster/views/committee.html.rb
@@ -4,7 +4,7 @@
_html do
_base href: '..'
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_body? do
_whimsy_body(
title: @committee[:display_name],
diff --git a/www/roster/views/committees.html.rb b/www/roster/views/committees.html.rb
index c9a89ff..565ca7e 100644
--- a/www/roster/views/committees.html.rb
+++ b/www/roster/views/committees.html.rb
@@ -4,7 +4,7 @@
_html do
_base href: '..'
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_whimsy_body(
title: 'ASF Committees Listing',
breadcrumbs: {
diff --git a/www/roster/views/committer.html.rb b/www/roster/views/committer.html.rb
index fe6c53d..bf7c0cb 100644
--- a/www/roster/views/committer.html.rb
+++ b/www/roster/views/committer.html.rb
@@ -4,7 +4,7 @@
_html do
_base href: '..'
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_body? do
_whimsy_body(
title: @committer[:name][:public_name],
diff --git a/www/roster/views/committers.html.rb b/www/roster/views/committers.html.rb
index e0f0844..0e41713 100644
--- a/www/roster/views/committers.html.rb
+++ b/www/roster/views/committers.html.rb
@@ -4,7 +4,7 @@
_html do
_base href: '..'
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_whimsy_body(
title: 'ASF Committer Search',
breadcrumbs: {
diff --git a/www/roster/views/duties.html.rb b/www/roster/views/duties.html.rb
index 241aa5e..7e9fddf 100644
--- a/www/roster/views/duties.html.rb
+++ b/www/roster/views/duties.html.rb
@@ -4,7 +4,7 @@
PVTCLASS = 'text-warning'
_html do
_base href: '..'
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_body? do
_whimsy_body(
diff --git a/www/roster/views/errors.html.rb b/www/roster/views/errors.html.rb
index aba03af..51dbdff 100644
--- a/www/roster/views/errors.html.rb
+++ b/www/roster/views/errors.html.rb
@@ -4,7 +4,7 @@
_html do
_header do
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
end
_body? do
_whimsy_body(
diff --git a/www/roster/views/group.html.rb b/www/roster/views/group.html.rb
index c288ae4..0e2fd8a 100644
--- a/www/roster/views/group.html.rb
+++ b/www/roster/views/group.html.rb
@@ -4,7 +4,7 @@
_html do
_base href: '..'
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_body? do
_whimsy_body(
title: @group[:id],
diff --git a/www/roster/views/groups.html.rb b/www/roster/views/groups.html.rb
index 0d75189..446fb19 100644
--- a/www/roster/views/groups.html.rb
+++ b/www/roster/views/groups.html.rb
@@ -4,7 +4,7 @@
_html do
_base href: '..'
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_banner breadcrumbs: {
roster: '.',
diff --git a/www/roster/views/index.html.rb b/www/roster/views/index.html.rb
index 836d5ce..9b7f421 100644
--- a/www/roster/views/index.html.rb
+++ b/www/roster/views/index.html.rb
@@ -4,7 +4,7 @@
PAGETITLE = "ASF Roster Tool" # Wvisible:projects
_html do
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_body? do
_whimsy_body(
diff --git a/www/roster/views/members.html.rb b/www/roster/views/members.html.rb
index e623ff6..72f2a9e 100644
--- a/www/roster/views/members.html.rb
+++ b/www/roster/views/members.html.rb
@@ -3,7 +3,7 @@
#
_html do
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_body? do
_whimsy_body(
diff --git a/www/roster/views/not_found.html.rb b/www/roster/views/not_found.html.rb
index 437aced..b173c06 100644
--- a/www/roster/views/not_found.html.rb
+++ b/www/roster/views/not_found.html.rb
@@ -4,7 +4,7 @@
_html do
_header do
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
end
_body? do
_whimsy_body(
diff --git a/www/roster/views/orgchart.html.rb b/www/roster/views/orgchart.html.rb
index 791fa49..279eab2 100644
--- a/www/roster/views/orgchart.html.rb
+++ b/www/roster/views/orgchart.html.rb
@@ -4,7 +4,7 @@
_html do
_base href: '..'
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_body? do
_whimsy_body(
diff --git a/www/roster/views/podlings.html.rb b/www/roster/views/podlings.html.rb
index dec2eb8..524fe15 100644
--- a/www/roster/views/podlings.html.rb
+++ b/www/roster/views/podlings.html.rb
@@ -3,7 +3,7 @@
#
_html do
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_style %{
p {margin-top: 0.5em}
}
diff --git a/www/roster/views/ppmc.html.rb b/www/roster/views/ppmc.html.rb
index 8aafe60..a61373d 100644
--- a/www/roster/views/ppmc.html.rb
+++ b/www/roster/views/ppmc.html.rb
@@ -4,7 +4,7 @@
_html do
_base href: '..'
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_body? do
_whimsy_body(
title: @ppmc[:display_name],
diff --git a/www/roster/views/ppmcs.html.rb b/www/roster/views/ppmcs.html.rb
index bd5ae9e..5d811f3 100644
--- a/www/roster/views/ppmcs.html.rb
+++ b/www/roster/views/ppmcs.html.rb
@@ -4,7 +4,7 @@
_html do
_base href: '..'
- _link rel: 'stylesheet', href: 'stylesheets/app.css'
+ _link rel: 'stylesheet', href: "stylesheets/app.css?#{cssmtime}"
_body? do
_whimsy_body(
title: 'ASF Podling List',
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].