Changeset 3183

Show
Ignore:
Timestamp:
02/17/11 07:48:44
Author:
johnsa
Message:

web clients:
- apply encoding to newline chararacters in xproperties
- allow topical area folders to expand/contract
- add some extra error checking to scheduling widget

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css

    r3156 r3183  
    11521152  background-color: transparent; 
    11531153} 
     1154.aliasTree input { 
     1155        margin-left: 6px; 
     1156} 
    11541157img.folderForAliasTree { 
    11551158  padding: 0.5em 0.2em 0 0.5em; 
    …… 
    13031306  background-color: inherit; 
    13041307} 
     1308div#footer a:hover { 
     1309 color: #444; 
     1310 background-color: transparent; 
     1311} 

  • releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl

    r3156 r3183  
    225225        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/> 
    226226        <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 
    227         <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/> 
     227        <link rel="stylesheet" href="/bedework-common/default/default/subColors.css"/> 
    228228        <!-- set globals that must be passed in from the XSLT --> 
    229229        <script type="text/javascript"> 
    …… 
    367367              </xsl:for-each> 
    368368            } 
     369 
     370            $(document).ready(function(){ 
     371 
     372                  <xsl:if test="/bedework/formElements/recurrenceId = ''"> 
     373                initRXDates(); 
     374              </xsl:if> 
     375               
     376              <xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 
     377                initXProperties(); 
     378                bwSetupDatePickers(); 
     379              </xsl:if> 
     380                             
     381              focusFirstElement(); 
     382 
     383              // If you wish to collapse specific topical areas, you can specify them here: 
     384              // (note that this will be managed from the admin client in time) 
     385              // $("ul.aliasTree > li:eq(4) > ul").hide();             
     386              // $("ul.aliasTree > li:eq(11) > ul").hide();            
     387              // $("ul.aliasTree > li:eq(13) > ul").hide();  
     388              $("ul.aliasTree > li > img.folderForAliasTree").attr("src", '<xsl:value-of select="$resourcesRoot"/>/resources/catExpander.gif'); 
     389              $("ul.aliasTree > li > img.folderForAliasTree").css("cursor","pointer"); 
     390              $("ul.aliasTree > li > img.folderForAliasTree").click(function(){ 
     391                $(this).next("ul.aliasTree > li > ul").slideToggle("slow"); 
     392              }); 
     393 
     394            }); 
    369395            </xsl:comment> 
    370396          </script> 
    …… 
    429455      </head> 
    430456      <body> 
    431         <xsl:choose> 
    432           <xsl:when test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 
    433             <xsl:attribute name="onload"><xsl:if test="/bedework/formElements/recurrenceId = ''">initRXDates();</xsl:if>initXProperties();focusFirstElement();bwSetupDatePickers();</xsl:attribute> 
    434           </xsl:when> 
    435           <xsl:otherwise> 
    436             <xsl:attribute name="onload">focusFirstElement();</xsl:attribute> 
    437           </xsl:otherwise> 
    438         </xsl:choose> 
    439457        <div id="bedework"><!-- main wrapper div to keep styles encapsulated --> 
    440458        <xsl:choose> 
    …… 
    12461264            '<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>', 
    12471265            '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:call-template>', 
    1248             '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>'); 
     1266            '<xsl:call-template name="escapeJson"><xsl:with-param name="string" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>'); 
    12491267        </script> 
    12501268 
    …… 
    24952513          <td> 
    24962514            <input type="text" name="xBwImageHolder" value="" size="80" class="edit"> 
    2497               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute> 
     2515              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    24982516            </input> 
    24992517            <xsl:text> </xsl:text> 

  • releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl

    r3154 r3183  
    999999            <td class="fieldval"> 
    10001000              <input type="text" name="xBwImageHolder" size="30" value=""> 
    1001                 <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute> 
     1001                <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    10021002              </input> 
    10031003              <xsl:text> </xsl:text> 
    …… 
    10271027            <label for="commentLocationAddress"><xsl:copy-of select="$bwStr-FoEl-Address"/><xsl:text> </xsl:text></label> 
    10281028            <input type="text" name="commentLocationAddress" id="bwCommentLocationAddress"> 
    1029               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text"/></xsl:attribute> 
     1029              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    10301030            </input> 
    10311031          </p> 
    …… 
    10331033            <label for="commentLocationSubaddress"><em><xsl:copy-of select="$bwStr-FoEl-SubAddress"/></em> </label> 
    10341034            <input type="text" name="commentLocationSubaddress" id="commentLocationSubaddress"> 
    1035               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-SUBADDRESS']"/></xsl:attribute> 
     1035              <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> 
    10361036            </input> 
    10371037            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span> 
    …… 
    10401040            <label for="commentLocationURL"><em><xsl:copy-of select="$bwStr-FoEl-URL"/></em> </label> 
    10411041            <input type="text" name="commentLocationURL" id="commentLocationURL"> 
    1042               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute> 
     1042              <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> 
    10431043            </input> 
    10441044            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span> 
    …… 
    10661066            <label for="commentContactName"><xsl:copy-of select="$bwStr-FoEl-OrganizationName"/><xsl:text> </xsl:text> </label> 
    10671067            <input type="text" name="commentContactName" id="bwCommentContactName" size="40"> 
    1068               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text"/></xsl:attribute> 
     1068              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    10691069            </input> 
    10701070            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-PleaseLimitContacts"/></span> 
    …… 
    10731073            <label for="commentContactPhone"><em><xsl:copy-of select="$bwStr-FoEl-Phone"/></em> </label> 
    10741074            <input type="text" name="commentContactPhone"> 
    1075               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-PHONE']"/></xsl:attribute> 
     1075              <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> 
    10761076            </input> 
    10771077            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span> 
    …… 
    10801080            <label for="commentContactURL"><em><xsl:copy-of select="$bwStr-FoEl-URL"/></em> </label> 
    10811081            <input type="text" name="commentContactURL"> 
    1082               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute> 
     1082              <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> 
    10831083            </input> 
    10841084            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span> 
    …… 
    10871087            <label for="commentContactEmail"><em><xsl:copy-of select="$bwStr-FoEl-Email"/></em> </label> 
    10881088            <input type="text" name="commentContactEmail"> 
    1089               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:attribute> 
     1089              <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> 
    10901090            </input> 
    10911091            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span> 
    …… 
    11131113            <label for="commentCategories"><xsl:copy-of select="$bwStr-FoEl-TypeOfEvent"/><xsl:text> </xsl:text></label> 
    11141114            <input type="text" name="commentCategories" size="80"> 
    1115               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute> 
     1115              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    11161116            </input> 
    11171117          </p> 
    …… 
    11541154            <label for="commentCategories">Category suggestion: </label> 
    11551155            <input type="text" name="commentCategories" size="30"> 
    1156               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute> 
     1156              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    11571157            </input> 
    11581158          </p> 
    …… 
    11851185          <!-- note: don't remove the #160 from the textarea or browsers will see it as a closed tag when empty --> 
    11861186           <textarea name="commentNotes" cols="60" rows="4"><!-- 
    1187            --><xsl:value-of select="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text)"/><!-- 
    1188            --><xsl:if test="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text) = ''">&#160;</xsl:if><!-- 
     1187           --><xsl:value-of select="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text)" disable-output-escaping="yes"/><!-- 
     1188           --><xsl:if test="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text) = ''"><xsl:text> </xsl:text></xsl:if><!-- 
    11891189           --></textarea> 
    11901190          </p> 

  • releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js

    r3138 r3183  
    437437      error: function(msg) { 
    438438        // there was a problem 
     439       if (msg.statusText == "OK") { 
     440         alert(msg.responseText); 
     441       } 
     442       else { 
    439443        alert(msg.statusText); 
     444       } 
    440445      } 
    441446    }); 
    …… 
    12541259        
    12551260    } catch (e) { 
    1256       alert(e); 
     1261      alert("Error: " + e); 
    12571262    } 
    12581263     

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

    r3156 r3183  
    11521152  background-color: transparent; 
    11531153} 
     1154.aliasTree input { 
     1155        margin-left: 6px; 
     1156} 
    11541157img.folderForAliasTree { 
    11551158  padding: 0.5em 0.2em 0 0.5em; 
    …… 
    13031306  background-color: inherit; 
    13041307} 
     1308div#footer a:hover { 
     1309 color: #444; 
     1310 background-color: transparent; 
     1311} 

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

    r3156 r3183  
    225225        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/> 
    226226        <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 
    227         <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/> 
     227        <link rel="stylesheet" href="/bedework-common/default/default/subColors.css"/> 
    228228        <!-- set globals that must be passed in from the XSLT --> 
    229229        <script type="text/javascript"> 
    …… 
    367367              </xsl:for-each> 
    368368            } 
     369 
     370            $(document).ready(function(){ 
     371 
     372                  <xsl:if test="/bedework/formElements/recurrenceId = ''"> 
     373                initRXDates(); 
     374              </xsl:if> 
     375               
     376              <xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 
     377                initXProperties(); 
     378                bwSetupDatePickers(); 
     379              </xsl:if> 
     380                             
     381              focusFirstElement(); 
     382 
     383              // If you wish to collapse specific topical areas, you can specify them here: 
     384              // (note that this will be managed from the admin client in time) 
     385              // $("ul.aliasTree > li:eq(4) > ul").hide();             
     386              // $("ul.aliasTree > li:eq(11) > ul").hide();            
     387              // $("ul.aliasTree > li:eq(13) > ul").hide();  
     388              $("ul.aliasTree > li > img.folderForAliasTree").attr("src", '<xsl:value-of select="$resourcesRoot"/>/resources/catExpander.gif'); 
     389              $("ul.aliasTree > li > img.folderForAliasTree").css("cursor","pointer"); 
     390              $("ul.aliasTree > li > img.folderForAliasTree").click(function(){ 
     391                $(this).next("ul.aliasTree > li > ul").slideToggle("slow"); 
     392              }); 
     393 
     394            }); 
    369395            </xsl:comment> 
    370396          </script> 
    …… 
    429455      </head> 
    430456      <body> 
    431         <xsl:choose> 
    432           <xsl:when test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 
    433             <xsl:attribute name="onload"><xsl:if test="/bedework/formElements/recurrenceId = ''">initRXDates();</xsl:if>initXProperties();focusFirstElement();bwSetupDatePickers();</xsl:attribute> 
    434           </xsl:when> 
    435           <xsl:otherwise> 
    436             <xsl:attribute name="onload">focusFirstElement();</xsl:attribute> 
    437           </xsl:otherwise> 
    438         </xsl:choose> 
    439457        <div id="bedework"><!-- main wrapper div to keep styles encapsulated --> 
    440458        <xsl:choose> 
    …… 
    12461264            '<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>', 
    12471265            '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:call-template>', 
    1248             '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>'); 
     1266            '<xsl:call-template name="escapeJson"><xsl:with-param name="string" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>'); 
    12491267        </script> 
    12501268 
    …… 
    24952513          <td> 
    24962514            <input type="text" name="xBwImageHolder" value="" size="80" class="edit"> 
    2497               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute> 
     2515              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    24982516            </input> 
    24992517            <xsl:text> </xsl:text> 

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

    r3154 r3183  
    999999            <td class="fieldval"> 
    10001000              <input type="text" name="xBwImageHolder" size="30" value=""> 
    1001                 <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute> 
     1001                <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    10021002              </input> 
    10031003              <xsl:text> </xsl:text> 
    …… 
    10271027            <label for="commentLocationAddress"><xsl:copy-of select="$bwStr-FoEl-Address"/><xsl:text> </xsl:text></label> 
    10281028            <input type="text" name="commentLocationAddress" id="bwCommentLocationAddress"> 
    1029               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text"/></xsl:attribute> 
     1029              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    10301030            </input> 
    10311031          </p> 
    …… 
    10331033            <label for="commentLocationSubaddress"><em><xsl:copy-of select="$bwStr-FoEl-SubAddress"/></em> </label> 
    10341034            <input type="text" name="commentLocationSubaddress" id="commentLocationSubaddress"> 
    1035               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-SUBADDRESS']"/></xsl:attribute> 
     1035              <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> 
    10361036            </input> 
    10371037            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span> 
    …… 
    10401040            <label for="commentLocationURL"><em><xsl:copy-of select="$bwStr-FoEl-URL"/></em> </label> 
    10411041            <input type="text" name="commentLocationURL" id="commentLocationURL"> 
    1042               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute> 
     1042              <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> 
    10431043            </input> 
    10441044            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span> 
    …… 
    10661066            <label for="commentContactName"><xsl:copy-of select="$bwStr-FoEl-OrganizationName"/><xsl:text> </xsl:text> </label> 
    10671067            <input type="text" name="commentContactName" id="bwCommentContactName" size="40"> 
    1068               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text"/></xsl:attribute> 
     1068              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    10691069            </input> 
    10701070            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-PleaseLimitContacts"/></span> 
    …… 
    10731073            <label for="commentContactPhone"><em><xsl:copy-of select="$bwStr-FoEl-Phone"/></em> </label> 
    10741074            <input type="text" name="commentContactPhone"> 
    1075               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-PHONE']"/></xsl:attribute> 
     1075              <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> 
    10761076            </input> 
    10771077            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span> 
    …… 
    10801080            <label for="commentContactURL"><em><xsl:copy-of select="$bwStr-FoEl-URL"/></em> </label> 
    10811081            <input type="text" name="commentContactURL"> 
    1082               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute> 
     1082              <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> 
    10831083            </input> 
    10841084            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span> 
    …… 
    10871087            <label for="commentContactEmail"><em><xsl:copy-of select="$bwStr-FoEl-Email"/></em> </label> 
    10881088            <input type="text" name="commentContactEmail"> 
    1089               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:attribute> 
     1089              <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> 
    10901090            </input> 
    10911091            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span> 
    …… 
    11131113            <label for="commentCategories"><xsl:copy-of select="$bwStr-FoEl-TypeOfEvent"/><xsl:text> </xsl:text></label> 
    11141114            <input type="text" name="commentCategories" size="80"> 
    1115               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute> 
     1115              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    11161116            </input> 
    11171117          </p> 
    …… 
    11541154            <label for="commentCategories">Category suggestion: </label> 
    11551155            <input type="text" name="commentCategories" size="30"> 
    1156               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute> 
     1156              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text" disable-output-escaping="yes"/></xsl:attribute> 
    11571157            </input> 
    11581158          </p> 
    …… 
    11851185          <!-- note: don't remove the #160 from the textarea or browsers will see it as a closed tag when empty --> 
    11861186           <textarea name="commentNotes" cols="60" rows="4"><!-- 
    1187            --><xsl:value-of select="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text)"/><!-- 
    1188            --><xsl:if test="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text) = ''">&#160;</xsl:if><!-- 
     1187           --><xsl:value-of select="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text)" disable-output-escaping="yes"/><!-- 
     1188           --><xsl:if test="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text) = ''"><xsl:text> </xsl:text></xsl:if><!-- 
    11891189           --></textarea> 
    11901190          </p> 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js

    r3137 r3183  
    437437      error: function(msg) { 
    438438        // there was a problem 
     439       if (msg.statusText == "OK") { 
     440         alert(msg.responseText); 
     441       } 
     442       else { 
    439443        alert(msg.statusText); 
     444       } 
    440445      } 
    441446    }); 
    …… 
    12541259        
    12551260    } catch (e) { 
    1256       alert(e); 
     1261      alert("Error: " + e); 
    12571262    } 
    12581263