Changeset 3044

Show
Ignore:
Timestamp:
11/10/10 14:29:16
Author:
johnsa
Message:

personal client: simplify the interface and hide views - they are not in use in the personal client at the moment.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/resources/javascript/bedework/bedeworkAccess.js

    r2997 r3044  
    4747 
    4848// note that resourcesRoot is passed in from the html head section defined in the xslt 
    49 var trashIcon = '<img src="' + resourcesRoot  + '/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/>'; 
    50 var userIcon = '<img src="' + resourcesRoot  + '/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/>'; 
    51 var groupIcon = '<img src="' + resourcesRoot  + '/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/>'; 
     49var trashIcon = '<img src="' + imagesRoot + '/trashIcon.gif" width="13" height="13" border="0" alt="remove"/>'; 
     50var userIcon = '<img src="' + imagesRoot + '/userIcon.gif" width="13" height="13" border="0" alt="user"/>'; 
     51var groupIcon = '<img src="' + imagesRoot + '/groupIcon.gif" width="13" height="13" border="0" alt="group"/>'; 
    5252 
    5353// How granted accesses appear 
  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/calendars.xsl

    r3039 r3044  
    8888    <!-- this template receives calType 0,1,4,7,8,9  --> 
    8989    <xsl:variable name="id" select="id"/> 
     90    <xsl:variable name="userRootCalendar">/user/<xsl:value-of select="/bedework/userid"/></xsl:variable> 
    9091    <li> 
    9192      <xsl:attribute name="class"> 
     
    9394          <xsl:when test="disabled = 'true'">unknown</xsl:when> 
    9495          <xsl:when test="lastRefreshStatus &gt; 300">unknown</xsl:when> 
    95           <xsl:when test="/bedework/selectionState/selectionType = 'collections' 
     96          <xsl:when test="not(path = $userRootCalendar) 
     97                          and /bedework/selectionState/selectionType = 'collections' 
    9698                          and path = /bedework/selectionState/collection/virtualpath">selected</xsl:when> 
    9799          <xsl:when test="isSubscription = 'true'"> 
     
    106108      </xsl:attribute> 
    107109      <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-content"> 
    108         <xsl:variable name="userRootCalendar">/user/<xsl:value-of select="/bedework/userid"/></xsl:variable> 
    109110        <form name="bwHideDisplayCal" class="bwHideDisplayCal" method="post"> 
    110111          <xsl:attribute name="action"> 
  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/sideBar.xsl

    r3007 r3044  
    2323   
    2424  <xsl:template name="sideBar"> 
     25    <!--  We'll leave the following views block here in case we (or someone) wants to make use of views. 
     26          We are not using them at the moment in the personal client, so we'll hide it. --> 
     27    <!--  
    2528    <h3> 
    2629      <xsl:copy-of select="$bwStr-SdBr-Views"/> 
     
    4750      </xsl:choose> 
    4851    </ul> 
     52    --> 
    4953 
    5054    <h3>