Changeset 2221
- Timestamp:
- 06/03/09 01:47:53
- Files:
-
- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (4 diffs)
- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (8 diffs)
- trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkCalendarGrid.js (modified) (3 diffs)
- trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkSetup.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
r2219 r2221 373 373 margin-left: -100px; 374 374 } 375 #bedework . bwActionIconsInList{376 right: 2em;375 #bedework .listAdd .bwActionIcons { 376 margin-left: -80px; 377 377 } 378 378 #bedework .bwActionIcons a:link, … … 801 801 list-style: none; 802 802 } 803 #bedework .eventActionsInGrid { 804 margin: 1em !important; 805 } 806 #bedework .eventActionsInGrid li { 807 display: block !important; 808 } 803 809 #bedework #refreshEventAction { 804 810 padding-left: 1em; … … 1284 1290 background-color: black !important; /* must be important to override a:hover selector above */ 1285 1291 } 1286 #bedework #monthCalendarTable a span.eventTip, 1287 #bedework #monthCalendarTable a span.eventTipReverse { 1292 #bedework #monthCalendarTable .eventTip { 1288 1293 display: none; 1289 1294 } 1290 #bedework #monthCalendarTable a:hover span.eventTip { 1291 display: block; 1295 #bedework #monthCalendarTable .eventTip { 1292 1296 position: absolute; 1293 1297 width: 20em; 1294 top: 1em;1295 left: 12em;1296 1298 background-color: #ffa; 1297 1299 color: black; 1298 padding: 4px; 1300 margin: -0.5em 0 0 4em; 1301 padding: 1em; 1299 1302 border: 1px solid #333; 1300 1303 } 1301 #bedework #monthCalendarTable a:hover span.eventTipReverse { 1302 display: block; 1303 position: absolute; 1304 width: 20em; 1305 top: 1em; 1306 left: -21em; 1307 background-color: #ffa; 1308 color: black; 1309 padding: 4px; 1310 border: 1px solid #333; 1311 } 1312 #bedework #monthCalendarTable a:hover span.eventTipStatusCancelled { 1304 #bedework #monthCalendarTable .eventTipReverse { 1305 margin: -0.5em 0 0 -4em; 1306 } 1307 #bedework #monthCalendarTable .eventTipDetails { 1308 padding: 1em; 1309 margin: 0; 1310 background-color: #ffd; 1311 color: black; 1312 } 1313 #bedework #monthCalendarTable .eventTip strong { 1314 font-weight: bold; 1315 font-size: 110%; 1316 } 1317 #bedework #monthCalendarTable .eventTip ul { 1318 margin-top: 1em; 1319 font-size: 120%; 1320 } 1321 #bedework #monthCalendarTable .eventTipStatusCancelled { 1313 1322 display: block; 1314 1323 color: white; … … 1318 1327 text-align: center; 1319 1328 } 1320 #bedework #monthCalendarTable a:hover span.eventTipStatusTentative {1329 #bedework #monthCalendarTable .eventTipStatusTentative { 1321 1330 display: block; 1322 1331 color: black; trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
r2220 r2221 899 899 <xsl:with-param name="startDate"> 900 900 <xsl:choose> 901 <xsl:when test="/bedework/periodname = ' day'"><xsl:value-of select="/bedework/firstday/date"/></xsl:when>901 <xsl:when test="/bedework/periodname = 'Day'"><xsl:value-of select="/bedework/firstday/date"/></xsl:when> 902 902 <xsl:otherwise><xsl:value-of select="/bedework/now/date"/></xsl:otherwise> 903 903 </xsl:choose> … … 1086 1086 <xsl:variable name="actionIconsId">bwActionIcons-<xsl:value-of select="value"/></xsl:variable> 1087 1087 <div class="listAdd"> 1088 < a href="javascript:toggleActionIcons('{$actionIconsId}','bwActionIcons bwActionIconsInList')" title="add...">1088 <span class="listAddButton"> 1089 1089 add... 1090 </ a>1090 </span> 1091 1091 <xsl:call-template name="actionIcons"> 1092 1092 <xsl:with-param name="actionIconsId"><xsl:value-of select="$actionIconsId"/></xsl:with-param> 1093 1093 <xsl:with-param name="startDate"><xsl:value-of select="$date"/></xsl:with-param> 1094 <xsl:with-param name="startTime"><xsl:value-of select="/bedework/now/twodigithour24"/>0000</xsl:with-param>1094 <xsl:with-param name="startTime"><xsl:value-of select="/bedework/now/twodigithour24"/>0000</xsl:with-param> 1095 1095 </xsl:call-template> 1096 1096 </div> … … 1480 1480 <xsl:with-param name="actionIconsId"><xsl:value-of select="$actionIconsId"/></xsl:with-param> 1481 1481 <xsl:with-param name="startDate"><xsl:value-of select="$dayDate"/></xsl:with-param> 1482 <xsl:with-param name="startTime"><xsl:value-of select="/bedework/now/twodigithour24"/>0000</xsl:with-param> 1482 1483 </xsl:call-template> 1483 1484 </div> … … 1531 1532 override the background-color set by eventClass. User styles should 1532 1533 not be used for canceled events (tentative is ok). --> 1533 <li >1534 <li class="event"> 1534 1535 <a href="{$eventView}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" 1535 1536 class="{$eventRootClass} {$eventClass}"> … … 1557 1558 </xsl:otherwise> 1558 1559 </xsl:choose> 1559 <xsl:variable name="eventTipClass"> 1560 </a> 1561 <div> 1562 <xsl:attribute name="class"> 1560 1563 <xsl:choose> 1561 <xsl:when test="$dayPos > 5">eventTip Reverse</xsl:when>1564 <xsl:when test="$dayPos > 5">eventTip eventTipReverse</xsl:when> 1562 1565 <xsl:otherwise>eventTip</xsl:otherwise> 1563 1566 </xsl:choose> 1564 </xsl: variable>1565 < span class="{$eventTipClass}">1566 <xsl:if test="status='CANCELLED'"><span class="eventTipStatusCancelled">CANCELED</span></xsl:if>1567 <xsl:if test="status='TENTATIVE'"><span class="eventTipStatusTentative">TENTATIVE</span></xsl:if>1567 </xsl:attribute> 1568 <xsl:if test="status='CANCELLED'"><span class="eventTipStatusCancelled">CANCELED</span></xsl:if> 1569 <xsl:if test="status='TENTATIVE'"><span class="eventTipStatusTentative">TENTATIVE</span></xsl:if> 1570 <div class="eventTipDetails"> 1568 1571 <xsl:choose> 1569 1572 <xsl:when test="summary = ''"> … … 1586 1589 </xsl:otherwise> 1587 1590 </xsl:choose><br/> 1588 <xsl:if test=" location/address">1591 <xsl:if test="normalize-space(location/address) != ''"> 1589 1592 Location: <xsl:value-of select="location/address"/><br/> 1590 1593 </xsl:if> … … 1610 1613 recurring 1611 1614 </xsl:if> 1615 <xsl:variable name="userStr">/principals/users/<xsl:value-of select="/bedework/userid"/></xsl:variable> 1612 1616 <xsl:choose> 1613 <xsl:when test=" owner = /bedework/userid">1617 <xsl:when test="$userStr = owner"> 1614 1618 personal <xsl:value-of select="$entityType"/> 1615 1619 </xsl:when> … … 1621 1625 </xsl:otherwise> 1622 1626 </xsl:choose> 1623 </span> 1624 </a> 1627 </div> 1628 <ul class="eventActionsInGrid"> 1629 <li> 1630 <a href="{$eventView}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"> 1631 <img src="{$resourcesRoot}/resources/glassFill-icon-viewGray.gif" width="13" height="13" border="0" alt="view"/> 1632 View details 1633 </a> 1634 </li> 1635 <li> 1636 <!-- download --> 1637 <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 1638 <xsl:choose> 1639 <xsl:when test="recurring='true' or recurrenceId != ''"> 1640 <img src="{$resourcesRoot}/resources/std-icalDownload-icon-small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 1641 Download 1642 <a href="{$export}&calPath={$calPath}&guid={$guid}&nocache=no&contentName={$eventIcalName}" title="download master (recurring event)"> 1643 all 1644 </a>, 1645 <a href="{$export}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&contentName={$eventIcalName}" title="download this instance (recurring event)"> 1646 instance 1647 </a> 1648 </xsl:when> 1649 <xsl:otherwise> 1650 <a href="{$export}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 1651 <img src="{$resourcesRoot}/resources/std-icalDownload-icon-small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 1652 Download 1653 </a> 1654 </xsl:otherwise> 1655 </xsl:choose> 1656 </li> 1657 <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-content"> 1658 <li> 1659 <xsl:choose> 1660 <xsl:when test="recurring='true' or recurrenceId != ''"> 1661 <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit master"/> 1662 Edit: 1663 <a href="{$editEvent}&calPath={$calPath}&guid={$guid}" title="edit master (recurring event)"> 1664 all 1665 </a>, 1666 <a href="{$editEvent}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" title="edit this instance (recurring event)"> 1667 instance 1668 </a> 1669 </xsl:when> 1670 <xsl:otherwise> 1671 <a href="{$editEvent}&calPath={$calPath}&guid={$guid}" title="edit event"> 1672 <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/> 1673 Edit 1674 </a> 1675 </xsl:otherwise> 1676 </xsl:choose> 1677 </li> 1678 </xsl:if> 1679 <li> 1680 <xsl:choose> 1681 <xsl:when test="recurring='true' or recurrenceId != ''"> 1682 <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit master"/> 1683 Copy: 1684 <a href="{$editEvent}&calPath={$calPath}&guid={$guid}&copy=true" title="copy master (recurring event)"> 1685 all 1686 </a>, 1687 <a href="{$editEvent}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&copy=true" title="copy this instance (recurring event)"> 1688 instance 1689 </a> 1690 </xsl:when> 1691 <xsl:otherwise> 1692 <a href="{$editEvent}&calPath={$calPath}&guid={$guid}&copy=true" title="copy event"> 1693 <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/> 1694 Copy 1695 </a> 1696 </xsl:otherwise> 1697 </xsl:choose> 1698 </li> 1699 1700 <xsl:if test="not(currentAccess/current-user-privilege-set/privilege/write-content) and not(recurring='true' or recurrenceId != '')"> 1701 <li> 1702 <!-- temporarily hide from Recurring events --> 1703 <xsl:choose> 1704 <xsl:when test="recurring='true' or recurrenceId != ''"> 1705 <img src="{$resourcesRoot}/resources/std-ical_iconLinkDkGray.gif" width="12" height="16" border="0" alt="add event reference"/> 1706 Link: 1707 <a href="{$addEventRef}&calPath={$calPath}&guid={$guid}" title="add master event reference to a calendar"> 1708 all 1709 </a>, 1710 <a href="{$addEventRef}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" title="add this event reference to a calendar"> 1711 instance 1712 </a> 1713 </xsl:when> 1714 <xsl:otherwise> 1715 <a href="{$addEventRef}&calPath={$calPath}&guid={$guid}" title="add event reference to a calendar"> 1716 <img src="{$resourcesRoot}/resources/std-ical_iconLinkDkGray.gif" width="12" height="16" border="0" alt="add event reference"/> 1717 Link 1718 </a> 1719 </xsl:otherwise> 1720 </xsl:choose> 1721 </li> 1722 </xsl:if> 1723 1724 <xsl:if test="currentAccess/current-user-privilege-set/privilege/unbind"> 1725 <li> 1726 <xsl:choose> 1727 <xsl:when test="recurring='true' or recurrenceId != ''"> 1728 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 1729 Delete: 1730 <a href="{$delEvent}&calPath={$calPath}&guid={$guid}" title="delete master (recurring event)" onclick="return confirm('Delete all recurrences of this event?');"> 1731 all 1732 </a>, 1733 <a href="{$delEvent}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" title="delete this instance (recurring event)" onclick="return confirm('Delete this event?');"> 1734 instance 1735 </a> 1736 </xsl:when> 1737 <xsl:otherwise> 1738 <a href="{$delEvent}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" title="delete event" onclick="return confirm('Delete this event?');"> 1739 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 1740 Delete 1741 </a> 1742 </xsl:otherwise> 1743 </xsl:choose> 1744 </li> 1745 </xsl:if> 1746 </ul> 1747 1748 </div> 1625 1749 </li> 1626 1750 </xsl:template> trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkCalendarGrid.js
r2220 r2221 34 34 $(document).ready(function() { 35 35 36 // a ctive day in the calendar grid36 // an active day in the calendar grid 37 37 $("td.bwActiveDay").click ( 38 38 function (event) { … … 40 40 var $targ = $(event.target); 41 41 if ($targ.is("td")) { 42 $(this).children("div").children("div.bwActionIcons").toggle( );42 $(this).children("div").children("div.bwActionIcons").toggle("fast"); 43 43 } 44 44 } … … 64 64 ); 65 65 66 $("div.listAdd").hover ( 67 function () { 68 $(this).children("div.bwActionIcons").show("fast"); 69 }, 70 function () { 71 $(this).children("div.bwActionIcons").hide("fast"); 72 } 73 ); 74 75 // EVENT MENUS and TOOLTIPS 76 77 $("li.event").hover ( 78 function () { 79 $(this).children("div.eventTip").show(); 80 }, 81 function () { 82 $(this).children("div.eventTip").hide(); 83 } 84 ); 85 86 $("div.eventTip").click ( 87 function () { 88 $(this).slideUp("fast"); 89 } 90 ); 91 92 66 93 }); 67 94 trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkSetup.js
r2220 r2221 36 36 $("#bwAddButton").click ( 37 37 function () { 38 $("#bwActionIcons-0").toggle(); 38 $("#bwActionIcons-0").toggle("fast"); 39 } 40 ); 41 $("#bwActionIcons-0").hover( 42 function() { 43 // do nothing on mouseover 44 }, 45 function () { 46 $("div.bwActionIcons").hide(); 39 47 } 40 48 );
