Changeset 2548

Show
Ignore:
Timestamp:
12/23/09 15:18:13
Author:
johnsa
Message:

public client: bring old skins back in line

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2509 r2548  
    4545  <!-- Other generally useful global variables --> 
    4646  <xsl:variable name="privateCal">/ucal</xsl:variable> 
    47   <xsl:variable name="feederPrefix">/feeder</xsl:variable> 
     47  <xsl:variable name="feeder">/feeder</xsl:variable> 
    4848  <xsl:variable name="prevdate" select="/bedework/previousdate" /> 
    4949  <xsl:variable name="nextdate" select="/bedework/nextdate" /> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/event.xsl

    r2511 r2548  
    3838        <xsl:choose> 
    3939          <xsl:when test="string-length($recurrenceId)"> 
    40             <a class="eventIcons" href="http://www.facebook.com/share.php?u={$feederPrefix}/event/cal/html/Public/{$recurrenceId}/{$guidEsc}" title="{$bwStr-SgEv-AddToFacebook}"> 
     40            <a class="eventIcons" href="http://www.facebook.com/share.php?u={$feeder}/event/cal/html/Public/{$recurrenceId}/{$guidEsc}" title="{$bwStr-SgEv-AddToFacebook}"> 
    4141              <img title="{$bwStr-SgEv-AddToFacebook}" src="{$resourcesRoot}/images/Facebook_Badge.gif" alt="{$bwStr-SgEv-AddToFacebook}" /> 
    4242            </a> 
    4343          </xsl:when> 
    4444          <xsl:otherwise> 
    45             <a class="eventIcons" href="http://www.facebook.com/share.php?u={$feederPrefix}/event/cal/html/Public/0/{$guidEsc}" title="{$bwStr-SgEv-AddToFacebook}"> 
     45            <a class="eventIcons" href="http://www.facebook.com/share.php?u={$feeder}/event/cal/html/Public/0/{$guidEsc}" title="{$bwStr-SgEv-AddToFacebook}"> 
    4646              <img title="{$bwStr-SgEv-AddToFacebook}" src="{$resourcesRoot}/images/Facebook_Badge.gif" alt="{$bwStr-SgEv-AddToFacebook}" /> 
    4747            </a> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/footer.xsl

    r2534 r2548  
    2424              </option> 
    2525              <option 
    26                 value="{$listEvents}&amp;setappvar=summaryMode(details)&amp;skinName=rss-list&amp;days=3"> 
    27                 <xsl:copy-of 
    28                   select="$bwStr-Foot-RSSNext3Days" /> 
     26                value="{$feeder}/main/listEvents.do?skinName=list-rss&amp;days=3"> 
     27                <xsl:copy-of select="$bwStr-Foot-RSSNext3Days" /> 
    2928              </option> 
    3029              <option 
    31                 value="{$listEvents}&amp;setappvar=summaryMode(details)&amp;skinName=js-list&amp;days=3&amp;contentType=text/javascript&amp;contentName=bedework.js"> 
    32                 <xsl:copy-of 
    33                   select="$bwStr-Foot-JavascriptNext3Days" /> 
    34               </option> 
    35               <option 
    36                 value="{$setViewPeriod}&amp;viewType=todayView&amp;skinName=jsToday&amp;contentType=text/javascript&amp;contentName=bedeworkToday.js"> 
    37                 <xsl:copy-of 
    38                   select="$bwStr-Foot-JavascriptTodaysEvents" /> 
     30                value="{$feeder}/main/listEvents.do?skinName=list-json&amp;days=3&amp;contentType=text/javascript&amp;contentName=bedework.js"> 
     31                <xsl:copy-of select="$bwStr-Foot-JavascriptNext3Days" /> 
    3932              </option> 
    4033              <option 
    4134                value="{$setup}&amp;browserTypeSticky=PDA"> 
    42                 <xsl:copy-of 
    43                   select="$bwStr-Foot-ForMobileBrowsers" /> 
     35                <xsl:copy-of select="$bwStr-Foot-ForMobileBrowsers" /> 
    4436              </option> 
    4537              <option 
    46                 value="{$setViewPeriod}&amp;viewType=todayView&amp;skinName=videocal"> 
    47                 <xsl:copy-of 
    48                   select="$bwStr-Foot-VideoFeed" /> 
     38                value="{$setViewPeriod}&amp;viewType=todayView&amp;skinNameSticky=videocal"> 
     39                <xsl:copy-of select="$bwStr-Foot-VideoFeed" /> 
    4940              </option> 
    5041              <option 
    5142                value="{$setup}&amp;skinNameSticky=default"> 
    52                 <xsl:copy-of 
    53                   select="$bwStr-Foot-ResetToCalendarDefault" /> 
     43                <xsl:copy-of select="$bwStr-Foot-ResetToCalendarDefault" /> 
    5444              </option> 
    5545            </select> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/iphone/default.xsl

    r2520 r2548  
    1515             BEDEWORK MOBILE STYLESHEET 
    1616 
     17        THIS WILL SHORTLY BE REPLACED WITH AN IPHONE FRIENDLY SKIN 
     18 
    1719        Renders Bedework public client for mobile 
    1820        devices.  Call this stylesheet using: 
    …… 
    2426       ==============================================  --> 
    2527 
    26   <!-- URL of resources common to all bedework apps (javascript, images) --> 
    27   <xsl:variable name="resourceCommons">../../../bedework-common</xsl:variable> 
    28  
    29   <!-- DEFINE INCLUDES --> 
    30   <!-- cannot use the resourceCommons variable in xsl:include paths --> 
    31   <xsl:include href="../../../bedework-common/default/default/errors.xsl"/> 
    32   <xsl:include href="../../../bedework-common/default/default/messages.xsl"/> 
    33  
    34   <!-- DEFINE GLOBAL CONSTANTS --> 
    35  
    36   <!-- URL of the XSL template directory --> 
    37   <!-- The approot is an appropriate place to put 
    38        included stylesheets and xml fragments. These are generally 
    39        referenced relatively (like errors.xsl and messages.xsl above); 
    40        this variable is here for your convenience if you choose to 
    41        reference it explicitly.  It is not used in this stylesheet, however, 
    42        and can be safely removed if you so choose. --> 
    43   <xsl:variable name="appRoot" select="/bedework/approot"/> 
    44  
    4528  <!-- URL of html resources (images, css, other html); by default this is 
    4629       set to the application root --> 
    47   <xsl:variable name="resourcesRoot" select="/bedework/approot"/> 
    48  
    49   <!-- Properly encoded prefixes to the application actions; use these to build 
    50        urls; allows the application to be used without cookies or within a portal. 
    51        These urls are rewritten in header.jsp and simply passed through for use 
    52        here. Every url includes a query string (either ?b=de or a real query 
    53        string) so that all links constructed in this stylesheet may begin the 
    54        query string with an ampersand. --> 
    55   <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
    56   <xsl:variable name="setSelection" select="/bedework/urlPrefixes/main/setSelection"/> 
    57   <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/calendar/fetchPublicCalendars"/> 
    58   <xsl:variable name="setViewPeriod" select="/bedework/urlPrefixes/main/setViewPeriod"/> 
    59   <xsl:variable name="eventView" select="/bedework/urlPrefixes/event/eventView"/> 
    60   <xsl:variable name="addEventRef" select="/bedework/urlPrefixes/event/addEventRef"/> 
    61   <xsl:variable name="export" select="/bedework/urlPrefixes/misc/export/a/@href"/> 
    62   <xsl:variable name="search" select="/bedework/urlPrefixes/search/search"/> 
    63   <xsl:variable name="search-next" select="/bedework/urlPrefixes/search/next"/> 
    64   <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mail/mailEvent"/> 
    65   <xsl:variable name="showPage" select="/bedework/urlPrefixes/main/showPage"/> 
    66   <xsl:variable name="stats" select="/bedework/urlPrefixes/stats/stats"/> 
    67  
    68   <!-- URL of the web application - includes web context --> 
    69   <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> 
    70  
    71   <!-- Other generally useful global variables --> 
    72   <xsl:variable name="privateCal">/ucal</xsl:variable> 
    73   <xsl:variable name="prevdate" select="/bedework/previousdate"/> 
    74   <xsl:variable name="nextdate" select="/bedework/nextdate"/> 
    75   <xsl:variable name="curdate" select="/bedework/currentdate/date"/> 
    76  
     30  <xsl:variable name="resourcesRoot"><xsl:value-of select="$appRoot"/>/themes/iphone</xsl:variable> 
    7731 
    7832  <!-- MAIN TEMPLATE --> 
    …… 
    8438        <meta http-equiv="Pragma" content="no-cache"/> 
    8539        <meta http-equiv="Expires" content="-1"/> 
    86         <link rel="stylesheet" href="{$resourcesRoot}/default/PDA/pda.css"/> 
     40        <link rel="stylesheet" href="{$resourcesRoot}/pda.css"/> 
    8741      </head> 
    8842      <body> 
    …… 
    475429  <!--==== LIST VIEW  (for day, week, and month) ====--> 
    476430  <xsl:template name="listView"> 
     431    <p> 
     432      <em> 
     433        This theme will shortly be replaced by an iphone/smartphone friendly theme. 
     434      </em> 
     435    </p> 
    477436    <xsl:choose> 
    478437      <xsl:when test="not(/bedework/eventscalendar/year/month/week/day/event)"> 
    …… 
    679638  </xsl:template> 
    680639 
    681   <!--==== UTILITY TEMPLATES ====--> 
    682  
    683   <!-- search and replace template taken from 
    684        http://www.biglist.com/lists/xsl-list/archives/200211/msg00337.html --> 
    685   <xsl:template name="replace"> 
    686     <xsl:param name="string" select="''"/> 
    687     <xsl:param name="pattern" select="''"/> 
    688     <xsl:param name="replacement" select="''"/> 
    689     <xsl:choose> 
    690       <xsl:when test="$pattern != '' and $string != '' and contains($string, $pattern)"> 
    691         <xsl:value-of select="substring-before($string, $pattern)"/> 
    692         <xsl:copy-of select="$replacement"/> 
    693         <xsl:call-template name="replace"> 
    694           <xsl:with-param name="string" select="substring-after($string, $pattern)"/> 
    695           <xsl:with-param name="pattern" select="$pattern"/> 
    696           <xsl:with-param name="replacement" select="$replacement"/> 
    697         </xsl:call-template> 
    698       </xsl:when> 
    699       <xsl:otherwise> 
    700         <xsl:value-of select="$string"/> 
    701       </xsl:otherwise> 
    702     </xsl:choose> 
    703   </xsl:template> 
    704  
    705640</xsl:stylesheet>