Changeset 2502

Show
Ignore:
Timestamp:
12/18/09 16:01:22
Author:
bleibson
Message:

o Reorganized as a theme
o Moved more definitional stuff to config.xsl
o Now "link to event" works and points to the cached copy: http://www.bedework.org/trac/bedework/ticket/495

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2500 r2502  
    3232  --> 
    3333 
     34  <!-- URL of resources common to all bedework apps (javascript, images) --> 
     35  <xsl:variable name="resourceCommons">../../../bedework-common</xsl:variable> 
     36 
     37  <!-- URL for resources (images, css, javascript) --> 
     38  <xsl:variable name="resourcesRoot" select="concat($appRoot,'/default/default/theme')"/> 
     39 
     40  <!-- DEFINE INCLUDES --> 
     41  <!-- cannot use the resourceCommons variable in xsl:include paths --> 
     42  <xsl:include href="../../../bedework-common/default/default/errors.xsl"/> 
     43  <xsl:include href="../../../bedework-common/default/default/messages.xsl"/> 
     44  <xsl:include href="../../../bedework-common/default/default/util.xsl"/> 
     45  <xsl:include href="./strings.xsl"/> 
     46 
     47  <!-- URL of the XSL template directory --> 
     48  <xsl:variable name="appRoot" select="/bedework/approot"/> 
     49  
    3450  <xsl:variable name="bwCacheHostUrl">http://localhost:3000</xsl:variable> 
    3551  <xsl:variable name="bwCalendarHostURL">http://localhost:8080</xsl:variable> 
     52 
     53  <!-- Properly encoded prefixes to the application actions; use these to build 
     54      urls; allows the application to be used without cookies or within a portal. 
     55      These urls are rewritten in header.jsp and simply passed through for use 
     56      here. Every url includes a query string (either ?b=de or a real query 
     57      string) so that all links constructed in this stylesheet may begin the 
     58      query string with an ampersand. --> 
     59  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
     60  <xsl:variable name="eventView" select="/bedework/urlPrefixes/event/eventView"/> 
     61  <xsl:variable name="addEventRef" select="/bedework/urlPrefixes/event/addEventRef"/> 
     62  <xsl:variable name="export" select="/bedework/urlPrefixes/misc/export"/> 
     63  <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mail/mailEvent"/> 
     64   
     65 
     66  <!-- URL of the web application - includes web context --> 
     67  <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> 
     68 
    3669   
    3770</xsl:stylesheet> 

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

    r2498 r2502  
    3030    to the maximum extent the law permits. --> 
    3131 
    32   <!-- URL of resources common to all bedework apps (javascript, images) --> 
    33   <xsl:variable name="resourceCommons">../../../bedework-common</xsl:variable> 
    34  
    35   <!-- DEFINE INCLUDES --> 
    36   <!-- cannot use the resourceCommons variable in xsl:include paths --> 
    37   <xsl:include href="../../../bedework-common/default/default/errors.xsl"/> 
    38   <xsl:include href="../../../bedework-common/default/default/messages.xsl"/> 
    39   <xsl:include href="../../../bedework-common/default/default/util.xsl"/> 
     32 <!-- Bring in settings -->  
    4033  <xsl:include href="./config.xsl"/> 
    41   <xsl:include href="./strings.xsl"/> 
    42  
    43   <!-- DEFINE GLOBAL CONSTANTS --> 
    44  
    45   <!-- URL of html resources (images, css, other html); by default this is 
    46        set to the application root --> 
    47   <xsl:variable name="resourcesRoot" select="/bedework/approot"/> 
    48  
    49   <!-- URL of the XSL template directory --> 
    50   <!-- The approot is an appropriate place to put 
    51        included stylesheets and xml fragments. These are generally 
    52        referenced relatively (like errors.xsl and messages.xsl above); 
    53        this variable is here for your convenience if you choose to 
    54        reference it explicitly.  It is not used in this stylesheet, however, 
    55        and can be safely removed if you so choose. --> 
    56   <xsl:variable name="appRoot" select="/bedework/approot"/> 
    57  
    58   <!-- Properly encoded prefixes to the application actions; use these to build 
    59        urls; allows the application to be used without cookies or within a portal. 
    60        These urls are rewritten in header.jsp and simply passed through for use 
    61        here. Every url includes a query string (either ?b=de or a real query 
    62        string) so that all links constructed in this stylesheet may begin the 
    63        query string with an ampersand. --> 
     34 
     35  <!--  global variables --> 
    6436  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
    6537  <xsl:variable name="setSelection" select="/bedework/urlPrefixes/main/setSelection"/> 
    …… 
    7446  <xsl:variable name="calendar-fetchForExport" select="/bedework/urlPrefixes/calendar/fetchForExport"/> 
    7547  <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mail/mailEvent"/> 
    76    
    77  <xsl:variable name="stats" select="/bedework/urlPrefixes/stats/stats"/> 
    78  
    79   <!-- URL of the web application - includes web context --> 
    80   <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> 
    81  
    82   <!-- Other generally useful global variables --> 
    8348  <xsl:variable name="privateCal" select="concat($bwCalendarHostURL,'/ucal')"/> 
    84   <xsl:variable name="prevdate" select="/bedework/previousdate"/> 
    85   <xsl:variable name="nextdate" select="/bedework/nextdate"/> 
    86   <xsl:variable name="curdate" select="/bedework/currentdate/date"/> 
    87  
    8849 
    8950  <!-- MAIN TEMPLATE --> 
    …… 
    9455        <meta content="text/html;charset=utf-8" http-equiv="Content-Type" /> 
    9556        <!-- load css --> 
    96         <link rel="stylesheet" href="{$resourcesRoot}/default/default/blue.css"/> 
     57        <link rel="stylesheet" href="{$resourcesRoot}/css/blue.css"/> 
    9758        <link rel="stylesheet" href="../../../bedework-common/default/default/subColors.css"/> 
    98         <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" /> 
     59        <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/css/print.css" /> 
    9960        <!-- load javascript --> 
    10061        <xsl:if test="/bedework/page='event' or /bedework/page='displayCalendarForExport'"> 
    …… 
    180141    </xsl:variable> 
    181142    <h2 class="{$statusClass}"> 
    182       <a id="linkToEvent" href="javascript:showLink('{$urlPrefix}/event/eventView.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')" title="{$bwStr-SgEv-GenerateLinkToThisEvent}"> 
     143<!--      <a id="linkToEvent" href="javascript:showLink('{$urlPrefix}/event/eventView.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')" title="{$bwStr-SgEv-GenerateLinkToThisEvent}"> --> 
     144       <a id="linkToEvent" href="javascript:showLink('{$bwCacheHostUrl}/v1.0/event/list-html/{$recurrenceId}/{$guid}')" title="{$bwStr-SgEv-GenerateLinkToThisEvent}"> 
    183145       <xsl:copy-of select="$bwStr-SgEv-LinkToThisEvent"/> 
    184146     </a> 

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

    r2501 r2502  
    1414  omit-xml-declaration="yes"/> 
    1515 
    16 <!-- ========================================================= 
    17  
    18  
    19  
    20 ===============================================================  --> 
    2116<!-- ********************************************************************** 
    22     Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved. 
     17    Copyright 2009 Rensselaer Polytechnic Institute. All worldwide rights reserved. 
    2318 
    2419    Redistribution and use of this distribution in source and binary forms, 
    …… 
    4338    special, consequential, or incidental damages related to the software, 
    4439    to the maximum extent the law permits. --> 
    45  
    46   <!-- ================================= --> 
    47   <!--  DEMO PUBLIC CALENDAR STYLESHEET  --> 
    48   <!-- ================================= --> 
    49  
    50   <!-- URL of resources common to all bedework apps (javascript, images) --> 
    51   <xsl:variable name="resourceCommons">../../../bedework-common</xsl:variable> 
    52  
    53   <!-- DEFINE INCLUDES --> 
    54   <!-- cannot use the resourceCommons variable in xsl:include paths --> 
    55   <xsl:include href="../../../bedework-common/default/default/errors.xsl"/> 
    56   <xsl:include href="../../../bedework-common/default/default/messages.xsl"/> 
    57   <xsl:include href="../../../bedework-common/default/default/util.xsl"/> 
     40  
     41  <!-- Bring in settings -->  
    5842  <xsl:include href="./config.xsl"/> 
    59   <xsl:include href="./strings.xsl"/> 
    60  
    61   <!-- DEFINE GLOBAL CONSTANTS --> 
    62  
    63   <!-- URL of html resources (images, css, other html); by default this is 
    64        set to the application root --> 
    65   <xsl:variable name="resourcesRoot" select="/bedework/approot"/> 
    66  
    67   <!-- URL of the XSL template directory --> 
    68   <!-- The approot is an appropriate place to put 
    69        included stylesheets and xml fragments. These are generally 
    70        referenced relatively (like errors.xsl and messages.xsl above); 
    71        this variable is here for your convenience if you choose to 
    72        reference it explicitly.  It is not used in this stylesheet, however, 
    73        and can be safely removed if you so choose. --> 
    74   <xsl:variable name="appRoot" select="/bedework/approot"/> 
    75  
    76   <!-- Properly encoded prefixes to the application actions; use these to build 
    77        urls; allows the application to be used without cookies or within a portal. 
    78        These urls are rewritten in header.jsp and simply passed through for use 
    79        here. Every url includes a query string (either ?b=de or a real query 
    80        string) so that all links constructed in this stylesheet may begin the 
    81        query string with an ampersand. --> 
    82   <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
    83   <xsl:variable name="eventView" select="/bedework/urlPrefixes/event/eventView"/> 
    84   <xsl:variable name="addEventRef" select="/bedework/urlPrefixes/event/addEventRef"/> 
    85   <xsl:variable name="export" select="/bedework/urlPrefixes/misc/export"/> 
    86   <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mail/mailEvent"/> 
    87  
    88   <!-- URL of the web application - includes web context --> 
    89   <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> 
    90  
    91   <!-- Other generally useful global variables --> 
     43 
     44  <!--  global variables --> 
     45  <xsl:variable name="prevdate" select="/bedework/previousdate"/> 
     46  <xsl:variable name="nextdate" select="/bedework/nextdate"/> 
     47  <xsl:variable name="curdate" select="/bedework/currentdate/date"/> 
     48  <xsl:variable name="stats" select="/bedework/urlPrefixes/stats/stats"/> 
    9249  <xsl:variable name="privateCal" select="concat($bwCalendarHostURL,'/ucal')"/> 
    9350 
    …… 
    9855        <title><xsl:copy-of select="$bwStr-Root-PageTitle"/></title> 
    9956        <meta content="text/html;charset=utf-8" http-equiv="Content-Type" /> 
    100         <link rel="stylesheet" href="{$resourcesRoot}/default/default/blue.css"/> 
    101         <link rel="stylesheet" href="../../../bedework-common/default/default/subColors.css"/> 
    102         <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" /> 
     57        <link rel="stylesheet" href="{$resourcesRoot}/css/blue.css"/> 
     58        <link rel="stylesheet" href="{$resourceCommons}/default/default/subColors.css"/> 
     59        <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/css/print.css" /> 
    10360        <!-- load javascript --> 
    10461        <xsl:if test="/bedework/page='event'"> 
    105           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
    106           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
    107           <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
    108           <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
    109           <script type="text/javascript" src="{$resourcesRoot}/resources/javascript/bedework.js">&#160;</script> 
     62          <script type="text/javascript" src="{$resourceCommons}/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
     63          <script type="text/javascript" src="{$resourceCommons}/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
     64          <link rel="stylesheet" href="{$resourceCommons}/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
     65          <link rel="stylesheet" href="{$resourceCommons}/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
     66          <script type="text/javascript" src="{$resourcesRoot}/javascript/bedework.js">&#160;</script> 
    11067        </xsl:if> 
    11168        <!-- address bar icon --> 
    …… 
    145102    </xsl:variable> 
    146103    <h2 class="{$statusClass}"> 
    147       <a id="linkToEvent" href="javascript:showLink('{$urlPrefix}/event/eventView.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')" title="{$bwStr-SgEv-GenerateLinkToThisEvent}"> 
     104      <a id="linkToEvent" href="javascript:showLink('{$bwCacheHostUrl}/v1.0/event/list-html/{$recurrenceId}/{$guid}')" title="{$bwStr-SgEv-GenerateLinkToThisEvent}"> 
    148105       <xsl:copy-of select="$bwStr-SgEv-LinkToThisEvent"/> 
    149106     </a>