Changeset 499

Show
Ignore:
Timestamp:
05/19/06 11:19:16
Author:
johnsa
Message:

admin client:

updates to struts-config to fix up subscription
funtionality

personal client:

better presentation of icons for editing and
deleting events based on current user access

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r494 r499  
    11201120                </xsl:choose> 
    11211121              </xsl:when> 
    1122               <xsl:when test="calendar/owner = /bedework/userid"> 
     1122              <xsl:when test="currentAccess/current-user-privilege-set/privilege/write-content"> 
    11231123                <a href="{$editEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}"> 
    11241124                  <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="13" border="0" alt="edit"/> 
    11251125                  Edit 
    1126                 </a> | 
    1127                 <xsl:choose> 
    1128                   <xsl:when test="recurring=true"> 
    1129                     <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}"> 
    1130                       <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    1131                       Delete All (recurring) 
    1132                     </a> 
    1133                   </xsl:when> 
    1134                   <xsl:otherwise> 
    1135                     <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}"> 
    1136                       <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    1137                       Delete 
    1138                     </a> 
    1139                   </xsl:otherwise> 
    1140                 </xsl:choose> 
     1126                </a> 
    11411127              </xsl:when> 
    11421128              <xsl:otherwise> 
     
    11471133              </xsl:otherwise> 
    11481134            </xsl:choose> 
     1135            <xsl:if test="currentAccess/current-user-privilege-set/privilege/unbind"> 
     1136               | 
     1137              <xsl:choose> 
     1138                <xsl:when test="recurring=true"> 
     1139                  <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}"> 
     1140                    <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
     1141                    Delete All (recurring) 
     1142                  </a> 
     1143                </xsl:when> 
     1144                <xsl:otherwise> 
     1145                  <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}"> 
     1146                    <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
     1147                    Delete 
     1148                  </a> 
     1149                </xsl:otherwise> 
     1150              </xsl:choose> 
     1151            </xsl:if> 
    11491152          </div> 
    11501153          <xsl:choose> 
     
    17431746                <img src="{$resourcesRoot}/resources/glassFill-icon-viewGray.gif" width="13" height="13" border="0" alt="view"/> 
    17441747                View 
    1745               </a> | 
    1746               <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPathEncoded}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}"> 
    1747                 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    1748                 Delete 
    17491748              </a> 
     1749              <xsl:if test="currentAccess/current-user-privilege-set/privilege/unbind"> 
     1750                | 
     1751                <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPathEncoded}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}"> 
     1752                  <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
     1753                  Delete 
     1754                </a> 
     1755              </xsl:if> 
    17501756            </div> 
    17511757            Personal Event 
     
    20902096          Access rights:<br/> 
    20912097          <input type="radio" value="R" name="how" checked="checked"/> read<br/> 
    2092           <input type="radio" value="Rc" name="how"/> read/write<br/> 
     2098          <input type="radio" value="Rc" name="how"/> read/write content<br/> 
    20932099          <input type="radio" value="f" name="how"/> read free/busy only<br/> 
    20942100          <input type="radio" value="d" name="how"/> default (reset access) 
     
    27062712          Access rights:<br/> 
    27072713          <input type="radio" value="R" name="how" checked="checked"/> read<br/> 
    2708           <input type="radio" value="Rc" name="how"/> read/write<br/> 
     2714          <input type="radio" value="Rc" name="how"/> read/write content<br/> 
    27092715          <input type="radio" value="f" name="how"/> read free/busy only<br/> 
    27102716          <input type="radio" value="d" name="how"/> default (reset access) 
  • trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml

    r284 r499  
    55          "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd"> 
    66 
    7   <!-- ================================================================= 
    8      This is a the Struts configuration for the public events admin app. 
    9      =================================================================== --> 
     7  <!-- ========================================================================= 
     8     This is a the Struts configuration for the Bedework public events admin app. 
     9     ======================================================================= --> 
     10 
     11   <!-- 
     12     The action-mappings below are divided into "normal" actions (suffixed 
     13     with ".do") and render actions (suffixed with ".rdo").  All normal actions 
     14     (which are typically used to change the application's state) redirect 
     15     to a render action that returns a jsp page for display.  Render actions 
     16     do not change state. 
     17 
     18     The action-mappings are grouped together by function; all render 
     19     actions use the type="org.bedework.webclient.BwRenderAction" class. 
     20     The division between normal and render actions is required, among other 
     21     things, to allow Bedework to run in a portal. All render actions 
     22     are marked with the comment "renderUrl" so that they may be 
     23     mechanically picked out of this file and built up for portal configuration. 
     24     By convention, most render actions are named "show[Name]". 
     25 
     26     Note that nearly all global forwards map to a render action that produce 
     27     a jsp page for display. 
     28 
     29     All action URLs used in any client are produced in header.jsp to take 
     30     advantage of appropriate encoding or extensions required by the container 
     31     and/or portal.  These "urlPrefixes" are then pulled into the xslt 
     32     for use in constructing links into the application.  Look at the top of 
     33     header.jsp and the default.xsl files within any client for examples.  Use 
     34     the url-prefix variables in the xslt rather than calling these paths directly. 
     35     --> 
    1036 
    1137<struts-config> 
     
    336362 
    337363    <action    path="/subs/subscribe" 
    338                type="org.bedework.webcommon.subs.SubscribeAction" 
     364               type="org.bedework.webcommon.subs.EndSubscribeAction" 
    339365               name="peForm" 
    340366               scope="session" 
     
    344370      <forward name="reffed" path="/subs/showSubs.rdo" redirect="true"/> 
    345371      <forward name="success" path="/subs/showSubs.rdo" redirect="true" /> 
     372      <forward name="added" path="/subs/showSubs.rdo" redirect="true" /> 
    346373    </action> 
    347374 
    348375    <action    path="/subs/unsubscribe" 
    349                type="org.bedework.webcommon.subs.UnsubscribeAction" 
     376               type="org.bedework.webcommon.subs.EndSubcribeAction" 
    350377               name="peForm" 
    351378               scope="session"