[Bedework-commit] bedework r1885 - in
releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins:
default/default resources
svnadmin at bedework.org
svnadmin at bedework.org
Wed May 14 17:17:57 EDT 2008
Author: johnsa
Date: 2008-05-14 17:17:56 -0400 (Wed, 14 May 2008)
New Revision: 1885
Added:
releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkDojo.js
releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/subIcon.gif
Modified:
releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.css
releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js
releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/calIcon-sm.gif
Log:
user client:
- updates to improve "portal friendly" performance (more needed here)
- better representation of subscribed writable calendars when selecting for add/edit event
Modified: releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2008-05-14 21:17:02 UTC (rev 1884)
+++ releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2008-05-14 21:17:56 UTC (rev 1885)
@@ -1478,7 +1478,8 @@
margin: 0;
padding: 2px 4px;
font-size: 1em;
- background-color: #5A6B93;
+ /*background-color: #5A6B93;*/
+ background-color: #747A8F;
color: #eee;
font-weight: normal;
}
@@ -1532,6 +1533,15 @@
list-style-image: url(../../resources/glassFill-icon-view.gif);
font-weight: bold;
}
+#bedework li.subscription {
+ list-style-image: url(../../resources/subIcon.gif);
+ font-style: italic;
+ margin-left: 0;
+ padding-left: 0;
+}
+#bedework li.subscription li {
+ font-style: normal;
+}
#bedework .calendarTree a:link,
#bedework .calendarTree a:active,
#bedework .calendarTree a:visited {
Modified: releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2008-05-14 21:17:02 UTC (rev 1884)
+++ releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2008-05-14 21:17:56 UTC (rev 1885)
@@ -165,7 +165,8 @@
<!-- the following variable can be set to "true" or "false";
to use dojo widgets and fancier UI features, set to false - these are
- not guaranteed to work in portals -->
+ not guaranteed to work in portals. Setting to true will make the
+ add/edit event form much faster, but will not support internationalization. -->
<xsl:variable name="portalFriendly">false</xsl:variable>
<!-- BEGIN MAIN TEMPLATE -->
@@ -376,14 +377,19 @@
/bedework/page='calendarListForExport'">
<script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script>
<link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
- <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script>
<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js"> </script>
<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js"> </script>
<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js"> </script>
- <xsl:if test="$portalFriendly = 'true'">
- <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>
- <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/>
- </xsl:if>
+ <xsl:choose>
+ <xsl:when test="$portalFriendly = 'true'">
+ <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>
+ <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script>
+ <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkDojo.js"> </script>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:if>
<xsl:if test="/bedework/editableAccess/access/acl/ace">
<script type="text/javascript">
@@ -907,7 +913,9 @@
</tr>
</xsl:when>
<xsl:otherwise>
- <xsl:for-each select="/bedework/eventscalendar/year/month/week/day[event]">
+ <xsl:for-each select="/bedework/eventscalendar/year/month/week/day[event[not(entityType=2 and start/noStart='true' and end/type='N')]]">
+ <!-- reminders are displayed below the normal event listings and are represented as
+ entityType=2 and start/noStart='true' and end/type='N'; we skip them within grid and list views -->
<xsl:if test="/bedework/periodname='Week' or /bedework/periodname='Month' or /bedework/periodname=''">
<tr>
<td colspan="6" class="dateRow">
@@ -4340,7 +4348,14 @@
<xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/></xsl:variable>
<xsl:choose>
<xsl:when test="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath))]/calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content]">
- <xsl:apply-templates select="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath))]/calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content]" mode="selectCalForEventCalTree"/>
+ <xsl:for-each select="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath)) and calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content]]">
+ <li class="subscription">
+ <xsl:value-of select="name"/>
+ <ul>
+ <xsl:apply-templates select="calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content]" mode="selectCalForEventCalTree"/>
+ </ul>
+ </li>
+ </xsl:for-each>
</xsl:when>
<xsl:otherwise>
<em>no writable calendars</em>
@@ -4379,9 +4394,10 @@
<a href="javascript:updateEventFormCalendar('{$calPath}','{$calDisplay}')">
<strong><xsl:value-of select="name"/></strong>
</a>
+ <!-- deprecated:
<xsl:if test="name != $calDisplay">
- <span class="small">(<xsl:value-of select="$calDisplay"/>)</span>
- </xsl:if>
+ <span class="small"> (<xsl:value-of select="$calDisplay"/>)</span>
+ </xsl:if> -->
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="name"/>
Added: releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkDojo.js
===================================================================
--- releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkDojo.js (rev 0)
+++ releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkDojo.js 2008-05-14 21:17:56 UTC (rev 1885)
@@ -0,0 +1,41 @@
+// Bedework Dojo functions
+
+/* **********************************************************************
+ Copyright 2007 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+ The above copyright notice and this permission notice appear in all
+ copies and supporting documentation;
+
+ The name, identifiers, and trademarks of Rensselaer Polytechnic
+ Institute are not used in advertising or publicity without the
+ express prior written permission of Rensselaer Polytechnic Institute;
+
+ DISCLAIMER: The software is distributed" AS IS" without any express or
+ implied warranty, including but not limited to, any implied warranties
+ of merchantability or fitness for a particular purpose or any warrant)'
+ of non-infringement of any current or pending patent rights. The authors
+ of the software make no representations about the suitability of this
+ software for any particular purpose. The entire risk as to the quality
+ and performance of the software is with the user. Should the software
+ prove defective, the user assumes the cost of all necessary servicing,
+ repair or correction. In particular, neither Rensselaer Polytechnic
+ Institute, nor the authors of the software are liable for any indirect,
+ special, consequential, or incidental damages related to the software,
+ to the maximum extent the law permits. */
+
+dojo.require("dojo.event.*");
+dojo.require("dojo.widget.DropdownDatePicker");
+
+function untilClickHandler(evt) {
+ selectRecurCountUntil('recurUntil');
+}
+
+function init() {
+ var untilHolder = dojo.byId("untilHolder");
+ dojo.event.connect(untilHolder, "onclick", untilClickHandler);
+}
+
+dojo.addOnLoad(init);
+
Modified: releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js
===================================================================
--- releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-05-14 21:17:02 UTC (rev 1884)
+++ releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-05-14 21:17:56 UTC (rev 1885)
@@ -25,11 +25,6 @@
special, consequential, or incidental damages related to the software,
to the maximum extent the law permits. */
-dojo.require("dojo.event.*");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.DropdownDatePicker");
-dojo.require("dojo.widget.DropdownTimePicker");
-
// ========================================================================
// ========================================================================
// Language and customization
@@ -43,7 +38,7 @@
// ========================================================================
/* An rdate
-/* date: String: internal date
+ * date: String: internal date
* time: String
* tzid timezone id or null
*/
@@ -604,15 +599,5 @@
}
}
-function untilClickHandler(evt) {
- selectRecurCountUntil('recurUntil');
-}
-function init() {
- var untilHolder = dojo.byId("untilHolder");
- dojo.event.connect(untilHolder, "onclick", untilClickHandler);
-}
-dojo.addOnLoad(init);
-
-
Modified: releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/calIcon-sm.gif
===================================================================
(Binary files differ)
Added: releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/subIcon.gif
===================================================================
(Binary files differ)
Property changes on: releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/subIcon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Bedework-commit
mailing list