whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: convert to a poll
Date Wed, 05 Apr 2017 15:06:58 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys 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  5deebfa   convert to a poll
5deebfa is described below

commit 5deebfaf6e42683f5f23a95a913cbf6ef6917e8f
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Wed Apr 5 11:06:49 2017 -0400

    convert to a poll
---
 www/members/inactive.cgi | 112 +++++++++++++++++++++++++++--------------------
 1 file changed, 64 insertions(+), 48 deletions(-)

diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index 22d0d6f..c4f600e 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -27,11 +27,20 @@ _html do
     .transcript {margin: 0 16px}
     .transcript pre {border: none; line-height: 0}
     pre._hilite {background-color: yellow}
+    form p {margin-top: 1em}
+    textarea {width: 100%; height: 8em}
+    textarea:disabled {background-color: #EEEEEE}
   }
 
-  if not tracker[$USER]
-    _p.alert.alert_success "You are not on the list"
-  else
+  # defaults for active users
+  tracker[$USER] ||= {
+    'missed' => 0,
+    'status' => 'not on the inactive list'
+  }
+
+  active = (tracker[$USER]['missed'] == 0)
+
+  if not active
     _p.alert.alert_warning "You have missed the last " + 
       tracker[$USER]['missed'].to_s + " meetings."
 
@@ -50,10 +59,11 @@ _html do
         _div_.transcript do
           work = `svn info #{latest}`[/URL: (.*)/, 1]
           _.system ['svn', 'checkout', auth, '--depth', 'empty', work, dir]
-           json = File.join(dir, 'non-participants.json')
+          json = File.join(dir, 'non-participants.json')
           _.system ['svn', 'update', auth, json]
           tracker = JSON.parse(IO.read(json))
           tracker[$USER]['status'] = @status
+          tracker[$USER]['status'] = @suggestions
           IO.write(json, JSON.pretty_generate(tracker))
           _.system ['svn', 'diff', json], hilite: [/"status":/],
             class: {hilight: '_stdout _hilite'}
@@ -61,60 +71,66 @@ _html do
         end
       end
     end
+  end
+
+  _h1_ 'Poll of Inactive Members'
 
-    _h1_ 'Status'
+  _div.status do
+    _p %{
+      We are reaching out to those members that have not participated in
+      ASF Members Meetings or Elections in over three years, and asking each
+      of them whether they wish to remain active or go emeritus.  You can
+      indicate your choice by pushing one of the buttons below.
+    }
 
-    _div.status do
+    _p_ do
+      _span 'Your current status is: '
+      _code tracker[$USER]['status']
+    end
+
+    _form method: 'post' do
       _p %{
-        We are reaching out to those members that have not participated in
-        ASF Members Meetings or Elections in over five years, and asking each
-        of them whether they wish to remain active or go emeritus.  You can
-        indicate your choice by pushing one of the buttons below.
+        Please provide input on what more we can do to make it easier
+        for you to participate:
       }
 
-      _p_ do
-        _span 'Your current status is: '
-        _code tracker[$USER]['status']
-      end
+      _textarea name: 'suggestions', disabled: active
 
       _p 'Update your status:'
-
-      _form method: 'post' do
-        _button.btn.btn_success 'I wish to remain active',
-          name: 'status', value: 'remain active',
-          disabled: tracker[$USER]['status'] == 'remain active'
-        _button.btn.btn_warning 'I consent to being placed in emeritus status',
-          name: 'status', value: 'go emeritus',
-          disabled: tracker[$USER]['status'] == 'go emeritus'
-      end
-
-      _p_ %{
-        Should you chose to remain active, please consider participating, at
-        least by proxy, in the upcoming membership meeting.  See the links
-        below for more information.
-      }
+      _button.btn.btn_success 'I wish to remain active',
+        name: 'status', value: 'remain active',
+        disabled: active or tracker[$USER]['status'] == 'remain active'
+      _button.btn.btn_warning 'I would like to go emeritus',
+        name: 'status', value: 'go emeritus',
+        disabled: active or tracker[$USER]['status'] == 'go emeritus'
     end
 
-    _h3_ 'Links'
+    _p_ %{
+      Should you chose to remain active, please consider participating, at
+      least by proxy, in the upcoming membership meeting.  See the links
+      below for more information.
+    }
+  end
 
-    _ul do
-      _li do
-        _a 'Meeting Notice', href:
-          'https://svn.apache.org/repos/private/foundation/Meetings/' +
-          File.basename(latest) + '/NOTICE.txt'
-      end
-      _li do
-        _a 'Meeting Agenda', href:
-          'https://svn.apache.org/repos/private/foundation/Meetings/' +
-          File.basename(latest) + '/agenda.txt'
-      end
-      _li do
-        _a 'Assign a proxy', href: 'https://whimsy.apache.org/members/proxy'
-      end
-      _li do
-        _a 'Members.txt', href:
-          'https://svn.apache.org/repos/private/foundation/members.txt'
-      end
+  _h3_ 'Links'
+
+  _ul do
+    _li do
+      _a 'Meeting Notice', href:
+        'https://svn.apache.org/repos/private/foundation/Meetings/' +
+        File.basename(latest) + '/NOTICE.txt'
+    end
+    _li do
+      _a 'Meeting Agenda', href:
+        'https://svn.apache.org/repos/private/foundation/Meetings/' +
+        File.basename(latest) + '/agenda.txt'
+    end
+    _li do
+      _a 'Assign a proxy', href: 'https://whimsy.apache.org/members/proxy'
+    end
+    _li do
+      _a 'Members.txt', href:
+        'https://svn.apache.org/repos/private/foundation/members.txt'
     end
   end
 

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

Mime
View raw message