You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2020/06/26 14:42:37 UTC
[whimsy] branch master updated: Add misssing _tbody after _thead
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 d7a8d28 Add misssing _tbody after _thead
d7a8d28 is described below
commit d7a8d28a28012a5a1ae50dcb50ba75cf205711dd
Author: Sebb <se...@apache.org>
AuthorDate: Fri Jun 26 15:42:28 2020 +0100
Add misssing _tbody after _thead
---
www/roster/views/committees.html.rb | 67 +++++++++++++++++++------------------
www/roster/views/nonpmcs.html.rb | 44 ++++++++++++------------
www/roster/views/ppmcs.html.rb | 58 ++++++++++++++++----------------
3 files changed, 86 insertions(+), 83 deletions(-)
diff --git a/www/roster/views/committees.html.rb b/www/roster/views/committees.html.rb
index 5e30d1d..5bd4516 100644
--- a/www/roster/views/committees.html.rb
+++ b/www/roster/views/committees.html.rb
@@ -53,44 +53,45 @@ _html do
_th 'Description', data_sort: 'string'
end
end
-
- prev_letter=nil
- @committees.sort_by {|pmc| pmc.display_name.downcase}.each do |pmc|
- letter = pmc.display_name.upcase[0]
- if letter != prev_letter
- options = {id: letter}
- else
- options = {}
- end
- prev_letter = letter
- _tr_ options do
- _td do
- _a pmc.display_name, href: "committee/#{pmc.name}"
+ _tbody do
+ prev_letter=nil
+ @committees.sort_by {|pmc| pmc.display_name.downcase}.each do |pmc|
+ letter = pmc.display_name.upcase[0]
+ if letter != prev_letter
+ options = {id: letter}
+ else
+ options = {}
end
-
- _td do
- pmc.chairs.each_with_index do |chair, index|
- _span ', ' unless index == 0
-
- if @members.include? chair[:id]
- _b! {_a chair[:name], href: "committer/#{chair[:id]}"}
- else
- _a chair[:name], href: "committer/#{chair[:id]}"
+ prev_letter = letter
+ _tr_ options do
+ _td do
+ _a pmc.display_name, href: "committee/#{pmc.name}"
+ end
+
+ _td do
+ pmc.chairs.each_with_index do |chair, index|
+ _span ', ' unless index == 0
+
+ if @members.include? chair[:id]
+ _b! {_a chair[:name], href: "committer/#{chair[:id]}"}
+ else
+ _a chair[:name], href: "committer/#{chair[:id]}"
+ end
end
end
- end
-
- if not pmc.established
- _td ''
- _td.issue 'Not in committee-info.txt'
- else
- if pmc.established =~ /^(\d\d)\/(\d{4})(.*)$/
- est = "#{$2}-#{$1}#{$3}"
+
+ if not pmc.established
+ _td ''
+ _td.issue 'Not in committee-info.txt'
else
- est = pmc.established
+ if pmc.established =~ /^(\d\d)\/(\d{4})(.*)$/
+ est = "#{$2}-#{$1}#{$3}"
+ else
+ est = pmc.established
+ end
+ _td est
+ _td pmc.description
end
- _td est
- _td pmc.description
end
end
end
diff --git a/www/roster/views/nonpmcs.html.rb b/www/roster/views/nonpmcs.html.rb
index 9b7b4ff..8c1c8ee 100644
--- a/www/roster/views/nonpmcs.html.rb
+++ b/www/roster/views/nonpmcs.html.rb
@@ -32,30 +32,30 @@ _html do
_th 'Description', data_sort: 'string'
end
end
-
- @nonpmcs.sort_by {|pmc| pmc.display_name.downcase}.each do |pmc|
- _tr_ do
- _td do
- _a pmc.display_name, href: "nonpmc/#{pmc.name}"
- end
-
- _td do
- pmc.chairs.each_with_index do |chair, index|
- _span ', ' unless index == 0
-
- if @members.include? chair[:id]
- _b! {_a chair[:name], href: "committer/#{chair[:id]}"}
- else
- _a chair[:name], href: "committer/#{chair[:id]}"
- end
+ _tbody do
+ @nonpmcs.sort_by {|pmc| pmc.display_name.downcase}.each do |pmc|
+ _tr_ do
+ _td do
+ _a pmc.display_name, href: "nonpmc/#{pmc.name}"
end
+
+ _td do
+ pmc.chairs.each_with_index do |chair, index|
+ _span ', ' unless index == 0
+
+ if @members.include? chair[:id]
+ _b! {_a chair[:name], href: "committer/#{chair[:id]}"}
+ else
+ _a chair[:name], href: "committer/#{chair[:id]}"
+ end
+ end
+ end
+ # if not pmc.established
+ # _td.issue 'Not in committee-info.txt'
+ # else
+ _td pmc.description
+ # end
end
-
-# if not pmc.established
-# _td.issue 'Not in committee-info.txt'
-# else
- _td pmc.description
-# end
end
end
end
diff --git a/www/roster/views/ppmcs.html.rb b/www/roster/views/ppmcs.html.rb
index addd561..015acc3 100644
--- a/www/roster/views/ppmcs.html.rb
+++ b/www/roster/views/ppmcs.html.rb
@@ -31,38 +31,40 @@ _html do
_th 'Description', data_sort: 'string'
end
end
-
- project_names = @projects.map {|project| project.name}
- prev_letter=nil
- @ppmcs.sort_by {|ppmc| ppmc.display_name.downcase}.each do |ppmc|
- letter = ppmc.display_name.upcase[0]
- if letter != prev_letter
- options = {id: letter}
- else
- options = {}
- end
- prev_letter = letter
- _tr_ options do
- _td do
- if project_names.include? ppmc.name
- _a ppmc.display_name, href: "ppmc/#{ppmc.name}"
- else
- _a.label_danger ppmc.display_name, href: "ppmc/#{ppmc.name}", title: 'LDAP project not yet set up'
- end
+ _tbody do
+ project_names = @projects.map {|project| project.name}
+ prev_letter=nil
+ @ppmcs.sort_by {|ppmc| ppmc.display_name.downcase}.each do |ppmc|
+ letter = ppmc.display_name.upcase[0]
+ if letter != prev_letter
+ options = {id: letter}
+ else
+ options = {}
end
-
- _td ppmc.startdate
-
- _td do
- # using _p here messes up the sort
- if project_names.include? ppmc.name
- _ ppmc.description
- else
- _ ppmc.description + " (not in ldap)"
+ prev_letter = letter
+ _tr_ options do
+ _td do
+ if project_names.include? ppmc.name
+ _a ppmc.display_name, href: "ppmc/#{ppmc.name}"
+ else
+ _a.label_danger ppmc.display_name, href: "ppmc/#{ppmc.name}", title: 'LDAP project not yet set up'
+ end
+ end
+
+ _td ppmc.startdate
+
+ _td do
+ # using _p here messes up the sort
+ if project_names.include? ppmc.name
+ _ ppmc.description
+ else
+ _ ppmc.description + " (not in ldap)"
+ end
end
end
- end
+ end
end
+
end
end
_script %{