Changeset 122

Show
Ignore:
Timestamp:
02/09/06 12:41:00
Author:
johnsa
Message:

updates to public header xml to repack selectionState information;
updates to public stylesheet to accomodate this change;
changed footer from skin switching to point at public working calendar examples;
beginnings of calendar description div in admin client add / edit event that displays a calendar description when a calendar is selected

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r39 r122  
    247247  font-weight: bold; 
    248248  margin: 0 1em; 
     249} 
     250table.eventFormTable #calendarDescriptionBox { 
     251  width: 450px; 
     252  border: 1px solid #ccb; 
     253  font-size: 0.75em; 
     254  background-color: #f5f5f5; 
     255  color: black; 
     256  margin: 4px 0; 
     257  padding: 4px; 
     258} 
     259table.eventFormTable #calendarDescriptionBox a { 
     260  display: block; 
     261  text-align: right; 
    249262} 
    250263.autoCompleteMatched { 

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

    r102 r122  
    451451          <td> 
    452452            <xsl:if test="/bedeworkadmin/formElements/form/calendar/preferred/select/option"> 
    453               <select name="prefCalendarId"> 
     453              <select name="prefCalendarId" onchange="getCalendarDescription(this.value,'please select a calendar.')"> 
    454454                <option value="-1"> 
    455455                  Select preferred: 
    …… 
    459459              or Calendar (all): 
    460460            </xsl:if> 
    461             <select name="calendarId"> 
     461            <select name="calendarId" onchange="getCalendarDescription(this.value,'please select a calendar.')"> 
    462462              <option value="-1"> 
    463463                Select: 
    …… 
    465465              <xsl:copy-of select="/bedeworkadmin/formElements/form/calendar/all/select/*"/> 
    466466            </select> 
    467             <xsl:text> </xsl:text> 
    468             <a href="" target="_blank">Calendar Definitions</a> 
     467            <div id="calendarDescriptionBox"> 
     468              Description: <span id="calendarDescription">please select a calendar.</span> 
     469              <a href="" target="calDescriptions">all calendar descriptions</a> 
     470            </div> 
    469471          </td> 
    470472        </tr> 

  • trunk/calendar3/deployment/webadmin/webapp/resources/resources/includes.js

    r2 r122  
    4141  } 
    4242} 
     43function  getCalendarDescription(calId,defaultMessage) { 
     44  div = document.getElementById("calendarDescription"); 
     45  if (calId == -1) { 
     46    div.innerHTML = defaultMessage; 
     47  } else { 
     48    div.innerHTML = calId; 
     49  } 
     50} 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl

    r121 r122  
    153153  </xsl:template> 
    154154 
    155   <!--==== BLOCK (named) TEMPLATES and NAVIGATION  ====--> 
     155  <!--==== HEADER TEMPLATES and NAVIGATION  ====--> 
    156156  <!-- these templates are separated out for convenience and to simplify the default template --> 
    157157 
    …… 
    490490                    <xsl:variable name="name" select="name"/> 
    491491                    <xsl:choose> 
    492                       <xsl:when test="name=/bedework/name"> 
     492                      <xsl:when test="name=/bedework/selectionState/view/name"> 
    493493                        <option value="{$name}" selected="selected"><xsl:value-of select="name"/></option> 
    494494                      </xsl:when> 
    …… 
    10011001  </xsl:template> 
    10021002 
    1003 <!--==== FOOTER ====--> 
     1003  <!--==== FOOTER ====--> 
    10041004 
    10051005  <xsl:template name="footer"> 
    …… 
    10221022            </select> 
    10231023          </form> 
    1024           <form name="skinSelectForm" method="get" action="{$setup}"> 
    1025             skin selector: 
    1026             <select name="skinNameSticky" onChange="submit()"> 
    1027               <option>select a skin</option> 
    1028               <option value="default">Demo</option> 
    1029               <option value="washington">Washington</option> 
    1030               <option value="rensselaer">Rensselaer</option> 
     1024          <form name="skinSelectForm" method="get" action=""> 
     1025            skin examples: 
     1026            <select name="skinNameSticky" onchange="window.location = this.value"> 
     1027              <option>select a calendar</option> 
     1028              <option value="http://events.rpi.edu">Rensselaer</option> 
     1029              <option value="http://myuw.washington.edu/cal/">Washington</option> 
    10311030            </select> 
    10321031          </form> 

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

    r113 r122  
    6767    Values: true, false - Flag if we are using 24 hour time --%> 
    6868 
    69   <logic:present name="calForm" property="currentView" > 
    70     <name><bean:write name="calForm" property="currentView.name"/></name><%-- 
    71       Value: string - Name of selected view for display --%> 
    72     <viewid><bean:write name="calForm" property="currentView.id"/></viewid><%-- 
    73       Value: string - String ID of selected view for display --%> 
    74   </logic:present> 
    75   <logic:notPresent name="calForm" property="currentView" > 
    76     <name>All</name> 
    77     <viewid>-1</viewid> 
    78   </logic:notPresent> 
    79   <search><bean:write name="calForm" property="search"/></search><%-- 
    80     Value: string - Current search string for display --%> 
    81  
    8269  <publicview><bean:write name="calForm" property="publicView" /></publicview><%-- 
    8370    Values: true, false - Flag if we are in the guest (public) view  --%> 
    …… 
    119106        e.g. <a href="{$urlPrefix}/eventView.do?eventId=8">View Event</a> --%> 
    120107  <urlpattern><genurl:rewrite action="DUMMYACTION.DO" /></urlpattern> 
    121  
    122   <selectionType><bean:write name="calForm" property="selectionType"/></selectionType><%-- 
    123         Value: view,search,calendar,subscription,filter 
    124         Used to branch into different presentation depending on the type of 
    125         output we expect --%> 
    126108 
    127109  <personaluri><bean:message key="org.bedework.personal.calendar.uri"/></personaluri> 
    …… 
    192174    </appvar> 
    193175  </logic:iterate> 
     176 
     177  <selectionState><%-- 
     178    What type of information have we selected to display?  Used to 
     179    branch between different templates in the xsl based on user selections. --%> 
     180    <selectionType><bean:write name="calForm" property="selectionType"/></selectionType><%-- 
     181        Value: view,search,calendar,subscription,filter 
     182        Used to branch into different presentation depending on the type of 
     183        output we expect --%> 
     184    <view> 
     185      <logic:present name="calForm" property="currentView" > 
     186        <name><bean:write name="calForm" property="currentView.name"/></name><%-- 
     187          Value: string - Name of selected view for display --%> 
     188        <id><bean:write name="calForm" property="currentView.id"/></id><%-- 
     189          Value: string - String ID of selected view for display --%> 
     190      </logic:present> 
     191      <logic:notPresent name="calForm" property="currentView" > 
     192        <name>All</name><%-- change: this should be the default not "All" --%> 
     193        <id>-1</id> 
     194      </logic:notPresent> 
     195    </view> 
     196    <search><bean:write name="calForm" property="search"/></search><%-- 
     197      Value: string - Current search string for display 
     198      Note: this will change when proper searching is implemented --%> 
     199    <subscription></subscription><%-- 
     200      Value: string - currently selected subscription ("calendar" too) --%> 
     201    <filter></filter> <%-- unimplemented --%> 
     202  </selectionState> 
     203 
    194204<% 
    195205} catch (Throwable t) {