Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 1884

Timestamp:

05/14/08 17:17:02

Author:

johnsa

Message:

user client:
- updates to improve "portal friendly" performance (more needed here)
- better representation of subscribed writable calendars when selecting for add/edit event

Files:

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

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

r1883	r1884
1479	1479	padding: 2px 4px;
1480	1480	font-size: 1em;
1481		background-color: #5A6B93;
	1481	/background-color: #5A6B93;/
	1482	background-color: #747A8F;
1482	1483	color: #eee;
1483	1484	font-weight: normal;
…	…
1532	1533	list-style-image: url(../../resources/glassFill-icon-view.gif);
1533	1534	font-weight: bold;
	1535	}
	1536	#bedework li.subscription {
	1537	list-style-image: url(../../resources/subIcon.gif);
	1538	font-style: italic;
	1539	margin-left: 0;
	1540	padding-left: 0;
	1541	}
	1542	#bedework li.subscription li {
	1543	font-style: normal;
1534	1544	}
1535	1545	#bedework .calendarTree a:link,

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

r1883	r1884
166	166	<!-- the following variable can be set to "true" or "false";
167	167	to use dojo widgets and fancier UI features, set to false - these are
168		not guaranteed to work in portals -->
	168	not guaranteed to work in portals. Setting to true will make the
	169	add/edit event form much faster, but will not support internationalization. -->
169	170	<xsl:variable name="portalFriendly">false</xsl:variable>
170	171
…	…
377	378	<script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script>
378	379	<link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
379		~~<script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script>~~
380	380	<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js"> </script>
381	381	<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js"> </script>
382	382	<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js"> </script>
383		<xsl:if test="$portalFriendly = 'true'">
384		<script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>
385		<link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/>
386		</xsl:if>
	383	<xsl:choose>
	384	<xsl:when test="$portalFriendly = 'true'">
	385	<script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>
	386	<link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/>
	387	</xsl:when>
	388	<xsl:otherwise>
	389	<script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script>
	390	<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkDojo.js"> </script>
	391	</xsl:otherwise>
	392	</xsl:choose>
387	393	</xsl:if>
388	394	<xsl:if test="/bedework/editableAccess/access/acl/ace">
…	…
908	914	</xsl:when>
909	915	<xsl:otherwise>
910		<xsl:for-each select="/bedework/eventscalendar/year/month/week/day[event]">
	916	<xsl:for-each select="/bedework/eventscalendar/year/month/week/day[event[not(entityType=2 and start/noStart='true' and end/type='N')]]">
	917	<!-- reminders are displayed below the normal event listings and are represented as
	918	entityType=2 and start/noStart='true' and end/type='N'; we skip them within grid and list views -->
911	919	<xsl:if test="/bedework/periodname='Week' or /bedework/periodname='Month' or /bedework/periodname=''">
912	920	<tr>
…	…
4341	4349	<xsl:choose>
4342	4350	<xsl:when test="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath))]/calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content]">
4343		<xsl:apply-templates select="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath))]/calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content]" mode="selectCalForEventCalTree"/>
	4351	<xsl:for-each select="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath)) and calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content]]">
	4352	<li class="subscription">
	4353	<xsl:value-of select="name"/>
	4354	<ul>
	4355	<xsl:apply-templates select="calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content]" mode="selectCalForEventCalTree"/>
	4356	</ul>
	4357	</li>
	4358	</xsl:for-each>
4344	4359	</xsl:when>
4345	4360	<xsl:otherwise>
…	…
4380	4395	<strong><xsl:value-of select="name"/></strong>
4381	4396	</a>
	4397	<!-- deprecated:
4382	4398	<xsl:if test="name != $calDisplay">
4383		<span class="small">(<xsl:value-of select="$calDisplay"/>)</span>
4384		</xsl:if>
	4399	<span class="small"> (<xsl:value-of select="$calDisplay"/>)</span>
	4400	</xsl:if> -->
4385	4401	</xsl:when>
4386	4402	<xsl:otherwise>

trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js

r1852	r1884
26	26	to the maximum extent the law permits. */
27	27
28		~~dojo.require("dojo.event.*");~~
29		~~dojo.require("dojo.widget.*");~~
30		~~dojo.require("dojo.widget.DropdownDatePicker");~~
31		~~dojo.require("dojo.widget.DropdownTimePicker");~~
32
33	28	// ========================================================================
34	29	// ========================================================================
…	…
44	39
45	40	/* An rdate
46		/* date: String: internal date
	41	* date: String: internal date
47	42	* time: String
48	43	* tzid timezone id or null
…	…
605	600	}
606	601
607		function untilClickHandler(evt) {
608		selectRecurCountUntil('recurUntil');
609		}
610
611		function init() {
612		var untilHolder = dojo.byId("untilHolder");
613		dojo.event.connect(untilHolder, "onclick", untilClickHandler);
614		}
615
616		dojo.addOnLoad(init);
617
618
	602
	603