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
The following commit(s) were added to refs/heads/master by this push:
new 7dc4012 Style allthethings!
7dc4012 is described below
commit 7dc40129160a6885951b89c0aa6b7a6996ce76fc
Author: Shane Curcuru <[email protected]>
AuthorDate: Fri Jun 2 18:06:18 2017 -0400
Style allthethings!
---
www/events/other.cgi | 137 ++++++++++++++++++++++++---------------------------
www/events/past.cgi | 53 +++++++++++---------
www/events/talks.cgi | 32 ++++++------
3 files changed, 110 insertions(+), 112 deletions(-)
diff --git a/www/events/other.cgi b/www/events/other.cgi
index 83120d5..92c0bb5 100755
--- a/www/events/other.cgi
+++ b/www/events/other.cgi
@@ -152,86 +152,79 @@ counts = counts.to_h
_html do
_body? do
- _whimsy_header PAGETITLE
- _whimsy_content do
- _div.row do
- _div.col_sm_10 do
- _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 column header to sort table.'
- _br
- _p 'Conferences that include speaker benefit types:'
- _ul do
- counts.each do |s, num|
- _li "#{cols[s]}: #{num}"
- end
- end
+ _whimsy_body(
+ title: PAGETITLE,
+ related: {
+ "https://github.com/afilina/dev-community-data"; => "FOSS conference
listing - ConFoo",
+ "https://github.com/szabgab/codeandtalk.com"; => "FOSS conference
listing - CodeAndTalk",
+ "https://www.apache.org/foundation/marks/resources"; => "Trademark Site
Map",
+ "https://www.apache.org/foundation/marks/list/"; => "Official Apache
Trademark List"
+ },
+ helpblock: -> {
+ _ "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 column header to sort table.'
+ _br
+ _p 'Conferences that include speaker benefit types:'
+ _ul do
+ counts.each do |s, num|
+ _li "#{cols[s]}: #{num}"
end
end
- end
- _div.row do
- _table.table.table_hover.table_striped do
- _thead_ do
- _tr do
- _th 'Conference', data_sort: 'string'
- cols.each do |id, desc|
- _th! desc, data_sort: 'string'
+ }
+ ) do
+ _table.table.table_hover.table_striped do
+ _thead_ do
+ _tr do
+ _th 'Conference', data_sort: 'string'
+ cols.each do |id, desc|
+ _th! desc, data_sort: 'string'
+ end
+ _th 'Last Event', data_sort: 'string'
+ _th 'Twitter'
+ end
+ _tbody do
+ conflist.each do | conf |
+ _tr_ do
+ _td do
+ _a conf['name'], href: conf['website']
end
- _th 'Last Event', data_sort: 'string'
- _th 'Twitter'
- end
- _tbody do
- conflist.each do | conf |
- _tr_ do
- _td do
- _a conf['name'], href: conf['website']
- end
- if conf[SPEAKERKIT] then
- cols.each do |id, desc|
- _td! conf[SPEAKERKIT][id]
- end
- else
- _td 'Unknown'
- _td 'Unknown'
- _td 'Unknown'
- end
- if conf['events'] then
- laste = conf['events'].max_by {|e|
Date.parse(e['event_end'])}
- _td laste['event_end']
- else
- _td conf['last_event']
- end
- _td do
- _a conf['twitter'], href: conf['twitter']
- end
- end
+ if conf[SPEAKERKIT] then
+ cols.each do |id, desc|
+ _td! conf[SPEAKERKIT][id]
+ end
+ else
+ _td 'Unknown'
+ _td 'Unknown'
+ _td 'Unknown'
+ end
+ if conf['events'] then
+ laste = conf['events'].max_by {|e| Date.parse(e['event_end'])}
+ _td laste['event_end']
+ else
+ _td conf['last_event']
+ end
+ _td do
+ _a conf['twitter'], href: conf['twitter']
end
end
end
end
-
- _script %{
- var table = $(".table").stupidtable();
- table.on("aftertablesort", function (event, data) {
- var th = $(this).find("th");
- th.find(".arrow").remove();
- var dir = $.fn.stupidtable.dir;
- var arrow = data.direction === dir.ASC ? "↑" : "↓";
- th.eq(data.column).append('<span class="arrow">' + arrow
+'</span>');
- });
- }
- _whimsy_footer(
- related: {
- "https://github.com/afilina/dev-community-data"; => "FOSS
conference listing - ConFoo",
- "https://github.com/szabgab/codeandtalk.com"; => "FOSS conference
listing - CodeAndTalk",
- "https://www.apache.org/foundation/marks/resources"; => "Trademark
Site Map",
- "https://www.apache.org/foundation/marks/list/"; => "Official
Apache Trademark List"
- })
end
end
+
+ _script %{
+ var table = $(".table").stupidtable();
+ table.on("aftertablesort", function (event, data) {
+ var th = $(this).find("th");
+ th.find(".arrow").remove();
+ var dir = $.fn.stupidtable.dir;
+ var arrow = data.direction === dir.ASC ? "↑" : "↓";
+ th.eq(data.column).append('<span class="arrow">' + arrow +'</span>');
+ });
+ }
+ end
end
end
-
\ No newline at end of file
diff --git a/www/events/past.cgi b/www/events/past.cgi
index 1409cc6..c06e06c 100755
--- a/www/events/past.cgi
+++ b/www/events/past.cgi
@@ -18,40 +18,45 @@ ifields = {
_html do
_body? do
- _whimsy_header PAGETITLE
- ac_dir = ASF::SVN['private/foundation/ApacheCon']
- history = File.read("#{ac_dir}/apacheconhistory.csv")
- history.sub! "\uFEFF", '' # remove Zero Width No-Break Space
- csv = CSV.parse(history, headers:true)
- _whimsy_content do
- _p do
- _ 'ApacheCon is the official conference of the ASF, and the next '
- _a 'ApacheCon is in Miami, May 2017!', href:
'http://events.linuxfoundation.org/events/apachecon-north-america/'
- end
- _p 'ApacheCon has been going on since before the ASF was born, and
includes great events:'
+ _whimsy_body(
+ title: PAGETITLE,
+ 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"
+ },
+ helpblock: -> {
+ _p do
+ _ 'ApacheCon is the official conference of the ASF, and the last '
+ _a 'ApacheCon was in Miami, May 2017!', href:
'http://events.linuxfoundation.org/events/apachecon-north-america/'
+ end
+ _p 'ApacheCon has been going on since before the ASF was born, and
includes great events:'
+ }
+ ) do
+ ac_dir = ASF::SVN['private/foundation/ApacheCon']
+ history = File.read("#{ac_dir}/apacheconhistory.csv")
+ history.sub! "\uFEFF", '' # remove Zero Width No-Break Space
+ csv = CSV.parse(history, headers:true)
_ul do
csv.each do |r|
_li do
_a r['Name'], href: r['Link']
_ ", was held in #{r['Location']}. "
- _br
- ifields.each do |fn, g|
- if r[fn] then
- _a! href: r[fn] do
- _span!.glyphicon class: "#{g[0]}"
- _! ' ' + g[1]
+ _ul do
+ ifields.each do |fn, g|
+ if r[fn] then
+ _li do
+ _a! href: r[fn] do
+ _span!.glyphicon class: "#{g[0]}"
+ _! ' ' + g[1]
+ end
+ end
end
end
end
end
- end
+ end
end
end
-
- _whimsy_footer(
- related: {
- "https://www.apache.org/foundation/marks/resources"; => "Trademark Site
Map",
- "https://www.apache.org/foundation/marks/list/"; => "Official Apache
Trademark List"
- })
end
end
diff --git a/www/events/talks.cgi b/www/events/talks.cgi
index e71ba2c..29d96c1 100755
--- a/www/events/talks.cgi
+++ b/www/events/talks.cgi
@@ -90,14 +90,21 @@ end
_html do
_body? do
- _whimsy_header PAGETITLE
- talks, submitters = get_talks_submitters()
- _whimsy_content do
- _p do
- _ 'DRAFT listing of curated Apache non-technical talks - about the
Apache Way, licenses, brands, governance, and ASF history.'
- _a 'See the source data.', href: COMDEVTALKS
- end
-
+ _whimsy_body(
+ title: PAGETITLE,
+ related: {
+ "https://community.apache.org/"; => "Apache Community Development",
+ "https://community.apache.org/speakers/"; => "Apache Speaker Resources",
+ "https://apachecon.com/"; => "ApacheCon Conferences"
+ },
+ helpblock: -> {
+ _p do
+ _ 'DRAFT listing of curated Apache non-technical talks - about the
Apache Way, licenses, brands, governance, and ASF history.'
+ _a 'See the source data.', href: COMDEVTALKS
+ end
+ }
+ ) do
+ talks, submitters = get_talks_submitters()
alltalks = talks.group_by { |t| t[1]['topics'][0]}
_p do
_ 'All talks by topics: '
@@ -118,12 +125,5 @@ _html do
end
end
end
-
- _whimsy_footer(
- related: {
- "https://community.apache.org/"; => "Apache Community Development",
- "https://community.apache.org/speakers/"; => "Apache Speaker Resources",
- "https://apachecon.com/"; => "ApacheCon Conferences"
- })
- end
end
+end
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
