Changeset 1184

Show
Ignore:
Timestamp:
12/28/06 16:19:47
Author:
johnsa
Message:

public web client:
- add variable for common resources path
- fix calendar export path
- remove confirmation ids that were still around
- some stylistic cleanup

admin client:
- correct timezone selection bug in edit form
- add variable for common resources path

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r1181 r1184  
    779779                    <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">true</xsl:attribute></xsl:if> 
    780780                    <option value="-1">select timezone...</option> 
     781                    <xsl:variable name="startTzId" select="form/start/tzid"/> 
    781782                    <xsl:for-each select="/bedeworkadmin/timezones/timezone"> 
    782783                      <option> 
    783784                        <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
    784                         <xsl:if test="form/start/tzid = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     785                        <xsl:if test="$startTzId = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    785786                        <xsl:value-of select="name"/> 
    786787                      </option> 
    …… 
    839840                      <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">true</xsl:attribute></xsl:if> 
    840841                      <option value="-1">select timezone...</option> 
     842                      <xsl:variable name="endTzId" select="form/end/dateTime/tzid"/> 
    841843                      <xsl:for-each select="/bedeworkadmin/timezones/timezone"> 
    842844                        <option> 
    843845                          <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
    844                           <xsl:if test="form/end/dateTime/tzid = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     846                          <xsl:if test="$endTzId = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    845847                          <xsl:value-of select="name"/> 
    846848                        </option> 

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

    r1183 r1184  
    910910  background-color: #eee; 
    911911  color: black; 
    912   border-top: 1px solid #bbb; 
    913912} 
    914913h2.bwStatusCancelled { 
    915914  background-color: #eee; 
    916915  color: black; 
    917   border-top: 1px solid #bbb; 
    918916} 
    919917h2.bwStatusTentative { 
    920918  background: #eee url('../../images/tentativeLines.gif') top; 
    921919  color: black; 
    922   border-top: 1px solid #bbb; 
    923920} 
    924921/* Header IDs and classes */ 

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

    r1176 r1184  
    5151  <!-- ================================= --> 
    5252 
     53  <!-- URL of resources common to all bedework apps (javascript, images) --> 
     54  <xsl:variable name="resourceCommons">../../../bedework-common</xsl:variable> 
     55 
    5356  <!-- DEFINE INCLUDES --> 
    54   <xsl:include href="/bedework-common/default/default/errors.xsl"/> 
     57  <!-- cannot use the resourceCommons variable in xsl:include paths --> 
     58  <xsl:include href="../../../bedework-common/default/default/errors.xsl"/> 
     59  <xsl:include href="../../../bedework-common/default/default/messages.xsl"/> 
    5560 
    5661  <!-- DEFINE GLOBAL CONSTANTS --> 
    …… 
    119124        <!-- load javascript --> 
    120125        <xsl:if test="/bedework/page='calendarList'"> 
    121           <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"/> 
     126          <script type="text/javascript" src="{$resourceCommons}/javascript/dojo/dojo.js"/> 
    122127          <script type="text/javascript" src="{$resourcesRoot}/resources/javascript/bedework.js"/> 
    123128        </xsl:if> 
    …… 
    907912                </td> 
    908913                <td class="icons"> 
    909                   <variable name="confId" select="/bedework/confirmationid"/> 
    910914                  <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    911915                    <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 
    …… 
    12191223      <xsl:if test="calendarCollection='true'"> 
    12201224        <xsl:variable name="name" select="name"/> 
    1221         <xsl:variable name="calPath" select="encodedPath"/> 
     1225        <xsl:variable name="calPath" select="path"/> 
    12221226        <span class="exportCalLink"> 
    12231227          <!--<a href="{$export}&amp;calPath={$calPath}&amp;dateLimits=active&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$name}.ics" title="export calendar as iCal (excluding past events)">--> 

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

    r1183 r1184  
    921921  background-color: #eee; 
    922922  color: black; 
    923   border-top: 1px solid #333; 
    924923} 
    925924h2.bwStatusCancelled { 
    926925  background-color: #eee; 
    927926  color: black; 
    928   border-top: 1px solid #333; 
    929927} 
    930928h2.bwStatusTentative { 
    931929  background: #eee url('../../images/tentativeLines.gif') top; 
    932930  color: black; 
    933   border-top: 1px solid #333; 
    934931} 
    935932/* Header IDs and classes */ 

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

    r1183 r1184  
    922922  background-color: #eee; 
    923923  color: black; 
    924   border-top: 1px solid #333; 
    925924} 
    926925h2.bwStatusCancelled { 
    927926  background-color: #eee; 
    928927  color: black; 
    929   border-top: 1px solid #333; 
    930928} 
    931929h2.bwStatusTentative { 
    932930  background: #eee url('../../images/tentativeLines.gif') top; 
    933931  color: black; 
    934   border-top: 1px solid #333; 
    935932} 
    936933/* Header IDs and classes */ 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1181 r1184  
    20442044                  <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">true</xsl:attribute></xsl:if> 
    20452045                  <option value="-1">select timezone...</option> 
     2046                  <xsl:variable name="startTzId" select="form/start/tzid"/> 
    20462047                  <xsl:for-each select="/bedework/timezones/timezone"> 
    20472048                    <option> 
    20482049                      <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
    2049                       <xsl:if test="/bedework/formElements/form/start/tzid = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     2050                      <xsl:if test="$startTzId = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    20502051                      <xsl:value-of select="name"/> 
    20512052                    </option> 
    …… 
    21042105                    <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">true</xsl:attribute></xsl:if> 
    21052106                    <option value="-1">select timezone...</option> 
     2107                    <xsl:variable name="endTzId" select="form/end/dateTime/tzid"/> 
    21062108                    <xsl:for-each select="/bedework/timezones/timezone"> 
    21072109                      <option> 
    21082110                        <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
    2109                         <xsl:if test="/bedework/formElements/form/end/dateTime/tzid = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     2111                          <xsl:if test="$endTzId = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    21102112                        <xsl:value-of select="name"/> 
    21112113                      </option>