Changeset 1392

Timestamp:

05/29/07 09:52:52

Author:

douglm

Message:

Export changes

To try to get this working in a portal switched to writing directly to output stream. Requires

1. a code change to UtilAbstractAction - not handling null action
   
2. Change ExportAction
   
3. Change style sheet so we don't set contentType and skinName (number of these in webuser, 2 in maincampus, 2 in soe)
   
4. Remove ical.xsl from each app
   
5. Remove export code from FreeBusyAction? (FreeBusyPublish? does it)
   
6. Remove vcal property from form
   
7. Remove showExportData action from struts-config
   
8. Ensure other data export actions don't forward
   

Files:

• trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (modified) (3 diffs)
• trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/ical.xsl (deleted)
• trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl (modified) (3 diffs)
• trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/ical.xsl (deleted)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (16 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/ical.xsl (deleted)

trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

@@ -13 +13 @@
-
-              DEMONSTRATION CALENDAR STYLESHEET
-
+
-                  MainCampus Calendar Suite
-
@@ -729 +729 @@
-            </xsl:if>
-            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-skinName=ical&amp;contentType=text/calendar&amp;
+
-              <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/>
-             download</a>
@@ -1012 +1012 @@
-                  </xsl:if>
-                  <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-skinName=ical&amp;contentType=text/calendar&amp;
+
-                    <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
-                  </a>

trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl

@@ -13 +13 @@
-
-        DEMONSTRATION "DEPARTMENTAL" CALENDAR STYLESHEET
-
+
-                  SoEDepartmental Calendar Suite
-
@@ -731 +731 @@
-            </xsl:if>
-            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-skinName=ical&amp;contentType=text/calendar&amp;
+
-              <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/>
-             download</a>
@@ -1014 +1014 @@
-                  </xsl:if>
-                  <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-skinName=ical&amp;contentType=text/calendar&amp;
+
-                    <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
-                  </a>

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

@@ -135 +135 @@
-  <xsl:variable name="schedule-processAttendeeReply" select="/bedework/urlPrefixes/schedule/processAttendeeReply/a/@href"/>
-  <!-- misc (mostly import and export) -->
-/a/@href
+
-  <xsl:variable name="initUpload" select="/bedework/urlPrefixes/misc/initUpload/a/@href"/>
-  <xsl:variable name="upload" select="/bedework/urlPrefixes/misc/upload/a/@href"/>
@@ -1006 +1006 @@
-                <td class="smallIcon">
-                  <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-skinName=ical&amp;contentType=text/calendar&amp;
+
-                    <img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
-                  </a>
@@ -1381 +1381 @@
-            <!-- download -->
-            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-skinName=ical&amp;contentType=text/calendar&amp;
+
-              <img src="{$resourcesRoot}/resources/std-icalDownload-icon-small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
-              Download
@@ -1604 +1604 @@
-        <!--<th class="icon" rowspan="2">
-          <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-skinName=ical&amp;contentType=text/calendar&amp;
+
-            <img src="{$resourcesRoot}/resources/std-ical-icon.gif" width="20" height="26" border="0" align="left" alt="Download this event"/>
-          </a>
@@ -3518 +3518 @@
-        <td>&#160;</td>
-        <td>
-
+method="post" 
-            View user's free/busy:<br/>
-            <input type="text" name="userid" size="20"/>
@@ -3936 +3936 @@
-  <xsl:template name="selectCalForEvent">
-    <h2>Select a calendar</h2>
-
+method="post" 
-      <xsl:choose>
-        <xsl:when test="/bedework/appvar[key='showAllCalsForEvent']/value = 'true'">
@@ -4052 +4052 @@
-  <xsl:template match="currentCalendar" mode="addCalendar">
-    <h3>Add Calendar / Folder</h3>
-
+method="post" 
-      <table class="common">
-        <tr>
@@ -4119 +4119 @@
-      </xsl:otherwise>
-    </xsl:choose>
-
+method="post" 
-      <table class="common">
-        <tr>
@@ -4207 +4207 @@
-        <xsl:with-param name="calPathEncoded" select="$calPathEncoded"/>
-      </xsl:apply-templates>
-
+method="post" 
-        <input type="hidden" name="calPath" value="{$calPath}"/>
-        <xsl:call-template name="entityAccessForm">
@@ -4323 +4323 @@
-    </xsl:choose>
-
-
+method="post" 
-      <table class="common">
-        <tr>
@@ -4377 +4377 @@
-      <input type="hidden" name="calPath" value=""/>
-      <input type="hidden" name="nocache" value="no"/>
-      <input type="hidden" name="skinName" value="ical"/>
-      <input type="hidden" name="contentType" value="text/calendar"/>
-      <input type="hidden" name="contentName" value="calendar.ics"/>
-
@@ -5389 +5387 @@
-          <td>
-            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-skinName=ical&amp;contentType=text/calendar&amp;
+
-              <img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="download"/>
-            </a>
@@ -5488 +5486 @@
-          <td>
-            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-skinName=ical&amp;contentType=text/calendar&amp;
+
-              <img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="download"/>
-            </a>
@@ -5999 +5997 @@
-        </td>
-        <td class="fieldval scheduleActions">
-
+method="post" 
-            <input type="submit" value="ok" name="update"/>
-            <input type="submit" value="cancel" name="cancelled"/>
@@ -6052 +6050 @@
-        <!--<th class="icon" rowspan="2">
-          <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-skinName=ical&amp;contentType=text/calendar&amp;
+
-            <img src="{$resourcesRoot}/resources/std-ical-icon.gif" width="20" height="26" border="0" align="left" alt="Download this event"/>
-          </a>
@@ -6548 +6546 @@
-          <xsl:with-param name="recurrenceId" select="$recurrenceId"/>
-        </xsl:apply-templates>
-
+method="post" 
-          <input type="hidden" name="calPath" value="{$calPath}"/>
-          <input type="hidden" name="guid" value="{$guid}"/>