You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cu...@apache.org on 2017/05/25 13:49:06 UTC
[whimsy] branch master updated (6c81c07 -> 7bf21b1)
This is an automated email from the ASF dual-hosted git repository.
curcuru pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from 6c81c07 Treat Proposed resolution the same as resolution
new a072757 Add _whimsy_panel to simplify some scripts
new 7bf21b1 Use new _whimsy_panel
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
lib/whimsy/asf/themes.rb | 15 +++++++++++++++
www/events/other.cgi | 27 ++++++++++++---------------
www/test/dataflow.cgi | 31 ++++++++++++++-----------------
3 files changed, 41 insertions(+), 32 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 02/02: Use new _whimsy_panel
Posted by cu...@apache.org.
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
commit 7bf21b1ac7ed817570506c60b08c0541135f4837
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Thu May 25 09:49:01 2017 -0400
Use new _whimsy_panel
---
www/events/other.cgi | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/www/events/other.cgi b/www/events/other.cgi
index f07856d..1c611af 100755
--- a/www/events/other.cgi
+++ b/www/events/other.cgi
@@ -34,21 +34,18 @@ _html do
_whimsy_content do
_div.row do
_div.col_sm_10 do
- _div.panel.panel_primary do
- _div.panel_heading {_h3.panel_title PAGETITLE}
- _div.panel_body do
- _ "Listing #{conflist.count} self-reported FOSS Conferences and their claimed speaker support status. Data from "
- _a_ 'afilina/dev-community-data', href: 'https://github.com/afilina/dev-community-data/'
- _ ', calendar website at '
- _a_ 'ConFoo Community', href: 'https://community.confoo.ca/'
- _ '. Click to sort table. "False" propercase entries are when conference doesn\'t report any speaker reimbursement details.'
- _br
- _p 'Conferences that include speaker benefit types:'
- _ul do
- counts.each do |s, num|
- _li "#{cols[s]}: #{num}"
- end
- end
+ _whimsy_panel PAGETITLE do
+ _ "Listing #{conflist.count} self-reported FOSS Conferences and their claimed speaker support status. Data from "
+ _a_ 'afilina/dev-community-data', href: 'https://github.com/afilina/dev-community-data/'
+ _ ', calendar website at '
+ _a_ 'ConFoo Community', href: 'https://community.confoo.ca/'
+ _ '. Click to sort table. "False" propercase entries are when conference doesn\'t report any speaker reimbursement details.'
+ _br
+ _p 'Conferences that include speaker benefit types:'
+ _ul do
+ counts.each do |s, num|
+ _li "#{cols[s]}: #{num}"
+ end
end
end
end
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 01/02: Add _whimsy_panel to simplify some scripts
Posted by cu...@apache.org.
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
commit a0727579cd6a027943ee7f8fd64b57e4265b23aa
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Thu May 25 09:47:30 2017 -0400
Add _whimsy_panel to simplify some scripts
---
lib/whimsy/asf/themes.rb | 15 +++++++++++++++
www/test/dataflow.cgi | 31 ++++++++++++++-----------------
2 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/lib/whimsy/asf/themes.rb b/lib/whimsy/asf/themes.rb
index 63190a8..ef6769b 100644
--- a/lib/whimsy/asf/themes.rb
+++ b/lib/whimsy/asf/themes.rb
@@ -76,4 +76,19 @@ class Wunderbar::HtmlMarkup
end
end
end
+
+ # Emit a panel with title and body content
+ def _whimsy_panel(title, style: 'panel-default', header: 'h3')
+ _div.panel class: style do
+ _div.panel_heading do
+ _.tag! header, class: 'panel-title' do
+ _ title
+ end
+ end
+ _div.panel_body do
+ yield
+ end
+ end
+ end
+
end
\ No newline at end of file
diff --git a/www/test/dataflow.cgi b/www/test/dataflow.cgi
index b5ecaee..b64b523 100755
--- a/www/test/dataflow.cgi
+++ b/www/test/dataflow.cgi
@@ -17,24 +17,21 @@ _html do
_whimsy_content do
_div.row do
_div.col_sm_11 do
- _div.panel.panel_primary do
- _div.panel_heading {_h3.panel_title 'What Data Comes From Where'}
- _div.panel_body do
- _p %{ Whimsy tools consume and produce a variety of data files
- about PMCs and the ASF as a whole. This non-comprehensive
- page explains which tools generate what intermediate data,
- and where the canonical underlying data sources are (many
- of which are privately stored). .json files generated in
- /public are consumed by many other websites.
+ _whimsy_panel 'What Data Comes From Where' do
+ _p %{ Whimsy tools consume and produce a variety of data files
+ about PMCs and the ASF as a whole. This non-comprehensive
+ page explains which tools generate what intermediate data,
+ and where the canonical underlying data sources are (many
+ of which are privately stored). .json files generated in
+ /public are consumed by many other websites.
+ }
+ _p do
+ _ %{ Whimsy has a number of cron jobs - typically hourly -
+ that periodically regenerate the /public directory, but
+ only when the underlying data source has changed.
+ See the
}
- _p do
- _ %{ Whimsy has a number of cron jobs - typically hourly -
- that periodically regenerate the /public directory, but
- only when the underlying data source has changed.
- See the
- }
- _a 'server docs for more info.', href: 'https://github.com/apache/whimsy/blob/master/DEPLOYMENT.md'
- end
+ _a 'server docs for more info.', href: 'https://github.com/apache/whimsy/blob/master/DEPLOYMENT.md'
end
end
end
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.