Changeset 2608
- Timestamp:
- 12/31/09 00:28:27
- Files:
-
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/strings.xsl (modified) (2 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/calendarList.xsl (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/eventList.xsl (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphoneTheme/calendarList.xsl (modified) (2 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphoneTheme/css/jsphone.css (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphoneTheme/dateSelect.xsl (modified) (2 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphoneTheme/listEvents.xsl (modified) (2 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphoneTheme/navigation.xsl (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/strings.xsl
r2607 r2608 48 48 <xsl:variable name="bwStr-Navi-WeekOf">Week of</xsl:variable> 49 49 <xsl:variable name="bwStr-Navi-Go">go</xsl:variable> 50 <xsl:variable name="bwStr-Navi-GoToDate">Go to date:</xsl:variable> 50 51 51 52 <!-- xsl:template name="searchBar" --> … … 155 156 <xsl:variable name="bwStr-LsVw-Add">add...</xsl:variable> 156 157 <xsl:variable name="bwStr-LsVw-AllDay">All Day</xsl:variable> 158 <xsl:variable name="bwStr-LsVw-At">at</xsl:variable> 157 159 <xsl:variable name="bwStr-LsVw-Today">Today</xsl:variable> 158 160 <xsl:variable name="bwStr-LsVw-AddEventToMyCalendar">Add to MyCalendar</xsl:variable> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/calendarList.xsl
r2607 r2608 30 30 31 31 <xsl:template match="calendar" mode="calTree"> 32 <xsl:variable name="itemClass">33 <xsl:choose>34 <xsl:when test="calType = '0'"><xsl:copy-of select="$bwStr-Calr-Folder"/></xsl:when>35 <xsl:otherwise><xsl:copy-of select="$bwStr-Calr-Calendar"/></xsl:otherwise>36 </xsl:choose>37 </xsl:variable>38 32 <xsl:variable name="virtualPath"><xsl:call-template name="url-encode"><xsl:with-param name="str">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:with-param></xsl:call-template></xsl:variable> 39 <li class="{$itemClass}"> 33 <li> 34 <xsl:attribute name="class"> 35 <xsl:choose> 36 <xsl:when test="calType = '0'">folder</xsl:when> 37 <xsl:otherwise>calendar</xsl:otherwise> 38 </xsl:choose> 39 </xsl:attribute> 40 40 <xsl:variable name="calPath" select="path"/> 41 <a href="{$setSelection}&virtualPath={$virtualPath}&setappvar=curCollection({$calPath})" title="view calendar"><xsl:value-of select="name"/></a> 41 <a href="{$setSelection}&virtualPath={$virtualPath}&setappvar=curCollection({$calPath})" title="view calendar"> 42 <xsl:value-of select="name"/> 43 </a> 42 44 <xsl:variable name="calPath" select="path"/> 43 45 <span class="exportCalLink"> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/eventList.xsl
r2580 r2608 41 41 </xsl:choose> 42 42 43 <!-- produce the list of events --> 43 44 <xsl:choose> 44 45 <xsl:when test="not(/bedework/eventscalendar/year/month/week/day/event)"> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphoneTheme/calendarList.xsl
r2578 r2608 6 6 <!--==== CALENDAR LIST ====--> 7 7 <xsl:template match="calendars"> 8 <h1>All Calendars</h1> 9 <p>Select a calendar from the list below to see only that calendar's events.</p> 10 <p> 11 <a class="linkBack" href="{$setup}"><xsl:copy-of select="$bwStr-HdBr-BackLink"/></a> 12 </p> 8 <h1><xsl:copy-of select="$bwStr-Cals-AllCalendars"/></h1> 9 <p><xsl:copy-of select="$bwStr-Cals-SelectCalendar"/></p> 10 11 <div id="navlink-back" class="navlink backlink" onclick="gotourl(this,'javascript:history.back()')"> 12 <xsl:copy-of select="$bwStr-HdBr-Back"/> 13 </div> 14 13 15 <ul class="calendarTree"> 14 <xsl:apply-templates select="calendar/calendar " mode="calTree"/>16 <xsl:apply-templates select="calendar/calendar[calType != 5 and calType != 6 and name != 'calendar']" mode="calTree"/> 15 17 </ul> 16 18 </xsl:template> 17 19 18 20 <xsl:template match="calendar" mode="calTree"> 19 <xsl:variable name=" url" select="encodedPath"/>21 <xsl:variable name="virtualPath"><xsl:call-template name="url-encode"><xsl:with-param name="str">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:with-param></xsl:call-template></xsl:variable> 20 22 <li> 21 23 <xsl:attribute name="class"> … … 25 27 </xsl:choose> 26 28 </xsl:attribute> 27 <a href="{$setSelection}&calUrl={$url}" title="view calendar"><xsl:value-of select="name"/></a> 29 <xsl:variable name="calPath" select="path"/> 30 <a href="{$setSelection}&virtualPath={$virtualPath}&setappvar=curCollection({$calPath})" title="view calendar"> 31 <xsl:value-of select="name"/> 32 </a> 28 33 <xsl:if test="calendar"> 29 34 <ul> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphoneTheme/css/jsphone.css
r2578 r2608 124 124 font-weight: normal; 125 125 } 126 126 #stateMsg { 127 margin: 1em; 128 } 129 .displayFilterName { 130 font-style: italic; 131 } 127 132 /* 128 133 ul.calendarTree li.folder { trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphoneTheme/dateSelect.xsl
r2578 r2608 8 8 <xsl:template name="dateSelect"> 9 9 <form id="dateSelect" name="calForm" method="post" action="{$setViewPeriod}"> 10 Go to date: 10 <xsl:copy-of select="$bwStr-Navi-GoToDate"/> 11 <xsl:text> </xsl:text> 11 12 <table border="0" cellpadding="0" cellspacing="0"> 12 13 <tr> … … 60 61 </td> 61 62 <td> 62 <input name="submit" type="submit" value=" go"/>63 <input name="submit" type="submit" value="{$bwStr-Navi-Go}"/> 63 64 </td> 64 65 </tr> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphoneTheme/listEvents.xsl
r2590 r2608 24 24 </xsl:otherwise> 25 25 </xsl:choose><br/> 26 No events to display.26 <xsl:copy-of select="$bwStr-LsEv-NoEventsToDisplay"/> 27 27 </p> 28 28 </xsl:when> … … 53 53 <xsl:value-of select="start/dayname"/>, <xsl:value-of select="start/longdate"/> 54 54 <xsl:choose> 55 <xsl:when test="start/allday = 'true'">(all day)</xsl:when> 56 <xsl:otherwise> at <xsl:value-of select="start/time"/></xsl:otherwise> 55 <xsl:when test="start/allday = 'true'"><xsl:copy-of select="$bwStr-LsVw-AllDay"/></xsl:when> 56 <xsl:otherwise> 57 <xsl:text> </xsl:text> 58 <xsl:copy-of select="$bwStr-LsVw-At"/> 59 <xsl:text> </xsl:text> 60 <xsl:value-of select="start/time"/> 61 </xsl:otherwise> 57 62 </xsl:choose> 58 63 <br/> 59 64 <strong> 60 <xsl:if test="status='CANCELLED'"> CANCELED:</xsl:if>65 <xsl:if test="status='CANCELLED'"><xsl:copy-of select="$bwStr-LsVw-Canceled"/><xsl:text> </xsl:text></xsl:if> 61 66 <xsl:value-of select="summary"/> 62 67 </strong> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphoneTheme/navigation.xsl
r2578 r2608 8 8 <div id="nav"> 9 9 <div class="navlink" id="navlink-prev" onclick="gotourl(this,'{$setViewPeriod}&date={$prevdate}');"> 10 < prev10 <<xsl:copy-of select="$bwStr-Srch-Prev"/> 11 11 </div> 12 12 <div class="navlink" id="navlink-today" onclick="gotourl(this,'{$setViewPeriod}&viewType=todayView&date={$curdate}');"> 13 today13 <xsl:copy-of select="$bwStr-Tabs-Today"/> 14 14 </div> 15 15 <div class="navlink" id="navlink-day" onclick="gotourl(this,'{$setViewPeriod}&viewType=dayView&date={$curdate}');"> … … 17 17 <xsl:attribute name="class">navlink selected</xsl:attribute> 18 18 </xsl:if> 19 day19 <xsl:copy-of select="$bwStr-Tabs-Day"/> 20 20 </div> 21 21 <div class="navlink" id="navlink-week" onclick="gotourl(this,'{$setViewPeriod}&viewType=weekView&date={$curdate}');"> … … 23 23 <xsl:attribute name="class">navlink selected</xsl:attribute> 24 24 </xsl:if> 25 week25 <xsl:copy-of select="$bwStr-Tabs-Week"/> 26 26 </div> 27 27 <div class="navlink" id="navlink-month" onclick="gotourl(this,'{$setViewPeriod}&viewType=monthView&date={$curdate}');"> … … 29 29 <xsl:attribute name="class">navlink selected</xsl:attribute> 30 30 </xsl:if> 31 month31 <xsl:copy-of select="$bwStr-Tabs-Month"/> 32 32 </div> 33 33 <div class="navlink" id="navlink-next" onclick="gotourl(this,'{$setViewPeriod}&date={$nextdate}');"> 34 next>34 <xsl:copy-of select="$bwStr-Srch-Next"/>> 35 35 </div> 36 36 37 <xsl:if test="/bedework/selectionState/selectionType = 'calendar'"> 38 <br/>Calendar: <xsl:value-of select="/bedework/selectionState/subscriptions/subscription/calendar/name"/> 39 <span class="link">[<a href="{$setSelection}">show all</a>]</span> 40 </xsl:if> 37 <!-- display information about the current selection state if not default --> 38 <xsl:choose> 39 <xsl:when test="/bedework/selectionState/selectionType = 'collections'"> 40 <div id="stateMsg"> 41 <xsl:copy-of select="$bwStr-LsVw-DispEventsForCal"/> 42 <xsl:text> </xsl:text> 43 <span class="displayFilterName"> 44 <xsl:call-template name="substring-afterLastInstanceOf"> 45 <xsl:with-param name="string" select="/bedework/selectionState/collection/virtualpath"/> 46 <xsl:with-param name="char">/</xsl:with-param> 47 </xsl:call-template> 48 </span><xsl:text> </xsl:text> 49 <span id="allView" class="navlink" onclick="gotourl(this,'{$setSelection}')"><xsl:copy-of select="$bwStr-LsVw-ShowAll"/></span> 50 </div> 51 </xsl:when> 52 <xsl:when test="/bedework/selectionState/view/name != 'All'"> 53 <div id="stateMsg"> 54 <xsl:copy-of select="$bwStr-LsVw-DispEventsForView"/> 55 <xsl:text> </xsl:text> 56 <span class="displayFilterName"> 57 <xsl:value-of select="/bedework/selectionState/view/name"/> 58 </span><xsl:text> </xsl:text> 59 <span id="allView" class="navlink" onclick="gotourl(this,'{$setSelection}')"><xsl:copy-of select="$bwStr-LsVw-ShowAll"/></span> 60 </div> 61 </xsl:when> 62 </xsl:choose> 63 41 64 </div> 42 65 </xsl:template>
