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 e6ded97: cross-link nominations and watch pages
Date Sat, 05 Mar 2016 21:34:17 GMT
Commit e6ded97723da3a70dc324d72bc0743a02fc91c8c:
    cross-link nominations and watch pages


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

------------------------------------------------------------
www/members/nominations.cgi                                  | ++ -
www/members/watch.cgi                                        | ++++++++++++ --
------------------------------------------------------------
17 changes: 14 additions, 3 deletions.
------------------------------------------------------------


diff --git a/www/members/nominations.cgi b/www/members/nominations.cgi
index 3e09260..b5301a3 100755
--- a/www/members/nominations.cgi
+++ b/www/members/nominations.cgi
@@ -67,7 +67,8 @@ _html do
   _div.flexbox do
     _div.flexitem do
       _h1_! do
-        _ "Nominations in "
+        _a 'Nominations', href: 'watch/nominees'
+        _ ' in '
         _a 'svn', href: File.join(svnurl, 'nominated-members.txt')
       end
 
diff --git a/www/members/watch.cgi b/www/members/watch.cgi
index 062f799..fe714af 100755
--- a/www/members/watch.cgi
+++ b/www/members/watch.cgi
@@ -234,26 +234,36 @@ _html do
 
     _h2_ 'Related Links'
     _ul do
-      unless request =~ /appstatus/
+      if Time.new.strftime('%Y%m%d') < File.basename(meeting)
         _li do
-          _a 'Application Status', href: 'members/watch/appstatus'
+          _a 'Posted nominations vs svn', href: 'members/watch/nominees'
+        end
+      else
+        unless request =~ /appstatus/
+          _li do
+            _a 'Application Status', href: 'members/watch/appstatus'
+          end
         end
       end
+
       unless list == watch_list
         _li do
           _a 'Potential Member Watch List', href: 'members/watch'
         end
       end
+
       unless request =~ /nominees/
         _li do
           _a 'Nominees', href: 'members/watch/nominees'
         end
       end
+
       unless request =~ /multiple/
         _li do
           _a 'Active in Multiple (>=3) PMCs', href: 'members/watch/multiple'
         end
       end
+
       unless request =~ /chairs/
         _li do
           _a 'Non-member PMC chairs', href: 'members/watch/chairs'

Mime
View raw message