Changeset 1665

Timestamp:

12/10/07 16:42:10

Author:

johnsa

Message:

event submit: added validation, more changes to admin to accomodate

Files:

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

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

@@ -66 +66 @@
-       dynamically in the xslt). -->
-
-
+
+
-
-  <!-- primary navigation, menu tabs -->
@@ -523 +524 @@
-            <xsl:attribute name="class">selected</xsl:attribute>
-          </xsl:if>
-
+Encoded
-        </li>
-        <xsl:if test="/bedework/currentCalSuite/currentAccess/current-user-privilege-set/privilege/write or /bedework/userInfo/superUser='true'">
@@ -2166 +2167 @@
-      <tr>
-        <xsl:choose>
-
+Unencoded
-            <td>
-              <input type="submit" name="updateSubmitEvent" value="Update Event"/>

trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.css

@@ -248 +248 @@
-  font-size: 0.9em;
-}
-#instructions 
+
-  float: right;
-  text-align: right;
-}
-#instructions 
+
-  vertical-align: middle;
+}
+#bedework .navBox {
+  padding: 4px;
+  background-color: #ffe;
+  border: 1px solid #ccc;
-}
-#bedework #bwBottomNav {
@@ -729 +734 @@
-  font-style: italic;
-}
+#bedework .highlight {
+  color: black;
+  background-color: #fee;
+  border: 1px solid #333;
+}
+#bedework .notice {
+  font-weight: bold;
+  font-style: italic;
+}

trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl

@@ -154 +154 @@
-        document.getElementById(id).focus();
-      }
-      function validate(form) {
-        alert ("check");
-        if (form.summary.value == "") {
-          alert("Please enter a summary.");
-          form.summary.focus();
-          return false;
-        }
-      }
-      ]]>
-      </xsl:comment>
@@ -235 +227 @@
-  <!--==== HOME ====-->
-  <xsl:template name="home">
+    <div class="navButtons navBox">
+      <a href="{$initEvent}">start
+        <img alt="previous"
+          src="{$resourcesRoot}/resources/arrowRight.gif"
+          width="13"
+          height="13"
+          border="0"/>
+      </a>
+    </div>
-    <h1>Entering Events</h1>
-    <ol id="introduction">
@@ -266 +267 @@
-  <!--==== ADD EVENT ====-->
-  <xsl:template match="formElements" mode="addEvent">
-return validate(); 
+
-      <xsl:apply-templates select="." mode="eventForm"/>
-    </form>
@@ -273 +274 @@
-  <!--==== EDIT EVENT ====-->
-  <xsl:template match="formElements" mode="editEvent">
-return validate(); 
+
-      <xsl:apply-templates select="." mode="eventForm"/>
-    </form>
@@ -287 +288 @@
-    <xsl:variable name="recurrenceId" select="recurrenceId"/>
-    <input type="hidden" name="endType" value="date"/>
+    <!-- for now, the comment field will hold the user's suggestions;
+         this should be replaced with a different field to avoid
+         overloading the RFC property.  -->
+    <input type="hidden" name="comment" id="bwEventComment"/>
-
-      <!-- event info for edit event -->
@@ -375 +380 @@
-      <div id="bwHelp-Details">
-        <div class="navButtons">
-
+
+
-            next
-            <img alt="previous"
@@ -395 +401 @@
-              border="0"/>
-          previous</a> |
-
+
+
-            next
-            <img alt="previous"
@@ -415 +422 @@
-              border="0"/>
-          previous</a> |
-
+
+
-            next
-            <img alt="previous"
@@ -458 +466 @@
-      <div id="bwEventTab-Details">
-        <table cellspacing="0" class="common">
+          <!-- Calendar -->
+          <!-- ======== -->
+          <!--  the string "user/" should not be hard coded; fix this -->
+          <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/></xsl:variable>
+          <xsl:variable name="writableCalendars">
+            <xsl:value-of select="
+              count(/bedework/myCalendars//calendar[calType = '1' and
+                     currentAccess/current-user-privilege-set/privilege/write-content]) +
+              count(/bedework/mySubscriptions//calendar[calType = '1' and
+                     currentAccess/current-user-privilege-set/privilege/write-content and
+                     (not(contains(path,$userPath)))])"/>
+          </xsl:variable>
-          <tr>
+            <xsl:if test="$writableCalendars = 1">
+              <xsl:attribute name="class">invisible</xsl:attribute>
+              <!-- hide this row altogether if there is only one calendar; if you want the calendar
+                   path displayed, comment out this xsl:if. -->
+            </xsl:if>
-            <td class="fieldname">
-              Calendar:
-            </td>
-            <td class="fieldval">
-              <!--  the string "user/" should not be hard coded; fix this -->
-              <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/></xsl:variable>
-              <xsl:variable name="writableCalendars">
-                <xsl:value-of select="
-                  count(/bedework/myCalendars//calendar[calType = '1' and
-                         currentAccess/current-user-privilege-set/privilege/write-content]) +
-                  count(/bedework/mySubscriptions//calendar[calType = '1' and
-                         currentAccess/current-user-privilege-set/privilege/write-content and
-                         (not(contains(path,$userPath)))])"/>
-              </xsl:variable>
-              <xsl:choose>
-                <xsl:when test="$writableCalendars = 1">
@@ -520 +535 @@
-          </tr>
-          <!--  Summary (title) of event  -->
+          <!--  ========================= -->
-          <tr>
-            <td class="fieldname">
@@ -525 +541 @@
-            </td>
-            <td class="fieldval">
+              <div id="bwEventTitleNotice" class="invisible">You must include a title.</div> <!-- a holder for validation notes -->
-              <xsl:variable name="title" select="form/title/input/@value"/>
-              <input type="text" name="summary" size="80" value="{$title}" id="bwEventTitle"/>
@@ -837 +854 @@
-            <td class="fieldname">Description:</td>
-            <td class="fieldval">
+              <div id="bwEventDescNotice" class="invisible">You must include a description.</div> <!-- a holder for validation notes -->
-              <xsl:choose>
-                <xsl:when test="normalize-space(form/desc/textarea) = ''">
-
+ id="bwEventDesc"
-                    <xsl:text> </xsl:text>
-                  </textarea>
@@ -846 +864 @@
-                </xsl:when>
-                <xsl:otherwise>
-
+ id="bwEventDescription"
-                    <xsl:value-of select="form/desc/textarea"/>
-                  </textarea>
@@ -888 +906 @@
-      <!-- ============== -->
-      <div id="bwEventTab-Location" class="invisible">
+        <div id="bwLocationUidNotice" class="invisible">You must either select a location or suggest one below.</div>
-        <div class="mainForm">
-          <span id="eventFormLocationList">
-
+ id="bwLocationUid"
-              <option value="">select an existing location...</option>
-              <xsl:copy-of select="form/location/locationmenu/select/*"/>
@@ -902 +921 @@
-          <p>
-            <label for="commentLocationAddress">Address: </label>
-
+ id="bwCommentLocationAddress"
-          </p>
-          <p>
@@ -918 +937 @@
-      <!-- ============== -->
-      <div id="bwEventTab-Contact" class="invisible">
+        <div id="bwContactUidNotice" class="invisible">You must either select a contact or suggest one below.</div>
-        <div class="mainForm">
-allContactId" id="eventFormPrefContactList
+contactUid" id="bwContactUid
-            <option value="">
-              select an existing contact...
@@ -932 +952 @@
-          <p>
-            <label for="commentContactName">Organization Name: </label>
-
+id="bwCommentContactName" 
-            <span class="note"> Please limit contacts to organizations, not individuals.</span>
-          </p>

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

@@ -218 +218 @@
-  }
-}
+// trim function
+function trim(str) {
+  var trimmedStr = str.replace(/^\s+|\s+$/g, '');
+  return trimmedStr.replace(/^(\&nbsp\;)+|(\&nbsp\;)+$/g, '');
+}
+

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

@@ -237 +237 @@
-
-// ========================================================================
+// Form Manipulation Functions
-// ========================================================================
-
-function setEventFields(formObj) {
-  setDates(formObj);
+  setComment(formObj);
-  setRecurrence(formObj);
-  setAccessHow(formObj,1);
@@ -257 +259 @@
-  formObj["eventEndDate.month"].value = endDate.getMonth() + 1;
-  formObj["eventEndDate.day"].value = endDate.getDate();
+}
+function setComment(formObj) {
+  // set the submission comments (location, contact, and category suggestions)
+  // in xml format for easier post processing.
+  // add and remove values as the application grows.
+  var comment = "<location>"
+  if (formObj["commentLocationAddress"].value != "") {
+    comment += "<address>" + formObj["commentLocationAddress"].value + "</address>";
+  }
+  if (formObj["commentLocationSubaddress"].value != "") {
+    comment += "<subaddress>" + formObj["commentLocationSubaddress"].value + "</subaddress>";
+  }
+  if (formObj["commentLocationURL"].value != "") {
+    comment += "<url>" + formObj["commentLocationURL"].value + "</url>";
+  }
+  if (formObj["commentLocationSubaddress"].value != "") {
+    comment += "<subaddress>" + formObj["commentLocationSubaddress"].value + "</subaddress>";
+  }
+  comment += "</location>";
+  comment += "<contact>";
+  if (formObj["commentContactName"].value != "") {
+    comment += "<name>" + formObj["commentContactName"].value + "</name>";
+  }
+  if (formObj["commentContactPhone"].value != "") {
+    comment += "<phone>" + formObj["commentContactPhone"].value + "</phone>";
+  }
+  if (formObj["commentContactURL"].value != "") {
+    comment += "<url>" + formObj["commentContactURL"].value + "</url>";
+  }
+  if (formObj["commentContactEmail"].value != "") {
+    comment += "<email>" + formObj["commentContactEmail"].value + "</email>";
+  }
+  comment += "</contact>";
+  if (formObj["commentCategory"].value != "") {
+    comment += "<category>" + formObj["commentCategory"].value + "</category>";
+  }
+  formObj["comment"].value = comment;
-}
-function swapAllDayEvent(obj) {
@@ -584 +623 @@
-}
-
+// =======================================================
+// Event submit validation by page
+// =======================================================
+function validateStep1() {
+  var validity = true;
+  if (trim(document.getElementById("bwEventTitle").value) == '') {
+    changeClass("bwEventTitle","highlight");
+    changeClass("bwEventTitleNotice","notice");
+    validity = false;
+  } else {
+    changeClass("bwEventTitle","none");
+    changeClass("bwEventTitleNotice","invisible");
+  }
+  if (trim(document.getElementById("bwEventDesc").value) == '') {
+    changeClass("bwEventDesc","highlight");
+    changeClass("bwEventDescNotice","notice");
+    validity = false;
+  } else {
+    changeClass("bwEventDesc","none");
+    changeClass("bwEventDescNotice","invisible");
+  }
+  document.getElementById("bwEventComment").value = "<comment>test</comment>";
+  return validity;
+}
+
+function validateStep2() {
+  var validity = true;
+  if (document.getElementById("bwLocationUid").value == '' &&
+      document.getElementById("bwCommentLocationAddress").value == '') {
+    changeClass("bwLocationUid","highlight bigSelect");
+    changeClass("bwCommentLocationAddress","highlight");
+    changeClass("bwLocationUidNotice","notice");
+    validity = false;
+  } else {
+    changeClass("bwLocationUid","bigSelect");
+    changeClass("bwCommentLocationAddress","none");
+    changeClass("bwLocationUidNotice","invisible");
+  }
+  return validity;
+}
+function validateStep3() {
+  var validity = true;
+  if (document.getElementById("bwContactUid").value == '' &&
+      document.getElementById("bwCommentContactName").value == '') {
+    changeClass("bwContactUid","highlight bigSelect");
+    changeClass("bwCommentContactName","highlight");
+    changeClass("bwContactUidNotice","notice");
+    validity = false;
+  } else {
+    changeClass("bwContactUid","bigSelect");
+    changeClass("bwCommentContactName","none");
+    changeClass("bwContactUidNotice","invisible");
+  }
+  return validity;
+}
+
+// =======================================================
+// Dojo initialization
+// =======================================================
+
-function init() {
-  var untilHolder = dojo.byId("untilHolder");