Changeset 22

Show
Ignore:
Timestamp:
01/23/06 16:59:45
Author:
johnsa
Message:

added update form for user preferences to stylesheets; added errors and messages to error and message stylesheets; added some messages to actions; changed behavior of prefs cancel to return to main menu in struts-config.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r14 r22  
    182182  padding: 0.2em; 
    183183  font-size: 0.9em; 
     184} 
     185table.eventFormTable tr.validationError td.fieldName { 
     186  color: black; 
     187  background-color: #ee0 !important; 
    184188} 
    185189table.eventFormTable td.optional { 

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

    r20 r22  
    402402    <form  name="peForm" method="post" action="{$modEventAction}"> 
    403403      <table class="eventFormTable"> 
    404         <tr> 
     404        <xsl:variable name="titleClass"> 
     405          <xsl:choose> 
     406            <xsl:when test="/bedeworkadmin/error[id='org.bedework.validation.error.notitle']">validationError</xsl:when> 
     407            <xsl:otherwise>normal</xsl:otherwise> 
     408          </xsl:choose> 
     409        </xsl:variable> 
     410        <tr class="{$titleClass}"> 
    405411          <td class="fieldName"> 
    406412            Title: 
    …… 
    19771983  <!--+++++++++++++++ User Prefs ++++++++++++++++++++--> 
    19781984  <xsl:template name="modPrefs"> 
    1979     mod prefs 
     1985    <h2>Edit User Preferences</h2> 
     1986    <form action="{$prefs-update}" method="post"> 
     1987      <table id="eventFormTable"> 
     1988        <tr> 
     1989          <td class="fieldName"> 
     1990            User: 
     1991          </td> 
     1992          <td> 
     1993            <xsl:value-of select="/bedeworkadmin/prefs/user"/> 
     1994            <xsl:variable name="user" select="/bedeworkadmin/prefs/user"/> 
     1995            <input type="hidden" name="user" value="{$user}"/> 
     1996          </td> 
     1997        </tr> 
     1998        <tr> 
     1999          <td class="fieldName"> 
     2000            Preferred view: 
     2001          </td> 
     2002          <td> 
     2003            <xsl:variable name="preferredView" select="/bedeworkadmin/prefs/preferredView"/> 
     2004            <input type="text" value="{$preferredView}" size="40"/> 
     2005          </td> 
     2006        </tr> 
     2007        <tr> 
     2008          <td class="fieldName"> 
     2009            Preferred view period: 
     2010          </td> 
     2011          <td> 
     2012            <xsl:variable name="preferredViewPeriod" select="/bedeworkadmin/prefs/preferredViewPeriod"/> 
     2013            <input type="text" value="{$preferredViewPeriod}" size="40"/> 
     2014          </td> 
     2015        </tr> 
     2016        <tr> 
     2017          <td class="fieldName"> 
     2018            Skin name: 
     2019          </td> 
     2020          <td> 
     2021            <xsl:variable name="skinName" select="/bedeworkadmin/prefs/skinName"/> 
     2022            <input type="text" value="{$skinName}" size="40"/> 
     2023          </td> 
     2024        </tr> 
     2025        <tr> 
     2026          <td class="fieldName"> 
     2027            Skin style: 
     2028          </td> 
     2029          <td> 
     2030            <xsl:variable name="skinStyle" select="/bedeworkadmin/prefs/skinStyle"/> 
     2031            <input type="text" value="{$skinStyle}" size="40"/> 
     2032          </td> 
     2033        </tr> 
     2034      </table> 
     2035      <br /> 
     2036 
     2037      <input type="submit" name="modPrefs" value="Update" class="padRight"/> 
     2038      <input type="reset" value="Reset"/> 
     2039      <input type="submit" name="cancelled" value="Cancel"/> 
     2040    </form> 
    19802041  </xsl:template> 
    19812042 
    …… 
    20172078      </tr> 
    20182079      <xsl:for-each select="/bedeworkadmin/groups/group"> 
    2019         <xsl:variable name="groupName"><xsl:copy-of select="name/*"/></xsl:variable> 
    2020         <!-- this data (groupname) apparently needs cleaning: there is %0A and other characters in it --> 
     2080        <xsl:variable name="groupName"><xsl:value-of select="name"/></xsl:variable> 
    20212081        <tr> 
    20222082          <td> 
    …… 
    22782338      <xsl:if test="/bedeworkadmin/message"> 
    22792339        <div id="messages"> 
    2280           <p><xsl:apply-templates select="/bedeworkadmin/message"/><br/></p> 
     2340          <xsl:apply-templates select="/bedeworkadmin/message"/> 
    22812341        </div> 
    22822342      </xsl:if> 
    22832343      <xsl:if test="/bedeworkadmin/error"> 
    22842344        <div id="errors"> 
    2285           <p><xsl:apply-templates select="/bedeworkadmin/error"/><br/></p> 
     2345          <xsl:apply-templates select="/bedeworkadmin/error"/> 
    22862346        </div> 
    22872347      </xsl:if> 

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

    r20 r22  
    44    <xsl:choose> 
    55      <xsl:when test="id='org.bedework.pubevents.error.missingfield'"> 
    6         <xsl:value-of select="param"/> is a required field. 
     6        Your information is incomplete: please update the fields highlighted below. 
    77      </xsl:when> 
    88      <xsl:when test="id='org.bedework.validation.error.notitle'"> 
    9         Title is a required field. 
     9        You must supply a title. 
    1010      </xsl:when> 
    1111      <xsl:when test="id='org.bedework.error.event.startafterend'"> 

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

    r2 r22  
    5252        Location is referenced 
    5353      </xsl:when> 
     54      <xsl:when test="id='org.bedework.client.message.prefs.updated'"> 
     55        User preferences updated 
     56      </xsl:when> 
    5457      <xsl:otherwise> 
    5558        <xsl:value-of select="id"/> = <xsl:value-of select="param"/> 

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

    r12 r22  
    751751      <forward name="continue" path="/authuser/showUpdateList.rdo" redirect="true" /> 
    752752    </action> 
    753      
     753 
    754754    <!-- =============================================================== 
    755755                     User Preferences Actions 
    …… 
    763763      <forward name="success" path="/docs/prefs/modPrefs.jsp"/> 
    764764    </action> 
    765           
     765 
    766766    <action    path="/prefs/fetchForUpdate" 
    767767               type="org.bedework.webcommon.pref.FetchPrefsAction" 
    …… 
    769769               scope="session" 
    770770               validate="false"> 
    771       <forward name="notFound" path="/authuser/showUpdateList.rdo" redirect="true" /> 
     771      <forward name="notFound" path="/admin/showMain.rdo" redirect="true" /> 
    772772      <forward name="success" path="/prefs/showModForm.rdo" redirect="true" /> 
    773773    </action> 
    …… 
    778778               scope="session" 
    779779               validate="false"> 
    780       <forward name="cancelled" path="/authuser/showUpdateList.rdo" redirect="true" /> 
     780      <forward name="cancelled" path="/admin/showMain.rdo" redirect="true" /> 
    781781      <forward name="retry" path="/prefs/showModForm.rdo" /> 
    782       <forward name="success" path="/authuser/showUpdateList.rdo" redirect="true" /> 
    783     </action>          
    784           
     782      <forward name="success" path="/admin/showMain.rdo" redirect="true" /> 
     783    </action> 
     784 
    785785    <!-- =============================================================== 
    786786                     Admin Group Actions 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java

    r21 r22  
    139139 
    140140    svc.updateUserPrefs(prefs); 
    141  
     141    form.getMsg().emit("org.bedework.client.message.prefs.updated"); 
    142142    return "success"; 
    143143  }