Changeset 1295

Show
Ignore:
Timestamp:
02/16/07 14:37:26
Author:
johnsa
Message:

user client:

added copy event feature (in progress)
made manage calendars and subscriptions links

more obvious

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1285 r1295  
    218218#bodyBlock td#sideBar h3 a:active, 
    219219#bodyBlock td#sideBar h3 a:visited { 
     220  float: right; 
     221  font-size: 0.8em; 
    220222  color: #eee; 
    221223  background: transparent; 

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

    r1291 r1295  
    486486 
    487487    <h3> 
    488       <a href="{$calendar-fetch}"> 
    489         <img alt="manage calendars" src="{$resourcesRoot}/resources/glassFill-icon-menuButton.gif" width="12" height="11" border="0"/> calendars 
     488      <a href="{$calendar-fetch}" title="manage calendars"> 
     489        manage 
    490490      </a> 
     491      calendars 
    491492    </h3> 
    492493    <!-- normal calendars --> 
    …… 
    504505    <h3> 
    505506      <a href="{$subscriptions-fetch}" title="manage subscriptions"> 
    506         <img alt="manage subscriptions" src="{$resourcesRoot}/resources/glassFill-icon-menuButton.gif" width="12" height="11" border="0"/> 
    507         subscriptions 
     507        manage 
    508508      </a> 
     509      subscriptions 
    509510    </h3> 
    510511    <ul class="calendarTree"> 
    …… 
    10451046      </xsl:choose> 
    10461047    </xsl:if> 
    1047     <xsl:if test="not(currentAccess/current-user-privilege-set/privilege/write-content)"> 
     1048    <xsl:if test="not(currentAccess/current-user-privilege-set/privilege/write-content) and not(recurring='true' or recurrenceId != '')"> 
     1049      <!-- temporarily hide from Recurring events --> 
    10481050      <xsl:choose> 
    10491051        <xsl:when test="recurring='true' or recurrenceId != ''"> 
    …… 
    14061408              </xsl:choose> 
    14071409            </xsl:if> 
    1408             <xsl:if test="not(currentAccess/current-user-privilege-set/privilege/write-content)"> 
     1410            | 
     1411            <xsl:choose> 
     1412              <xsl:when test="recurring='true' or recurrenceId != ''"> 
     1413                <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit master"/> 
     1414                Copy: 
     1415                <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;copy=true" title="copy master (recurring event)">master</a>,<a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;copy=true" title="copy instance (recurring event)">instance</a> 
     1416              </xsl:when> 
     1417              <xsl:otherwise> 
     1418                <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;copy=true" title="copy event"> 
     1419                  <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/> 
     1420                  Copy 
     1421                </a> 
     1422              </xsl:otherwise> 
     1423            </xsl:choose> 
     1424            <xsl:if test="not(currentAccess/current-user-privilege-set/privilege/write-content) and not(recurring='true' or recurrenceId != '')"> 
     1425              <!-- temporarily hide from Recurring events --> 
    14091426              | 
    14101427              <xsl:choose>