Changeset 2171

Timestamp:

05/13/09 17:09:53

Author:

johnsa

Message:

set and remove xprops for aliases explicitly

Files:

• trunk/deployment/resources/javascript/bedework/bedeworkXProperties.js (modified) (3 diffs)
• trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (1 diff)
• trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (modified) (2 diffs)
• trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (modified) (2 diffs)
• trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl (modified) (2 diffs)

trunk/deployment/resources/javascript/bedework/bedeworkXProperties.js

@@ -31 +31 @@
-// ========================================================================
-
+var bwXPropertyAlias = "X-BEDEWORK-ALIAS";
-var bwXPropertyImage = "X-BEDEWORK-IMAGE";
-var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY";
@@ -133 +134 @@
-  }
-
+  this.removeByValue = function(name, value) {
+    index = this.getIndexByValue(name, value);
+    if (index > -1) {
+      xproperties.splice(index,1);
+    }
+  }
+
-  this.getIndex = function(name) {
-    for (var i = 0; i < xproperties.length; i++) {
@@ -138 +146 @@
-      if (curXprop.name == name) {
-        return i;
+      }
+    }
+    return -1;
+  }
+
+  this.getIndexByValue = function(name,value) {
+    for (var i = 0; i < xproperties.length; i++) {
+      var curXprop = xproperties[i];
+      if (curXprop.name == name) {
+        if (curXprop.value == value) {
+          return i;
+        }
-      }
-    }

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

@@ -2595 +2595 @@
-          </xsl:when>
-          <xsl:otherwise>
-
-
+
+
+
-              <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>

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

@@ -376 +376 @@
-  // commit all xproperties back to the form
-  bwXProps.generate(formObj);
+}
+function toggleBedeworkXProperty(xprop,value,checked) {
+  if (!checked) {
+    bwXProps.removeByValue(xprop, value);
+  } else {
+    bwXProps.update(bwXPropertyAlias,[],value,false);
+  }
-}
-function claimPendingEvent(group,user) {
@@ -725 +732 @@
-  sntext.value = "Your event has been approved and is now published.\n\nEVENT DETAILS\n-------------\n\nTitle: " + eventTitle + "\nURL: " + eventUrlPrefix + "&" + publishingCal;
-}
+
-function doRejectEvent(reason,eventTitle) {
-

trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

@@ -838 +838 @@
-            <xsl:for-each select="xproperties/X-BEDEWORK-ALIAS">
-              <xsl:variable name="calUrl" select="values/text"/>
-calUrl
+virtualPath
-                <xsl:call-template name="substring-afterLastInstanceOf">
-                  <xsl:with-param name="string" select="values/text"/>
@@ -1451 +1451 @@
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="url" select="encodedPath"/>
-    <xsl:variable name="virtualPath"><xsl:call-template name="url-encode"><xsl:with-param name="str">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:with-param></xsl:call-template></xsl:variable>
-    <li class="{$itemClass}">
-      <xsl:variable name="calPath" select="path"/>
-calUrl={$url}&amp;
+
-      <xsl:variable name="calPath" select="path"/>
-      <span class="exportCalLink">

trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl

@@ -837 +837 @@
-            <xsl:for-each select="xproperties/X-BEDEWORK-ALIAS">
-              <xsl:variable name="calUrl" select="values/text"/>
-calUrl
+virtualPath
-                <xsl:call-template name="substring-afterLastInstanceOf">
-                  <xsl:with-param name="string" select="values/text"/>
@@ -1450 +1450 @@
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="url" select="encodedPath"/>
-    <xsl:variable name="virtualPath"><xsl:call-template name="url-encode"><xsl:with-param name="str">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:with-param></xsl:call-template></xsl:variable>
-    <li class="{$itemClass}">
-      <xsl:variable name="calPath" select="path"/>
-calUrl={$url}&amp;
+
-      <xsl:variable name="calPath" select="path"/>
-      <span class="exportCalLink">
-calPath={$calPath}&amp;
+
-          <img src="{$resourcesRoot}/images/calIconExport-sm.gif" width="13" height="13" alt="export calendar" border="0"/>
-        </a>