whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject [whimsy] branch master updated: Use final version of _whimsy_body
Date Fri, 02 Jun 2017 20:57:39 GMT
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  8a94e86   Use final version of _whimsy_body
8a94e86 is described below

commit 8a94e86dfe2c7ade1c6fd35540021112e6e19807
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Fri Jun 2 16:57:34 2017 -0400

    Use final version of _whimsy_body
---
 lib/whimsy/asf/themes.rb | 20 +-------------------
 www/test/dataflow.cgi    | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/lib/whimsy/asf/themes.rb b/lib/whimsy/asf/themes.rb
index bebdea1..0632f5f 100644
--- a/lib/whimsy/asf/themes.rb
+++ b/lib/whimsy/asf/themes.rb
@@ -169,26 +169,8 @@ class Wunderbar::HtmlMarkup
     end
   end
   
-  # Emit complete bootstrap theme (container/row/column) for common use cases
-  def _whimsy_body **args
-    _whimsy_nav
-    _div.content.container_fluid do
-      _div.row do
-        _div.col_sm_12 do
-          _h1 args[:title]
-        end
-      end
-      _div.row do
-        _div.col_sm_12 do
-          yield
-        end
-      end
-      _whimsy_footer args
-    end
-  end
-
   # Emit complete bootstrap theme, with related links, and helpblock of intro text
-  def _whimsy_body2(title: 'MOAR WHIMSY!', related: {}, helpblock: nil)
+  def _whimsy_body(title: 'MOAR WHIMSY!', related: {}, helpblock: nil)
     _whimsy_nav
     _div.content.container_fluid do
       _div.row do
diff --git a/www/test/dataflow.cgi b/www/test/dataflow.cgi
index 0ee0007..e4a0b0d 100755
--- a/www/test/dataflow.cgi
+++ b/www/test/dataflow.cgi
@@ -12,13 +12,15 @@ GITWHIMSY = 'https://github.com/apache/whimsy/blob/master'
 
 _html do
   _body? do
-    deplist = JSON.parse(File.read(DATAFLOWDATA)) 
-    _whimsy_body title: PAGETITLE, related: {
-      "https://projects.apache.org/" => "Apache Projects Listing",
-      "https://home.apache.org/" => "Apache Committer Phonebook",
-      "https://community.apache.org/" => "Apache Community Development"
-    } do
-      _whimsy_panel 'What Data Comes From Where' do
+    deplist = JSON.parse(File.read(DATAFLOWDATA))
+    _whimsy_body(
+      title: PAGETITLE,
+      related: {
+        "https://projects.apache.org/" => "Apache Projects Listing",
+        "https://home.apache.org/" => "Apache Committer Phonebook",
+        "https://community.apache.org/" => "Apache Community Development"
+      },
+      helpblock: -> {
         _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, 
@@ -34,7 +36,8 @@ _html do
           }
           _a 'server docs for more info.', href: 'https://github.com/apache/whimsy/blob/master/DEPLOYMENT.md'
         end
-      end
+      }
+    ) do
       _ul.list_group do
         deplist.each do |dep, info|
           _li.list_group_item do

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message