Changeset 95

Show
Ignore:
Timestamp:
02/06/06 15:44:31
Author:
johnsa
Message:

changed fetchCalendar actions in public client struts-config, modified jsp pages that iterate over calendars, and passed these changes through to the stylesheet, renamed subCalendars.jsp and calendars.jsp

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl

    r92 r95  
    5252  <xsl:variable name="setup" select="/ucalendar/urlPrefixes/setup"/> 
    5353  <xsl:variable name="selectView" select="/ucalendar/urlPrefixes/selectView"/> 
    54   <xsl:variable name="showCals" select="/ucalendar/urlPrefixes/showCals"/> 
     54  <xsl:variable name="fetchPublicCalendars" select="/ucalendar/urlPrefixes/fetchPublicCalendars"/> 
    5555  <xsl:variable name="setView" select="/ucalendar/urlPrefixes/setView"/> 
    5656  <xsl:variable name="eventView" select="/ucalendar/urlPrefixes/eventView"/> 
    …… 
    10321032            </select> 
    10331033          </form> 
    1034           <span class="calLinks"><a href="{$selectView}">show all</a> | <a href="{$showCals}">calendar list</a></span> 
     1034          <span class="calLinks"><a href="{$selectView}">show all</a> | <a href="{$fetchPublicCalendars}">calendar list</a></span> 
    10351035        </td> 
    10361036      </tr> 

  • trunk/calendar3/webclient/war/WEB-INF/struts-config.xml

    r78 r95  
    6161    </action> 
    6262 
     63    <action    path="/showPublicCals" 
     64               type="org.bedework.webclient.BwRenderAction" 
     65               name="calForm" 
     66               scope="session" 
     67               validate="false"> 
     68      <forward name="success" path="/docs/emitPublicCalendars.jsp" /> 
     69    </action> 
     70 
    6371    <action    path="/showCals" 
    6472               type="org.bedework.webclient.BwRenderAction" 
    …… 
    6674               scope="session" 
    6775               validate="false"> 
    68       <forward name="success" path="/docs/calendars.jsp" /> 
     76      <forward name="success" path="/docs/emitCalendars.jsp" /> 
    6977    </action> 
    7078 
    …… 
    177185               validate="false"> 
    178186      <forward name="noCalDef" path="/showMain.rdo" redirect="true" /> 
     187    </action> 
     188 
     189    <action    path="/fetchPublicCalendars" 
     190               type="org.bedework.webclient.BwAction" 
     191               name="calForm" 
     192               scope="session" 
     193               validate="false"> 
     194      <forward name="success" path="/showPublicCals.rdo" redirect="true" /> 
     195    </action> 
     196 
     197    <action    path="/fetchCalendars" 
     198               type="org.bedework.webclient.BwAction" 
     199               name="calForm" 
     200               scope="session" 
     201               validate="false"> 
     202      <forward name="success" path="/showCals.rdo" redirect="true" /> 
    179203    </action> 
    180204