Changeset 2088

Timestamp:

03/03/09 16:42:59

Author:

johnsa

Message:

continue working on submissions client

Files:

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

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

@@ -314 +314 @@
-  display: inline;
-  font-size: 1.1em;
+  padding: 1em 0;
-}
-#bwSubmittedEventCommentBlock table {
@@ -328 +329 @@
-}
-#bwSubmittedEventCommentBlock p {
-  padding-top: 1em;
-  clear: both;
-}

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

@@ -277 +277 @@
-    }
-    if (this.category != "") {
-
-
-
-
+
+
+
-    }
-    output += '<p>';

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

@@ -661 +661 @@
-  border: 1px solid #666 !important;
-}
+#bedework .aliasTree {
+  margin: 1em 0;
+  padding: 0;
+}
+#bedework .aliasTree li {
+  list-style: none !important;
+  margin: 0;
+  padding: 0;
+}
+#bedework .aliasTree li ul {
+  margin: 0 0 0.5em 0.75em;
+  padding-left: 10px;
+}
+#bedework img.folderForAliasTree {
+  padding: 0.5em 0.2em 0 0.5em;
+}
-#bedework #submitTable {
-  width: 98%; /* less than 100% helps avoid IE weirdness */

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

@@ -471 +471 @@
-      </div>
-      <div id="bwHelp-Categories" class="invisible">
+        <!-- this tab is now "topical areas - we will leave the ids named "categories" for now. -->
-        <div class="navButtons">
-          <a href="javascript:show('bwEventTab-Contact','bwHelp-Contact','bwBottomNav-Contact'); hide('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories');">
@@ -488 +489 @@
-          </a>
-        </div>
-Categorie
+Topical Area
-      </div>
-      <div id="bwHelp-Review" class="invisible">
@@ -535 +536 @@
-            <td class="fieldval">
-              <xsl:choose>
-&gt;
+=
-                  <!-- there is only 1 writable calendar, just send a hidden field -->
-                  <xsl:variable name="newCalPath"><xsl:value-of select="/bedework/myCalendars//calendar[calType='1']/path"/></xsl:variable>
@@ -1051 +1052 @@
-      </div>
-
-
-
+(now Topical areas) 
+====================
-      <div id="bwEventTab-Categories" class="invisible">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <xsl:choose>
-          <xsl:when test="not(form/categories/all/category)">
@@ -1094 +1115 @@
-            </input>
-          </p>
-
+--
-      </div>
-
@@ -1211 +1232 @@
-      </div>
-    </div>
+  </xsl:template>
+
+  <xsl:template match="calendar" mode="showEventFormAliases">
+    <xsl:param name="root">false</xsl:param>
+    <li>
+      <xsl:if test="$root != 'true'">
+        <!-- hide the root calendar. -->
+        <xsl:choose>
+          <xsl:when test="calType = '0'">
+            <!-- no direct selecting of folders or folder aliases: we only want users to select the
+                 underlying calendar aliases -->
+            <!--img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/-->
+            <input type="checkbox" name="forDiplayOnly" disabled="disabled"/>
+            <xsl:value-of select="name"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <input type="checkbox" name="alias">
+              <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute>
+              <xsl:if test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if>
+            </input>
+            <xsl:value-of select="name"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
+
+      <xsl:if test="calendar">
+        <ul>
+          <xsl:apply-templates select="calendar" mode="showEventFormAliases"/>
+        </ul>
+      </xsl:if>
+    </li>
-  </xsl:template>
-

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

@@ -271 +271 @@
-  // Depends on bedeworkXProperties.js
-  // Set application local x-properties here.
+
+  // Submission comments as x-properties
+  // Only return those comments that contain non-empty values;
+  // throw out the subfields if main field has no value.
+
+  if (formObj["commentLocationAddress"].value != "") {
+    bwXProps.update(bwXPropertyLocation,
+                  [[bwXParamSubAddress,formObj["commentLocationSubaddress"].value],
+                   [bwXParamURL,formObj["commentLocationURL"].value]],
+                   formObj["commentLocationAddress"].value,true);
+  }
+  if (formObj["commentContactName"].value != "") {
+    bwXProps.update(bwXPropertyContact,
+                  [[bwXParamPhone,formObj["commentContactPhone"].value],
+                   [bwXParamURL,formObj["commentContactURL"].value],
+                   [bwXParamEmail,formObj["commentContactEmail"].value]],
+                   formObj["commentContactName"].value,true);
+  }
+  if (formObj["commentCategories"].value) {
+    bwXProps.update(bwXPropertyCategories,[],formObj["commentCategories"].value,true);
+  }
+  if (formObj["commentNotes"].value) {
+    bwXProps.update(bwXPropertySubmitComment,[],formObj["commentNotes"].value,true);
+  }
-
-  // X-BEDEWORK-IMAGE and its parameters: