Changeset 1466
- Timestamp:
- 07/11/07 14:52:40
- Files:
-
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css (modified) (2 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (modified) (10 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css (modified) (2 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css (modified) (2 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/resources/javascript/bedework.js (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl (modified) (10 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.css (modified) (2 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/resources/javascript/bedework.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css
r1279 r1466 972 972 padding: 0 1em; 973 973 } 974 #stats { 974 #stats, 975 #export { 975 976 font-size: 0.9em; 976 977 margin: 0px; … … 993 994 padding-right: 2em; 994 995 } 996 .indent { 997 margin-left: 1em; 998 } 995 999 .hidden { 996 1000 visibility: hidden; trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
r1392 r1466 92 92 <xsl:variable name="search" select="/bedework/urlPrefixes/search/search"/> 93 93 <xsl:variable name="search-next" select="/bedework/urlPrefixes/search/next"/> 94 <xsl:variable name="calendar-fetchForExport" select="/bedework/urlPrefixes/calendar/fetchForExport"/> 94 95 <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mail/mailEvent"/> 95 96 <xsl:variable name="showPage" select="/bedework/urlPrefixes/main/showPage"/> … … 127 128 <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" /> 128 129 <!-- load javascript --> 129 <xsl:if test="/bedework/page='calendarList' ">130 <xsl:if test="/bedework/page='calendarList' or /bedework/page='displayCalendarForExport'"> 130 131 <script type="text/javascript" src="{$resourceCommons}/javascript/dojo/dojo.js"> </script> 131 132 <script type="text/javascript" src="{$resourcesRoot}/resources/javascript/bedework.js"> </script> … … 156 157 <!-- show a list of all calendars --> 157 158 <xsl:apply-templates select="/bedework/calendars"/> 159 </xsl:when> 160 <xsl:when test="/bedework/page='displayCalendarForExport'"> 161 <!-- page for calendar export (can optionally be replaced by 162 a pop-up widget; see the calendars template) --> 163 <xsl:apply-templates select="/bedework/currentCalendar" mode="export"/> 158 164 </xsl:when> 159 165 <xsl:when test="/bedework/page='searchResult'"> … … 1249 1255 </xsl:template> 1250 1256 1251 <!--==== CALENDARS PAGE ====--> 1257 <!--==== CALENDARS ====--> 1258 1259 <!-- list of available calendars --> 1252 1260 <xsl:template match="calendars"> 1253 1261 <xsl:variable name="topLevelCalCount" select="count(calendar/calendar)"/> … … 1263 1271 Select a calendar from the list below to see only that calendar's events. 1264 1272 </p> 1273 <!-- Uncomment this block, and change the links on the download calendar 1274 icon (in the following template) to use a dojo floating 1275 widget instead of a separate page 1276 for downloading whole calendars (this method does not work 1277 portal-agnostically: it is not intended for use in portals). 1278 1265 1279 <div dojoType="FloatingPane" id="bwCalendarExportWidget" 1266 1280 title="Export Calendar as iCal" toggle="plain" … … 1273 1287 <strong>Event date limits:</strong> 1274 1288 <form name="exportCalendarForm" id="exportCalendarForm" action="{$export}" method="post"> 1275 <!-- this value is passed into the form when the widget is requested -->1276 1289 <input type="hidden" name="calPath" value=""/> 1277 <!-- fill these on submit -->1278 1290 <input type="hidden" name="eventStartDate.year" value=""/> 1279 1291 <input type="hidden" name="eventStartDate.month" value=""/> … … 1282 1294 <input type="hidden" name="eventEndDate.month" value=""/> 1283 1295 <input type="hidden" name="eventEndDate.day" value=""/> 1284 <!-- static fields -->1285 1296 <input type="hidden" name="nocache" value="no"/> 1286 1297 <input type="hidden" name="skinName" value="ical"/> 1287 1298 <input type="hidden" name="contentType" value="text/calendar"/> 1288 1299 <input type="hidden" name="contentName" value="calendar.ics"/> 1289 <!-- visible fields -->1290 1300 <input type="radio" name="dateLimits" value="active" checked="checked" onclick="changeClass('exportDateRange','invisible')"/> today forward 1291 1301 <input type="radio" name="dateLimits" value="none" onclick="changeClass('exportDateRange','invisible')"/> all dates … … 1295 1305 End: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetEndDate"><xsl:text> </xsl:text></div> 1296 1306 </div> 1297 <p><input type="submit" value="export" class="bwWidgetSubmit" onclick="fillExportFields( 'exportCalendarForm');hideWidget('bwCalendarExportWidget')"/></p>1307 <p><input type="submit" value="export" class="bwWidgetSubmit" onclick="fillExportFields(this.form);hideWidget('bwCalendarExportWidget')"/></p> 1298 1308 </form> 1299 </div> 1309 </div>--> 1300 1310 </td> 1301 1311 </tr> … … 1326 1336 <a href="{$setSelection}&calUrl={$url}" title="view calendar"><xsl:value-of select="name"/></a> 1327 1337 <xsl:if test="calendarCollection='true'"> 1328 <xsl:variable name="name" select="name"/>1329 1338 <xsl:variable name="calPath" select="path"/> 1330 <xsl:variable name="idForCal" select="translate(translate(path,'/','S'),' ','s')"/>1331 1339 <span class="exportCalLink"> 1340 <!-- To use the dojo floating widget from the template above, uncomment 1341 this block: 1342 <xsl:variable name="name" select="name"/> 1343 <xsl:variable name="idForCal" select="translate(translate(path,'/','S'),' ','s')"/> 1332 1344 <a href="javascript:launchExportWidget('exportCalendarForm','{$export}','{$name}','{$calPath}')" id="{$idForCal}" title="export calendar as iCal"> 1345 <img src="{$resourcesRoot}/images/calIconExport-sm.gif" width="13" height="13" alt="export calendar" border="0"/> 1346 </a> --> 1347 <a href="{$calendar-fetchForExport}&calPath={$calPath}" title="export calendar as iCal"> 1333 1348 <img src="{$resourcesRoot}/images/calIconExport-sm.gif" width="13" height="13" alt="export calendar" border="0"/> 1334 1349 </a> … … 1343 1358 </xsl:template> 1344 1359 1360 <!-- calendar export page --> 1361 <xsl:template match="currentCalendar" mode="export"> 1362 <h2 class="bwStatusConfirmed">Export Calendar</h2> 1363 <div id="export"> 1364 <p> 1365 <strong>Calendar to export:</strong> 1366 </p> 1367 <div class="indent"> 1368 Name: <strong><em><xsl:value-of select="name"/></em></strong><br/> 1369 Path: <xsl:value-of select="path"/> 1370 </div> 1371 <p> 1372 <strong>Event date limits:</strong> 1373 </p> 1374 <form name="exportCalendarForm" id="exportCalendarForm" action="{$export}" method="post"> 1375 <input type="hidden" name="calPath"> 1376 <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute> 1377 </input> 1378 <!-- fill these on submit --> 1379 <input type="hidden" name="eventStartDate.year" value=""/> 1380 <input type="hidden" name="eventStartDate.month" value=""/> 1381 <input type="hidden" name="eventStartDate.day" value=""/> 1382 <input type="hidden" name="eventEndDate.year" value=""/> 1383 <input type="hidden" name="eventEndDate.month" value=""/> 1384 <input type="hidden" name="eventEndDate.day" value=""/> 1385 <!-- static fields --> 1386 <input type="hidden" name="nocache" value="no"/> 1387 <input type="hidden" name="skinName" value="ical"/> 1388 <input type="hidden" name="contentType" value="text/calendar"/> 1389 <input type="hidden" name="contentName"> 1390 <xsl:attribute name="value"><xsl:value-of select="name"/>.ics</xsl:attribute> 1391 </input> 1392 <!-- visible fields --> 1393 <input type="radio" name="dateLimits" value="active" checked="checked" onclick="changeClass('exportDateRange','invisible')"/> today forward 1394 <input type="radio" name="dateLimits" value="none" onclick="changeClass('exportDateRange','invisible')"/> all dates 1395 <input type="radio" name="dateLimits" value="limited" onclick="changeClass('exportDateRange','visible')"/> date range 1396 <div id="exportDateRange" class="invisible"> 1397 Start: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetStartDate"><xsl:text> </xsl:text></div> 1398 End: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetEndDate"><xsl:text> </xsl:text></div> 1399 </div> 1400 <p><input type="submit" value="export" class="bwWidgetSubmit" onclick="fillExportFields(this.form)"/></p> 1401 </form> 1402 </div> 1403 </xsl:template> 1404 1345 1405 <!--==== SEARCH RESULT ====--> 1346 1406 <xsl:template name="searchResult"> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css
r1279 r1466 975 975 padding: 0 1em; 976 976 } 977 #stats { 977 #stats, 978 #export { 978 979 font-size: 0.9em; 979 980 margin: 0px; … … 996 997 padding-right: 2em; 997 998 } 999 .indent { 1000 margin-left: 1em; 1001 } 998 1002 .hidden { 999 1003 visibility: hidden; trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css
r1279 r1466 976 976 padding: 0 1em; 977 977 } 978 #stats { 978 #stats, 979 #export { 979 980 font-size: 0.9em; 980 981 margin: 0px; … … 997 998 padding-right: 2em; 998 999 } 1000 .indent { 1001 margin-left: 1em; 1002 } 999 1003 .hidden { 1000 1004 visibility: hidden; trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/resources/javascript/bedework.js
r1223 r1466 16 16 document.getElementById('bwCalendarExportWidgetCalName').innerHTML = name; 17 17 } 18 function fillExportFields(formId) { 19 var formObj = document.getElementById(formId); 18 function fillExportFields(formObj) { 20 19 var startDate = new Date(); 21 20 startDate = dojo.widget.byId("bwExportCalendarWidgetStartDate").getDate(); trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
r1392 r1466 103 103 <xsl:variable name="search" select="/bedework/urlPrefixes/search/search"/> 104 104 <xsl:variable name="search-next" select="/bedework/urlPrefixes/search/next"/> 105 <xsl:variable name="calendar-fetchForExport" select="/bedework/urlPrefixes/calendar/fetchForExport"/> 105 106 <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mail/mailEvent"/> 106 107 <xsl:variable name="showPage" select="/bedework/urlPrefixes/main/showPage"/> … … 126 127 <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/> 127 128 <!-- load javascript --> 128 <xsl:if test="/bedework/page='calendarList' ">129 <xsl:if test="/bedework/page='calendarList' or /bedework/page='displayCalendarForExport'"> 129 130 <script type="text/javascript" src="{$resourceCommons}/javascript/dojo/dojo.js"> </script> 130 131 <script type="text/javascript" src="{$resourcesRoot}/resources/javascript/bedework.js"> </script> … … 155 156 <!-- show a list of all calendars --> 156 157 <xsl:apply-templates select="/bedework/calendars"/> 158 </xsl:when> 159 <xsl:when test="/bedework/page='displayCalendarForExport'"> 160 <!-- page for calendar export (can optionally be replaced by 161 a pop-up widget; see the calendars template) --> 162 <xsl:apply-templates select="/bedework/currentCalendar" mode="export"/> 157 163 </xsl:when> 158 164 <xsl:when test="/bedework/page='searchResult'"> … … 1251 1257 </xsl:template> 1252 1258 1253 <!--==== CALENDARS PAGE ====--> 1259 <!--==== CALENDARS ====--> 1260 1261 <!-- list of available calendars --> 1254 1262 <xsl:template match="calendars"> 1255 1263 <xsl:variable name="topLevelCalCount" select="count(calendar/calendar)"/> … … 1265 1273 Select a calendar from the list below to see only that calendar's events. 1266 1274 </p> 1275 <!-- Uncomment this block, and change the links on the download calendar 1276 icon (in the following template) to use a dojo floating 1277 widget instead of a separate page 1278 for downloading whole calendars (this method does not work 1279 portal-agnostically: it is not intended for use in portals). 1280 1267 1281 <div dojoType="FloatingPane" id="bwCalendarExportWidget" 1268 1282 title="Export Calendar as iCal" toggle="plain" … … 1275 1289 <strong>Event date limits:</strong> 1276 1290 <form name="exportCalendarForm" id="exportCalendarForm" action="{$export}" method="post"> 1277 <!-- this value is passed into the form when the widget is requested -->1278 1291 <input type="hidden" name="calPath" value=""/> 1279 <!-- fill these on submit -->1280 1292 <input type="hidden" name="eventStartDate.year" value=""/> 1281 1293 <input type="hidden" name="eventStartDate.month" value=""/> … … 1284 1296 <input type="hidden" name="eventEndDate.month" value=""/> 1285 1297 <input type="hidden" name="eventEndDate.day" value=""/> 1286 <!-- static fields -->1287 1298 <input type="hidden" name="nocache" value="no"/> 1288 1299 <input type="hidden" name="skinName" value="ical"/> 1289 1300 <input type="hidden" name="contentType" value="text/calendar"/> 1290 1301 <input type="hidden" name="contentName" value="calendar.ics"/> 1291 <!-- visible fields -->1292 1302 <input type="radio" name="dateLimits" value="active" checked="checked" onclick="changeClass('exportDateRange','invisible')"/> today forward 1293 1303 <input type="radio" name="dateLimits" value="none" onclick="changeClass('exportDateRange','invisible')"/> all dates … … 1297 1307 End: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetEndDate"><xsl:text> </xsl:text></div> 1298 1308 </div> 1299 <p><input type="submit" value="export" class="bwWidgetSubmit" onclick="fillExportFields( 'exportCalendarForm');hideWidget('bwCalendarExportWidget')"/></p>1309 <p><input type="submit" value="export" class="bwWidgetSubmit" onclick="fillExportFields(this.form);hideWidget('bwCalendarExportWidget')"/></p> 1300 1310 </form> 1301 </div> 1311 </div>--> 1302 1312 </td> 1303 1313 </tr> … … 1328 1338 <a href="{$setSelection}&calUrl={$url}" title="view calendar"><xsl:value-of select="name"/></a> 1329 1339 <xsl:if test="calendarCollection='true'"> 1330 <xsl:variable name="name" select="name"/>1331 1340 <xsl:variable name="calPath" select="path"/> 1332 <xsl:variable name="idForCal" select="translate(translate(path,'/','S'),' ','s')"/>1333 1341 <span class="exportCalLink"> 1342 <!-- To use the dojo floating widget from the template above, uncomment 1343 this block: 1344 <xsl:variable name="name" select="name"/> 1345 <xsl:variable name="idForCal" select="translate(translate(path,'/','S'),' ','s')"/> 1334 1346 <a href="javascript:launchExportWidget('exportCalendarForm','{$export}','{$name}','{$calPath}')" id="{$idForCal}" title="export calendar as iCal"> 1347 <img src="{$resourcesRoot}/images/calIconExport-sm.gif" width="13" height="13" alt="export calendar" border="0"/> 1348 </a> --> 1349 <a href="{$calendar-fetchForExport}&calPath={$calPath}" title="export calendar as iCal"> 1335 1350 <img src="{$resourcesRoot}/images/calIconExport-sm.gif" width="13" height="13" alt="export calendar" border="0"/> 1336 1351 </a> … … 1343 1358 </xsl:if> 1344 1359 </li> 1360 </xsl:template> 1361 1362 <!-- calendar export page --> 1363 <xsl:template match="currentCalendar" mode="export"> 1364 <h2 class="bwStatusConfirmed">Export Calendar</h2> 1365 <div id="export"> 1366 <p> 1367 <strong>Calendar to export:</strong> 1368 </p> 1369 <div class="indent"> 1370 Name: <strong><em><xsl:value-of select="name"/></em></strong><br/> 1371 Path: <xsl:value-of select="path"/> 1372 </div> 1373 <p> 1374 <strong>Event date limits:</strong> 1375 </p> 1376 <form name="exportCalendarForm" id="exportCalendarForm" action="{$export}" method="post"> 1377 <input type="hidden" name="calPath"> 1378 <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute> 1379 </input> 1380 <!-- fill these on submit --> 1381 <input type="hidden" name="eventStartDate.year" value=""/> 1382 <input type="hidden" name="eventStartDate.month" value=""/> 1383 <input type="hidden" name="eventStartDate.day" value=""/> 1384 <input type="hidden" name="eventEndDate.year" value=""/> 1385 <input type="hidden" name="eventEndDate.month" value=""/> 1386 <input type="hidden" name="eventEndDate.day" value=""/> 1387 <!-- static fields --> 1388 <input type="hidden" name="nocache" value="no"/> 1389 <input type="hidden" name="skinName" value="ical"/> 1390 <input type="hidden" name="contentType" value="text/calendar"/> 1391 <input type="hidden" name="contentName"> 1392 <xsl:attribute name="value"><xsl:value-of select="name"/>.ics</xsl:attribute> 1393 </input> 1394 <!-- visible fields --> 1395 <input type="radio" name="dateLimits" value="active" checked="checked" onclick="changeClass('exportDateRange','invisible')"/> today forward 1396 <input type="radio" name="dateLimits" value="none" onclick="changeClass('exportDateRange','invisible')"/> all dates 1397 <input type="radio" name="dateLimits" value="limited" onclick="changeClass('exportDateRange','visible')"/> date range 1398 <div id="exportDateRange" class="invisible"> 1399 Start: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetStartDate"><xsl:text> </xsl:text></div> 1400 End: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetEndDate"><xsl:text> </xsl:text></div> 1401 </div> 1402 <p><input type="submit" value="export" class="bwWidgetSubmit" onclick="fillExportFields(this.form)"/></p> 1403 </form> 1404 </div> 1345 1405 </xsl:template> 1346 1406 trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.css
r1353 r1466 970 970 padding: 0 1em; 971 971 } 972 #stats { 972 #stats, 973 #export { 973 974 font-size: 0.9em; 974 975 margin: 0px; 975 976 padding: 1em; 976 border-bottom: 2px solid #aaa; 977 border-left: 2px solid #aaa; 978 border-right: 2px solid #aaa; 977 border-bottom: 2px solid #000; 978 border-left: 2px solid #000; 979 border-right: 2px solid #000; 980 background-color: white; 981 color: black; 979 982 } 980 983 #statsTable { … … 990 993 text-align: right; 991 994 padding-right: 2em; 995 } 996 .indent { 997 margin-left: 1em; 992 998 } 993 999 .hidden { trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/resources/javascript/bedework.js
r1220 r1466 17 17 } 18 18 function fillExportFields(formId) { 19 var formObj = document.getElementById(formId);20 19 var startDate = new Date(); 21 20 startDate = dojo.widget.byId("bwExportCalendarWidgetStartDate").getDate();
