[Bedework-commit] bedework r1873 - in
releases/bedework-3.4.1.1/deployment:
webadmin/webapp/resources/default/default
webpublic/webapp/resources/demoskins/MainCampus/default/default
webpublic/webapp/resources/demoskins/SoEDepartmental/default/default
websubmit/webapp/resources/demoskins/default/default
websubmit/webapp/resources/demoskins/resources
svnadmin at bedework.org
svnadmin at bedework.org
Fri May 9 10:45:34 EDT 2008
Author: johnsa
Date: 2008-05-09 10:45:33 -0400 (Fri, 09 May 2008)
New Revision: 1873
Modified:
releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl
releases/bedework-3.4.1.1/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
releases/bedework-3.4.1.1/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js
Log:
web submit: avoid returning xprops without values
web admin: fix publish button overloading
textual updates
Modified: releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl 2008-05-09 13:56:06 UTC (rev 1872)
+++ releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl 2008-05-09 14:45:33 UTC (rev 1873)
@@ -2087,16 +2087,14 @@
<span class="fieldInfo">(optional: for more information about the event)</span>
</td>
</tr>
- <!-- Url -->
+ <!-- Image Url -->
<tr>
<td class="optional">
Image URL:
</td>
<td>
<input type="text" name="xBwImageHolder" value="" class="edit" size="30">
- <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute>
- </xsl:if>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute>
</input>
<xsl:text> </xsl:text>
<span class="fieldInfo">(optional: to include an image with the event description)</span>
@@ -2332,8 +2330,12 @@
</td>
</tr>
</xsl:if>
- </table>
- <xsl:call-template name="submitEventButtons"/>
+ </table>
+ <xsl:if test="not(starts-with(form/calendar/path,$submissionsRootUnencoded))">
+ <!-- don't create two instances of the submit buttons on pending events;
+ the publishing buttons require numerous unique ids -->
+ <xsl:call-template name="submitEventButtons"/>
+ </xsl:if>
</form>
</xsl:template>
Modified: releases/bedework-3.4.1.1/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1.1/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl 2008-05-09 13:56:06 UTC (rev 1872)
+++ releases/bedework-3.4.1.1/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl 2008-05-09 14:45:33 UTC (rev 1873)
@@ -1779,7 +1779,7 @@
<xsl:template name="footer">
<div id="footer">
- Demonstration calendar; place footer information here.
+ Based on the <a href="http://www.bedework.org/">Bedework Calendar System</a>
</div>
<table id="skinSelectorTable" border="0" cellpadding="0" cellspacing="0">
<tr>
Modified: releases/bedework-3.4.1.1/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1.1/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl 2008-05-09 13:56:06 UTC (rev 1872)
+++ releases/bedework-3.4.1.1/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl 2008-05-09 14:45:33 UTC (rev 1873)
@@ -1640,10 +1640,10 @@
<xsl:template name="footer">
<div id="footer">
- Demonstration calendar; place footer information here.
+ Footer information here
</div>
<div id="subFoot">
- Based on the <a href="http://www.bedework.org/">Bedework Calendar</a> |
+ Based on the <a href="http://www.bedework.org/">Bedework Calendar System</a> |
<a href="?noxslt=yes">show XML</a> |
<a href="?refreshXslt=yes">refresh XSLT</a>
</div>
Modified: releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl 2008-05-09 13:56:06 UTC (rev 1872)
+++ releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl 2008-05-09 14:45:33 UTC (rev 1873)
@@ -869,25 +869,6 @@
</xsl:choose>
</td>
</tr>
- <!-- Link (url associated with event) -->
- <tr>
- <td class="fieldname"><em>Event Link:</em></td>
- <td class="fieldval">
- <xsl:variable name="link" select="form/link/input/@value"/>
- <input type="text" name="event.link" size="81" value="{$link}"/>
- <span class="note"> optional</span>
- </td>
- </tr>
- <!-- Cost -->
- <tr>
- <td class="fieldname"><em>Cost:</em></td>
- <td class="fieldval">
- <input type="text" name="event.cost" size="81" value="">
- <xsl:attribute name="value"><xsl:value-of select="form/cost/input/@value"/></xsl:attribute>
- </input>
- <span class="note"> optional</span>
- </td>
- </tr>
<!-- Status -->
<tr>
<td class="fieldname">
@@ -908,6 +889,37 @@
cancelled
</td>
</tr>
+ <!-- Cost -->
+ <tr>
+ <td class="fieldname"><em>Cost:</em></td>
+ <td class="fieldval">
+ <input type="text" name="event.cost" size="30" value="">
+ <xsl:attribute name="value"><xsl:value-of select="form/cost/input/@value"/></xsl:attribute>
+ </input>
+ <span class="note"> optional: if any, and place to purchase tickets</span>
+ </td>
+ </tr>
+ <!-- Link (url associated with event) -->
+ <tr>
+ <td class="fieldname"><em>Event URL:</em></td>
+ <td class="fieldval">
+ <input type="text" name="event.link" size="30" value="">
+ <xsl:attribute name="value"><xsl:value-of select="form/link/input/@value"/></xsl:attribute>
+ </input>
+ <span class="note"> optional: for more information about the event</span>
+ </td>
+ </tr>
+ <!-- Image Url -->
+ <tr>
+ <td class="fieldname"><em>Image URL:</em></td>
+ <td class="fieldval">
+ <input type="text" name="xBwImageHolder" size="30" value="">
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ <span class="note"> optional: to include an image with the event description</span>
+ </td>
+ </tr>
</table>
</div>
@@ -1510,7 +1522,7 @@
<!--==== FOOTER ====-->
<xsl:template name="footer">
<div id="footer">
- Demonstration calendar; place footer information here.
+ Based on the <a href="http://www.bedework.org/">Bedework Calendar System</a>
</div>
<div id="subfoot">
<a href="http://www.bedework.org/">Bedework Website</a> |
Modified: releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js
===================================================================
--- releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-05-09 13:56:06 UTC (rev 1872)
+++ releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-05-09 14:45:33 UTC (rev 1873)
@@ -43,7 +43,7 @@
// ========================================================================
/* An rdate
-/* date: String: internal date
+ * date: String: internal date
* time: String
* tzid timezone id or null
*/
@@ -273,18 +273,29 @@
// Depends on bedeworkXProperties.js
// Set application x-properties here.
- // Sumbission comments as x-properties
- bwXProps.update(bwXPropertyLocation,
+ // 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);
- bwXProps.update(bwXPropertyContact,
+ }
+ if (formObj["commentContactName"].value != "") {
+ bwXProps.update(bwXPropertyContact,
[[bwXParamPhone,formObj["commentContactPhone"].value],
[bwXParamURL,formObj["commentContactURL"].value],
[bwXParamEmail,formObj["commentContactEmail"].value]],
formObj["commentContactName"].value,true);
- bwXProps.update(bwXPropertyCategories,[],formObj["commentCategories"].value,true);
- bwXProps.update(bwXPropertySubmitComment,[],formObj["commentNotes"].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:
if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') {
More information about the Bedework-commit
mailing list