Changeset 348

Show
Ignore:
Timestamp:
04/08/06 08:04:29
Author:
johnsa
Message:

moved "views" xml output into the header for the web clients (will need it in all pages for menuing); added view icon.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css

    r345 r348  
    204204#bodyBlock td#sideBar #sideBarMenu li { 
    205205  padding-bottom: 0.5em; 
     206} 
     207#myViews li { 
     208  list-style-image: url(../../resources/glassFill-icon-view.gif); 
    206209} 
    207210#bodyBlock td#bodyContent { 

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

    r345 r348  
    264264  <xsl:template name="sideBar"> 
    265265    <h3> 
    266       <img alt="manage views" src="{$resourcesRoot}/resources/glassFill-button-menu.gif" width="12" height="11" border="0"/> views 
     266      <img alt="manage views" src="{$resourcesRoot}/resources/glassFill-icon-menuButton.gif" width="12" height="11" border="0"/> views 
    267267    </h3> 
    268268    <ul id="myViews"> 
    …… 
    270270    </ul> 
    271271 
    272     <h3><img alt="manage calendars" src="{$resourcesRoot}/resources/glassFill-button-menu.gif" width="12" height="11" border="0"/> calendars</h3> 
     272    <h3><img alt="manage calendars" src="{$resourcesRoot}/resources/glassFill-icon-menuButton.gif" width="12" height="11" border="0"/> calendars</h3> 
    273273    <ul class="calendarTree"> 
    274274      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar" mode="myCalendars"/> 
    …… 
    277277    <h3> 
    278278      <a href="{$subscriptions-fetch}" title="manage subscriptions"> 
    279         <img alt="manage subscriptions" src="{$resourcesRoot}/resources/glassFill-button-menu.gif" width="12" height="11" border="0"/> 
     279        <img alt="manage subscriptions" src="{$resourcesRoot}/resources/glassFill-icon-menuButton.gif" width="12" height="11" border="0"/> 
    280280        subscriptions 
    281281      </a> 
    …… 
    787787            <td> 
    788788              <xsl:variable name="dayDate" select="date"/> 
    789               <a href="{$initEvent}?date={$dayDate}" class="gridAdd"> 
     789              <a href="{$initEvent}?date={$dayDate}" class="gridAdd" title="add event"> 
    790790                <img src="{$resourcesRoot}/resources/addEvent-forGrid-icon.gif" width="10" height="10" border="0" alt="add event"/> 
    791791              </a> 
    792               <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink"> 
     792              <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink" title="go to day"> 
    793793                <xsl:value-of select="value"/> 
    794794              </a> 
    …… 
    824824                <td> 
    825825                  <xsl:variable name="dayDate" select="date"/> 
    826                   <a href="{$initEvent}?date={$dayDate}" class="gridAdd"> 
     826                  <a href="{$initEvent}?date={$dayDate}" class="gridAdd" title="add event"> 
    827827                    <img src="{$resourcesRoot}/resources/addEvent-forGrid-icon.gif" width="10" height="10" border="0" alt="add event"/> 
    828828                  </a> 
    829                   <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink"> 
     829                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink" title="go to day"> 
    830830                    <xsl:value-of select="value"/> 
    831831                  </a> 

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

    r341 r348  
    221221    <filter></filter> <%-- unimplemented --%> 
    222222  </selectionState> 
     223   
     224  <%-- List of views for menuing --%> 
     225  <views> 
     226    <logic:present name="calForm" property="views"> 
     227      <logic:iterate id="view" name="calForm" property="views" > 
     228        <view> 
     229          <name><bean:write name="view" property="name"/></name> 
     230          <id><bean:write name="view" property="id"/></id> 
     231        </view> 
     232      </logic:iterate> 
     233    </logic:present> 
     234  </views> 
    223235 
    224236<%-- **************************************************************** 
    225237      the following code should not be produced in the public client 
    226238     **************************************************************** --%> 
    227     <myViews> 
    228     </myViews> 
    229  
     239  <logic:equal name="calForm" property="publicView" value="false"> 
    230240    <myCalendars> 
    231241      <jsp:include page="/docs/calendar/emitCalendars.jsp"/> 
    …… 
    238248    <myPreferences> 
    239249    </myPreferences> 
     250  </logic:equal> 
    240251 
    241252<% 

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

    r313 r348  
    7272  </logic:iterate> 
    7373</eventscalendar> 
    74  
    75 <%-- List of views for menuing --%> 
    76 <views> 
    77   <logic:present name="calForm" property="views"> 
    78     <logic:iterate id="view" name="calForm" property="views" > 
    79       <view> 
    80         <name><bean:write name="view" property="name"/></name> 
    81         <id><bean:write name="view" property="id"/></id> 
    82       </view> 
    83     </logic:iterate> 
    84   </logic:present> 
    85 </views> 
    8674 
    8775<%-- Produce date and time form elements for personal calendar to be used