Changeset 1480

Show
Ignore:
Timestamp:
07/31/07 15:36:41
Author:
johnsa
Message:

user client: allow conditional switching of the calendar selection widget (portal-friendly old-style widget or slicker dojo widget)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1476 r1480  
    33<xsl:output 
    44  method="xhtml" 
    5   indent="no
     5  indent="yes
    66  media-type="text/html" 
    77  doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" 
     
    167167  <xsl:variable name="skin">default</xsl:variable> 
    168168  <xsl:variable name="publicCal">/cal</xsl:variable> 
     169   
     170  <!-- the following variable can be set to "true" or "false"; 
     171       to use dojo widgets and fancier UI features, set to false - these are 
     172       not guaranteed to work in portals --> 
     173  <xsl:variable name="portalFriendly">false</xsl:variable>  
    169174 
    170175 <!-- BEGIN MAIN TEMPLATE --> 
     
    392397      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script> 
    393398      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js">&#160;</script> 
     399      <xsl:if test="$portalFriendly = 'true'"> 
     400        <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js">&#160;</script> 
     401        <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/> 
     402      </xsl:if> 
    394403    </xsl:if> 
    395404    <xsl:if test="/bedework/editableAccess/access/acl/ace"> 
     
    22182227              <div class="dateFields"> 
    22192228                <span class="startDateLabel">Date </span> 
    2220                 <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    2221                   <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 
    2222                   <xsl:text> </xsl:text> 
    2223                 </span> 
    2224                 <input type="hidden" name="eventStartDate.year"> 
    2225                   <xsl:attribute name="value"><xsl:value-of select="form/start/yearText/input/@value"/></xsl:attribute> 
    2226                 </input> 
    2227                 <input type="hidden" name="eventStartDate.month"> 
    2228                   <xsl:attribute name="value"><xsl:value-of select="form/start/month/select/option[@selected = 'selected']/@value"/></xsl:attribute> 
    2229                 </input> 
    2230                 <input type="hidden" name="eventStartDate.day"> 
    2231                   <xsl:attribute name="value"><xsl:value-of select="form/start/day/select/option[@selected = 'selected']/@value"/></xsl:attribute> 
    2232                 </input> 
     2229                <xsl:choose> 
     2230                  <xsl:when test="$portalFriendly = 'true'"> 
     2231                    <xsl:copy-of select="/bedework/formElements/form/start/month/*"/> 
     2232                    <xsl:copy-of select="/bedework/formElements/form/start/day/*"/> 
     2233                    <xsl:choose> 
     2234                      <xsl:when test="/bedework/creating = 'true'"> 
     2235                        <xsl:copy-of select="/bedework/formElements/form/start/year/*"/> 
     2236                      </xsl:when> 
     2237                      <xsl:otherwise> 
     2238                        <xsl:copy-of select="/bedework/formElements/form/start/yearText/*"/> 
     2239                      </xsl:otherwise> 
     2240                        </xsl:choose> 
     2241                    <script language="JavaScript" type="text/javascript"> 
     2242                      <xsl:comment> 
     2243                      startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', <xsl:value-of select="number(/bedework/formElements/form/start/yearText/input/@value)"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(/bedework/formElements/form/start/day/select/option[@selected='selected']/@value)"/>, 'startDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/'); 
     2244                      </xsl:comment> 
     2245                    </script> 
     2246                  </xsl:when> 
     2247                  <xsl:otherwise> 
     2248                    <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
     2249                      <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 
     2250                      <xsl:text> </xsl:text> 
     2251                    </span> 
     2252                    <input type="hidden" name="eventStartDate.year"> 
     2253                      <xsl:attribute name="value"><xsl:value-of select="form/start/yearText/input/@value"/></xsl:attribute> 
     2254                    </input> 
     2255                    <input type="hidden" name="eventStartDate.month"> 
     2256                      <xsl:attribute name="value"><xsl:value-of select="form/start/month/select/option[@selected = 'selected']/@value"/></xsl:attribute> 
     2257                    </input> 
     2258                    <input type="hidden" name="eventStartDate.day"> 
     2259                      <xsl:attribute name="value"><xsl:value-of select="form/start/day/select/option[@selected = 'selected']/@value"/></xsl:attribute> 
     2260                    </input> 
     2261                  </xsl:otherwise> 
     2262                </xsl:choose> 
    22332263              </div> 
    22342264              <div class="{$timeFieldsClass}" id="startTimeFields"> 
     
    22812311              <div class="{$endDateTimeClass}" id="endDateTime"> 
    22822312                <div class="dateFields"> 
    2283                   <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    2284                     <xsl:attribute name="value"><xsl:value-of select="form/end/rfc3339DateTime"/></xsl:attribute> 
    2285                     <xsl:text> </xsl:text> 
    2286                   </span> 
    2287                   <input type="hidden" name="eventEndDate.year"> 
    2288                     <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/yearText/input/@value"/></xsl:attribute> 
    2289                   </input> 
    2290                   <input type="hidden" name="eventEndDate.month"> 
    2291                     <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/month/select/option[@selected = 'selected']/@value"/></xsl:attribute> 
    2292                   </input> 
    2293                   <input type="hidden" name="eventEndDate.day"> 
    2294                     <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/day/select/option[@selected = 'selected']/@value"/></xsl:attribute> 
    2295                   </input> 
     2313                  <xsl:choose> 
     2314                    <xsl:when test="$portalFriendly = 'true'"> 
     2315                      <xsl:copy-of select="/bedework/formElements/form/end/dateTime/month/*"/> 
     2316                      <xsl:copy-of select="/bedework/formElements/form/end/dateTime/day/*"/> 
     2317                      <xsl:choose> 
     2318                        <xsl:when test="/bedework/creating = 'true'"> 
     2319                          <xsl:copy-of select="/bedework/formElements/form/end/dateTime/year/*"/> 
     2320                        </xsl:when> 
     2321                        <xsl:otherwise> 
     2322                          <xsl:copy-of select="/bedework/formElements/form/end/dateTime/yearText/*"/> 
     2323                        </xsl:otherwise> 
     2324                      </xsl:choose> 
     2325                      <script language="JavaScript" type="text/javascript"> 
     2326                      <xsl:comment> 
     2327                        endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', <xsl:value-of select="number(/bedework/formElements/form/start/yearText/input/@value)"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(/bedework/formElements/form/start/day/select/option[@selected='selected']/@value)"/>, 'endDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/'); 
     2328                      </xsl:comment> 
     2329                      </script> 
     2330                    </xsl:when> 
     2331                    <xsl:otherwise> 
     2332                      <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
     2333                        <xsl:attribute name="value"><xsl:value-of select="form/end/rfc3339DateTime"/></xsl:attribute> 
     2334                        <xsl:text> </xsl:text> 
     2335                      </span> 
     2336                      <input type="hidden" name="eventEndDate.year"> 
     2337                        <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/yearText/input/@value"/></xsl:attribute> 
     2338                      </input> 
     2339                      <input type="hidden" name="eventEndDate.month"> 
     2340                        <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/month/select/option[@selected = 'selected']/@value"/></xsl:attribute> 
     2341                      </input> 
     2342                      <input type="hidden" name="eventEndDate.day"> 
     2343                        <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/day/select/option[@selected = 'selected']/@value"/></xsl:attribute> 
     2344                      </input> 
     2345                    </xsl:otherwise> 
     2346                  </xsl:choose> 
    22962347                </div> 
    22972348                <div class="{$timeFieldsClass}" id="endTimeFields"> 
  • trunk/deployment/webuser/webapp/resources/demoskins/resources/dynCalendarWidget.css

    r952 r1480  
    2121  height: 15px; 
    2222} 
    23 .dynCalendar_header a { 
     23.dynCalendar_header a:link, 
     24.dynCalendar_header a:active, 
     25.dynCalendar_header a:visited, 
     26.dynCalendar_header a:hover { 
    2427  background-color: inherit; 
    25   color: #eee;   
     28  color: #eee !important; 
     29  text-decoration: none !important; 
    2630} 
    2731.dynCalendar_dayname { 
  • trunk/deployment/webuser/webapp/resources/demoskins/resources/dynCalendarWidget.js

    r1204 r1480  
    236236  function dynCalendar_writeHTML() 
    237237  { 
    238     if (is_ie5up || is_ie6up || is_nav6up || is_gecko) { 
     238    //if (is_ie5up || is_ie6up || is_nav6up || is_gecko) { 
    239239      document.write('<a href="javascript: ' + this.objName + '.show()"><img src="' + this.imagesPath + 'calIcon.gif" border="0" width="16" height="15" /></a>'); 
    240240      document.write('<div class="dynCalendar" id="' + this.layerID + '" onmouseover="' + this.objName + '._mouseover(true)" onmouseout="' + this.objName + '._mouseover(false)"></div>'); 
    241    
     241    //
    242242  } 
    243243 
     
    461461  document.onmousemove = function () 
    462462  { 
    463     if (is_ie5up || is_nav6up || is_gecko) { 
     463    //if (is_ie5up || is_nav6up || is_gecko) { 
    464464      if (arguments[0]) { 
    465465        dynCalendar_mouseX = arguments[0].pageX; 
     
    472472 
    473473      dynCalendar_oldOnmousemove(); 
    474    
     474    //
    475475  } 
    476476 
     
    482482  document.onclick = function () 
    483483  { 
    484     if (is_ie5up || is_nav6up || is_gecko) { 
     484    //if (is_ie5up || is_nav6up || is_gecko) { 
    485485      if(!dynCalendar_mouseoverStatus){ 
    486486        for(i=0; i<dynCalendar_layers.length; ++i){ 
     
    490490 
    491491      dynCalendar_oldOnclick(arguments[0] ? arguments[0] : null); 
    492     } 
    493   } 
     492    //} 
     493  } 
     494   
     495/** 
     496* Bedework specific callbacks 
     497*/ 
     498function startDateCalWidgetCallback(date, month, year) { 
     499  if (String(month).length == 1) { 
     500      month = '0' + month; 
     501  } 
     502  if (String(date).length == 1) { 
     503      date = '0' + date; 
     504  } 
     505  document.eventForm['eventStartDate.month'].value = month; 
     506  document.eventForm['eventStartDate.day'].value = date; 
     507  document.eventForm['eventStartDate.year'].value = year; 
     508
     509function endDateCalWidgetCallback(date, month, year) { 
     510  if (String(month).length == 1) { 
     511      month = '0' + month; 
     512  } 
     513  if (String(date).length == 1) { 
     514      date = '0' + date; 
     515  } 
     516  document.eventForm['eventEndDate.month'].value = month; 
     517  document.eventForm['eventEndDate.day'].value = date; 
     518  document.eventForm['eventEndDate.year'].value = year; 
     519