Changeset 2587

Show
Ignore:
Timestamp:
12/29/09 19:45:49
Author:
bleibson
Message:

o bring consistency to the naming conventions.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2583 r2587  
    1919  <!-- Location of the web cache --> 
    2020  <xsl:variable name="bwCacheHostUrl">/webcache</xsl:variable> 
     21 
     22  <!-- Location of resources --> 
     23  <xsl:variable name="resourcesRoot" select="concat($appRoot,'/default/default/theme')"/> 
    2124 
    2225  <!-- Properly encoded prefixes to the application actions; use these to build 
    …… 
    5053  <xsl:variable name="nextdate" select="/bedework/nextdate" /> 
    5154  <xsl:variable name="curdate" select="/bedework/currentdate/date" /> 
     55   
    5256 
    5357</xsl:stylesheet> 

  • trunk/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/grid-html.xsl

    r2561 r2587  
    3131 
    3232 <!-- Bring in settings --> 
    33   <xsl:include href="./xsl/config.xsl"/> 
    34  
    35   <!--  global variables --> 
    36   <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
    37   <xsl:variable name="setSelection" select="/bedework/urlPrefixes/main/setSelection"/> 
    38   <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/calendar/fetchPublicCalendars"/> 
    39   <xsl:variable name="setViewPeriod" select="/bedework/urlPrefixes/main/setViewPeriod"/> 
    40   <xsl:variable name="listEvents" select="/bedework/urlPrefixes/main/listEvents"/> 
    41   <xsl:variable name="eventView" select="/bedework/urlPrefixes/event/eventView"/> 
    42   <xsl:variable name="addEventRef" select="/bedework/urlPrefixes/event/addEventRef"/> 
    43   <xsl:variable name="export" select="/bedework/urlPrefixes/misc/export"/> 
    44   <xsl:variable name="search" select="/bedework/urlPrefixes/search/search"/> 
    45   <xsl:variable name="search-next" select="/bedework/urlPrefixes/search/next"/> 
    46   <xsl:variable name="calendar-fetchForExport" select="/bedework/urlPrefixes/calendar/fetchForExport"/> 
    47   <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mail/mailEvent"/> 
    48   <xsl:variable name="privateCal" select="concat($bwCalendarHostURL,'/ucal')"/> 
    49  
    50    
     33  <xsl:include href="globals.xsl"/> 
     34  <xsl:include href="../strings.xsl"/> 
     35 
    5136  <xsl:template match="/"> 
    5237        <!-- grab category filters.  -->         
    …… 
    8873        <!-- load css --> 
    8974        <link rel="stylesheet" href="{$resourcesRoot}/css/blue.css"/> 
    90         <link rel="stylesheet" href="../../../bedework-common/default/default/subColors.css"/> 
     75        <link rel="stylesheet" href="/bedework-common/default/default/subColors.css"/> 
    9176        <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/css/print.css" /> 
    9277        <!-- load javascript --> 
    9378        <xsl:if test="/bedework/page='event' or /bedework/page='displayCalendarForExport'"> 
    94           <script type="text/javascript" src="../../../bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
    95           <script type="text/javascript" src="../../../bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
     79          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
     80          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
    9681          <link rel="stylesheet" href="../../../bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
    97           <link rel="stylesheet" href="../../../bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
     82          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
    9883          <script type="text/javascript" src="{$resourcesRoot}/resources/javascript/bedework.js">&#160;</script> 
    9984          <xsl:if test="/bedework/page='displayCalendarForExport'"> 

  • trunk/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/grid-json.xsl

    r2561 r2587  
    3030 
    3131  <!-- Bring in settings and included xsl --> 
    32   <xsl:include href="./xsl/config.xsl"/> 
     32  <xsl:include href="globals.xsl"/> 
     33  <xsl:include href="../strings.xsl"/> 
     34 
    3335  <!-- Provides event template --> 
    3436  <xsl:include href="./xsl/jsonEvent.xsl"/> 
    3537  <!-- Provides category filter templates --> 
    3638  <xsl:include href="./xsl/categoryFiltering.xsl"/> 
    37  
    38   <!--  global variables -->  
    39   <xsl:variable name="urlprefix" select="/bedework/urlprefix"/> 
    40   <xsl:variable name="eventView" select="/bedework/urlPrefixes/event/eventView"/> 
    4139 
    4240  <xsl:template match='/'> 

  • trunk/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/list-html.xsl

    r2583 r2587  
    4040 
    4141  <!-- Bring in settings and included xsl --> 
    42   <xsl:include href="./xsl/config.xsl"/> 
    43   <xsl:include href="./strings.xsl"/> 
     42  <xsl:include href="globals.xsl"/> 
     43  <xsl:include href="../strings.xsl"/> 
    4444  <!-- Provides event template --> 
    4545  <xsl:include href="./xsl/htmlEvent.xsl"/> 
    …… 
    4747  <xsl:include href="./xsl/htmlCategoryFiltering.xsl"/> 
    4848 
    49  
    50   <!--  global variables --> 
    51   <xsl:variable name="prevdate" select="/bedework/previousdate"/> 
    52   <xsl:variable name="nextdate" select="/bedework/nextdate"/> 
    53   <xsl:variable name="curdate" select="/bedework/currentdate/date"/> 
    54   <xsl:variable name="stats" select="/bedework/urlPrefixes/stats/stats"/> 
    55   <xsl:variable name="privateCal" select="concat($bwCalendarHostURL,'/ucal')"/> 
    5649 
    5750  <!-- MAIN TEMPLATE --> 
    …… 
    6255        <meta content="text/html;charset=utf-8" http-equiv="Content-Type" /> 
    6356        <link rel="stylesheet" href="{$resourcesRoot}/css/blue.css"/> 
    64         <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/css/print.css" /> 
     57        <link rel="stylesheet" type="text/css" media="print" href="/bedework/common/css/print.css" /> 
    6558        <!-- load javascript --> 
    6659        <xsl:if test="/bedework/page='event'"> 
    67           <script type="text/javascript" src="{$resourceCommons}/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
    68           <script type="text/javascript" src="{$resourceCommons}/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
    69           <link rel="stylesheet" href="{$resourceCommons}/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
    70           <link rel="stylesheet" href="{$resourceCommons}/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
    71           <script type="text/javascript" src="{$resourcesRoot}/javascript/bedework.js">&#160;</script> 
     60          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
     61          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
     62          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
     63          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
     64          <script type="text/javascript" src="/bedework-common/javascript/bedework.js">&#160;</script> 
    7265        </xsl:if> 
    7366        <!-- address bar icon --> 

  • trunk/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/list-json.xsl

    r2559 r2587  
    3636   
    3737  <!-- Bring in settings and included xsl --> 
    38   <xsl:include href="./xsl/config.xsl"/> 
    39   <!-- Provides event template --> 
     38  <xsl:include href="globals.xsl"/> 
     39  <xsl:include href="../strings.xsl"/> 
     40 
    4041  <xsl:include href="./xsl/jsonEvent.xsl"/> 
    4142  <!-- Provides category filter templates --> 
    4243  <xsl:include href="./xsl/categoryFiltering.xsl"/> 
    43  
    44   <!--  global variables --> 
    45   <xsl:variable name="urlprefix" select="/bedework/urlprefix"/> 
    46   <xsl:variable name="eventView" select="/bedework/urlPrefixes/event/eventView"/> 
    4744 
    4845  <xsl:template match='/'> 

  • trunk/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/xsl/jsonEvent.xsl

    r2557 r2587  
    3636                    "recurrenceId" : "<xsl:value-of select="recurrenceId"/>", 
    3737                    "link" : "<xsl:value-of select='link'/>", 
    38                     "eventlink" : "<xsl:value-of select="$urlprefix"/><xsl:value-of select="$eventView"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/>", 
     38                    "eventlink" : "<xsl:value-of select="$urlPrefix"/><xsl:value-of select="$eventView"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/>", 
    3939                    "status" : "<xsl:value-of select='status'/>", 
    4040                    "start" : {