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: Add unregistered marks; minor fixups
Date Tue, 25 Apr 2017 22:47:45 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  604ec42   Add unregistered marks; minor fixups
604ec42 is described below

commit 604ec422a40a63b5bfefed7805a5446eec7ed65c
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Tue Apr 25 18:47:41 2017 -0400

    Add unregistered marks; minor fixups
    
    Promise I’ll find a new home for it!
---
 www/test/trademark.cgi | 42 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/www/test/trademark.cgi b/www/test/trademark.cgi
index 43cfa1c..e54cf06 100755
--- a/www/test/trademark.cgi
+++ b/www/test/trademark.cgi
@@ -7,15 +7,37 @@ require 'wunderbar'
 require 'wunderbar/bootstrap'
 require 'net/http'
 
-PAGETITLE = 'Listing of Apache Registered Trademarks'
+PAGETITLE = 'Listing of Apache Trademarks'
 COUNTRY = 'CountryName' # Fieldnames from counsel provided docket
 STAT = 'TrademarkStatus'
 CLASS = 'Class'
 REG = 'RegNumber'
 
+def _unreg(name, url, desc, parent, n)
+  _div.panel.panel_default do
+    _div.panel_heading role: "tab", id: "urh#{n}" do
+      _h4.panel_title do
+        _a role: "button", data_toggle: "collapse",  aria_expanded: "true", data_parent:
"##{parent}", href: "#urc#{n}", aria_controls: "#urc#{n}" do
+          _ name
+          _{"&trade; software"}
+        end
+      end
+    end
+    _div.panel_collapse.collapse.in id: "#urc#{n}", role: "tabpanel", aria_labelledby: "urh#{n}"
do
+      _div.panel_body do
+        _a href: url do
+          _ name
+        end
+        _ ': '
+        _ desc
+      end
+    end
+  end
+end
+
 def _marks(marks)
-  _ul.list_group do
-    marks.each do |mark, items|
+  marks.each do |mark, items|
+    _ul.list_group do
       _li!.list_group_item.active do
         _{"#{mark} &reg;"}
       end
@@ -26,7 +48,7 @@ def _marks(marks)
               _a "In the #{itm[COUNTRY]}, class #{itm[CLASS]}, reg # #{itm[REG]}", href:
'usptolink'
             end
           else
-            _li.list_group_item "In the #{itm[COUNTRY]}, class #{itm[CLASS]}, reg # #{itm[REG]}",
href: 'usptolink'
+            _li.list_group_item "In #{itm[COUNTRY]}, class #{itm[CLASS]}, reg # #{itm[REG]}",
href: 'usptolink'
           end
         end
       end
@@ -71,7 +93,7 @@ _html do
     projects = JSON.parse(Net::HTTP.get(URI('https://projects.apache.org/json/foundation/projects.json')))
 
     _whimsy_content do
-      _p 'The ASF holds the following registered trademarks'
+      _h3 'The ASF holds the following registered trademarks:'
       docket.each do |pmc, marks|
         if pmc == 'apache' then
           _apache(marks)
@@ -82,6 +104,16 @@ _html do
           _project 'Apache ' + pmc.capitalize, 'https://' + pmc + '.apache.org', marks
         end
       end
+      
+      _h3 'The ASF holds the following unregistered trademarks:'
+      parent = "unreg_a" # TODO: split up by letter
+      _div.panel_group id: parent, role: "tablist", aria_multiselectable: "true" do
+        projects.each_with_index do |(pnam, proj), num|
+          unless docket[pnam] then
+            _unreg(proj['name'], proj['homepage'], proj['description'], parent, num)
+          end
+        end
+      end
     end
 
     _whimsy_footer({

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

Mime
View raw message