Changeset 2001

Timestamp:

12/31/08 14:58:23

Author:

johnsa

Message:

admin client: more updates for new subscription model and views, updates to adming group listings

Files:

• trunk/deployment/webadmin/webapp/resources/default/default/default.css (modified) (10 diffs)
• trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (22 diffs)
• trunk/deployment/webadmin/webapp/resources/resources/bedework.js (modified) (5 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (1 diff)
• trunk/deployment/webuser/webapp/resources/demoskins/resources/bedework.js (modified) (4 diffs)

trunk/deployment/webadmin/webapp/resources/default/default/default.css

@@ -298 +298 @@
-  padding: 0.25em 0 0 0;
-}
-ul.adminMenu a:link,
-ul.adminMenu a:active,
-ul.adminMenu a:visited {
-  text-decoration: none;
-  color: #483D8B;
-  background-color: transparent;
-}
-ul.adminMenu a:hover {
-  text-decoration: none;
-  color: #483D8B;
-  background-color: #ff3;
-}
-#bwSubmittedEventCommentBlock {
-  font-size: 0.9em;
@@ -349 +337 @@
-#commonListTable th {
-  padding: 0.2em 1em 0.2em 0.5em;
-ccc
+bbb
-  color: black;
-  white-space: nowrap;
@@ -358 +346 @@
-  padding: 0.2em 1em 0.2em 0.5em;
-  color: black;
-eee
+ddd
-}
-#commonListTable td.date,
@@ -365 +353 @@
-}
-#commonListTable tr.highlight td {
-
+
+
-}
-.recurrenceEditLinks {
@@ -726 +715 @@
-}
-#sharingBox {
-
+1em 
-  border-top: 1px solid #333;
-  padding: 1em 1em 2em 1em;
@@ -932 +921 @@
-  padding: 2em;
-}
-#
+.
-  padding-left: 10px;
-  margin-left: 10px;
-}
-#
+.
-  padding-top: 0.25em;
-  /*font-weight: bold;*/
-}
-#calendarTree 
+
-  list-style-image: url(../../resources/catIcon.gif);
-}
-#calendarTree 
+
-  list-style-image: url(../../resources/calIcon-sm.gif);
-}
-#
+.
-  list-style-image: url(../../resources/trashIcon.gif);
-}
-#
+.
-  list-style-image: url(../../resources/inboxIcon.gif);
-}
-#
+.
-  list-style-image: url(../../resources/outboxIcon.gif);
-}
-#
+.
-  list-style-image: url(../../resources/calIconDeleted-sm.gif);
-}
-#
+.
-  list-style-image: url(../../resources/glassFill-icon-view.gif);
-  font-weight: bold;
-}
-#
+.
-  list-style-image: url(../../resources/calIconAlias-sm.gif);
-  font-style: italic;
@@ -968 +957 @@
-  padding-left: 0;
-}
-#
+.
-  list-style-image: url(../../resources/catIconAlias.gif);
-  font-style: italic;
@@ -974 +963 @@
-  padding-left: 0;
-}
-#
+.
-  font-style: normal;
-}
-
-
-
-
-
-
-
-
-
-
+
-  /* the arrangement below is required for cross-browser compatibility;
-     be cautious changing it (works IE7, FF2, Safari 3) */
@@ -993 +973 @@
-  margin: 0 25px 0 -35px;
-}
+#bwPublicCalDisplay {
+  margin: 1em 0 -1em 1em;
+}
-#filterTable {
-  font-size: 0.9em;
@@ -1053 +1036 @@
-.padTop {
-  padding-top: 1em;
+}
+.viewsTable {
+  width: 60%;
+}
+a {
+  color: #00c;
+  background-color: inherit;
+  text-decoration: none;
+}
+a:hover {
+  color: #483D8B;
+  background-color: #ff3;
-}
-#footer {

trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

@@ -275 +275 @@
-          </script>
-        </xsl:if>
-
+
+
+
-          <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script>
-          <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js">&#160;</script>
@@ -3211 +3213 @@
-        <td class="cals">
-          <h3>Public calendars</h3>
-id
+class
-            <xsl:choose>
-              <xsl:when test="/bedework/page='calendarDescriptions' or /bedework/page='displayCalendar'">
@@ -3437 +3439 @@
-      </div>
-      <div id="subscriptionTypes" class="invisible">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            <tr>
-              <th>URL to calendar:</th>
-              <td>
-Holder" id="aliasUriHolder
+
-              </td>
-            </tr>
@@ -3499 +3461 @@
-            </tr>
-          </table>
+          <p>
+            Note: An alias can be added to a Bedework calendar using a URL of the form:<br/>
+            bwcal://[path], e.g. bwcal:///public/Arts
+          </p>
-        </div>
-      </div>
@@ -3638 +3604 @@
-            <xsl:choose>
-              <xsl:when test="isSubscription='true'">
-Delet
+Remov
-              </xsl:when>
-              <xsl:when test="calType = '0'">
@@ -3729 +3695 @@
-  <xsl:template match="currentCalendar" mode="deleteCalendarConfirm">
-    <xsl:choose>
+      <xsl:when test="isSubscription = 'true'">
+        <h3>Remove Subscription</h3>
+        <p>
+          The following subscription will be removed.
+          Continue?
+        </p>
+      </xsl:when>
-      <xsl:when test="calType = '0'">
-        <h3>Delete Folder</h3>
@@ -3779 +3752 @@
-          <td align="right">
-            <xsl:choose>
+              <xsl:when test="isSubscription = 'true'">
+                <input type="submit" name="delete" value="Yes: Remove Subscription!"/>
+              </xsl:when>
-              <xsl:when test="calType = '0'">
-                <input type="submit" name="delete" value="Yes: Delete Folder!"/>
@@ -3813 +3789 @@
-      </form>-->
-      <h4>Calendars</h4>
-id
+class
-        <xsl:apply-templates select="/bedework/calendars/calendar" mode="selectCalForEventCalTree"/>
-      </ul>
@@ -3906 +3882 @@
-        <td class="bwCalsForMove">
-          <p>Select a new parent folder:</p>
-id
+class
-            <xsl:apply-templates select="/bedework/calendars/calendar" mode="listForMove"/>
-          </ul>
@@ -4387 +4363 @@
-        <td class="cals">
-          <h3>Subscription Tree</h3>
-id
+class
-            <xsl:apply-templates select="calendar" mode="listForUpdateSubscription">
-              <xsl:with-param name="root">true</xsl:with-param>
@@ -4471 +4447 @@
-      <xsl:if test="calendar">
-        <ul>
-
-
+
-        </ul>
-      </xsl:if>
@@ -4479 +4454 @@
-
-  <xsl:template match="currentCalendar" mode="addSubscription">
- or Folder
-
+
+return 
-      <table class="common">
-        <tr>
@@ -4533 +4508 @@
-          <th>Type:</th>
-          <td>
-            <!-- we will set the value of "calendarCollection on submit.
-                 Value is false only for folders, so we default it to true here.  -->
-            <input type="hidden" value="true" name="calendarCollection"/>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          </td>
-        </tr>
@@ -4548 +4556 @@
-        <input type="submit" name="cancelled" value="cancel"/>
-      </div>
-      <div id="subscriptionTypes" class="invisible">
-        <!-- If we are making a subscription, we will set the hidden value of "aliasUri" based
-             on the subscription type. -->
-        <input type="hidden" name="aliasUri" value=""/>
-        <p>
-          <strong>Subscription Type:</strong><br/>
-          <!-- subType is defaulted to public.  It is changed when a subTypeSwitch is clicked. -->
-          <input type="hidden" value="public" name="subType" id="bwSubType"/>
-          <input type="radio" name="subTypeSwitch" value="public" checked="checked" onclick="changeClass('subscriptionTypePublic','visible');changeClass('subscriptionTypeExternal','invisible');changeClass('subscriptionTypeUser','invisible');setField('bwSubType',this.value);"/> Public calendar (alias)
-          <!-- input type="radio" name="subTypeSwitch" value="user" onclick="changeClass('subscriptionTypePublic','invisible');changeClass('subscriptionTypeExternal','invisible');changeClass('subscriptionTypeUser','visible');setField('bwSubType',this.value);"/> User calendar-->
-          <input type="radio" name="subTypeSwitch" value="external" onclick="changeClass('subscriptionTypePublic','invisible');changeClass('subscriptionTypeExternal','visible');changeClass('subscriptionTypeUser','invisible');setField('bwSubType',this.value);"/> URL
-        </p>
-
-        <div id="subscriptionTypePublic">
-          <input type="hidden" value="" name="publicAliasHolder" id="publicAliasHolder"/>
-          <div id="bwPublicCalDisplay">
-            Select the public calendar or folder:
-          </div>
-          <ul id="publicSubscriptionTree">
-            <xsl:apply-templates select="/bedework/publicCalendars/calendar" mode="selectCalForPublicAliasCalTree"/>
-          </ul>
-        </div>
-
-        <div id="subscriptionTypeUser" class="invisible">
-          <table class="common">
-            <tr>
-              <th>User's ID:</th>
-              <td>
-                <input type="text" name="userIdHolder" value="" size="40"/>
-              </td>
-            </tr>
-            <tr>
-              <th>Calendar Path:</th>
-              <td>
-                <input type="text" name="userCalHolder" value="calendar" size="40"/><br/>
-                <span class="note">E.g. "calendar" (default) or "someFolder/someCalendar"</span>
-              </td>
-            </tr>
-          </table>
-        </div>
-
-
-        <div class="invisible" id="subscriptionTypeExternal">
-          <table class="common">
-            <tr>
-              <th>URL to calendar:</th>
-              <td>
-                <input type="text" name="aliasUriHolder" id="aliasUriHolder" value="" size="40"/>
-              </td>
-            </tr>
-            <tr>
-              <th>ID (if required):</th>
-              <td>
-                <input type="text" name="remoteId" value="" size="40"/>
-              </td>
-            </tr>
-            <tr>
-              <th>Password (if required):</th>
-              <td>
-                <input type="password" name="remotePw" value="" size="40"/>
-              </td>
-            </tr>
-          </table>
-        </div>
-      </div>
-
-    </form>
-
@@ -4622 +4564 @@
-  </xsl:template>
-
+  <xsl:template match="calendar" mode="selectCalForPublicAliasCalTree">
+    <xsl:variable name="id" select="id"/>
+    <li>
+      <xsl:attribute name="class">
+        <xsl:choose>
+          <xsl:when test="name='Trash'">trash</xsl:when>
+          <xsl:when test="isSubscription = 'true'">alias</xsl:when>
+          <xsl:when test="calType = '0'">folder</xsl:when>
+          <xsl:otherwise>calendar</xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+      <xsl:variable name="calPath" select="path"/>
+      <xsl:variable name="calDisplay" select="path"/>
+      <xsl:variable name="calendarCollection" select="calendarCollection"/>
+      <xsl:choose>
+        <xsl:when test="canAlias = 'true'">
+          <a href="javascript:updatePublicCalendarAlias('{$calPath}','{$calDisplay}','{$calendarCollection}')">
+            <xsl:value-of select="name"/>
+          </a>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="name"/>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:if test="calendar">
+        <ul>
+          <xsl:apply-templates select="calendar" mode="selectCalForPublicAliasCalTree"/>
+        </ul>
+      </xsl:if>
+    </li>
+  </xsl:template>
+
-  <!--+++++++++++++++ Views ++++++++++++++++++++-->
-  <xsl:template match="views" mode="viewList">
@@ -4627 +4601 @@
-    <xsl:variable name="userPath">/user/<xsl:value-of select="/bedework/userInfo/user"/>/</xsl:variable>
-
-
+
+
+
+
+
+
+
-    <form name="addView" action="{$view-addView}" method="post">
-      <input type="text" name="name" size="60"/>
@@ -4633 +4613 @@
-    </form>
-
-3>Views</h3
-
+4>Views</h4
+ class="viewsTable"
-      <tr>
-        <th>Name</th>
@@ -4725 +4705 @@
-      </tr>
-    </table>
+
-    <table border="0" id="submitTable">
-      <tr>
@@ -5654 +5635 @@
-        <th>Name</th>
-        <th>Description</th>
+        <th>Calendar Suite*</th>
-        <xsl:if test="/bedework/groups/showMembers='true'">
-          <th>Members</th>
@@ -5660 +5642 @@
-      </tr>
-      <xsl:for-each select="/bedework/groups/group">
-!--<xsl:sort select="name" order="ascending" case-order="upper-first"/>--
+xsl:sort select="name" order="ascending" case-order="lower-first"/
-        <xsl:variable name="groupName" select="name"/>
-        <tr>
+          <xsl:if test="name = /bedework/calSuites//calSuite/group">
+            <xsl:attribute name="class">highlight</xsl:attribute>
+          </xsl:if>
-          <td>
-            <a href="{$admingroup-fetchForUpdate}&amp;adminGroupName={$groupName}">
@@ -5670 +5655 @@
-          <td>
-            <xsl:value-of select="desc"/>
+          </td>
+          <td>
+            <xsl:for-each select="/bedework/calSuites/calSuite">
+              <xsl:if test="group = $groupName">
+                <xsl:value-of select="name"/>
+              </xsl:if>
+            </xsl:for-each>
-          </td>
-          <xsl:if test="/bedework/groups/showMembers='true'">
@@ -5684 +5676 @@
-      </xsl:for-each>
-    </table>
+    <p class="note">
+     *Highlighted rows indicate a group to which a Calendar Suite is attached.
+    </p>
-    <p>
-      <input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initAdd}')" value="Add a new group"/>

trunk/deployment/webadmin/webapp/resources/resources/bedework.js

@@ +1 @@
+/* **********************************************************************
+    Copyright 2008 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. */
+
+/* NOTE: this file is different between Bedework web applications and is
+   therefore not currently interchangable between apps.  This will be normalized
+   in the coming versions, but for now don't try to exchange them. */
+
-var debug = false; // very basic debugging for now
-
@@ -4 +33 @@
-
-function changeClass(id, newClass) {
-
+
+
+
+
-  identity.className=newClass;
-}
+// set a field's value by ID
+// typically used to set the value of a hidden field
+function setField(id,val) {
+  field = document.getElementById(id);
+  field.value = val;
+}
+
+// show hide items using a checkbox
+function swapVisible(obj,id) {
+  if (obj.checked) {
+    changeClass(id,'visible');
+  } else {
+    changeClass(id,'invisible');
+  }
+}
+// hide a group of items
+// send IDs as parameters
+function hide() {
+  if (arguments.length != 0) {
+    for (i = 0; i < arguments.length; i++) {
+      changeClass(arguments[i],'invisible');
+    }
+  }
+}
+// show a group of items
+// send IDs as parameters
+function show() {
+  if (arguments.length != 0) {
+    for (i = 0; i < arguments.length; i++) {
+      changeClass(arguments[i],'visible');
+    }
+  }
+}
+// show and hide an item based on its current
+// visibility; if visible, hide it; if invisible
+// show it.
-function toggleVisibility(id,newClass) {
-  if (document.getElementById(id).className == 'invisible') {
@@ -16 +84 @@
-  } else {
-    changeClass(id,'invisible');
-  }
-}
-// show hide items using a checkbox
-function swapVisible(obj,id) {
-  if (obj.checked) {
-    changeClass(id,'visible');
-  } else {
-    changeClass(id,'invisible');
-  }
-}
-// hide a group of items
-// send IDs as parameters
-function hide() {
-  if (arguments.length != 0) {
-    for (i = 0; i < arguments.length; i++) {
-      changeClass(arguments[i],'invisible');
-    }
-  }
-}
-// show a group of items
-// send IDs as parameters
-function show() {
-  if (arguments.length != 0) {
-    for (i = 0; i < arguments.length; i++) {
-      changeClass(arguments[i],'visible');
-    }
-  }
-}
@@ -106 +148 @@
-// editing, and importing events
-function launchCalSelectWindow(URL) {
-7
+5
-  window.calSelect.focus();
-}
@@ -122 +164 @@
-  window.close();
-}
+// used to update a calendar subscription (alias) We must do two things: update the hidden
+// calendar input field and update the displayed text
+function updatePublicCalendarAlias(newCalPath,calDisplay,calendarCollection) {
+  var calendarAliasHolder = document.getElementById("publicAliasHolder");
+  calendarAliasHolder.value = newCalPath;
+  var bwCalDisplay = document.getElementById("bwPublicCalDisplay");
+  bwCalDisplay.innerHTML = "Selected calendar: <strong>" + calDisplay + "</strong>";
+}
+// set the subscription URI when creating or updating a subscription
+function setCalendarAlias(formObj) {
+  if (!formObj) {
+    alert("The subscription form is not available.");
+    return false;
+  }
+
+  // set the aliasUri to an empty string.  Only set it if user
+  // has requested a subscription.
+  formObj.aliasUri.value == "";
+
+  if (formObj.type.value == "folder") {
+    formObj.calendarCollection.value = "false";
+  } else if (formObj.type.value == "subscription") {
+    switch (formObj.subType.value) {
+      case "public":
+        formObj.aliasUri.value = "bwcal://" + formObj.publicAliasHolder.value;
+        break;
+      case "user":
+        //the "/user/" string is temporary; it needs to be passed as a param.
+        formObj.aliasUri.value = "bwcal:///user/" + formObj.userIdHolder.value + "/" + formObj.userCalHolder.value;
+        break;
+      case "external":
+        formObj.aliasUri.value = formObj.aliasUriHolder.value;
+        break;
+    }
+  }
+  return true;
+}
-// build a uri based on user and path in the subscription form
+// DEPRECATED - use setCalendarAlias() above.
-function setSubscriptionUri(formObj,prefix) {
-  if (formObj) {

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

@@ -616 +616 @@
-    <h3>options</h3>
-    <ul id="sideBarMenu">
-      <li>
-        <a href="{$category-initUpdate}">Manage Categories</a>
-      </li>
-      <li>
-        <a href="{$location-initUpdate}">Manage Locations</a>
-      </li>
-      <li class="prefs">
-        <a href="{$prefs-fetchForUpdate}">

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

@@ -1 +1 @@
-/* **********************************************************************
-7
+8
-
-    Redistribution and use of this distribution in source and binary forms,
@@ -24 +24 @@
-    to the maximum extent the law permits. */
-
+/* NOTE: this file is different between Bedework web applications and is 
+   therefore not currently interchangable between apps.  This will be normalized
+   in the coming versions, but for now don't try to exchange them. */
+
-var debug = false; // very basic debugging for now
-
@@ -71 +75 @@
-// visibility; if visible, hide it; if invisible
-// show it.
-
-
-
+
+
+
+
+
+
+
-  } else {
-    changeClass(id,'invisible');
@@ -158 +166 @@
-// launch the calSelect pop-up window for selecting a calendar when creating,
-// editing, and importing events
-// DEPRECATED - can't use pop-ups in current portal environments in a
-// portal-agnostic way
-function launchCalSelectWindow(URL) {
-  calSelect = window.open(URL, "calSelect", "width=500,height=600,scrollbars=yes,resizable=yes,alwaysRaised=yes,menubar=no,toolbar=no");