Changeset 1669

Timestamp:

12/12/07 17:47:26

Author:

johnsa

Message:

web submit and admin client:
display submission comments in the admin client when working with a submitted event.

Files:

• trunk/deployment/webadmin/webapp/resources/default/default/default.css (modified) (1 diff)
• trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (1 diff)
• trunk/deployment/webadmin/webapp/resources/resources/bedework.js (modified) (1 diff)
• trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (modified) (2 diffs)
• trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js (modified) (1 diff)

trunk/deployment/webadmin/webapp/resources/default/default/default.css

@@ -309 +309 @@
-  background-color: #ff3;
-}
+#bwSubmittedEventCommentBlock {
+  font-size: 0.9em;
+  padding: 1em;
+  border: 1px solid #ccc;
+  background-color: #ffe;
+  color: black;
+}
+#bwSubmittedEventCommentBlock h4 {
+  display: inline;
+  font-size: 1.1em;
+}
+#bwSubmittedEventCommentBlock table {
+  margin: 1em 0 0 0;
+}
+#bwSubmittedEventCommentBlock td {
+  padding-left: 2em;
+}
+#bwSubmittedEventCommentBlock a.toggle {
+  padding-left: 1em;
+  font-size: 0.9em;
+}
-#commonListTable {
-  margin-bottom: 2em;

trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

@@ -940 +940 @@
-
-    <h2>Event Information</h2>
+
+    <!-- if a submitted event has comments, display them -->
+    <xsl:if test="normalize-space(form/xproperties/xproperty[@name='X-BEDEWORK-SUBMIT-COMMENT']/value) != ''">
+      <script type="text/javascript">
+        bwSubmitComment = new bwSubmitComment('<xsl:value-of select="form/xproperties/xproperty[@name='X-BEDEWORK-SUBMIT-COMMENT']/value"/>','bwSubmittedEventComment');
+      </script>
+
+      <div id="bwSubmittedEventCommentBlock">
+        <h4>Comments from Submitter</h4>
+        <a href="javascript:toggleVisibility('bwSubmittedEventComment');" class="toggle">show/hide</a>
+        <a href="javascript:bwSubmitComment.launch();" class="toggle">pop-up</a>
+        <div id="bwSubmittedEventComment">
+        </div>
+      </div>
+      <script type="text/javascript">
+        bwSubmitComment.display();
+      </script>
+    </xsl:if>
-
-    <xsl:variable name="modEventAction" select="form/@action"/>

trunk/deployment/webadmin/webapp/resources/resources/bedework.js

@@ -6 +6 @@
-  identity = document.getElementById(id);
-  identity.className=newClass;
+}
+function toggleVisibility(id) {
+  if (document.getElementById(id).className == 'invisible') {
+    changeClass(id,'visible');
+  } else {
+    changeClass(id,'invisible');
+  }
-}
-// show hide items using a checkbox

trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js

@@ -72 +72 @@
-  }
-
-
+ 
-    var res = this.date + "\t" + this.time + "\t";
-
@@ -233 +233 @@
-
-    return res;
+  }
+}
+// ========================================================================
+// Submitted event comments
+// ========================================================================
+
+/* An comment accompanying a submitted event
+/* comment: the x-property string X-BEDEWORK-SUBMIT-COMMENT, tab delimited
+ * id: id of the div to be written to for display
+ */
+function bwSubmitComment(comment,displayId) {
+  var commentVals = comment.split('\t');
+  this.locationAddress = commentVals[0];
+  this.locationSubaddress = commentVals[1];
+  this.locationUrl = commentVals[2];
+  this.contactName = commentVals[3];
+  this.contactPhone = commentVals[4];
+  this.contactUrl = commentVals[5];
+  this.contactEmail = commentVals[6];
+  this.category = commentVals[7];
+  this.notes = commentVals[8];
+
+  this.render = function() {
+    var output = "";
+    output += '<table>';
+    output += '<tr><th colspan="2">Suggested Location:</th><th colspan="2">Suggested Contact:</th></tr>';
+    output += '<tr><td>Address:</td><td>' + this.locationAddress + '</td><td>Name:</td><td>' + this.contactName + '</td></tr>';
+    output += '<tr><td>Subaddress:</td><td>' + this.locationSubddress + '</td><td>Phone:</td><td>' + this.contactPhone + '</td></tr>';
+    output += '<tr><td>URL:</td><td>' + this.locationUrl + '</td><td>URL:</td><td>' + this.contactUrl + '</td></tr>';
+    output += '<tr><td colspan="2"></td><td>Email:</td><td>' + this.contactEmail + '</td></tr>';
+    output += '<tr><th colspan="4">Notes:</th></tr>';
+    output += '<tr><td colspan="4">' + this.notes + '</td></tr>';
+    output += '</table>';
+
+    return output;
+  }
+
+  this.display = function() {
+    var showComment = document.getElementById(displayId);
+    showComment.innerHTML = this.render();
+  }
+
+  // launch comment in a pop-up window
+  this.launch = function() {
+    var commentWindow = window.open("", "commentWindow", "width=800,height=400,scrollbars=yes,resizable=yes,alwaysRaised=yes,menubar=no,toolbar=no");
+    commentWindow.document.open();
+    commentWindow.document.writeln("<html><head><title>Submitted Event Comments</title>");
+    commentWindow.document.writeln('<style type="text/css">body{background-color: #ffe; color: black; padding: 1em; font-size: 0.9em; font-family: Arial,sans-serif;}th{text-align: left;}td{padding-left: 2em;}</style></head>');
+    commentWindow.document.writeln("<body><h2>Comments from Submitter</h2>");
+    commentWindow.document.writeln(this.render());
+    commentWindow.document.writeln("</body></html>");
+    commentWindow.document.close();
-  }
-}

trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js

@@ -262 +262 @@
-function setComment(formObj) {
-  // set the submission comments (location, contact, and category suggestions)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-  formObj["xbwsubmitcomment"].value = comment;