added nicer popup windows for topic, nosy, etc (has add/remove buttons)

Richard Jones · Richard Jones · commit 8aaf65db2852 · 2003-03-27T01:36:19.000Z
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -56,6 +56,8 @@ Feature:
 - Class.find() may now find unset Links (sf bug 700620)
 - more flexibility in classhelp link labelling (sf feature 608204)
 - added command-line functionality for roundup-adming (sf feature 687664)
+- added nicer popup windows for topic, nosy, etc (has add/remove buttons)
+  thanks Gus Gollings
 
 
 Fixed:
diff --git a/doc/index.txt b/doc/index.txt
@@ -57,6 +57,7 @@ Titus Brown,
 Roch'e Compaan,
 Hernan Martinez Foffani,
 Ajit George,
+Gus Gollings,
 Dan Grassi,
 Engelbert Gruber,
 Juergen Hermann,
diff --git a/roundup/templates/classic/html/_generic.help b/roundup/templates/classic/html/_generic.help
@@ -2,15 +2,90 @@
 <head>
 <link rel="stylesheet" type="text/css" href="_file/style.css">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8;">
+<script language="JavaScript" 
+        tal:condition="python:request.form.has_key('property')"
+        tal:content="structure string:
+
+// this is the name of the field in the original form that we're working on
+field = '${request/form/property/value}';
+
+function listClose() {
+  window.close();
+}
+        
+function listClear() {
+  window.opener.document.itemSynopsis[field].value = '';
+}
+        
+function pick(opt) {
+  if (window.opener && !window.opener.closed) {
+    window.opener.document.itemSynopsis[field].value = opt;
+  }
+}
+        
+// add a value to the form field
+function add(opt) {
+  val = window.opener.document.itemSynopsis[field].value;
+  if (/^\s*$$/.test(val)) {
+    newval = opt;   // existing is all whitespace, so just replace
+  } else {
+    newval = val + ', ' + opt;
+  }
+  pick(newval);
+}
+        
+// remove a value from the form field
+function remove(opt) {
+  // ((opt(,\s*)?)|(,\s*opt))
+  replaceStr = new String('(('+opt+'(,\\s*)?)|(,\\s*'+opt+'))');
+  re = new RegExp(replaceStr);
+
+  str = window.opener.document.itemSynopsis[field].value;
+
+  // replace occurences with empty string
+  newstr = str.replace(re, '');
+  pick(newstr);
+}
+">
+</script>
 </head>
+
 <body class="body" marginwidth="0" marginheight="0">
+<form>
+<div style="padding:10px;text-align:center;">
+ <script language="javascript">
+  // put up a 'reset' button if the field has values when we pop up this window
+
+  // this is the name of the field in the original form that we're working on
+  orig = window.opener.document.itemSynopsis[field].value;
+  if (/[^\s]/.test(orig)) {
+    reset = '<input type="button" onclick="pick(orig);" ' +
+      'value="Reset to original values" /> | ';
+    document.write(reset);
+  }
+ </script>
+ <input type="button"
+        tal:attributes="value string:Clear all ${request/form/property/value} values"
+        onclick="listClear();" /> | 
+ <input type="button" onclick="listClose();" value="Close this window" />
+</div>
 
 <table class="classhelp"
        tal:define="props python:request.form['properties'].value.split(',')">
-<tr><th tal:repeat="prop props" tal:content="prop"></th></tr>
+<tr>
+ <th tal:condition="python:request.form.has_key('property')">add/remove</th>
+ <th tal:repeat="prop props" tal:content="prop"></th>
+</tr>
 <tr tal:repeat="item context/list">
+ <td tal:condition="python:request.form.has_key('property')">
+ <input type="button" tal:define="opt python: item[props[0]]" 
+         tal:attributes="onclick string:add('${opt}')" value=" + ">
+ <input type="button" tal:define="opt python: item[props[0]]" 
+         tal:attributes="onclick string:remove('${opt}')" value=" - " />
+ </td>
  <td tal:repeat="prop props" tal:content="structure python:item[prop]"></td>
 </tr>
 </table>
-
+</form>
 </body>
+</html>
diff --git a/roundup/templates/classic/html/issue.item b/roundup/templates/classic/html/issue.item
@@ -19,7 +19,7 @@
 You are not allowed to view this page.
 </span>
 
-<form method="POST" onSubmit="return submit_once()"
+<form method="POST" name="itemSynopsis" onSubmit="return submit_once()"
       enctype="multipart/form-data" tal:condition="context/is_edit_ok">
 
 <input type="hidden" name=":template" value="item">
@@ -42,7 +42,7 @@ You are not allowed to view this page.
  <th nowrap>Superseder</th>
  <td>
   <span tal:replace="structure python:context.superseder.field(showid=1, size=20)" />
-  <span tal:replace="structure python:db.issue.classhelp('id,title')" />
+  <span tal:replace="structure python:db.issue.classhelp('id,title', property='superseder')" />
   <span tal:condition="context/superseder" tal:repeat="sup context/superseder">
    <br>View: <a tal:attributes="href string:issue${sup/id}"
                 tal:content="sup/id"></a>
@@ -52,7 +52,7 @@ You are not allowed to view this page.
  <td>
   <span tal:replace="structure context/nosy/field" />
   <span tal:replace="structure
-python:db.user.classhelp('username,realname,address,phone')" /><br>
+python:db.user.classhelp('username,realname,address', property='nosy', width='600')" /><br>
  </td>
 </tr>
 
@@ -62,7 +62,7 @@ python:db.user.classhelp('username,realname,address,phone')" /><br>
  <th nowrap>Topics</th>
  <td>
   <span tal:replace="structure context/topic/field" />
-  <span tal:replace="structure db/keyword/classhelp" />
+  <span tal:replace="structure python:db.keyword.classhelp(property='topic')" />
  </td>
 </tr>
 
diff --git a/roundup/templates/classic/html/keyword.item b/roundup/templates/classic/html/keyword.item
@@ -32,6 +32,7 @@
       enctype="multipart/form-data">
 
  <input type="hidden" name=":required" value="name">
+ <input type="hidden" name=":template" value="item">
 
  <table class="form">
   <tr>
