Changeset 450

Timestamp:

05/04/06 17:29:15

Author:

johnsa

Message:

Updates to user preferences in user client

Files:

• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (9 diffs)
• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/dynCalendarWidget.js (modified) (10 diffs)
• trunk/calendar3/webclient/war/docs/prefs/modPrefs.jsp (modified) (1 diff)

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

@@ -241 +241 @@
-                  /bedework/page='editEvent' or
-                  /bedework/page='selectCalForEvent' or
-
+
+
-      <script type="text/javascript" src="{$resourcesRoot}/resources/includes.js"></script>
-    </xsl:if>
-    <xsl:if test="/bedework/page='addEvent' or
-
-
+
-      <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"></script>
-      <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
@@ -1335 +1335 @@
-              </xsl:choose>
-            </span>
-Simple
+CalSelect
-          </td>
-        </tr>
@@ -1724 +1724 @@
-              </xsl:choose>
-            </span>
-Simple
+CalSelect
-          </td>
-        </tr>
@@ -2045 +2045 @@
-
-  <xsl:template match="event" mode="addEventRef">
+  <!-- The name "eventForm" is referenced by several javascript functions. Do not
+    change it without modifying includes.js -->
-    <form name="eventForm" method="post" action="{$event-addEventRefComplete}" id="standardForm"  enctype="multipart/form-data">
-      <xsl:variable name="subscriptionId" select="subscription/id"/>
@@ -2076 +2078 @@
-              <em>default calendar</em>
-            </span>
-Simple
+CalSelect
-          </td>
-        </tr>
@@ -3184 +3186 @@
-  <!--==== UPLOAD ====-->
-  <xsl:template name="upload">
+  <!-- The name "eventForm" is referenced by several javascript functions. Do not
+    change it without modifying includes.js -->
-    <form name="eventForm" method="post" action="{$upload}" id="standardForm"  enctype="multipart/form-data">
-      <h2>Upload iCAL File</h2>
@@ -3204 +3208 @@
-              <em>default calendar</em>
-            </span>
-Simple
+CalSelect
-          </td>
-        </tr>
@@ -3384 +3388 @@
-  <xsl:template match="prefs">
-    <h2>Manage Preferences</h2>
-
+
+
+
-      <table class="common">
-        <tr><td colspan="2" class="fill">User settings:</td></tr>
@@ -3413 +3419 @@
-          </td>
-          <td>
-defaultCalendar
-select name="defaultCalendar"
-  <xsl:for-each select="/bedework/myCalendars/calendars//calendar[currentAccess/current-user-privilege-set/privilege/write-content and calendarCollection = 'true']"
-    <xsl:variable name="calPath" select="path"/
-  
-  <xsl:when test="path = $defaultCalendar
-  <option value="{$calPath}" selected="selected"><xsl:value-of select="path"/></option
-  
-  
-  <option value="{$calPath}"><xsl:value-of select="path"/></option
-  
-  
-  </xsl:for-each
-/select
+calPath
+input type="hidden" name="calPath" value="{$calPath}"/
+<xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable
+<span id="bwEventCalDisplay"
+
+<xsl:when test="contains(defaultCalendar,$userPath)
+<xsl:value-of select="substring-after(defaultCalendar,$userPath)"/
+
+
+<xsl:value-of select="defaultCalendar"/
+
+
+</span
+a href="javascript:launchCalSelectWindow('{$event-selectCalForEvent}')" class="small">[change]</a
-          </td>
-        </tr>

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

@@ -7 +7 @@
-*
-*
- 
- 
+
+
-*/
-
@@ -41 +41 @@
-                // this.month          = this.today.getMonth();
-                // this.year           = this.today.getFullYear();
-
- 
+
+
-    // calendar widget.
-                this.year           = yr; //this.today.getFullYear();
@@ -116 +116 @@
-                var nextMonth, nextYear, prevImgHTML, prevLinkHTML, nextImgHTML, nextLinkHTML;
-                var monthComboOptions, monthCombo, yearComboOptions, yearCombo, html;
-
+
-                this.currentMonth = month = arguments[0] != null ? arguments[0] : this.currentMonth;
-                this.currentYear  = year  = arguments[1] != null ? arguments[1] : this.currentYear;
@@ -159 +159 @@
-                        previousYear--;
-                }
-
+
-                nextYear  = thisMonth.getFullYear();
-                nextMonth = thisMonth.getMonth() + 1;
@@ -187 +187 @@
-                        monthCombo = monthnames[thisMonth.getMonth()];
-                }
-
+
-                /**
-        * Build year combo
@@ -276 +276 @@
-                this.offsetY = Yoffset;
-        }
-
+
-/**
-* Sets the images path
@@ -370 +370 @@
-        {
-                this._getLayer().style.visibility = 'hidden';
-
+
-    // for Bedework event editing; reveal time fields when cal widget is hidden
-    changeClass('calWidgetStartTimeHider','shown');
@@ -384 +384 @@
-        {
-                this._getLayer().style.visibility = 'visible';
-
+
-    // for Bedework event editing; hide time fields when cal widget is visible
-    // to avoid IE rendering oddities (IE always displays the "windowed" layer
@@ -459 +459 @@
-                                arguments[0] = null;
-                        }
-
+
-                        dynCalendar_oldOnmousemove();
-                }
@@ -477 +477 @@
-                                }
-                        }
-
+
-                        dynCalendar_oldOnclick(arguments[0] ? arguments[0] : null);
-                }

trunk/calendar3/webclient/war/docs/prefs/modPrefs.jsp

@@ -13 +13 @@
-  <email><bean:write name="userPrefs" property="email"/></email>
-  <!-- default calendar into which events will be placed -->
-
+
+
+
+
-  <!-- name of default view (collection of subscriptions) that will appear upon login -->
-  <preferredView><bean:write name="userPrefs" property="preferredView"/></preferredView>