Changeset 2476

Show
Ignore:
Timestamp:
12/14/09 00:39:57
Author:
johnsa
Message:

public client: more work on new default skin

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2474 r2476  
    6565 
    6666  <!-- Page subsections --> 
    67   <xsl:include href="./defaultTheme/event.xsl" /> 
     67  <xsl:include href="./bwclassicTheme/event.xsl" /> 
    6868 
    6969  <!-- DEFINE GLOBAL CONSTANTS --> 

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

    r2475 r2476  
    2323      <xsl:choose> 
    2424        <xsl:when test="link != ''"> 
    25           <xsl:variable name="link" select="link"/> 
    26           <a href="{$link}"> 
     25          <a> 
     26            <xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute> 
    2727            <xsl:value-of select="summary"/> 
    2828          </a> 
    …… 
    164164          <div id="eventIcons"> 
    165165            <a href="{$privateCal}/event/addEventRef.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="{$bwStr-SgEv-AddEventToMyCalendar}" target="myCalendar"> 
    166               <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
     166              <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="{$bwStr-SgEv-AddEventToMyCalendar}"/> 
    167167              <xsl:copy-of select="$bwStr-SgEv-AddToMyCalendar"/> 
    168168            </a> 
    …… 
    182182            </xsl:when> 
    183183            <xsl:otherwise> 
    184               <xsl:variable name="locationLink" select="location/link"/> 
    185               <a href="{$locationLink}"> 
     184              <a> 
     185                <xsl:attribute name="href"><xsl:value-of select="location/link"/></xsl:attribute> 
    186186                <xsl:value-of select="location/address"/> 
    187187              </a> 
    …… 
    197197        <td colspan="2" class="fieldval description"> 
    198198          <xsl:if test="xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 
    199             <xsl:variable name="bwImage"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:variable> 
    200             <img src="{$bwImage}" class="bwEventImage"/> 
     199            <img class="bwEventImage"> 
     200              <xsl:attribute name="src"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" /></xsl:attribute> 
     201            </img> 
    201202          </xsl:if> 
    202203          <xsl:call-template name="replace"> 
    …… 
    225226          <td class="fieldname"><xsl:copy-of select="$bwStr-SgEv-See"/></td> 
    226227          <td colspan="2" class="fieldval"> 
    227             <xsl:variable name="link" select="link"/> 
    228             <a href="{$link}"><xsl:value-of select="link"/></a> 
     228            <a> 
     229              <xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute> 
     230              <xsl:value-of select="link"/> 
     231            </a> 
    229232          </td> 
    230233        </tr> 
    …… 
    239242              </xsl:when> 
    240243              <xsl:otherwise> 
    241                 <xsl:variable name="sponsorLink" select="contact/link"/> 
    242                 <a href="{$sponsorLink}"> 
    243                   <xsl:value-of select="contact/name"/> 
     244                <a> 
     245                  <xsl:attribute name="href"><xsl:value-of select="contact/link" /></xsl:attribute> 
     246                  <xsl:value-of select="contact/name" /> 
    244247                </a> 
    245248              </xsl:otherwise> 

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

    r2475 r2476  
    5151    to the maximum extent the law permits. --> 
    5252 
    53   <!-- ================================= --> 
    54   <!--  DEMO PUBLIC CALENDAR STYLESHEET  --> 
    55   <!-- ================================= --> 
    56  
    5753  <!-- DEFINE INCLUDES --> 
    5854  <xsl:include href="../../../bedework-common/default/default/errors.xsl" /> 
    …… 
    6258 
    6359  <!-- Page subsections --> 
     60  <xsl:include href="./defaultTheme/head.xsl" /> 
    6461  <xsl:include href="./defaultTheme/header.xsl" /> 
    6562  <xsl:include href="./defaultTheme/footer.xsl" /> 
    …… 
    6966  <xsl:include href="./defaultTheme/ongoing.xsl" /> 
    7067  <xsl:include href="./defaultTheme/featured.xsl"/> 
     68  <xsl:include href="./defaultTheme/groups.xsl"/> 
    7169  <xsl:include href="./defaultTheme/system-stats.xsl"/> 
    7270 
    …… 
    122120  <xsl:template match="/"> 
    123121    <html lang="en"> 
    124       <head> 
    125         <title> 
    126           <xsl:choose> 
    127             <xsl:when test="/bedework/page='event'"> 
    128               <xsl:value-of select="/bedework/event/summary" /> 
    129             </xsl:when> 
    130             <xsl:otherwise> 
    131               <xsl:copy-of select="$bwStr-Root-PageTitle" /> 
    132             </xsl:otherwise> 
    133           </xsl:choose> 
    134         </title> 
    135  
    136         <meta content="text/html;charset=utf-8" http-equiv="Content-Type" /> 
    137  
    138         <!-- address bar favicon --> 
    139         <link rel="icon" type="image/ico" href="{$resourcesRoot}/images/bedework.ico" /> 
    140  
    141         <!-- load css --> 
    142         <link rel="stylesheet" type="text/css" media="screen" href="{$resourcesRoot}/css/fixed.css" /> 
    143         <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/css/print.css" /> 
    144  
    145         <!-- Dependencies --> 
    146         <xsl:text disable-output-escaping="yes"> 
    147           <![CDATA[ 
    148           <!--[if IE 6]> 
    149             <link rel="stylesheet" type="text/css" media="screen" href="/calrsrc.MainCampus/default/default/defaultTheme/css/ie6.css"/> 
    150           <![endif]--> 
    151  
    152           <!--[if IE 7]> 
    153             <link rel="stylesheet" type="text/css" media="screen" href="/calrsrc.MainCampus/default/default/defaultTheme/css/ie7.css"/> 
    154           <![endif]--> 
    155           ]]> 
    156         </xsl:text> 
    157  
    158         <!-- load javascript --> 
    159         <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
    160         <script type="text/javascript" src="{$resourcesRoot}/javascript/yui/yahoo-dom-event.js">&#160;</script> 
    161         <script type="text/javascript" src="{$resourcesRoot}/javascript/yui/calendar-min.js">&#160;</script> 
    162         <script type="text/javascript" src="{$resourcesRoot}/javascript/yui/animation-min.js">&#160;</script> 
    163         <xsl:if test="/bedework/page='searchResult'"> 
    164           <script type="text/javascript" src="{$resourcesRoot}/javascript/catSearch.js">&#160;</script> 
    165         </xsl:if> 
    166         <script type="text/javascript" src="{$resourcesRoot}/javascript/mainCampus.js">&#160;</script> 
    167         <script type="text/javascript"> 
    168           <xsl:call-template name="jsonDataObject" /> 
    169         </script> 
    170         <script type="text/javascript" src="{$resourcesRoot}/javascript/ifs-calendar.js">&#160;</script> 
    171       </head> 
     122      <xsl:call-template name="head"/> 
    172123      <body> 
    173124        <div id="wrap"> 
    …… 
    178129          <xsl:if test="/bedework/error"> 
    179130            <div id="errors"> 
    180               <xsl:apply-templates 
    181                 select="/bedework/error" /> 
     131              <xsl:apply-templates select="/bedework/error" /> 
    182132            </div> 
    183133          </xsl:if> 
    …… 
    185135            <xsl:choose> 
    186136              <!-- Set up the layouts for each type of display --> 
     137 
    187138              <!-- Layout for: Single Event Display--> 
    188139              <xsl:when test="/bedework/page = 'event'"> 
    …… 
    336287        <li> 
    337288          <a href="#" 
    338             onClick="javascript:toggleDiv('groupListDiv'); toggleDiv('right_column'); toggleDiv('center_column');"> 
     289            onclick="javascript:toggleDiv('groupListDiv'); toggleDiv('right_column'); toggleDiv('center_column');"> 
    339290            Group List 
    340291          </a> 
    …… 
    405356 
    406357 
    407   <!-- Groups List --> 
    408   <xsl:template name="groupsList"> 
    409     <div style="display:none;" id="groupListDiv"> 
    410       <div class="groupHeader"> 
    411         <h3>Select a Group</h3> 
    412         <a href="#" 
    413           onClick="javascript:toggleDiv('groupListDiv'); toggleDiv('right_column'); toggleDiv('center_column');"> 
    414           X - Close 
    415         </a> 
    416       </div> 
    417       <ul class="groupList"> 
    418         <li> 
    419           <a href="/cal/?setappvar=group(all)"> 
    420             <xsl:if 
    421               test="((/bedework/appvar[key = 'group']/value = 'all') or not(/bedework/appvar[key = 'group']/value))"> 
    422               <xsl:attribute name="class">current</xsl:attribute> 
    423             </xsl:if> 
    424             All 
    425           </a> 
    426         </li> 
    427         <xsl:for-each 
    428           select="/bedework/urlPrefixes/groups/group[ memberof/name = 'campusAdminGroups' ]"> 
    429           <xsl:variable name="eventOwner" 
    430             select="eventOwner/text()" /> 
    431           <xsl:variable name="groupName" select="name/text()" /> 
    432           <xsl:variable name="groupDescription" 
    433             select="description/text()" /> 
    434           <li> 
    435             <a 
    436               href="/cal/?setappvar=group({$eventOwner})"> 
    437               <xsl:if 
    438                 test="$eventOwner = (/bedework/appvar[key = 'group']/value)"> 
    439                 <xsl:attribute name="class">current</xsl:attribute> 
    440               </xsl:if> 
    441               <xsl:value-of select="$groupName" /> 
    442             </a> 
    443             <xsl:if 
    444               test="$groupName != $groupDescription"> 
    445               <div class="groupDesc"> 
    446                 <xsl:value-of 
    447                   select="$groupDescription" /> 
    448               </div> 
    449             </xsl:if> 
    450           </li> 
    451         </xsl:for-each> 
    452       </ul> 
    453     </div> 
    454   </xsl:template> 
    455358 
    456359  <!-- Side Links Navigation --> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/defaultTheme/css/fixed.css

    r2475 r2476  
    551551} 
    552552.eventTitle { 
    553  display: block; 
    554553} 
    555554.eventListingCal { 
    556  display: block; 
    557555} 
    558556.eventLink { 
    559  display: block; 
    560557} 
    561558.eventWhen { 
    562  display: block; 
    563559} 
    564560.eventWhere { 
    565  display: block; 
    566561} 
    567562.eventDescription { 
    568  display: block; 
     563 margin: 1em 0; 
    569564} 
    570565.eventStatus { 
    571  display: block; 
    572566} 
    573567.eventCost { 
    574  display: block; 
    575568} 
    576569.eventLink { 
    577  display: block; 
    578570} 
    579571.eventContact { 
    580  display: block; 
    581572} 
    582573.eventCategories { 
    583  display: block; 
    584574} 
    585575.eventComments { 
    586  display: block; 
    587576} 
    588577.eventIcons { 
    …… 
    891880  display: inline; 
    892881} 
    893 } 
    894 } 

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

    r2475 r2476  
    2626        <xsl:variable name="gText" select="summary" /> 
    2727        <xsl:variable name="gDetails" select="summary" /> 
    28         <a class="eventIcons" href="http://www.google.com/calendar/event?action=TEMPLATE&amp;dates={$gStartdate}/{$gEnddate}&amp;text={$gText}&amp;details={$gDetails}&amp;location={$gLocation}"> 
    29           <img title="Add to Google Calendar" src="{$resourcesRoot}/images/gcal.gif" alt="Add to Google Calendar" /> 
     28        <a class="eventIcons" href="http://www.google.com/calendar/event?action=TEMPLATE&amp;dates={$gStartdate}/{$gEnddate}&amp;text={$gText}&amp;details={$gDetails}&amp;location={$gLocation}" title="{$bwStr-SgEv-AddToGoogleCalendar}"> 
     29          <img title="Add to Google Calendar" src="{$resourcesRoot}/images/gcal.gif" alt="{$bwStr-SgEv-AddToGoogleCalendar}" /> 
    3030        </a> 
    3131        <xsl:choose> 
    3232          <xsl:when test="string-length($recurrenceId)"> 
    33             <a class="eventIcons" href="http://www.facebook.com/share.php?u={$feederPrefix}/event/cal/html/Public/{$recurrenceId}/{$guidEsc}"> 
    34               <img title="Add to Facebook" src="{$resourcesRoot}/images/Facebook_Badge.gif" alt="Add to Facebook" /> 
     33            <a class="eventIcons" href="http://www.facebook.com/share.php?u={$feederPrefix}/event/cal/html/Public/{$recurrenceId}/{$guidEsc}" title="{$bwStr-SgEv-AddToGoogleCalendar}"> 
     34              <img title="Add to Facebook" src="{$resourcesRoot}/images/Facebook_Badge.gif" alt="{$bwStr-SgEv-AddToFacebook}" /> 
    3535            </a> 
    3636          </xsl:when> 
    3737          <xsl:otherwise> 
    38             <a class="eventIcons" href="http://www.facebook.com/share.php?u={$feederPrefix}/event/cal/html/Public/0/{$guidEsc}"> 
    39               <img title="Add to Facebook" src="{$resourcesRoot}/images/Facebook_Badge.gif" alt="Add to Facebook" /> 
     38            <a class="eventIcons" href="http://www.facebook.com/share.php?u={$feederPrefix}/event/cal/html/Public/0/{$guidEsc}" title="{$bwStr-SgEv-AddToGoogleCalendar}"> 
     39              <img title="Add to Facebook" src="{$resourcesRoot}/images/Facebook_Badge.gif" alt="{$bwStr-SgEv-AddToGoogleCalendar}" /> 
    4040            </a> 
    4141          </xsl:otherwise> 
    4242        </xsl:choose> 
    4343        <xsl:variable name="eventIcalName" select="concat($guid,'.ics')" /> 
    44         <a class="eventIcons" href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download .ics file for import to other calendars"> 
    45           <img src="{$resourcesRoot}/images/std-ical_icon.gif" alt="Download this event" /> 
     44        <a class="eventIcons" href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="{$bwStr-SgEv-DownloadEvent}"> 
     45          <img src="{$resourcesRoot}/images/std-ical_icon.gif" alt="{$bwStr-SgEv-Download}"/> 
    4646        </a> 
    4747      </div> 
    …… 
    179179      </div> 
    180180 
    181       <span class="eventWhere"> 
    182         <span class="infoTitle">Where: </span> 
     181      <div class="eventWhere"> 
     182        <span class="infoTitle"><xsl:copy-of select="$bwStr-SgEv-Where"/><xsl:text> </xsl:text></span> 
    183183        <xsl:choose> 
    184184          <xsl:when test="location/link=''"> 
    …… 
    191191          </xsl:when> 
    192192          <xsl:otherwise> 
    193             <xsl:variable name="locationLink" 
    194               select="location/link" /> 
    195             <a href="{$locationLink}"> 
    196               <xsl:value-of select="location/address" /> 
     193            <a> 
     194              <xsl:attribute name="href"><xsl:value-of select="location/link"/></xsl:attribute> 
     195              <xsl:value-of select="location/address"/> 
    197196              <xsl:if test="location/subaddress!=''"> 
    198197                <xsl:text> </xsl:text> 
    199                 <xsl:value-of 
    200                   select="location/subaddress" /> 
     198                <xsl:value-of select="location/subaddress" /> 
    201199              </xsl:if> 
    202200            </a> 
    203201          </xsl:otherwise> 
    204202        </xsl:choose> 
    205       </span> 
     203      </div> 
    206204 
    207205      <xsl:if test="cost!=''"> 
    208         <span class="eventCost"> 
    209           <span class="infoTitle">Cost: </span> 
     206        <div class="eventCost"> 
     207          <span class="infoTitle"><xsl:copy-of select="$bwStr-SgEv-Cost"/><xsl:text> </xsl:text></span> 
    210208          <xsl:value-of select="cost" /> 
    211         </span> 
    212       </xsl:if> 
    213  
    214       <span class="eventLink"> 
     209        </div> 
     210      </xsl:if> 
     211 
     212      <div class="eventLink"> 
    215213        <xsl:if test="link != ''"> 
    216           <xsl:variable name="link" select="link" /> 
    217           <span class="infoTitle"> 
    218             <a href="{$link}">More Info</a> 
    219           </span> 
    220         </xsl:if> 
    221       </span> 
    222  
    223       <br /> 
    224       <xsl:if 
    225         test="xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 
    226         <xsl:variable name="bwImage"> 
    227           <xsl:value-of 
    228             select="xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" /> 
    229         </xsl:variable> 
    230         <img src="{$bwImage}" class="bwEventImage" /> 
    231       </xsl:if> 
    232       <span class="eventDescription"> 
    233         <span class="infoTitle">Description: </span> 
     214          <span class="infoTitle"><xsl:copy-of select="$bwStr-SgEv-See"/><xsl:text> </xsl:text></span> 
     215            <a> 
     216              <xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute> 
     217              <xsl:value-of select="link"/> 
     218            </a> 
     219        </xsl:if> 
     220      </div> 
     221 
     222      <xsl:if test="xproperties/node()[name()='X-BEDEWORK-IMAGE']"> 
     223        <img class="bwEventImage"> 
     224          <xsl:attribute name="src"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text" /></xsl:attribute> 
     225        </img> 
     226      </xsl:if> 
     227 
     228      <div class="eventDescription"> 
     229        <span class="infoTitle"><xsl:copy-of select="$bwStr-SgEv-Description"/><xsl:text> </xsl:text></span> 
     230        <!-- to preserve line breaks in descriptions, set <br/> as the replacement string 
     231             in this replace template call: --> 
    234232        <xsl:call-template name="replace"> 
    235233          <xsl:with-param name="string" select="description" /> 
    …… 
    237235          <xsl:with-param name="replacement"></xsl:with-param> 
    238236        </xsl:call-template> 
    239       </span> 
    240       <br /> 
    241  
    242       <!--   <span class="eventListingCal"> 
     237      </div> 
     238 
     239      <!--   <div class="eventListingCal"> 
    243240        <xsl:if test="calendar/path!=''"> 
    244241        Calendar: 
    …… 
    248245        </a> 
    249246        </xsl:if> 
    250         </span>--> 
     247        </div>--> 
    251248 
    252249      <xsl:if test="status !='' and status != 'CONFIRMED'"> 
    253         <span class="eventStatus"> 
    254           <span class="infoTitle">Status: </span> 
     250        <div class="eventStatus"> 
     251          <span class="infoTitle"><xsl:copy-of select="$bwStr-SgEv-STATUS"/><xsl:text> </xsl:text></span> 
    255252          <xsl:value-of select="status" /> 
    256         </span> 
    257       </xsl:if> 
    258       <xsl:choose> 
    259         <xsl:when 
    260           test="xproperties/X-BEDEWORK-CS/values/text != ''"> 
    261           <span class="eventContact"> 
    262             <span class="infoTitle">Co-sponsors: </span> 
    263             <xsl:if test="creator != ''"> 
    264               <xsl:variable name="creator" 
    265                 select="creator" /> 
    266               <xsl:value-of 
    267                 select="/bedework/urlPrefixes/groups/group[eventOwner = $creator]/name" /> 
    268             </xsl:if> 
    269             <xsl:value-of disable-output-escaping="yes" 
    270               select="xproperties/X-BEDEWORK-CS/values/text" /> 
    271           </span> 
    272         </xsl:when> 
    273         <xsl:otherwise> 
    274           <span class="eventContact"> 
    275             <span class="infoTitle">Sponsor: </span> 
    276             <xsl:if test="creator != ''"> 
    277               <xsl:variable name="creator" 
    278                 select="creator" /> 
    279               <xsl:value-of 
    280                 select="/bedework/urlPrefixes/groups/group[eventOwner = $creator]/name" /> 
    281             </xsl:if> 
    282             <xsl:value-of disable-output-escaping="yes" 
    283               select="xproperties/X-BEDEWORK-CS/values/text" /> 
    284           </span> 
    285         </xsl:otherwise> 
    286       </xsl:choose> 
     253        </div> 
     254      </xsl:if> 
     255 
    287256      <xsl:if test="contact/name!='None'"> 
    288         <span class="eventContact"> 
    289           <span class="infoTitle">Contact Information: </span> 
     257        <div class="eventContact"> 
     258          <span class="infoTitle"><xsl:copy-of select="$bwStr-SgEv-Contact"/><xsl:text> </xsl:text></span> 
    290259          <xsl:choose> 
    291260            <xsl:when test="contact/link=''"> 
    …… 
    293262            </xsl:when> 
    294263            <xsl:otherwise> 
    295               <xsl:variable name="sponsorLink" 
    296                 select="contact/link" /> 
    297               <a href="{$sponsorLink}"> 
     264              <a> 
     265                <xsl:attribute name="href"><xsl:value-of select="contact/link" /></xsl:attribute> 
    298266                <xsl:value-of select="contact/name" /> 
    299267              </a> 
    …… 
    312280            </a> 
    313281          </xsl:if> 
    314         </span> 
    315       </xsl:if> 
    316       <xsl:if 
    317         test="xproperties/node()[name()='X-BEDEWORK-STUDENT-CONTACT']/values/text != ''"> 
    318         <span class="eventContact"> 
    319           <span class="infoTitle">Contact Information: </span> 
    320           <xsl:value-of 
    321             select="xproperties/node()[name()='X-BEDEWORK-STUDENT-CONTACT']/values/text" /> 
    322           <xsl:if 
    323             test="xproperties/node()[name()='X-BEDEWORK-STUDENT-CONTACT']/parameters/X-BEDEWORK-PARAM-EMAIL != ''"> 
    324             <xsl:variable name="emailAddress" 
    325               select="xproperties/node()[name()='X-BEDEWORK-STUDENT-CONTACT']/parameters/X-BEDEWORK-PARAM-EMAIL" /> 
    326             <a href="mailto:{$emailAddress}">E-mail</a> 
    327           </xsl:if> 
    328         </span> 
    329       </xsl:if> 
     282        </div> 
     283      </xsl:if> 
     284 
     285      <xsl:if test="xproperties/X-BEDEWORK-ALIAS"> 
     286        <div class="eventAliases"> 
     287          <span class="infoTitle"><xsl:copy-of select="$bwStr-SgEv-TopicalArea"/><xsl:text> </xsl:text></span> 
     288          <xsl:for-each select="xproperties/X-BEDEWORK-ALIAS"> 
     289            <xsl:variable name="calUrl" select="values/text"/> 
     290            <a href="{$setSelection}&amp;virtualPath={$calUrl}&amp;setappvar=curCollection({$calUrl})"> 
     291              <xsl:call-template name="substring-afterLastInstanceOf"> 
     292                <xsl:with-param name="string" select="values/text"/> 
     293                <xsl:with-param name="char">/</xsl:with-param> 
     294              </xsl:call-template> 
     295            </a><xsl:if test="position()!=last()">, </xsl:if> 
     296          </xsl:for-each> 
     297        </div> 
     298      </xsl:if> 
     299 
    330300      <xsl:if test="categories[1]/category"> 
    331         <span class="eventCategories"> 
    332           <span class="infoTitle">Categories: </span> 
    333           <xsl:for-each 
    334             select="categories[1]/category[(word != 'Local') and (word != 'Main') and (word != 'Student') and (word != 'calCrossPublish')]"> 
    335             <xsl:value-of select="word" /> 
    336             <xsl:if test="position() != last()">, </xsl:if> 
    337           </xsl:for-each> 
    338         </span> 
     301        <div class="eventCategories"> 
     302          <span class="infoTitle"><xsl:copy-of select="$bwStr-SgEv-Categories"/><xsl:text> </xsl:text></span> 
     303          <xsl:for-each select="categories/category"> 
     304              <xsl:value-of select="word"/><xsl:if test="position() != last()">, </xsl:if> 
     305            </xsl:for-each> 
     306        </div> 
    339307      </xsl:if> 
    340308 
    341309      <xsl:if test="comments/comment"> 
    342         <span class="eventComments"> 
    343           <span class="infoTitle">Comments: </span> 
     310        <div class="eventComments"> 
     311          <span class="infoTitle"><xsl:copy-of select="$bwStr-SgEv-Comments"/><xsl:text> </xsl:text></span> 
    344312          <xsl:for-each select="comments/comment"> 
    345313            <p> 
    …… 
    347315            </p> 
    348316          </xsl:for-each> 
    349         </span> 
     317        </div> 
    350318      </xsl:if> 
    351319    </div> 

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

    r2471 r2476  
    44  xmlns="http://www.w3.org/1999/xhtml"> 
    55 
    6  
    76</xsl:stylesheet> 

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

    r2469 r2476  
    6969  <xsl:variable name="bwStr-SgEv-EditThisInstance">edit this instance (recurring event)</xsl:variable> 
    7070  <xsl:variable name="bwStr-SgEv-EditEvent">edit event</xsl:variable> 
    71   <xsl:variable name="bwStr-SgEv-DownloadEvent">Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars</xsl:variable> 
     71  <xsl:variable name="bwStr-SgEv-DownloadEvent">Download ical</xsl:variable> 
    7272  <xsl:variable name="bwStr-SgEv-Download">Download</xsl:variable> 
    7373  <xsl:variable name="bwStr-SgEv-DownloadMaster">download master (recurring event)</xsl:variable> 
    …… 
    8686  <xsl:variable name="bwStr-SgEv-End">End:</xsl:variable> 
    8787  <xsl:variable name="bwStr-SgEv-AddToMyCalendar">add to my calendar</xsl:variable> 
    88   <xsl:variable name="bwStr-SgEv-AddEventToMyCalendar">Add event to MyCalendar</xsl:variable> 
     88  <xsl:variable name="bwStr-SgEv-AddEventToMyCalendar">Add to MyCalendar</xsl:variable> 
     89  <xsl:variable name="bwStr-SgEv-AddToGoogleCalendar">Add to Google Calendar</xsl:variable> 
     90  <xsl:variable name="bwStr-SgEv-AddToFacebook">Add to Facebook</xsl:variable> 
    8991  <xsl:variable name="bwStr-SgEv-Where">Where:</xsl:variable> 
    9092  <xsl:variable name="bwStr-SgEv-Complete">Complete:</xsl:variable> 
    …… 
    99101  <xsl:variable name="bwStr-SgEv-Cost">Cost:</xsl:variable> 
    100102  <xsl:variable name="bwStr-SgEv-See">See:</xsl:variable> 
     103  <xsl:variable name="bwStr-SgEv-MoreInfo">More Info</xsl:variable> 
    101104  <xsl:variable name="bwStr-SgEv-Contact">Contact:</xsl:variable> 
     105  <xsl:variable name="bwStr-SgEv-ContactInfo">Contact Information:</xsl:variable> 
    102106  <!--Recipients:, recipient --> 
    103107  <xsl:variable name="bwStr-SgEv-Calendar">Calendar:</xsl:variable> 
    104   <xsl:variable name="bwStr-SgEv-Categories">Categories:</xsl:variable> 
     108  <xsl:variable name="bwStr-SgEv-Categories">Tags:</xsl:variable> 
    105109  <xsl:variable name="bwStr-SgEv-Comments">Comments:</xsl:variable> 
    106   <xsl:variable name="bwStr-SgEv-TopicalArea">Topical Area:</xsl:variable> 
     110  <xsl:variable name="bwStr-SgEv-TopicalArea">Topical Areas:</xsl:variable> 
    107111 
    108112  <!--  xsl:template name="listView" --> 
    …… 
    111115  <xsl:variable name="bwStr-LsVw-AllDay">all day</xsl:variable> 
    112116  <xsl:variable name="bwStr-LsVw-Today">today</xsl:variable> 
    113   <xsl:variable name="bwStr-LsVw-AddEventToMyCalendar">Add event to MyCalendar</xsl:variable> 
    114   <xsl:variable name="bwStr-LsVw-DownloadEvent">Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars</xsl:variable> 
     117  <xsl:variable name="bwStr-LsVw-AddEventToMyCalendar">Add to MyCalendar</xsl:variable> 
     118  <xsl:variable name="bwStr-LsVw-DownloadEvent">Download ical</xsl:variable> 
    115119  <xsl:variable name="bwStr-LsVw-Description">description</xsl:variable> 
    116120  <xsl:variable name="bwStr-LsVw-Canceled">CANCELED:</xsl:variable> 
    …… 
    121125  <xsl:variable name="bwStr-LsEv-Next7Days">Next 7 Days</xsl:variable> 
    122126  <xsl:variable name="bwStr-LsEv-NoEventsToDisplay">No events to display.</xsl:variable> 
    123   <xsl:variable name="bwStr-LsEv-DownloadEvent">Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars</xsl:variable> 
     127  <xsl:variable name="bwStr-LsEv-DownloadEvent">Download ical</xsl:variable> 
    124128  <xsl:variable name="bwStr-LsEv-Categories">Categories:</xsl:variable> 
    125129  <xsl:variable name="bwStr-LsEv-Contact">Contact:</xsl:variable>