Changeset 2632
- Timestamp:
- 01/05/10 21:26:58
- Files:
-
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/globals.xsl (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/strings.xsl (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/bedework.xsl (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/css/fixed.css (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/navigation.xsl (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/showPage.xsl (modified) (2 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/themeSettings.xsl (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bwclassicTheme/header.xsl (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/themes/bwclassicTheme/header.xsl (modified) (1 diff)
- trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/themes/bwclassicTheme/template.xsl (deleted)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/globals.xsl
r2628 r2632 36 36 <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mail/mailEvent" /> 37 37 <xsl:variable name="stats" select="/bedework/urlPrefixes/stats/stats" /> 38 <xsl:variable name="showPage" select="/bedework/urlPrefixes/misc/showPage" /> 38 39 39 40 <!-- URL of the web application - includes web context --> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/strings.xsl
r2628 r2632 10 10 <xsl:variable name="bwStr-Error">Error:</xsl:variable> 11 11 <xsl:variable name="bwStr-Error-NoPage">No page to display</xsl:variable> 12 <xsl:variable name="bwStr-Error-PageNotDefined">Page "<xsl:value-of select="/bedework/appvar[key='page']/value"/>" is not defined.</xsl:variable> 13 <xsl:variable name="bwStr-Error-IframeUnsupported">Your browser does not support iframes.</xsl:variable> 12 14 13 15 <!-- xsl:template name="headBar" --> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/bedework.xsl
r2630 r2632 178 178 </xsl:when> 179 179 <xsl:otherwise> 180 <xsl:copy-of select="$bwStr-Error-NoPage"/> 180 <div id="page"> 181 <xsl:copy-of select="$bwStr-Error-NoPage"/> 182 </div> 181 183 </xsl:otherwise> 182 184 </xsl:choose> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/css/fixed.css
r2607 r2632 999 999 margin-bottom: 1em; 1000 1000 } 1001 #page { 1002 margin: 1em; 1003 } 1001 1004 #footForms { 1002 1005 float: right; trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/navigation.xsl
r2565 r2632 24 24 </ul> 25 25 <a id="rssRequest" class="rss" href="/feeder/showMain.rdo?skinName=list-rss" title="RSS feed"> 26 <xsl:attribute name="href"> 27 <xsl:choose> 28 <xsl:when test="$embedUrlBuilder = 'true'"><xsl:value-of select="$showPage"/>&setappvar=page(urlbuilder)</xsl:when> 29 <xsl:otherwise><xsl:value-of select="$urlbuilder"/></xsl:otherwise> 30 </xsl:choose> 31 </xsl:attribute> 26 32 <img src="{$resourcesRoot}/images/feed-icon-14x14.png" alt="RSS Feed Icon" /> 27 33 </a> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/showPage.xsl
r2630 r2632 9 9 10 10 <xsl:template name="showPage"> 11 <xsl:param name="page "/>11 <xsl:param name="pageName"/> 12 12 <!-- branch here by adding xsl:when statements --> 13 13 <xsl:choose> 14 <xsl:when test="$page = 'urlbuilder'">14 <xsl:when test="$pageName = 'urlbuilder'"> 15 15 <xsl:call-template name="urlbuilder"/> 16 16 </xsl:when> 17 <xsl:otherwise> 18 <div id="page"> 19 <xsl:copy-of select="$bwStr-Error-PageNotDefined"/> 20 </div> 21 </xsl:otherwise> 17 22 </xsl:choose> 18 23 </xsl:template> … … 20 25 <xsl:template name="urlbuilder"> 21 26 <!-- call the urlbuilder by its globally defined prefix --> 22 <iframe id="feedBuilder" src="{$urlbuilder}"> 27 <iframe id="feedBuilder" src="{$urlbuilder}" width="1100" height="1800"> 28 <p> 29 <xsl:copy-of select="$bwStr-Error-IframeUnsupported"/> 30 </p> 23 31 </iframe> 24 32 </xsl:template> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/themeSettings.xsl
r2589 r2632 45 45 when a collection (e.g calendar "Exhibits") is directly selected? --> 46 46 <xsl:variable name="ongoingEventsShowForCollection">true</xsl:variable> 47 48 49 <!-- EMBED THE FEED URL AND WIDGET BUILDER? --> 50 <!-- If true, the urlbuilder will be rendered in an iframe. 51 If false, it will be treated as an external link. 52 The urlbuilder constructs filtered feeds (e.g. json, rss, xml) 53 and widgets and points to the cached feeder application for delivery. --> 54 <xsl:variable name="embedUrlBuilder">true</xsl:variable> 47 55 48 56 trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bwclassicTheme/header.xsl
r2631 r2632 58 58 <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-HdBr-Print"/> 59 59 </a> 60 <a class="rss" href="{$ listEvents}&setappvar=summaryMode(details)&skinName=rss-list&days=3" title="{$bwStr-HdBr-RSSFeed}"><xsl:copy-of select="$bwStr-HdBr-RSS"/></a>60 <a class="rss" href="{$urlbuilder}" title="{$bwStr-HdBr-RSSFeed}"><xsl:copy-of select="$bwStr-HdBr-RSS"/></a> 61 61 </td> 62 62 </tr> trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/themes/bwclassicTheme/header.xsl
r2597 r2632 58 58 <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-HdBr-Print"/> 59 59 </a> 60 <a class="rss" href="{$ listEvents}&setappvar=summaryMode(details)&skinName=rss-list&days=3" title="{$bwStr-HdBr-RSSFeed}"><xsl:copy-of select="$bwStr-HdBr-RSS"/></a>60 <a class="rss" href="{$urlbuilder}" title="{$bwStr-HdBr-RSSFeed}"><xsl:copy-of select="$bwStr-HdBr-RSS"/></a> 61 61 </td> 62 62 </tr>
