[whimsy] branch master updated: Make PPMC GUI more like PMC; add Committers anchor

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb 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 3e22fd4  Make PPMC GUI more like PMC; add Committers anchor
3e22fd4 is described below

commit 3e22fd41e9a3211a5a3b83cba37685d4d7246150
Author: Sebb <se...@apache.org>
AuthorDate: Wed Nov 22 15:37:15 2017 +0000

    Make PPMC GUI more like PMC; add Committers anchor
---
 www/roster/views/ppmc/committers.js.rb | 23 +++++++++++++++++++----
 www/roster/views/ppmc/main.js.rb       |  3 +++
 www/roster/views/ppmc/members.js.rb    |  8 ++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/www/roster/views/ppmc/committers.js.rb b/www/roster/views/ppmc/committers.js.rb
index 9539dcd..1c17064 100644
--- a/www/roster/views/ppmc/committers.js.rb
+++ b/www/roster/views/ppmc/committers.js.rb
@@ -6,16 +6,27 @@ class PPMCCommitters < Vue
   def render
     pending = [] 
 
-    if @@ppmc.committers.all? {|id| @@ppmc.owners.include? id}
+    _ ' ' # Not sure why, but without this the H2 elements are not generated
+
+    if
+      @@ppmc.committers.all? do |id|
+        @@ppmc.owners.include? id
+      end
+    then
+      _h2.committers! 'Committers'
       _p 'All committers are members of the PPMC'
     else
-      _h2.committers! 'Committers'
+      _h2.committers! do
+        _ 'Committers'
+        _small ' (excluding PPMC members above)'
+      end
+      _p 'Click on column name to sort'
       _table.table.table_hover do
         _thead do
           _tr do
             _th if @@auth.ppmc
-            _th 'id'
-            _th 'public name'
+            _th 'id', data_sort: 'string'
+            _th.sorting_asc 'public name', data_sort: 'string-ins'
             _th 'notes'
           end
         end
@@ -52,6 +63,10 @@ class PPMCCommitters < Vue
     end
   end
 
+  def mounted()
+    jQuery('.table', $el).stupidtable()
+  end
+
   # compute list of committers
   def committers
     result = []
diff --git a/www/roster/views/ppmc/main.js.rb b/www/roster/views/ppmc/main.js.rb
index 47f34fa..50818f4 100644
--- a/www/roster/views/ppmc/main.js.rb
+++ b/www/roster/views/ppmc/main.js.rb
@@ -25,6 +25,9 @@ class PPMC < Vue
         _a 'PPMC', :href => "ppmc/#{@ppmc.id}#ppmc"
       end
       _li role: "presentation" do
+        _a 'Committers', :href => "ppmc/#{@ppmc.id}#committers"
+      end
+      _li role: "presentation" do
         _a 'Mail Moderators', :href => "ppmc/#{@ppmc.id}#mail"
       end
       _li role: "presentation" do
diff --git a/www/roster/views/ppmc/members.js.rb b/www/roster/views/ppmc/members.js.rb
index 34c309f..c177085 100644
--- a/www/roster/views/ppmc/members.js.rb
+++ b/www/roster/views/ppmc/members.js.rb
@@ -9,8 +9,8 @@ class PPMCMembers < Vue
       _thead do
         _tr do
           _th if @@auth.ppmc
-          _th 'id'
-          _th 'public name'
+          _th 'id', data_sort: 'string'
+          _th.sorting_asc 'public name', data_sort: 'string-ins'
           _th 'notes'
         end
       end
@@ -24,6 +24,10 @@ class PPMCMembers < Vue
     end
   end
 
+  def mounted()
+    jQuery('.table', $el).stupidtable()
+  end
+
   # compute roster
   def roster
     result = []

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