You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cu...@apache.org on 2017/07/04 00:51:21 UTC

[whimsy] 01/01: Merge branch 'master' into roster-style

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

curcuru pushed a commit to branch roster-style
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 79ffe68f2430d16d88582ade2b4bd83c80c84229
Merge: b41c8d7 b893809
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Mon Jul 3 20:51:19 2017 -0400

    Merge branch 'master' into roster-style

 lib/whimsy/asf/themes.rb                        |  6 +-
 tools/moderationhelper.rb                       | 33 +++++++----
 www/apmail/mods.cgi                             |  2 +-
 www/board/agenda/views/layout/header.js.rb      |  2 +-
 www/board/agenda/views/pages/action-items.js.rb |  2 +-
 www/board/agenda/views/pages/adjournment.js.rb  |  2 +-
 www/board/agenda/views/pages/report.js.rb       |  2 +-
 www/board/agenda/views/pages/roll-call.js.rb    |  2 +-
 www/board/posted-reports.cgi                    |  2 +-
 www/committers/subscribe.cgi                    |  2 +-
 www/committers/testauth.cgi                     |  9 +--
 www/committers/tm-report.cgi                    |  2 +-
 www/events/past.cgi                             |  2 +-
 www/incubator/maillist.cgi                      |  4 +-
 www/incubator/podling-crosscheck.cgi            |  2 +-
 www/incubator/signoff.cgi                       |  4 +-
 www/members/attendance-xcheck.cgi               |  6 +-
 www/members/inactive.cgi                        |  2 +-
 www/members/memberless-pmcs.cgi                 |  4 +-
 www/members/namediff.cgi                        |  2 +-
 www/members/nominations.cgi                     |  4 +-
 www/members/non-participants.cgi                |  8 +--
 www/members/subscriptions.cgi                   |  4 +-
 www/members/watch.cgi                           |  4 +-
 www/officers/acreq.cgi                          | 77 +++++++++----------------
 www/roster/banner.rb                            |  2 +-
 www/roster/views/not_found.html.rb              |  2 +-
 www/roster/views/pmc/main.js.rb                 |  1 -
 www/secretary/icla-lint.cgi                     |  2 +-
 www/secretary/public-names.cgi                  |  6 +-
 www/secretary/workbench/views/parts.html.rb     |  8 +--
 www/site.cgi                                    |  2 +-
 www/test/dataflow.cgi                           |  2 +-
 www/test/icla/views/app.html.rb                 |  6 +-
 www/test/test.cgi                               |  2 +-
 www/treasurer/bill-upload.cgi                   |  2 +-
 www/treasurer/expenses.cgi                      |  2 +-
 www/treasurer/paypal.cgi                        |  2 +-
 38 files changed, 108 insertions(+), 120 deletions(-)

diff --cc www/roster/views/pmc/main.js.rb
index 1480b21,88b6da1..2f2bf48
--- a/www/roster/views/pmc/main.js.rb
+++ b/www/roster/views/pmc/main.js.rb
@@@ -108,53 -103,55 +108,52 @@@ class PMC < Reac
        end
      end
  
 -    # reporting schedule
 -    _h2.reporting! 'Reporting Schedule'
 -    _ul do
 -      _li @committee.report
 -
 -      if @committee.schedule and @committee.schedule != @committee.report
 -        _li @committee.schedule 
 -      end
 -
 -      _li do
 -        _a 'Prior reports', href: '/board/minutes/' +
 -          @committee.display_name.gsub(/\s+/, '_')
 -      end
--
 -      if @committee.ldap[@@auth.id] or @@auth.member
 -        _li do
 -          _a 'Apache Committee Report Helper',
 -            href: "https://reporter.apache.org/?#{@committee.id}"
 +    # reporting schedule and links
 +    _div.row do
 +      _div.col_md_6 do
 +        _h3.reporting! 'Reporting Schedule'
 +        _ul do
 +          _li @committee.report
 +          if @committee.schedule and @committee.schedule != @committee.report
 +            _li @committee.schedule 
 +          end
 +          _li do
 +            _a 'Prior reports', href: 'https://whimsy.apache.org/board/minutes/' +
 +              @committee.display_name.gsub(/\s+/, '_')
 +          end
 +          if @committee.ldap[@@auth.id] or @@auth.member
 +            _li do
 +              _a 'Apache Committee Report Helper',
 +                href: "https://reporter.apache.org/?#{@committee.id}"
 +            end
 +          end
          end
        end
 -    end
 -
 -    _h2.links! 'Links'
 -    _ul do
 -      _li {_a 'Site check', href: "../site/project/#{@committee.id}"}
 -
 -      info = @committee.project_info
 -
 -      if info
 -        if info.doap
 -          _li {_a 'DOAP', href: info.doap}
 -        end
 -
 -        if info['download-page']
 -          _li {_a 'Download Page', href: info['download-page']}
 -        end
 -
 -        if info['bug-database']
 -          _li {_a 'Bug Database', href: info['bug-database']}
 -        end
 -
 -        if info.repository and not info.repository.empty?
 -          if info.repository.length == 1
 -            _li {_a 'Repository', href: info.repository.first}
 -          else
 -            _li do
 -              _span 'Repositories:'
 -              _ul info.repository do |repository|
 -                _li {_a repository, href: repository}
 +      _div.col_md_6 do
 +        _h3.links! 'Links'
 +        _ul do
 +          _li {_a 'Site check', href: "../site/project/#{@committee.id}"}
 +          info = @committee.project_info
 +          if info
 +            if info.doap
 +              _li {_a 'DOAP', href: info.doap}
 +            end
 +            if info['download-page']
 +              _li {_a 'Download Page', href: info['download-page']}
 +            end
 +            if info['bug-database']
 +              _li {_a 'Bug Database', href: info['bug-database']}
 +            end
 +            if info.repository and not info.repository.empty?
 +              if info.repository.length == 1
 +                _li {_a 'Repository', href: info.repository.first}
 +              else
 +                _li do
 +                  _span 'Repositories:'
 +                  _ul info.repository do |repository|
 +                    _li {_a repository, href: repository}
 +                  end
 +                end
                end
              end
            end

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