Changeset 291

Timestamp:

03/17/06 15:10:28

Author:

johnsa

Message:

first round of updates to the personal client; this fixes general style and image paths, but leaves the add event form in an incomplete state.

Files:

• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (4 diffs)
• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (38 diffs)
• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/includes.js (modified) (3 diffs)

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

@@ -224 +224 @@
-#tabsTable .centerCell {
-  text-align: left;
-imag
+../../resourc
-  font-size: 0.8em;
-  white-space: nowrap;
@@ -234 +234 @@
-}
-#tabsTable .rightCell {
-imag
+../../resourc
-  padding-right: 0.5em;
-}
@@ -383 +383 @@
-  background-color: white;
-}
+#clock {
+  position: relative;
+}
+.shown {
+  display: inline;
+}
+.invisible {
+  display: none;
+}
+.hidden {
+  visibility: hidden;
+}
-form#subscriptions {
-  margin: 0;
@@ -416 +428 @@
-}
-#calPageTable ul.calendarTree li.folder {
-images/demo
+resources
-  padding-top: 0.25em;
-  padding-bottom: 0.25em;
-}
-#calPageTable ul.calendarTree li.calendar {
-images/demo
+resources
-}
-#calPageTable td.infoCell {

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

@@ -95 +95 @@
-              <xsl:when test="/bedework/appvar[key='sidebar']/value='closed'">
-                <td id="sideBarClosed">
-images/demo
+resources
-                </td>
-              </xsl:when>
@@ -187 +187 @@
-  <xsl:template name="headSection">
-     <title>Bedework: Personal Calendar Client</title>
+      <meta name="robots" content="noindex,nofollow"/>
-      <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/>
-      <meta name="robots" content="noindex,nofollow"/>
-      <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" />
-!--<link rel="icon" type="image/ico" href="{}/favicon.ico" />--
-script language="JavaScript
-// launches new browser window with print-friendly version of page when
-// print icon is clicked
-function launchPrintWindow(URL) {
-  printWindow = window.open(URL, "printWindow", "width=640,height=500,scrollbars=yes,resizable=yes,alwaysRaised=yes,menubar=yes,toolbar=yes");
-  window.printWindow.focus();
-}
-script
+link rel="icon" type="image/ico" href="{$resourcesRoot}/resources/bedework.ico" /
+xsl:if test="/bedework/page='addEvent' or /bedework/page='editEvent'
+<script type="text/javascript" src="{$resourcesRoot}/resources/includes.js"></script>
+<script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"></script>
+<link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
+<script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"></script>
+<link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/>
+<script type="text/javascript" src="{$resourcesRoot}/resources/browserSniffer.js"></script>
+xsl:if
-  </xsl:template>
-
@@ -209 +209 @@
-    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="logoTable">
-      <tr>
-images/demo
+resources
-        <td colspan="2" id="schoolLinksCell">
-          <h2>Personal Calendar</h2>
@@ -223 +223 @@
-    <table width="100%" border="0" cellpadding="0" cellspacing="0">
-      <tr>
-images/demo
-images/demo
-images/demo
+resources
+resources
+resources
-      </tr>
-    </table>
@@ -233 +233 @@
-          <xsl:when test="/bedework/appvar[key='sidebar']/value='closed'">
-            <a href="?setappvar=sidebar(opened)">
-images/demo
+resources
-            </a>
-          </xsl:when>
-          <xsl:otherwise>
-            <a href="?setappvar=sidebar(closed)">
-images/demo
+resources
-            </a>
-          </xsl:otherwise>
@@ -275 +275 @@
-              <xsl:choose>
-                <xsl:when test="/bedework/periodname='Day'">
-images/demo
+resources
-                </xsl:when>
-                <xsl:otherwise>
-images/demo
+resources
-                </xsl:otherwise>
-              </xsl:choose>
@@ -285 +285 @@
-              <xsl:choose>
-                <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''">
-images/demo
+resources
-                 </xsl:when>
-                <xsl:otherwise>
-images/demo
+resources
-                 </xsl:otherwise>
-              </xsl:choose>
@@ -295 +295 @@
-              <xsl:choose>
-                <xsl:when test="/bedework/periodname='Month'">
-images/demo
+resources
-                </xsl:when>
-                <xsl:otherwise>
-images/demo
+resources
-                </xsl:otherwise>
-              </xsl:choose>
@@ -305 +305 @@
-              <xsl:choose>
-                <xsl:when test="/bedework/periodname='Year'">
-images/demo
+resources
-                </xsl:when>
-                <xsl:otherwise>
-images/demo
+resources
-                </xsl:otherwise>
-              </xsl:choose>
@@ -317 +317 @@
-            <td class="rssPrint">
-              <a href="javascript:window.print()" title="print this view">
-images/demo
+resources
-              </a>
-              <a class="rss" href="{$setSelection}?calId=&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
@@ -332 +332 @@
-          <tr>
-            <td>
-images/demo
+resources
-            </td>
-            <td>
-images/demo
+resources
-            </td>
-            <td>
-images/demo
+resources
-            </td>
-            <td>
-images/demo
+resources
-            </td>
-            <td class="centerCell">
@@ -359 +359 @@
-      <tr>
-        <td class="leftCell">
-images/demo
-images/demo
+resources
+resources
-          <xsl:choose>
-            <xsl:when test="/bedework/periodname='Day'">
@@ -437 +437 @@
-        <td class="todayButton">
-          <a href="{$setViewPeriod}?viewType=todayView&amp;date={$curdate}">
-images/demo
+resources
-          </a>
-        </td>
@@ -490 +490 @@
-           <xsl:choose>
-            <xsl:when test="/bedework/periodname='Day'">
-images/demo
+resources
-            </xsl:when>
-            <xsl:when test="/bedework/periodname='Year'">
-images/demo
+resources
-            </xsl:when>
-            <xsl:when test="/bedework/periodname='Month'">
@@ -499 +499 @@
-                <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
-                  <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view">
-images/demo
+resources
-                  </a>
-                </xsl:when>
-                <xsl:otherwise>
-                  <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view">
-images/demo
+resources
-                  </a>
-                </xsl:otherwise>
@@ -513 +513 @@
-                <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'">
-                  <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view">
-images/demo
+resources
-                  </a>
-                </xsl:when>
-                <xsl:otherwise>
-                  <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view">
-images/demo
+resources
-                  </a>
-                </xsl:otherwise>
@@ -534 +534 @@
-                <xsl:choose>
-                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-images/demo
+resources
-                  </xsl:when>
-                  <xsl:otherwise>
-images/demo
+resources
-                  </xsl:otherwise>
-                </xsl:choose>
@@ -545 +545 @@
-                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-                    <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view">
-images/demo
+resources
-                    </a>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view">
-images/demo
+resources
-                    </a>
-                  </xsl:otherwise>
@@ -556 +556 @@
-              </xsl:otherwise>
-            </xsl:choose>
-images/demo
+resources
-         </td>
-       </tr>
@@ -1069 +1069 @@
-          <xsl:variable name="icalName" select="concat($guid,'.ics')"/>
-          <a href="{$eventView}?subid={$subscriptionId}&amp;&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$icalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
-images/demo
+resources
-          </a><!-- <br />
-          [<a href="">help</a>] -->
@@ -1182 +1182 @@
-        </tr>
-        <tr>
-N
+n
-            Date &amp; Time:
-          </td>
-
+ class="fieldval"
-            <!-- Set the timefields class for the first load of the page;
-                 subsequent changes will take place using javascript without a
@@ -1191 +1191 @@
-            <xsl:variable name="timeFieldsClass">
-              <xsl:choose>
-admin
+
-                <xsl:otherwise>timeFields</xsl:otherwise>
-              </xsl:choose>
-            </xsl:variable>
-            <xsl:choose>
-admin
+
-                <input type="checkbox" name="allDayFlag" onclick="swapAllDayEvent(this)" value="on" checked="checked"/>
-                <input type="hidden" name="eventStartDate.dateOnly" value="on" id="allDayStartDateField"/>
@@ -1212 +1212 @@
-              <div class="dateFields">
-                <span class="startDateLabel">Date </span>
-admin
-admin
+
+
-                <xsl:choose>
-admin
-admin
+
+
-                  </xsl:when>
-                  <xsl:otherwise>
-admin
+
-                  </xsl:otherwise>
-                </xsl:choose>
@@ -1231 +1231 @@
-              <div class="{$timeFieldsClass}" id="startTimeFields">
-                <span id="calWidgetStartTimeHider" class="show">
-admin
-admin
-admin
-admin
+
+
+
+
-                  </xsl:if>
-                  <xsl:text> </xsl:text>
@@ -1244 +1244 @@
-              <strong>End:</strong>
-              <xsl:choose>
-admin
+
-                  <input type="radio" name="eventEndType" value="E" checked="checked" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
-                </xsl:when>
@@ -1254 +1254 @@
-              <xsl:variable name="endDateTimeClass">
-                <xsl:choose>
-admin
+
-                  <xsl:otherwise>invisible</xsl:otherwise>
-                </xsl:choose>
@@ -1260 +1260 @@
-              <div class="{$endDateTimeClass}" id="endDateTime">
-                <div class="dateFields">
-admin
-admin
+
+
-                  <xsl:choose>
-admin
-admin
+
+
-                    </xsl:when>
-                    <xsl:otherwise>
-admin
+
-                    </xsl:otherwise>
-                  </xsl:choose>
@@ -1279 +1279 @@
-                <div class="{$timeFieldsClass}" id="endTimeFields">
-                  <span id="calWidgetEndTimeHider" class="show">
-admin
-admin
-admin
-admin
+
+
+
+
-                    </xsl:if>
-                    <xsl:text> </xsl:text>
@@ -1294 +1294 @@
-              <div class="dateFields">
-                <xsl:choose>
-admin
+
-                    <input type="radio" name="eventEndType" value="D" checked="checked" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/>
-                  </xsl:when>
@@ -1304 +1304 @@
-                <xsl:variable name="endDurationClass">
-                  <xsl:choose>
-admin
+
-                    <xsl:otherwise>invisible</xsl:otherwise>
-                  </xsl:choose>
@@ -1310 +1310 @@
-                <xsl:variable name="durationHrMinClass">
-                  <xsl:choose>
-admin
+
-                    <xsl:otherwise>shown</xsl:otherwise>
-                  </xsl:choose>
@@ -1316 +1316 @@
-                <div class="{$endDurationClass}" id="endDuration">
-                  <xsl:choose>
-admin
+
-                    <!-- we are using day, hour, minute format -->
-                    <!-- must send either no week value or week value of 0 (zero) -->
-                      <div class="durationBox">
-                        <input type="radio" name="eventDuration.type" value="daytime" onclick="swapDurationType('daytime')" checked="checked"/>
-admin
+
-                        <input type="text" name="eventDuration.daysStr" size="2" value="{$daysStr}" id="durationDays"/>days
-                        <span id="durationHrMin" class="{$durationHrMinClass}">
-admin
+
-                          <input type="text" name="eventDuration.hoursStr" size="2" value="{$hoursStr}" id="durationHours"/>hours
-admin
+
-                          <input type="text" name="eventDuration.minutesStr" size="2" value="{$minutesStr}" id="durationMinutes"/>minutes
-                        </span>
@@ -1333 +1333 @@
-                      <div class="durationBox">
-                        <input type="radio" name="eventDuration.type" value="weeks" onclick="swapDurationType('week')"/>
-admin
+
-                        <input type="text" name="eventDuration.weeksStr" size="2" value="{$weeksStr}" id="durationWeeks" disabled="true"/>weeks
-                      </div>
@@ -1341 +1341 @@
-                      <div class="durationBox">
-                        <input type="radio" name="eventDuration.type" value="daytime" onclick="swapDurationType('daytime')"/>
-admin
+
-                        <input type="text" name="eventDuration.daysStr" size="2" value="{$daysStr}" id="durationDays" disabled="true"/>days
-                        <span id="durationHrMin" class="{$durationHrMinClass}">
-admin
+
-                          <input type="text" name="eventDuration.hoursStr" size="2" value="{$hoursStr}" id="durationHours" disabled="true"/>hours
-admin
+
-                          <input type="text" name="eventDuration.minutesStr" size="2" value="{$minutesStr}" id="durationMinutes" disabled="true"/>minutes
-                        </span>
@@ -1353 +1353 @@
-                      <div class="durationBox">
-                        <input type="radio" name="eventDuration.type" value="weeks" onclick="swapDurationType('week')" checked="checked"/>
-admin
+
-                        <input type="text" name="eventDuration.weeksStr" size="2" value="{$weeksStr}" id="durationWeeks"/>weeks
-                      </div>
@@ -1362 +1362 @@
-              <div class="dateFields" id="noDuration">
-                <xsl:choose>
-admin
+
-                    <input type="radio" name="eventEndType" value="N" checked="checked" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/>
-                  </xsl:when>
@@ -1376 +1376 @@
-        <!--  Status  -->
-        <tr>
-N
+n
-            Status:
-          </td>
-
+ class="fieldval"
-            <xsl:choose>
-admin
+
-                <input type="radio" name="event.status" value="CONFIRMED"/>confirmed <input type="radio" name="event.status" value="TENTATIVE" checked="checked"/>tentative <input type="radio" name="event.status" value="CANCELLED"/>cancelled
-              </xsl:when>
-admin
+
-                <input type="radio" name="event.status" value="CONFIRMED"/>confirmed <input type="radio" name="event.status" value="TENTATIVE"/>tentative <input type="radio" name="event.status" value="CANCELLED" checked="checked"/>cancelled
-              </xsl:when>
@@ -1913 +1913 @@
-      <tr>
-        <td class="leftCell">
-
+
+
-        </td>
-        <td class="rightCell">

trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/includes.js

@@ -48 +48 @@
-}
-
+// launches new browser window with print-friendly version of page when
+// print icon is clicked
+function launchPrintWindow(URL) {
+  printWindow = window.open(URL, "printWindow", "width=640,height=500,scrollbars=yes,resizable=yes,alwaysRaised=yes,menubar=yes,toolbar=yes");
+  window.printWindow.focus();
+}
+
-function startDateCalWidgetCallback(date, month, year) {
-  if (String(month).length == 1) {
@@ -54 +61 @@
-  if (String(date).length == 1) {
-      date = '0' + date;
-    
+
-  today = new Date();
-  if (year < today.getFullYear()) {
@@ -70 +77 @@
-  if (String(date).length == 1) {
-      date = '0' + date;
-    
+
-  today = new Date();
-  if (year < today.getFullYear()) {