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/04/11 19:08:53 UTC
[whimsy] branch master updated: Add standard _whimsy_content for
nice margins
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 8462f39 Add standard _whimsy_content for nice margins
8462f39 is described below
commit 8462f39c59d1a9c6e9e478bcb6949c54e3ba1b8d
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Tue Apr 11 15:08:48 2017 -0400
Add standard _whimsy_content for nice margins
---
lib/whimsy/asf/themes.rb | 11 +++++++++++
www/test/trademark.cgi | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/whimsy/asf/themes.rb b/lib/whimsy/asf/themes.rb
index d744886..068f4c6 100644
--- a/lib/whimsy/asf/themes.rb
+++ b/lib/whimsy/asf/themes.rb
@@ -37,6 +37,17 @@ class Wunderbar::HtmlMarkup
end
end
end
+
+ # Wrap content with nicer fluid margins
+ def _whimsy_content colstyle="col-lg-11"
+ _div.content.container_fluid do
+ _div.row do
+ _div class: colstyle do
+ yield
+ end
+ end
+ end
+ end
# Emit ASF style footer with (optional) list of related links
def _whimsy_footer related
diff --git a/www/test/trademark.cgi b/www/test/trademark.cgi
index 362fa30..874493f 100755
--- a/www/test/trademark.cgi
+++ b/www/test/trademark.cgi
@@ -26,9 +26,9 @@ _html do
docket = CSV.read("#{brand_dir}/trademark-registrations.csv", headers:true)
docketcols = %w[ Mark Jurisdiction Class ]
# TODO: consolidate Jurisdiction info by 'Mark' column
- # TODO add error recovery
+ # TODO: add optional json output to convert rarely-changed registered CSV into checkinable JSON
projects = JSON.parse(Net::HTTP.get(URI('https://projects.apache.org/json/foundation/projects.json')))
- _div.container_fluid do
+ _whimsy_content do
_table class: "table " do
_thead_ do
_tr do
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].