[whimsy] 03/03: Merge branch 'master' of https://github.com/apache/whimsy

[cu...@apache.org]

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

commit 47591ab74ac244b04950f9211054ffe4361a53b6
Merge: 1bcae59 c9e7556
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Sat May 4 17:05:42 2019 -0400

    Merge branch 'master' of https://github.com/apache/whimsy

 www/members/mentors.cgi | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --cc www/members/mentors.cgi
index 27f2786,f24d3aa..9e1fd86
--- a/www/members/mentors.cgi
+++ b/www/members/mentors.cgi
@@@ -77,18 -88,41 +88,20 @@@ _html d
      ) do
        _div.panel_group id: MENTORS_LIST, role: "tablist", aria_multiselectable: "true" do
          mentors.each_with_index do |(apacheid, mentor), n| # TODO Should we randomize the default listing?
-           _whimsy_accordion_item(listid: MENTORS_LIST, itemid: apacheid, itemtitle: "#{mentor[MentorFormat::PUBLICNAME]}  (#{apacheid})  Timezone: #{mentor[MentorFormat::TIMEZONE]}  ", n: n, itemclass: 'panel-primary') do
+           timezone = mentor[MentorFormat::TIMEZONE]
+           offset = TZInfo::Timezone.get(timezone).strftime("%:z")
 -          _div!.panel.panel_default  id: apacheid do
 -            _div!.panel_heading role: "tab", id: "#{MENTORS_LIST}h#{n}" do
 -              _h4!.panel_title do
 -                _a!.collapsed role: "button", data_toggle: "collapse",  aria_expanded: "false", data_parent: "##{MENTORS_LIST}", href: "##{MENTORS_LIST}c#{n}", aria_controls: "#{MENTORS_LIST}c#{n}" do
 -                  _ "#{mentor[MentorFormat::PUBLICNAME]}  (#{apacheid})  Timezone: #{timezone} (#{offset}) "
 -                  _span.glyphicon.glyphicon_chevron_down id: "#{apacheid}-nav"
 -                  mentor.delete(MentorFormat::PUBLICNAME) # So not re-displayed below
 -                end
 -              end
 -            end
 -            _div!.panel_collapse.collapse id: "#{MENTORS_LIST}c#{n}", role: "tabpanel", aria_labelledby: "#{MENTORS_LIST}h#{n}" do
 -              _div!.panel_body do
 -                _table.table.table_hover do
 -                  _tbody do
 -                    mentor.each do |k, v|
 -                      _tr do
 -                        _td!.text_right do
 -                          _span.text_primary uimap.has_key?(k) ? "#{uimap[k][0]}" : "#{k}"
 -                        end
 -                        _td!.text_left do
 -                          v = v.join(', ') if v.kind_of?(Array)
 -                          _markdown v
 -                        end
 -                      end
++          _whimsy_accordion_item(listid: MENTORS_LIST, itemid: apacheid, itemtitle: "#{mentor[MentorFormat::PUBLICNAME]}  (#{apacheid})  Timezone: #{timezone} (#{offset})  ", n: n, itemclass: 'panel-primary') do
 +            _table.table.table_hover do
 +              _tbody do
 +                mentor.delete(MentorFormat::PUBLICNAME) # So not re-displayed again
 +                mentor.each do |k, v|
 +                  _tr do
 +                    _td!.text_right do
 +                      _span.text_primary uimap.has_key?(k) ? "#{uimap[k][0]}" : "#{k}"
                      end
 -                    _tr do
 -                      _td!.text_right do
 -                        _ 'ASF Projects/Podlings Involved In'
 -                      end
 -                      _td!.text_left do
 -                        # TODO: instead of link to roster, this could read and display here
 -                        _a "#{MentorFormat::ROSTER}#{apacheid}", href: "#{MentorFormat::ROSTER}#{apacheid}"
 -                      end
 +                    _td!.text_left do
 +                      v = v.join(', ') if v.kind_of?(Array)
 +                      _markdown v
                      end
                    end
                  end