whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sam Ruby <ru...@apache.org>
Subject [whimsy.git] [1/1] Commit a01c512: cleanup committee list
Date Mon, 15 Feb 2016 17:11:00 GMT
Commit a01c5126cc850c59ee9ccadbf136a69905132c2a:
    cleanup committee list


Branch: refs/heads/master
Author: Sam Ruby <rubys@intertwingly.net>
Committer: Sam Ruby <rubys@intertwingly.net>
Pusher: rubys <rubys@apache.org>

------------------------------------------------------------
www/roster/models/committee.rb                               | + -
www/roster/views/committee.js.rb                             | + --
www/roster/views/committees.html.rb                          | +++++++++ -
------------------------------------------------------------
24 changes: 19 additions, 5 deletions.
------------------------------------------------------------


diff --git a/www/roster/models/committee.rb b/www/roster/models/committee.rb
index 5eab65b..ca3b3ce 100644
--- a/www/roster/models/committee.rb
+++ b/www/roster/models/committee.rb
@@ -11,7 +11,7 @@ def self.serialize(id)
 
     response = {
       id: id,
-      chair: pmc.chair.id,
+      chair: pmc.chair && pmc.chair.id,
       display_name: pmc.display_name,
       description: pmc.description,
       schedule: pmc.schedule,
diff --git a/www/roster/views/committee.js.rb b/www/roster/views/committee.js.rb
index ab0c2c8..f28da2a 100644
--- a/www/roster/views/committee.js.rb
+++ b/www/roster/views/committee.js.rb
@@ -9,8 +9,7 @@ def render
     # header
     _h1 do
       _a @committee.display_name, href: @committee.site
-      _span ' '
-      _small "established #{@committee.established}"
+      _small " established #{@committee.established}" if @committee.established
     end
 
     _p @committee.description
diff --git a/www/roster/views/committees.html.rb b/www/roster/views/committees.html.rb
index 044bcaf..65eed90 100644
--- a/www/roster/views/committees.html.rb
+++ b/www/roster/views/committees.html.rb
@@ -14,12 +14,21 @@
 
   _h1 'PMCs'
 
-  _table do
-    @committees.each do |pmc|
+  _table.table.table_hover do
+    _thead do
+      _tr do
+        _th 'Name'
+        _th 'Chair(s)'
+        _th 'Notes'
+      end
+    end
+
+    @committees.sort_by {|pmc| pmc.display_name.downcase}.each do |pmc|
       _tr_ do
         _td do
           _a pmc.display_name, href: "committee/#{pmc.name}"
         end
+
         _td do
           pmc.chairs.each_with_index do |chair, index|
             if @members.include? chair[:id]
@@ -31,6 +40,12 @@
             _span ', ' unless index == 0
           end
         end
+
+        if not pmc.established
+          _td.issue 'Not in committee-info.txt'
+        else
+          _td
+        end
       end
     end
   end

Mime
View raw message