You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cl...@apache.org on 2016/08/23 00:04:38 UTC
[whimsy] branch incomplete-unsigned updated: Put Classification
buttons on two rows
This is an automated email from the ASF dual-hosted git repository.
clr pushed a commit to branch incomplete-unsigned
in repository https://git-dual.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/incomplete-unsigned by this push:
new 507a5ae Put Classification buttons on two rows
507a5ae is described below
commit 507a5aeb1a7bf8d9dcf2bd39d63c8d57837000f3
Author: Craig L Russell <cr...@oracle.com>
AuthorDate: Mon Aug 22 17:04:25 2016 -0700
Put Classification buttons on two rows
---
www/secretary/workbench/file.cgi | 31 ++++++++++++------
www/secretary/workbench/worklist.cgi | 61 +++++++++++++++++++++++++++++++++---
2 files changed, 78 insertions(+), 14 deletions(-)
diff --git a/www/secretary/workbench/file.cgi b/www/secretary/workbench/file.cgi
index d27e8d6..64b31a4 100755
--- a/www/secretary/workbench/file.cgi
+++ b/www/secretary/workbench/file.cgi
@@ -66,7 +66,7 @@ def update_pending fields, dest
# copy email field
fields['email'] ||= fields['gemail'] || fields['cemail'] ||
fields['nemail'] || fields['memail'] ||
- fields['iemail'] || fields['uemail']
+ fields['iemail'] || fields['uemail'] || fields['pemail']
fields.delete('email') unless fields['email']
# Concatenate the fields to the pending list and write to disk
@@ -611,20 +611,31 @@ _html do
update_pending params, dest
when 'incomplete'
- @realname ||= @iname
- dest = "incomplete"
+ Dir.chdir(RECEIVED) do
+ @realname ||= @iname
- _h1 "Incomplete document received from #{@iname}"
- _.move @source, dest
+ _h1 "Incomplete document received from #{@iname}"
+ _.move @source, dest
- update_pending params, dest
+ end
+
+ update_pending params, 'deadletter/incomplete'
when 'unsigned'
- @realname ||= @nname
- dest = "unsigned"
+ Dir.chdir(RECEIVED) do
- _h1 "Unsigned document received from #{@uname}"
- _.move @source, dest
+ @realname ||= @nname
+
+ _h1 "Unsigned document received from #{@uname}"
+ _.move @source, 'deadletter/unsigned'
+ end
+
+ update_pending params, dest
+
+ when 'publickey'
+ @realname ||= @iname
+
+ _h1 "Public key not found for #{@pname}"
update_pending params, dest
diff --git a/www/secretary/workbench/worklist.cgi b/www/secretary/workbench/worklist.cgi
index f911239..82f03ea 100755
--- a/www/secretary/workbench/worklist.cgi
+++ b/www/secretary/workbench/worklist.cgi
@@ -2,7 +2,7 @@
require 'wunderbar'
require 'yaml'
-DOCTYPES = %w{icla grant ccla nda incomplete unsigned other}
+DOCTYPES = %w{icla grant ccla nda other incomplete unsigned publickey}
_html do
_head_ do
@@ -31,7 +31,7 @@ _html do
begin
begin
require './local_paths'
- DOCTYPES.insert(-2, 'mem') if defined?(MEETING)
+ DOCTYPES.insert(-1, 'mem') if defined?(MEETING)
rescue
_h2_ 'Syntax error in local_paths.yml'
raise
@@ -79,6 +79,8 @@ _html do
message = "Incomplete document received from #{pending['iname']}"
elsif pending['doctype'] == 'unsigned'
message = "Unsigned document received from #{pending['uname']}"
+ elsif pending['doctype'] == 'publickey'
+ message = "Public key not found for #{pending['iname']}"
end
end
end
@@ -133,14 +135,29 @@ _html do
_form.doctype! target: 'viewport', action: 'file.cgi', method: 'post' do
_table_ do
_tr do
- DOCTYPES.each do |doctype|
+ DOCTYPES[0..4].each do |doctype|
_td align: 'center' do
_input type: 'radio', name: 'doctype', value: doctype
end
end
end
_tr do
- DOCTYPES.each do |doctype|
+ DOCTYPES[0..4].each do |doctype|
+ _td doctype, align: 'center'
+ end
+ end
+ end
+
+ _table_ do
+ _tr do
+ DOCTYPES[5..-1].each do |doctype|
+ _td align: 'center' do
+ _input type: 'radio', name: 'doctype', value: doctype
+ end
+ end
+ end
+ _tr do
+ DOCTYPES[5..-1].each do |doctype|
_td doctype, align: 'center'
end
end
@@ -252,6 +269,26 @@ _html do
end
end
+ _div_ id: 'publickey-form' do
+ _table do
+ _tr do
+ _td do
+ _label 'Name', for: 'pname'
+ end
+ _td do
+ _input type: :text, name: 'pname', id: 'pname'
+ end
+ end
+
+ _tr do
+ _td.label 'EMail'
+ _td.input do
+ _input name: 'pemail', id: 'pemail', type: 'email'
+ end
+ end
+ end
+ end
+
_div id: 'mem-form' do
if defined?(MEETING)
received = open("#{MEETING}/memapp-received.txt").read
@@ -499,6 +536,7 @@ _html do
end
end
end
+
_table id: 'incomplete2-form' do
_tr do
_td.label 'PMC'
@@ -513,6 +551,7 @@ _html do
end
end
end
+
_table id: 'unsigned2-form' do
_tr do
_td.label 'PMC'
@@ -527,6 +566,20 @@ _html do
end
end
end
+ _table id: 'publickey2-form' do
+ _tr do
+ _td.label 'PMC'
+ _td.input do
+ _input name: 'ppmc', id: 'ppmc', type: 'text'
+ end
+ end
+ _tr do
+ _td.label 'Podling'
+ _td.input do
+ _input name: 'ipodling', id: 'ipodling', type: 'text'
+ end
+ end
+ end
end
end
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].