Changeset 518

Show
Ignore:
Timestamp:
05/31/06 17:21:44
Author:
johnsa
Message:

fundamental building blocks in place for calendar suites in UI (currently only produces form for adding a calendar suite)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r512 r518  
    9292  <xsl:variable name="system-fetch" select="/bedeworkadmin/urlPrefixes/system/fetch/a/@href"/> 
    9393  <xsl:variable name="system-update" select="/bedeworkadmin/urlPrefixes/system/update/a/@href"/> 
     94  <xsl:variable name="calsuite-fetch" select="/bedeworkadmin/urlPrefixes/calsuite/fetch/a/@href"/> 
     95  <xsl:variable name="calsuite-add" select="/bedeworkadmin/urlPrefixes/calsuite/add/a/@href"/> 
     96  <xsl:variable name="calsuite-showForm" select="/bedeworkadmin/urlPrefixes/calsuite/showForm/a/@href"/> 
    9497  <xsl:variable name="timezones-initUpload" select="/bedeworkadmin/urlPrefixes/timezones/initUpload/a/@href"/> 
    9598  <xsl:variable name="timezones-upload" select="/bedeworkadmin/urlPrefixes/timezones/upload/a/@href"/> 
    …… 
    206209              <xsl:call-template name="modView"/> 
    207210            </xsl:when> 
     211            <xsl:when test="/bedeworkadmin/page='deleteViewConfirm'"> 
     212              <xsl:call-template name="deleteViewConfirm"/> 
     213            </xsl:when> 
    208214            <xsl:when test="/bedeworkadmin/page='modSyspars'"> 
    209215              <xsl:call-template name="modSyspars"/> 
    210216            </xsl:when> 
    211             <xsl:when test="/bedeworkadmin/page='deleteViewConfirm'"> 
    212               <xsl:call-template name="deleteViewConfirm"/> 
     217            <xsl:when test="/bedeworkadmin/page='calSuiteList'"> 
     218              <xsl:call-template name="calSuiteList"/> 
     219            </xsl:when> 
     220            <xsl:when test="/bedeworkadmin/page='modCalSuite'"> 
     221              <xsl:call-template name="modCalSuite"/> 
    213222            </xsl:when> 
    214223            <xsl:when test="/bedeworkadmin/page='authUserList'"> 
    …… 
    352361            <a href="{$view-fetch}"> 
    353362              Manage views 
     363            </a> 
     364          </li> 
     365        </ul> 
     366        <h4 class="menuTitle">Super user features</h4> 
     367        <ul class="adminMenu"> 
     368          <li> 
     369            <a href="{$calsuite-fetch}"> 
     370              Manage calendar suites 
    354371            </a> 
    355372          </li> 
    …… 
    23722389  </xsl:template> 
    23732390 
     2391  <!--+++++++++++++++ Calendar Suites (calsuite) ++++++++++++++++++++--> 
     2392  <xsl:template name="calSuiteList"> 
     2393    <h2>Manage Calendar Suites</h2> 
     2394    <p>List will go here</p> 
     2395    <p>For now: <a href="{$calsuite-showForm}">Add Calendar Suite</a></p> 
     2396  </xsl:template> 
     2397 
     2398  <xsl:template name="modCalSuite"> 
     2399    <h2>Add Calendar Suite</h2> 
     2400    <form name="calSuiteForm" action="{$calsuite-add}" method="post"> 
     2401      <table class="eventFormTable"> 
     2402        <tr> 
     2403          <th>Name:</th> 
     2404          <td> 
     2405            <input name="name" size="20"/> 
     2406          </td> 
     2407          <td> 
     2408            Name of your calendar suite 
     2409          </td> 
     2410        </tr> 
     2411        <tr> 
     2412          <th>Group:</th> 
     2413          <td> 
     2414            <input name="groupName" size="20"/> 
     2415          </td> 
     2416          <td> 
     2417            Name of admin group which contains event administrators and event owner to which preferences for the suite are attached 
     2418          </td> 
     2419        </tr> 
     2420        <tr> 
     2421          <th>Root calendar:</th> 
     2422          <td> 
     2423            <input name="calPath" size="20"/> 
     2424          </td> 
     2425          <td> 
     2426            Path of root calendar (not required if suite only consists of subscriptions and views) 
     2427          </td> 
     2428        </tr> 
     2429      </table> 
     2430      <table border="0" id="submitTable"> 
     2431        <tr> 
     2432          <td> 
     2433            <input type="submit" name="updateCalSuite" value="Add"/> 
     2434            <input type="submit" name="cancelled" value="Cancel"/> 
     2435            <input type="reset" value="Reset"/> 
     2436          </td> 
     2437        </tr> 
     2438      </table> 
     2439    </form> 
     2440  </xsl:template> 
     2441 
    23742442  <!--+++++++++++++++ Timezones ++++++++++++++++++++--> 
    23752443  <xsl:template name="uploadTimezones"> 

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

    r504 r518  
    136136        You must remove the subscription from this view before deleting.</p> 
    137137      </xsl:when> 
     138      <xsl:when test="id='org.bedework.client.error.calsuitenotadded'"> 
     139        <p>Error: calendar suite not added.</p> 
     140      </xsl:when> 
    138141      <xsl:when test="id='org.bedework.error.timezones.readerror'"> 
    139142        <p>Timzone error: could not read file</p> 
    …… 
    147150      <xsl:when test="id='org.bedework.error.duplicate.admingroup'"> 
    148151        Error: duplicate admin group.  <em><xsl:value-of select="param"/></em> already exists. 
     152      </xsl:when> 
     153      <xsl:when test="id='org.bedework.client.error.nosuchadmingroup'"> 
     154        Error: no such admin group "<em><xsl:value-of select="param"/></em>" 
    149155      </xsl:when> 
    150156      <xsl:when test="id='org.bedework.error.unknowgroup'"> 

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

    r514 r518  
    397397         =============================================================== --> 
    398398 
    399     <action    path="/calsuite/showViews" 
     399    <action    path="/calsuite/showCalSuites" 
    400400               type="org.bedework.webadmin.PERenderAction" 
    401401               name="peForm" 

  • trunk/calendar3/webadmin/war/docs/calsuite/calSuiteList.jsp

    r514 r518  
    99<page>calSuiteList</page> 
    1010 
    11 <% /* used by included file */ 
    12    String rpitemp; %> 
    1311<calsuites> 
    14   <logic:iterate id="calSuite" name="peForm" property="accessibleCalSuites" > 
    15     <%@include file="/docs/calsuite/emitCalSuite.jsp"%> 
    16   </logic:iterate> 
     12<% /*  <logic:iterate id="calSuite" name="peForm" property="accessibleCalSuites" > 
     13    < % @include file="/docs/calsuite/emitCalSuite.jsp" % > 
     14  </logic:iterate> */ %> 
    1715</calsuites> 
    1816 

  • trunk/calendar3/webadmin/war/docs/calsuite/emitCalSuite.jsp

    r514 r518  
    55<html:xhtml/> 
    66 
    7 <bean:define id="name" name="calSuite" property="name"/> 
    8 <% rpitemp="/calsuite/fetchForUpdate.do?calname=" + name; %> 
    97<calsuite> 
    10   <name> 
    11     <genurl:link page="<%=rpitemp%>"> 
    12       <bean:write name="calSuite" property="name" /> 
    13     </genurl:link> 
    14   </name> 
    15   <bw:emitText name="calSuite" property="group.name" tagName"group" /> 
    16   <bw:emitText name="calSuite" property="calendar.path" tagName"calPath" /> 
     8  <bw:emitText name="calSuite" property="name" /> 
     9  <bw:emitText name="calSuite" property="group.name" tagName="group" /> 
     10  <bw:emitText name="calSuite" property="calendar.path" tagName="calPath" /> 
    1711</calsuite> 

  • trunk/calendar3/webadmin/war/docs/calsuite/modCalSuite.jsp

    r514 r518  
    1010<creating><bean:write name="peForm" property="addingCalSuite"/></creating> 
    1111 
    12 <!-- Mod pages contain only formElements for now; we do this to 
    13      take advantage of Struts' form processing features --> 
    14 <formElements> 
    15   <genurl:form action="calSuite/update" > 
    16  
    17     <name><html:text property="name" size="30" /></name> 
    18     <group><html:text property="groupName" size="30" /></group> 
    19     <calendar><html:text property="calPath" size="30" /></calendar> 
    20  
    21      <!-- these are the values that may be submitted to the update action --> 
    22     <submitButtons> 
    23       <button type="add">addCalSuite</button> 
    24       <button type="update">updateCalSuite</button> 
    25       <button type="cancel">forwardto</button> 
    26       <button type="delete">delete</button> 
    27     </submitButtons> 
    28  
    29   </genurl:form> 
    30 </formElements> 
     12<%/* <bean:define id="calSuite" name="peForm" property="calSuite"/> */%> 
     13<calSuite> 
     14  <%/*<bw:emitText name="calSuite" property="name" /> 
     15  <bw:emitText name="calSuite" property="group.name" tagName="group" /> 
     16  <bw:emitText name="calSuite" property="calendar.path" tagName="calPath" />*/%> 
     17</calSuite> 
    3118 
    3219<%@include file="/docs/footer.jsp"%> 

  • trunk/calendar3/webadmin/war/docs/header.jsp

    r512 r518  
    121121      <remove><genurl:link page="/view/removeView.do?b=de"/></remove> 
    122122    </view> 
     123    <calsuite> 
     124      <fetch><genurl:link page="/calsuite/showCalSuites.rdo?b=de"/></fetch> 
     125      <add><genurl:link page="/calsuite/addCalSuite.do?b=de"/></add> 
     126      <showForm><genurl:link page="/calsuite/showModForm.rdo?b=de"/></showForm> 
     127    </calsuite> 
    123128    <system> <!-- only those listed are used here (no need to clean up) --> 
    124129      <fetch><genurl:link page="/syspars/fetch.do?b=de"/></fetch> 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/calsuite/AddCalSuiteAction.java

    r514 r518  
    7878 *      <li>"noAccess"     user not authorised.</li> 
    7979 *      <li>"notAdded"     duplicate or bad name.</li> 
    80  *      <li>"success"      subscribed ok.</li> 
     80 *      <li>"success"      created ok.</li> 
    8181 * </ul> 
    8282 *