[Bedework-commit] bedework r3183 -
releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default
releases/bedework-3.7/deployment/webadmin/webapp/resources/resources
releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/default/default
releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript
trunk/deployment/webadmin/webapp/resources/default/default
trunk/deployment/webadmin/webapp/resources/resources
trunk/deployment/websubmit/webapp/resources/demoskins/default/default
trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript
svnadmin at bedework.org
svnadmin at bedework.org
Thu Feb 17 07:48:47 EST 2011
Author: johnsa
Date: 2011-02-17 07:48:44 -0500 (Thu, 17 Feb 2011)
New Revision: 3183
Added:
releases/bedework-3.7/deployment/webadmin/webapp/resources/resources/catExpander.gif
trunk/deployment/webadmin/webapp/resources/resources/catExpander.gif
Modified:
releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css
releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl
releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js
trunk/deployment/webadmin/webapp/resources/default/default/default.css
trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js
Log:
web clients:
- apply encoding to newline chararacters in xproperties
- allow topical area folders to expand/contract
- add some extra error checking to scheduling widget
Modified: releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css
===================================================================
--- releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css 2011-02-16 20:50:47 UTC (rev 3182)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css 2011-02-17 12:48:44 UTC (rev 3183)
@@ -1151,6 +1151,9 @@
color: #f00;
background-color: transparent;
}
+.aliasTree input {
+ margin-left: 6px;
+}
img.folderForAliasTree {
padding: 0.5em 0.2em 0 0.5em;
}
@@ -1302,3 +1305,7 @@
color: #999;
background-color: inherit;
}
+div#footer a:hover {
+ color: #444;
+ background-color: transparent;
+}
Modified: releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl 2011-02-16 20:50:47 UTC (rev 3182)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl 2011-02-17 12:48:44 UTC (rev 3183)
@@ -224,7 +224,7 @@
<title><xsl:copy-of select="$bwStr-Root-PageTitle"/></title>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
<link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/>
- <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/>
+ <link rel="stylesheet" href="/bedework-common/default/default/subColors.css"/>
<!-- set globals that must be passed in from the XSLT -->
<script type="text/javascript">
<xsl:comment>
@@ -366,6 +366,32 @@
bwXProps.init('<xsl:value-of select="name()"/>',[<xsl:for-each select="parameters/node()">['<xsl:value-of select="name()"/>','<xsl:value-of select="node()"/>']<xsl:if test="position() != last()">,</xsl:if></xsl:for-each>],'<xsl:call-template name="escapeApos"><xsl:with-param name="str"><xsl:value-of select="values/text"/></xsl:with-param></xsl:call-template>');
</xsl:for-each>
}
+
+ $(document).ready(function(){
+
+ <xsl:if test="/bedework/formElements/recurrenceId = ''">
+ initRXDates();
+ </xsl:if>
+
+ <xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'">
+ initXProperties();
+ bwSetupDatePickers();
+ </xsl:if>
+
+ focusFirstElement();
+
+ // If you wish to collapse specific topical areas, you can specify them here:
+ // (note that this will be managed from the admin client in time)
+ // $("ul.aliasTree > li:eq(4) > ul").hide();
+ // $("ul.aliasTree > li:eq(11) > ul").hide();
+ // $("ul.aliasTree > li:eq(13) > ul").hide();
+ $("ul.aliasTree > li > img.folderForAliasTree").attr("src", '<xsl:value-of select="$resourcesRoot"/>/resources/catExpander.gif');
+ $("ul.aliasTree > li > img.folderForAliasTree").css("cursor","pointer");
+ $("ul.aliasTree > li > img.folderForAliasTree").click(function(){
+ $(this).next("ul.aliasTree > li > ul").slideToggle("slow");
+ });
+
+ });
</xsl:comment>
</script>
</xsl:if>
@@ -428,14 +454,6 @@
</script>
</head>
<body>
- <xsl:choose>
- <xsl:when test="/bedework/page='modEvent' or /bedework/page='modEventPending'">
- <xsl:attribute name="onload"><xsl:if test="/bedework/formElements/recurrenceId = ''">initRXDates();</xsl:if>initXProperties();focusFirstElement();bwSetupDatePickers();</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="onload">focusFirstElement();</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
<div id="bedework"><!-- main wrapper div to keep styles encapsulated -->
<xsl:choose>
<xsl:when test="/bedework/page='selectCalForEvent'">
@@ -1245,7 +1263,7 @@
'<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:call-template>',
'<xsl:for-each select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-ALIAS']/values/text"><xsl:call-template name="escapeApos"><xsl:with-param name="str"><xsl:call-template name="substring-afterLastInstanceOf"><xsl:with-param name="string" select="."/><xsl:with-param name="char">/</xsl:with-param></xsl:call-template></xsl:with-param></xsl:call-template><br/></xsl:for-each>',
'<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:call-template>',
- '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>');
+ '<xsl:call-template name="escapeJson"><xsl:with-param name="string" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>');
</script>
<div id="bwSubmittedEventCommentBlock">
@@ -2494,7 +2512,7 @@
</td>
<td>
<input type="text" name="xBwImageHolder" value="" size="80" class="edit">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
<xsl:text> </xsl:text>
<span class="fieldInfo"><xsl:copy-of select="$bwStr-AEEF-OptionalEventImage"/></span>
Added: releases/bedework-3.7/deployment/webadmin/webapp/resources/resources/catExpander.gif
===================================================================
(Binary files differ)
Property changes on: releases/bedework-3.7/deployment/webadmin/webapp/resources/resources/catExpander.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl 2011-02-16 20:50:47 UTC (rev 3182)
+++ releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl 2011-02-17 12:48:44 UTC (rev 3183)
@@ -998,7 +998,7 @@
<td class="fieldname"><em><xsl:copy-of select="$bwStr-FoEl-ImageURL"/></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>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
<xsl:text> </xsl:text>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-ImageURLOptional"/></span>
@@ -1026,20 +1026,20 @@
<p>
<label for="commentLocationAddress"><xsl:copy-of select="$bwStr-FoEl-Address"/><xsl:text> </xsl:text></label>
<input type="text" name="commentLocationAddress" id="bwCommentLocationAddress">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
</p>
<p>
<label for="commentLocationSubaddress"><em><xsl:copy-of select="$bwStr-FoEl-SubAddress"/></em> </label>
<input type="text" name="commentLocationSubaddress" id="commentLocationSubaddress">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-SUBADDRESS']"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-SUBADDRESS']" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
</p>
<p>
<label for="commentLocationURL"><em><xsl:copy-of select="$bwStr-FoEl-URL"/></em> </label>
<input type="text" name="commentLocationURL" id="commentLocationURL">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
</p>
@@ -1065,28 +1065,28 @@
<p>
<label for="commentContactName"><xsl:copy-of select="$bwStr-FoEl-OrganizationName"/><xsl:text> </xsl:text> </label>
<input type="text" name="commentContactName" id="bwCommentContactName" size="40">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-PleaseLimitContacts"/></span>
</p>
<p>
<label for="commentContactPhone"><em><xsl:copy-of select="$bwStr-FoEl-Phone"/></em> </label>
<input type="text" name="commentContactPhone">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-PHONE']"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-PHONE']" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
</p>
<p>
<label for="commentContactURL"><em><xsl:copy-of select="$bwStr-FoEl-URL"/></em> </label>
<input type="text" name="commentContactURL">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
</p>
<p>
<label for="commentContactEmail"><em><xsl:copy-of select="$bwStr-FoEl-Email"/></em> </label>
<input type="text" name="commentContactEmail">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
</p>
@@ -1112,7 +1112,7 @@
<p>
<label for="commentCategories"><xsl:copy-of select="$bwStr-FoEl-TypeOfEvent"/><xsl:text> </xsl:text></label>
<input type="text" name="commentCategories" size="80">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
</p>
</div>
@@ -1153,7 +1153,7 @@
<p>
<label for="commentCategories">Category suggestion: </label>
<input type="text" name="commentCategories" size="30">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
</p>
</div-->
@@ -1184,8 +1184,8 @@
<xsl:copy-of select="$bwStr-FoEl-FinalNotes"/><br/>
<!-- note: don't remove the #160 from the textarea or browsers will see it as a closed tag when empty -->
<textarea name="commentNotes" cols="60" rows="4"><!--
- --><xsl:value-of select="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text)"/><!--
- --><xsl:if test="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text) = ''"> </xsl:if><!--
+ --><xsl:value-of select="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text)" disable-output-escaping="yes"/><!--
+ --><xsl:if test="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text) = ''"><xsl:text> </xsl:text></xsl:if><!--
--></textarea>
</p>
</div>
Modified: releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js
===================================================================
--- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js 2011-02-16 20:50:47 UTC (rev 3182)
+++ releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js 2011-02-17 12:48:44 UTC (rev 3183)
@@ -436,7 +436,12 @@
},
error: function(msg) {
// there was a problem
+ if (msg.statusText == "OK") {
+ alert(msg.responseText);
+ }
+ else {
alert(msg.statusText);
+ }
}
});
@@ -1253,7 +1258,7 @@
);
} catch (e) {
- alert(e);
+ alert("Error: " + e);
}
};
Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.css
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.css 2011-02-16 20:50:47 UTC (rev 3182)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.css 2011-02-17 12:48:44 UTC (rev 3183)
@@ -1151,6 +1151,9 @@
color: #f00;
background-color: transparent;
}
+.aliasTree input {
+ margin-left: 6px;
+}
img.folderForAliasTree {
padding: 0.5em 0.2em 0 0.5em;
}
@@ -1302,3 +1305,7 @@
color: #999;
background-color: inherit;
}
+div#footer a:hover {
+ color: #444;
+ background-color: transparent;
+}
Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2011-02-16 20:50:47 UTC (rev 3182)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2011-02-17 12:48:44 UTC (rev 3183)
@@ -224,7 +224,7 @@
<title><xsl:copy-of select="$bwStr-Root-PageTitle"/></title>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
<link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/>
- <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/>
+ <link rel="stylesheet" href="/bedework-common/default/default/subColors.css"/>
<!-- set globals that must be passed in from the XSLT -->
<script type="text/javascript">
<xsl:comment>
@@ -366,6 +366,32 @@
bwXProps.init('<xsl:value-of select="name()"/>',[<xsl:for-each select="parameters/node()">['<xsl:value-of select="name()"/>','<xsl:value-of select="node()"/>']<xsl:if test="position() != last()">,</xsl:if></xsl:for-each>],'<xsl:call-template name="escapeApos"><xsl:with-param name="str"><xsl:value-of select="values/text"/></xsl:with-param></xsl:call-template>');
</xsl:for-each>
}
+
+ $(document).ready(function(){
+
+ <xsl:if test="/bedework/formElements/recurrenceId = ''">
+ initRXDates();
+ </xsl:if>
+
+ <xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'">
+ initXProperties();
+ bwSetupDatePickers();
+ </xsl:if>
+
+ focusFirstElement();
+
+ // If you wish to collapse specific topical areas, you can specify them here:
+ // (note that this will be managed from the admin client in time)
+ // $("ul.aliasTree > li:eq(4) > ul").hide();
+ // $("ul.aliasTree > li:eq(11) > ul").hide();
+ // $("ul.aliasTree > li:eq(13) > ul").hide();
+ $("ul.aliasTree > li > img.folderForAliasTree").attr("src", '<xsl:value-of select="$resourcesRoot"/>/resources/catExpander.gif');
+ $("ul.aliasTree > li > img.folderForAliasTree").css("cursor","pointer");
+ $("ul.aliasTree > li > img.folderForAliasTree").click(function(){
+ $(this).next("ul.aliasTree > li > ul").slideToggle("slow");
+ });
+
+ });
</xsl:comment>
</script>
</xsl:if>
@@ -428,14 +454,6 @@
</script>
</head>
<body>
- <xsl:choose>
- <xsl:when test="/bedework/page='modEvent' or /bedework/page='modEventPending'">
- <xsl:attribute name="onload"><xsl:if test="/bedework/formElements/recurrenceId = ''">initRXDates();</xsl:if>initXProperties();focusFirstElement();bwSetupDatePickers();</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="onload">focusFirstElement();</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
<div id="bedework"><!-- main wrapper div to keep styles encapsulated -->
<xsl:choose>
<xsl:when test="/bedework/page='selectCalForEvent'">
@@ -1245,7 +1263,7 @@
'<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:call-template>',
'<xsl:for-each select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-ALIAS']/values/text"><xsl:call-template name="escapeApos"><xsl:with-param name="str"><xsl:call-template name="substring-afterLastInstanceOf"><xsl:with-param name="string" select="."/><xsl:with-param name="char">/</xsl:with-param></xsl:call-template></xsl:with-param></xsl:call-template><br/></xsl:for-each>',
'<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:call-template>',
- '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>');
+ '<xsl:call-template name="escapeJson"><xsl:with-param name="string" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>');
</script>
<div id="bwSubmittedEventCommentBlock">
@@ -2494,7 +2512,7 @@
</td>
<td>
<input type="text" name="xBwImageHolder" value="" size="80" class="edit">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
<xsl:text> </xsl:text>
<span class="fieldInfo"><xsl:copy-of select="$bwStr-AEEF-OptionalEventImage"/></span>
Added: trunk/deployment/webadmin/webapp/resources/resources/catExpander.gif
===================================================================
(Binary files differ)
Property changes on: trunk/deployment/webadmin/webapp/resources/resources/catExpander.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl 2011-02-16 20:50:47 UTC (rev 3182)
+++ trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl 2011-02-17 12:48:44 UTC (rev 3183)
@@ -998,7 +998,7 @@
<td class="fieldname"><em><xsl:copy-of select="$bwStr-FoEl-ImageURL"/></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>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
<xsl:text> </xsl:text>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-ImageURLOptional"/></span>
@@ -1026,20 +1026,20 @@
<p>
<label for="commentLocationAddress"><xsl:copy-of select="$bwStr-FoEl-Address"/><xsl:text> </xsl:text></label>
<input type="text" name="commentLocationAddress" id="bwCommentLocationAddress">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
</p>
<p>
<label for="commentLocationSubaddress"><em><xsl:copy-of select="$bwStr-FoEl-SubAddress"/></em> </label>
<input type="text" name="commentLocationSubaddress" id="commentLocationSubaddress">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-SUBADDRESS']"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-SUBADDRESS']" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
</p>
<p>
<label for="commentLocationURL"><em><xsl:copy-of select="$bwStr-FoEl-URL"/></em> </label>
<input type="text" name="commentLocationURL" id="commentLocationURL">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
</p>
@@ -1065,28 +1065,28 @@
<p>
<label for="commentContactName"><xsl:copy-of select="$bwStr-FoEl-OrganizationName"/><xsl:text> </xsl:text> </label>
<input type="text" name="commentContactName" id="bwCommentContactName" size="40">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-PleaseLimitContacts"/></span>
</p>
<p>
<label for="commentContactPhone"><em><xsl:copy-of select="$bwStr-FoEl-Phone"/></em> </label>
<input type="text" name="commentContactPhone">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-PHONE']"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-PHONE']" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
</p>
<p>
<label for="commentContactURL"><em><xsl:copy-of select="$bwStr-FoEl-URL"/></em> </label>
<input type="text" name="commentContactURL">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
</p>
<p>
<label for="commentContactEmail"><em><xsl:copy-of select="$bwStr-FoEl-Email"/></em> </label>
<input type="text" name="commentContactEmail">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']" disable-output-escaping="yes"/></xsl:attribute>
</input>
<span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
</p>
@@ -1112,7 +1112,7 @@
<p>
<label for="commentCategories"><xsl:copy-of select="$bwStr-FoEl-TypeOfEvent"/><xsl:text> </xsl:text></label>
<input type="text" name="commentCategories" size="80">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
</p>
</div>
@@ -1153,7 +1153,7 @@
<p>
<label for="commentCategories">Category suggestion: </label>
<input type="text" name="commentCategories" size="30">
- <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text" disable-output-escaping="yes"/></xsl:attribute>
</input>
</p>
</div-->
@@ -1184,8 +1184,8 @@
<xsl:copy-of select="$bwStr-FoEl-FinalNotes"/><br/>
<!-- note: don't remove the #160 from the textarea or browsers will see it as a closed tag when empty -->
<textarea name="commentNotes" cols="60" rows="4"><!--
- --><xsl:value-of select="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text)"/><!--
- --><xsl:if test="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text) = ''"> </xsl:if><!--
+ --><xsl:value-of select="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text)" disable-output-escaping="yes"/><!--
+ --><xsl:if test="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text) = ''"><xsl:text> </xsl:text></xsl:if><!--
--></textarea>
</p>
</div>
Modified: trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js 2011-02-16 20:50:47 UTC (rev 3182)
+++ trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js 2011-02-17 12:48:44 UTC (rev 3183)
@@ -436,7 +436,12 @@
},
error: function(msg) {
// there was a problem
+ if (msg.statusText == "OK") {
+ alert(msg.responseText);
+ }
+ else {
alert(msg.statusText);
+ }
}
});
@@ -1253,7 +1258,7 @@
);
} catch (e) {
- alert(e);
+ alert("Error: " + e);
}
};
More information about the Bedework-commit
mailing list