Changeset 39

Show
Ignore:
Timestamp:
01/25/06 15:50:09
Author:
johnsa
Message:

modified admin client titles to make them consistent; updated location action branching in struts-config; improved location management interface in stylsheet; made minor change to subscriptions xml (clean up).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r38 r39  
    296296  padding-right: 1em; 
    297297} 
    298  
     298#submitTable { 
     299  margin-top: 1em; 
     300} 
    299301#deleteListTable { 
    300302  margin: 1em 0em 2em 1em; 

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

    r38 r39  
    754754            </td> 
    755755            <td> 
    756               <xsl:copy-of select="/bedeworkadmin/formElements/form/sponsor/phone/*"/>- 
     756              <xsl:copy-of select="/bedeworkadmin/formElements/form/sponsor/phone/*"/> 
    757757              <xsl:text> </xsl:text> 
    758758              <span class="fieldInfo">(optional)</span> 
    …… 
    11151115    <p> 
    11161116      Select the location that you would like to update: 
     1117      <input type="button" name="return" value="Add new location" onclick="javascript:location.replace('{$location-initAdd}')"/> 
    11171118    </p> 
    11181119 
    …… 
    11441145 
    11451146  <xsl:template name="modLocation"> 
     1147    <xsl:choose> 
     1148      <xsl:when test="/bedeworkadmin/creating='true'"> 
     1149        <h2>Add Location</h2> 
     1150      </xsl:when> 
     1151      <xsl:otherwise> 
     1152        <h2>Update Location</h2> 
     1153      </xsl:otherwise> 
     1154    </xsl:choose> 
     1155 
    11461156    <form action="{$location-update}" method="post"> 
    1147       <h2>Location Information</h2> 
    1148  
    11491157      <table id="eventFormTable"> 
    11501158        <tr> 
    …… 
    22412249      </p> 
    22422250    </form> 
    2243  
    2244       <table id="adminGroupFormTable"> 
    2245         <tr> 
    2246           <td class="fieldName"> 
    2247             Name: 
    2248           </td> 
    2249           <td> 
    2250             <xsl:value-of select="/bedeworkadmin/adminGroup/name"/> 
    2251           </td> 
    2252         </tr> 
    2253         <tr> 
    2254           <td class="fieldName"> 
    2255             Members: 
    2256           </td> 
    2257           <td> 
    2258             <table id="memberAccountList"> 
    2259               <xsl:for-each select="/bedeworkadmin/adminGroup/members/member"> 
    2260                 <xsl:sort select="account" order="ascending" case-order="upper-first"/> 
    2261                 <tr> 
    2262                   <td> 
    2263                     <xsl:choose> 
    2264                       <xsl:when test="kind='0'"><img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/></xsl:when> 
    2265                       <xsl:when test="kind='1'"><img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/></xsl:when> 
    2266                       <xsl:when test="kind='3'"></xsl:when> 
    2267                       <xsl:otherwise></xsl:otherwise> 
    2268                     </xsl:choose> 
    2269                   </td> 
    2270                   <td> 
    2271                     <xsl:value-of select="account"/> 
    2272                   </td> 
    2273                   <td> 
    2274                     <xsl:variable name="acct" select="account"/> 
    2275                     <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}" title="remove"> 
    2276                       <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/> 
    2277                     </a> 
    2278                   </td> 
    2279                 </tr> 
    2280               </xsl:for-each> 
    2281             </table> 
    2282           </td> 
    2283         </tr> 
    2284       </table> 
    2285       <p> 
    2286         <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> user, 
    2287         <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/> group 
    2288       </p> 
    2289       <p><input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initUpdate}')" value="Return to Admin Group listing"/></p> 
    2290  
     2251    <p><input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initUpdate}')" value="Return to Admin Group listing"/></p> 
     2252 
     2253    <table id="adminGroupFormTable"> 
     2254      <tr> 
     2255        <td class="fieldName"> 
     2256          Name: 
     2257        </td> 
     2258        <td> 
     2259          <xsl:value-of select="/bedeworkadmin/adminGroup/name"/> 
     2260        </td> 
     2261      </tr> 
     2262      <tr> 
     2263        <td class="fieldName"> 
     2264          Members: 
     2265        </td> 
     2266        <td> 
     2267          <table id="memberAccountList"> 
     2268            <xsl:for-each select="/bedeworkadmin/adminGroup/members/member"> 
     2269              <xsl:sort select="account" order="ascending" case-order="upper-first"/> 
     2270              <tr> 
     2271                <td> 
     2272                  <xsl:choose> 
     2273                    <xsl:when test="kind='0'"><img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/></xsl:when> 
     2274                    <xsl:when test="kind='1'"><img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/></xsl:when> 
     2275                    <xsl:when test="kind='3'"></xsl:when> 
     2276                    <xsl:otherwise></xsl:otherwise> 
     2277                  </xsl:choose> 
     2278                </td> 
     2279                <td> 
     2280                  <xsl:value-of select="account"/> 
     2281                </td> 
     2282                <td> 
     2283                  <xsl:variable name="acct" select="account"/> 
     2284                  <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}" title="remove"> 
     2285                    <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/> 
     2286                  </a> 
     2287                </td> 
     2288              </tr> 
     2289            </xsl:for-each> 
     2290          </table> 
     2291        </td> 
     2292      </tr> 
     2293    </table> 
     2294    <p> 
     2295      <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> user, 
     2296      <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/> group 
     2297    </p> 
    22912298  </xsl:template> 
    22922299 
    …… 
    23212328        <xsl:choose> 
    23222329          <xsl:when test="/bedeworkadmin/page='modEvent' or 
    2323                           /bedeworkadmin/page='eventList'"> 
    2324             <xsl:choose> 
    2325               <xsl:when test="/bedeworkadmin/creating='true'"> 
    2326                 Add a Public Event 
    2327               </xsl:when> 
    2328               <xsl:otherwise> 
    2329                 Update a Public Event 
    2330               </xsl:otherwise> 
    2331             </xsl:choose> 
     2330                          /bedeworkadmin/page='eventList' or 
     2331                          /bedeworkadmin/page='displayEvent'"> 
     2332            Manage Events 
    23322333          </xsl:when> 
    2333           <xsl:when test="/bedeworkadmin/page='displayEvent'"> 
    2334             Display Event 
    2335           </xsl:when> 
    2336           <xsl:when test="/bedeworkadmin/page='sponsorList'"> 
     2334          <xsl:when test="/bedeworkadmin/page='sponsorList' or 
     2335                          /bedeworkadmin/page='modSponsor' or 
     2336                          /bedeworkadmin/page='deleteSponsorConfirm'"> 
    23372337            Manage Contacts 
    23382338          </xsl:when> 
    2339           <xsl:when test="/bedeworkadmin/page='modSponsor'"> 
    2340             Update Contact Info 
    2341           </xsl:when> 
    2342           <xsl:when test="/bedeworkadmin/page='deleteSponsorConfirm'"> 
    2343             Delete Contact 
    2344           </xsl:when> 
    2345           <xsl:when test="/bedeworkadmin/page='locationList'"> 
     2339          <xsl:when test="/bedeworkadmin/page='locationList' or 
     2340                          /bedeworkadmin/page='modLocation' or 
     2341                          /bedeworkadmin/page='deleteLocationConfirm'"> 
    23462342            Manage Locations 
    2347           </xsl:when> 
    2348           <xsl:when test="/bedeworkadmin/page='modLocation'"> 
    2349             Update Location 
    2350           </xsl:when> 
    2351           <xsl:when test="/bedeworkadmin/page='deleteLocationConfirm'"> 
    2352             Delete Location 
    23532343          </xsl:when> 
    23542344          <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='modCalendar'"> 
    …… 
    23772367          </xsl:when> 
    23782368          <xsl:when test="/bedeworkadmin/page='uploadTimezones'"> 
    2379             Time Zones 
     2369            Manage Time Zones 
    23802370          </xsl:when> 
    23812371          <xsl:when test="/bedeworkadmin/page='noAccess'"> 

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

    r37 r39  
    8484      </xsl:when> 
    8585      <xsl:when test="id='org.bedework.validation.error.nolocationaddress'"> 
    86         You must select a location.  For general use, use "on-campus" or "off-campus". 
     86        You must enter a location <em>address</em>. 
    8787      </xsl:when> 
    8888      <xsl:when test="id='org.bedework.client.error.missingfield'"> 

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

    r37 r39  
    503503      <forward name="inUse" path="/sponsor/showReferenced.rdo" redirect="true" /> 
    504504      <forward name="notFound" path="/sponsor/showUpdateList.rdo" redirect="true" /> 
     505      <forward name="cancelled" path="/sponsor/showUpdateList.rdo" redirect="true" /> 
    505506      <forward name="continue" path="/sponsor/showUpdateList.rdo" redirect="true" /> 
    506507    </action> 
    …… 
    529530               scope="session" 
    530531               validate="false"> 
    531       <forward name="continue" path="/sponsor/showUpdateList.rdo" redirect="true" /> 
     532      <forward name="continue" path="/sponsor/showModForm.rdo" redirect="true" /> 
    532533      <forward name="retry" path="/sponsor/showModForm.rdo" redirect="true" /> 
     534      <forward name="cancelled" path="/sponsor/showUpdateList.rdo" redirect="true" /> 
    533535      <forward name="delete" path="/sponsor/showDeleteConfirm.rdo" redirect="true" /> 
    534536    </action> 
    …… 
    601603      <forward name="inUse" path="/location/showReferenced.rdo" redirect="true" /> 
    602604      <forward name="notFound" path="/location/showUpdateList.rdo" redirect="true" /> 
     605      <forward name="cancelled" path="/location/showUpdateList.rdo" redirect="true" /> 
    603606      <forward name="continue" path="/location/showUpdateList.rdo" redirect="true" /> 
    604607    </action> 
    …… 
    627630               scope="session" 
    628631               validate="false"> 
    629       <forward name="continue" path="/location/showUpdateList.rdo" redirect="true" /> 
     632      <forward name="cancelled" path="/location/showUpdateList.rdo" redirect="true" /> 
     633      <forward name="continue" path="/location/showModForm.rdo" redirect="true" /> 
    630634      <forward name="retry" path="/location/showModForm.rdo" redirect="true" /> 
    631635      <forward name="delete" path="/location/showDeleteConfirm.rdo" redirect="true" /> 

  • trunk/calendar3/webadmin/war/docs/subs/subscriptions.jsp

    r2 r39  
    55 
    66<page>subscriptions</page> 
    7 <!--fix--> 
     7 
    88<subscriptions> 
    99  <logic:iterate name="peForm" property="subscriptions" id="subscription">