Changeset 2632

Show
Ignore:
Timestamp:
01/05/10 21:26:58
Author:
johnsa
Message:

public skin: provide ability to embed the urlbuilder

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/globals.xsl

    r2628 r2632  
    3636  <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mail/mailEvent" /> 
    3737  <xsl:variable name="stats" select="/bedework/urlPrefixes/stats/stats" /> 
     38  <xsl:variable name="showPage" select="/bedework/urlPrefixes/misc/showPage" /> 
    3839 
    3940  <!-- URL of the web application - includes web context --> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/strings.xsl

    r2628 r2632  
    1010  <xsl:variable name="bwStr-Error">Error:</xsl:variable> 
    1111  <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> 
    1214 
    1315  <!-- xsl:template name="headBar" --> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/bedework.xsl

    r2630 r2632  
    178178                      </xsl:when> 
    179179                      <xsl:otherwise> 
    180                         <xsl:copy-of select="$bwStr-Error-NoPage"/> 
     180                        <div id="page"> 
     181                          <xsl:copy-of select="$bwStr-Error-NoPage"/> 
     182                        </div> 
    181183                      </xsl:otherwise> 
    182184                    </xsl:choose> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/css/fixed.css

    r2607 r2632  
    999999  margin-bottom: 1em; 
    10001000} 
     1001#page { 
     1002  margin: 1em; 
     1003} 
    10011004#footForms { 
    10021005  float: right; 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/navigation.xsl

    r2565 r2632  
    2424      </ul> 
    2525      <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"/>&amp;setappvar=page(urlbuilder)</xsl:when> 
     29            <xsl:otherwise><xsl:value-of select="$urlbuilder"/></xsl:otherwise> 
     30          </xsl:choose> 
     31        </xsl:attribute> 
    2632        <img src="{$resourcesRoot}/images/feed-icon-14x14.png" alt="RSS Feed Icon" /> 
    2733      </a> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/showPage.xsl

    r2630 r2632  
    99 
    1010  <xsl:template name="showPage"> 
    11     <xsl:param name="page"/> 
     11    <xsl:param name="pageName"/> 
    1212    <!-- branch here by adding xsl:when statements --> 
    1313    <xsl:choose> 
    14       <xsl:when test="$page = 'urlbuilder'"> 
     14      <xsl:when test="$pageName = 'urlbuilder'"> 
    1515        <xsl:call-template name="urlbuilder"/> 
    1616      </xsl:when> 
     17      <xsl:otherwise> 
     18        <div id="page"> 
     19          <xsl:copy-of select="$bwStr-Error-PageNotDefined"/> 
     20        </div> 
     21      </xsl:otherwise> 
    1722    </xsl:choose> 
    1823  </xsl:template> 
     
    2025  <xsl:template name="urlbuilder"> 
    2126    <!-- 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> 
    2331    </iframe> 
    2432  </xsl:template> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/themeSettings.xsl

    r2589 r2632  
    4545       when a collection (e.g calendar "Exhibits") is directly selected? --> 
    4646  <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> 
    4755 
    4856 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bwclassicTheme/header.xsl

    r2631 r2632  
    5858            <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"/> 
    5959          </a> 
    60           <a class="rss" href="{$listEvents}&amp;setappvar=summaryMode(details)&amp;skinName=rss-list&amp;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> 
    6161        </td> 
    6262      </tr> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/themes/bwclassicTheme/header.xsl

    r2597 r2632  
    5858            <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"/> 
    5959          </a> 
    60           <a class="rss" href="{$listEvents}&amp;setappvar=summaryMode(details)&amp;skinName=rss-list&amp;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> 
    6161        </td> 
    6262      </tr>