Changeset 102

Show
Ignore:
Timestamp:
02/07/06 10:51:20
Author:
johnsa
Message:

updated calendarReferenced jsp page to xmlize it
carried change and error message through stylesheets

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r90 r102  
    179179              <xsl:call-template name="deleteLocationConfirm"/> 
    180180            </xsl:when> 
    181             <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='modCalendar' or /bedeworkadmin/page='deleteCalendarConfirm'"> 
     181            <xsl:when test="/bedeworkadmin/page='calendarList' or 
     182                            /bedeworkadmin/page='modCalendar' or 
     183                            /bedeworkadmin/page='deleteCalendarConfirm' or 
     184                            /bedeworkadmin/page='calendarReferenced'"> 
    182185              <xsl:apply-templates select="/bedeworkadmin/calendars"/> 
    183186            </xsl:when> 
    …… 
    12761279        <td class="calendarContent"> 
    12771280          <xsl:choose> 
    1278             <xsl:when test="/bedeworkadmin/page='calendarList'"> 
     1281            <xsl:when test="/bedeworkadmin/page='calendarList' or 
     1282                            /bedeworkadmin/page='calendarReferenced'"> 
    12791283              <xsl:call-template name="calendarList"/> 
    12801284            </xsl:when> 
    …… 
    24592463            Manage Locations 
    24602464          </xsl:when> 
    2461           <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='modCalendar'"> 
     2465          <xsl:when test="/bedeworkadmin/page='calendarList' or 
     2466                          /bedeworkadmin/page='modCalendar' or 
     2467                          /bedeworkadmin/page='calendarReferenced' or 
     2468                          /bedeworkadmin/page='deleteCalendarConfirm'"> 
    24622469            Manage Calendars 
    24632470          </xsl:when> 
    2464           <xsl:when test="/bedeworkadmin/page='subscriptions' or /bedeworkadmin/page='modSubscription'"> 
     2471          <xsl:when test="/bedeworkadmin/page='subscriptions' or 
     2472                          /bedeworkadmin/page='modSubscription'"> 
    24652473            Manage Subscriptions 
    24662474          </xsl:when> 
    2467           <xsl:when test="/bedeworkadmin/page='views' or /bedeworkadmin/page='modView'"> 
     2475          <xsl:when test="/bedeworkadmin/page='views' or 
     2476                          /bedeworkadmin/page='modView'"> 
    24682477            Manage Views 
    24692478          </xsl:when> 
    …… 
    24712480            Manage System Preferences 
    24722481          </xsl:when> 
    2473           <xsl:when test="/bedeworkadmin/page='authUserList' or /bedeworkadmin/page='modAuthUser'"> 
     2482          <xsl:when test="/bedeworkadmin/page='authUserList' or 
     2483                          /bedeworkadmin/page='modAuthUser'"> 
    24742484            Manage Public Events Administrators 
    24752485          </xsl:when> 

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

    r42 r102  
    3737      </xsl:when> 
    3838      <xsl:when test="id='org.bedework.client.error.calendar.referenced'"> 
    39         Cannot delete: the calendar is referenced by events 
     39        Cannot delete: the calendar is not empty 
    4040      </xsl:when> 
    4141      <xsl:when test="id='org.bedework.client.error.unimplemented'"> 

  • trunk/calendar3/webadmin/war/docs/calendar/referenced.jsp

    r2 r102  
    44<%@ taglib uri='struts-genurl' prefix='genurl' %> 
    55 
    6 <jsp:include page="/docs/header.jsp"> 
    7   <jsp:param name="title" value="org.bedework.title.calendar.inuse"/> 
    8 </jsp:include> 
     6<%@include file="/docs/header.jsp"%> 
    97 
    10 <h2><bean:message key="org.bedework.text.calendar.referenced" /></h2> 
     8<page>calendarReferenced</page> 
    119 
    12 <genurl:form action="calendar/fetchForUpdate" > 
    13   <html:submit property="listCalendars" value="OK"/>&nbsp;&nbsp;&nbsp; 
    14  
    15   <jsp:include page="displayCalendarsCommon.jsp" /> 
    16 </genurl:form> 
     10<%@include file="/docs/calendar/emitCalendars.jsp"%> 
    1711 
    1812<%@include file="/docs/footer.jsp"%>