Changeset 1873

Show
Ignore:
Timestamp:
05/09/08 10:45:33
Author:
johnsa
Message:

web submit: avoid returning xprops without values
web admin: fix publish button overloading
textual updates

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1870 r1873  
    20882088          </td> 
    20892089        </tr> 
    2090         <!-- Url --> 
     2090        <!-- Image Url --> 
    20912091        <tr> 
    20922092          <td class="optional"> 
    …… 
    20952095          <td> 
    20962096            <input type="text" name="xBwImageHolder" value="" class="edit" size="30"> 
    2097               <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 
    2098                 <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute> 
    2099               </xsl:if> 
     2097              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute> 
    21002098            </input> 
    21012099            <xsl:text> </xsl:text> 
    …… 
    23342332        </xsl:if> 
    23352333      </table> 
    2336       <xsl:call-template name="submitEventButtons"/> 
     2334      <xsl:if test="not(starts-with(form/calendar/path,$submissionsRootUnencoded))"> 
     2335        <!-- don't create two instances of the submit buttons on pending events; 
     2336             the publishing buttons require numerous unique ids --> 
     2337        <xsl:call-template name="submitEventButtons"/> 
     2338      </xsl:if> 
    23372339    </form> 
    23382340  </xsl:template> 

  • releases/bedework-3.4.1.1/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r1870 r1873  
    17801780  <xsl:template name="footer"> 
    17811781    <div id="footer"> 
    1782       Demonstration calendar; place footer information here. 
     1782      Based on the <a href="http://www.bedework.org/">Bedework Calendar System</a> 
    17831783    </div> 
    17841784    <table id="skinSelectorTable" border="0" cellpadding="0" cellspacing="0"> 

  • releases/bedework-3.4.1.1/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl

    r1836 r1873  
    16411641  <xsl:template name="footer"> 
    16421642    <div id="footer"> 
    1643       Demonstration calendar; place footer information here. 
     1643      Footer information here 
    16441644    </div> 
    16451645    <div id="subFoot"> 
    1646       Based on the <a href="http://www.bedework.org/">Bedework Calendar</a> | 
     1646      Based on the <a href="http://www.bedework.org/">Bedework Calendar System</a> | 
    16471647      <a href="?noxslt=yes">show XML</a> | 
    16481648      <a href="?refreshXslt=yes">refresh XSLT</a> 

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

    r1870 r1873  
    870870            </td> 
    871871          </tr> 
    872           <!--  Link (url associated with event)  --> 
    873           <tr> 
    874             <td class="fieldname"><em>Event Link:</em></td> 
    875             <td class="fieldval"> 
    876               <xsl:variable name="link" select="form/link/input/@value"/> 
    877               <input type="text" name="event.link" size="81" value="{$link}"/> 
    878               <span class="note"> optional</span> 
    879             </td> 
    880           </tr> 
    881           <!-- Cost --> 
    882           <tr> 
    883             <td class="fieldname"><em>Cost:</em></td> 
    884             <td class="fieldval"> 
    885               <input type="text" name="event.cost" size="81" value=""> 
    886                 <xsl:attribute name="value"><xsl:value-of select="form/cost/input/@value"/></xsl:attribute> 
    887               </input> 
    888               <span class="note"> optional</span> 
    889             </td> 
    890           </tr> 
    891872          <!--  Status  --> 
    892873          <tr> 
    …… 
    907888              </input> 
    908889              cancelled 
     890            </td> 
     891          </tr> 
     892          <!-- Cost --> 
     893          <tr> 
     894            <td class="fieldname"><em>Cost:</em></td> 
     895            <td class="fieldval"> 
     896              <input type="text" name="event.cost" size="30" value=""> 
     897                <xsl:attribute name="value"><xsl:value-of select="form/cost/input/@value"/></xsl:attribute> 
     898              </input> 
     899              <span class="note"> optional: if any, and place to purchase tickets</span> 
     900            </td> 
     901          </tr> 
     902          <!--  Link (url associated with event)  --> 
     903          <tr> 
     904            <td class="fieldname"><em>Event URL:</em></td> 
     905            <td class="fieldval"> 
     906              <input type="text" name="event.link" size="30" value=""> 
     907                <xsl:attribute name="value"><xsl:value-of select="form/link/input/@value"/></xsl:attribute> 
     908              </input> 
     909              <span class="note"> optional: for more information about the event</span> 
     910            </td> 
     911          </tr> 
     912          <!-- Image Url --> 
     913          <tr> 
     914            <td class="fieldname"><em>Image URL:</em></td> 
     915            <td class="fieldval"> 
     916              <input type="text" name="xBwImageHolder" size="30" value=""> 
     917                <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute> 
     918              </input> 
     919              <xsl:text> </xsl:text> 
     920              <span class="note"> optional: to include an image with the event description</span> 
    909921            </td> 
    910922          </tr> 
    …… 
    15111523  <xsl:template name="footer"> 
    15121524    <div id="footer"> 
    1513       Demonstration calendar; place footer information here. 
     1525      Based on the <a href="http://www.bedework.org/">Bedework Calendar System</a> 
    15141526    </div> 
    15151527    <div id="subfoot"> 

  • releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js

    r1851 r1873  
    4444 
    4545/* An rdate 
    46 /* date: String: internal date 
     46 * date: String: internal date 
    4747 * time: String 
    4848 * tzid timezone id or null 
    …… 
    274274  // Set application x-properties here. 
    275275 
    276   // Sumbission comments as x-properties 
    277   bwXProps.update(bwXPropertyLocation, 
     276  // Submission comments as x-properties 
     277  // Only return those comments that contain non-empty values; 
     278  // throw out the subfields if main field has no value. 
     279 
     280  if (formObj["commentLocationAddress"].value != "") { 
     281    bwXProps.update(bwXPropertyLocation, 
    278282                  [[bwXParamSubAddress,formObj["commentLocationSubaddress"].value], 
    279283                   [bwXParamURL,formObj["commentLocationURL"].value]], 
    280284                   formObj["commentLocationAddress"].value,true); 
    281   bwXProps.update(bwXPropertyContact, 
     285  } 
     286  if (formObj["commentContactName"].value != "") { 
     287    bwXProps.update(bwXPropertyContact, 
    282288                  [[bwXParamPhone,formObj["commentContactPhone"].value], 
    283289                   [bwXParamURL,formObj["commentContactURL"].value], 
    284290                   [bwXParamEmail,formObj["commentContactEmail"].value]], 
    285291                   formObj["commentContactName"].value,true); 
    286   bwXProps.update(bwXPropertyCategories,[],formObj["commentCategories"].value,true); 
    287   bwXProps.update(bwXPropertySubmitComment,[],formObj["commentNotes"].value,true); 
     292  } 
     293  if (formObj["commentCategories"].value) { 
     294    bwXProps.update(bwXPropertyCategories,[],formObj["commentCategories"].value,true); 
     295  } 
     296  if (formObj["commentNotes"].value) { 
     297    bwXProps.update(bwXPropertySubmitComment,[],formObj["commentNotes"].value,true); 
     298  } 
    288299 
    289300  // X-BEDEWORK-IMAGE and its parameters: