Changeset 37

Show
Ignore:
Timestamp:
01/25/06 13:36:22
Author:
johnsa
Message:

added success message to subscription and adminGroup deletion; updated stylesheet to correctly handle adminGroup deletion; simplified admingroup xml; re-routed some actions in the struts-config regarding admingroups.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r33 r37  
    201201            <xsl:when test="/bedeworkadmin/page='modAdminGroupMembers'"> 
    202202              <xsl:call-template name="modAdminGroupMembers"/> 
     203            </xsl:when> 
     204            <xsl:when test="/bedeworkadmin/page='deleteAdminGroupConfirm'"> 
     205              <xsl:call-template name="deleteAdminGroupConfirm"/> 
    203206            </xsl:when> 
    204207            <xsl:when test="/bedeworkadmin/page='noGroup'"> 
    …… 
    20852088    <p>Click on the group name to modify the group owner or description.<br/> 
    20862089    Click "add/remove members" to modify group membership.</p> 
    2087     <p> 
    2088       <strong> 
    2089         <a href="{$admingroup-initAdd}">Add a new group</a> 
    2090       </strong> 
    2091     </p> 
     2090    <p><input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initAdd}')" value="Add a new group"/></p> 
    20922091    <table id="commonListTable"> 
    20932092      <tr> 
    …… 
    21232122      </xsl:for-each> 
    21242123    </table> 
     2124    <p><input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initAdd}')" value="Add a new group"/></p> 
    21252125  </xsl:template> 
    21262126 
    …… 
    22272227 
    22282228  <xsl:template name="modAdminGroupMembers"> 
    2229  
    2230     <p><a href="{$admingroup-initUpdate}">return to Admin Group listing</a></p> 
    2231  
     2229    <h2>Update Group Membership</h2> 
     2230    <p>Enter a userid and click "add" or "remove" to change group membership.</p> 
    22322231    <form name="adminGroupMembersForm" method="post" action="{$admingroup-updateMembers}"> 
    22332232      <table id="adminGroupFormTable"> 
    …… 
    22612260        </tr> 
    22622261      </table> 
     2262      <p><input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initUpdate}')" value="Return to Admin Group listing"/></p> 
     2263    </form> 
     2264  </xsl:template> 
     2265 
     2266  <xsl:template name="deleteAdminGroupConfirm"> 
     2267    <h2>Delete Admin Group?</h2> 
     2268    <p>The following group will be deleted. Continue?</p> 
     2269    <p> 
     2270      <strong><xsl:value-of select="/bedeworkadmin/groups/group/name"/></strong>: 
     2271      <xsl:value-of select="/bedeworkadmin/groups/group/desc"/> 
     2272    </p> 
     2273    <form  name="adminGroupDelete" method="post" action="{$admingroup-delete}"> 
     2274      <input type="submit" name="removeAdminGroupOK" value="Yes: Delete!"/> 
     2275      <input type="submit" name="cancelled" value="No: Cancel"/> 
    22632276    </form> 
    22642277  </xsl:template> 
    …… 
    23272340            Choose Administrative Group 
    23282341          </xsl:when> 
    2329           <xsl:when test="/bedeworkadmin/page='adminGroupList'"> 
     2342          <xsl:when test="/bedeworkadmin/page='adminGroupList' or 
     2343                          /bedeworkadmin/page='modAdminGroup' or 
     2344                          /bedeworkadmin/page='modAdminGroup' or 
     2345                          /bedeworkadmin/page='modAdminGroupMembers'"> 
    23302346            Manage Administrative Groups 
    2331           </xsl:when> 
    2332           <xsl:when test="/bedeworkadmin/page='modAdminGroup'"> 
    2333             <xsl:choose> 
    2334               <xsl:when test="/bedeworkadmin/creating = 'true'"> 
    2335                 Add Administrative Group 
    2336               </xsl:when> 
    2337               <xsl:otherwise> 
    2338                 Update Administrative Group 
    2339               </xsl:otherwise> 
    2340             </xsl:choose> 
    2341           </xsl:when> 
    2342           <xsl:when test="/bedeworkadmin/page='modAdminGroupMembers'"> 
    2343             Update Administrative Group Members 
    23442347          </xsl:when> 
    23452348          <xsl:when test="/bedeworkadmin/page='noGroup'"> 

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

    r29 r37  
    6969      </xsl:when> 
    7070      <xsl:when test="id='org.bedework.validation.error.notitle'"> 
    71         You must supply a title 
     71        You must supply a title<br/> 
    7272      </xsl:when> 
    7373      <xsl:when test="id='org.bedework.validation.error.nodescription'"> 
    74         You must supply a description 
     74        You must supply a description<br/> 
    7575      </xsl:when> 
    7676      <xsl:when test="id='org.bedework.validation.error.event.startafterend'"> 
    …… 
    8787      </xsl:when> 
    8888      <xsl:when test="id='org.bedework.client.error.missingfield'"> 
    89         Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em> 
     89        Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em><br/> 
    9090      </xsl:when> 
    9191      <xsl:when test="id='org.bedework.validation.error.missingfield'"> 
    92         Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em> 
     92        Your information is incomplete: please supply a <em><xsl:value-of select="param"/></em><br/> 
    9393      </xsl:when> 
    9494      <xsl:when test="id='org.bedework.validation.error.forbidden.calmode'"> 

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

    r35 r37  
    9090        Category updated 
    9191      </xsl:when> 
     92      <xsl:when test="id='org.bedework.client.message.subscription.removed'"> 
     93        Subscription removed 
     94      </xsl:when> 
    9295      <xsl:when test="id='org.bedework.client.message.view.deleted'"> 
    9396        View deleted 
    …… 
    104107      <xsl:when test="id='org.bedework.client.message.authuser.updated'"> 
    105108        Administrator updated 
     109      </xsl:when> 
     110      <xsl:when test="id='org.bedework.client.message.admingroup.deleted'"> 
     111        Administrative group deleted 
    106112      </xsl:when> 
    107113      <xsl:when test="id='org.bedework.client.message.timezones.imported'"> 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEDeleteAGAction.java

    r2 r37  
    100100    adgrps.removeGroup(updgrp); 
    101101    form.setUpdAdminGroup(null); 
    102  
     102    form.getMsg().emit("org.bedework.client.message.admingroup.deleted"); 
    103103    return "continue"; 
    104104  } 

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

    r34 r37  
    859859      <forward name="inUse" path="/admingroup/showReferenced.rdo" redirect="true" /> 
    860860      <forward name="notFound" path="/admingroup/showUpdateList.rdo" redirect="true" /> 
     861      <forward name="cancelled" path="/admingroup/showUpdateList.rdo" redirect="true" /> 
    861862      <forward name="continue" path="/admingroup/showUpdateList.rdo" redirect="true" /> 
    862863    </action> 

  • trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp

    r28 r37  
    11<%@ taglib uri='struts-bean' prefix='bean' %> 
    22<%@ taglib uri='struts-logic' prefix='logic' %> 
    3 <%@ taglib uri='struts-html' prefix='html' %> 
    4 <%@ taglib uri='struts-genurl' prefix='genurl' %> 
    5 <html:xhtml/> 
    63 
    74<%@include file="/docs/header.jsp"%> 

  • trunk/calendar3/webadmin/war/docs/admingroup/chooseAdminGroup.jsp

    r28 r37  
    11<%@ taglib uri='struts-bean' prefix='bean' %> 
    22<%@ taglib uri='struts-logic' prefix='logic' %> 
    3 <%@ taglib uri='struts-html' prefix='html' %> 
    4 <%@ taglib uri='struts-genurl' prefix='genurl' %> 
    5 <html:xhtml/> 
    63 
    74<%@include file="/docs/header.jsp"%> 

  • trunk/calendar3/webadmin/war/docs/admingroup/deleteAdminGroupConfirm.jsp

    r2 r37  
    33<%@ taglib uri='struts-html' prefix='html' %> 
    44<%@ taglib uri='struts-genurl' prefix='genurl' %> 
    5 <html:xhtml/> 
    65 
    76<%@include file="/docs/header.jsp"%> 
    …… 
    1312</groups> 
    1413 
    15 <formElements> 
    16   <genurl:form action="admingroup/delete.do" > 
    17     <html:submit property="cancelled" value="Cancel"/> 
    18     <html:submit property="removeAdminGroupOK" value="Delete"/> 
    19   </genurl:form> 
    20 </formElements> 
    21  
    2214<%@include file="/docs/footer.jsp"%> 
    2315 

  • trunk/calendar3/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp

    r2 r37  
    11<%@ taglib uri='struts-bean' prefix='bean' %> 
    22<%@ taglib uri='struts-logic' prefix='logic' %> 
    3 <html:xhtml/> 
    43 
    54<group> 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/UnsubscribeAction.java

    r24 r37  
    108108 
    109109    svc.removeSubscription(sub); 
    110  
     110    form.getMsg().emit("org.bedework.client.message.subscription.removed"); 
    111111    return "success"; 
    112112  }