Changeset 1226

Show
Ignore:
Timestamp:
01/17/07 14:17:13
Author:
johnsa
Message:

personal client

- more rdate work

general web client cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1188 r1226  
    365365      </body> 
    366366    </html> 
     367  </xsl:template> 
     368 
     369 
     370  <!--==== HEADER TEMPLATES and NAVIGATION  ====--> 
     371 
     372  <xsl:template name="header"> 
     373    <div id="header"> 
     374      <a href="/bedework/"> 
     375        <img id="logo" 
     376            alt="logo" 
     377            src="{$resourcesRoot}/resources/bedeworkAdminLogo.gif" 
     378            width="217" 
     379            height="40" 
     380            border="0"/> 
     381      </a> 
     382      <!-- set the page heading: --> 
     383      <h1> 
     384        <xsl:choose> 
     385          <xsl:when test="/bedeworkadmin/page='modEvent' or /bedeworkadmin/page='eventList' or /bedeworkadmin/page='displayEvent'"> 
     386            Manage Events 
     387          </xsl:when> 
     388          <xsl:when test="/bedeworkadmin/page='contactList' or /bedeworkadmin/page='modContact' or /bedeworkadmin/page='deleteContactConfirm'"> 
     389            Manage Contacts 
     390          </xsl:when> 
     391          <xsl:when test="/bedeworkadmin/page='locationList' or /bedeworkadmin/page='modLocation' or /bedeworkadmin/page='deleteLocationConfirm'"> 
     392            Manage Locations 
     393          </xsl:when> 
     394          <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='modCalendar' or /bedeworkadmin/page='calendarReferenced' or /bedeworkadmin/page='deleteCalendarConfirm'"> 
     395            Manage Calendars 
     396          </xsl:when> 
     397          <xsl:when test="/bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar'"> 
     398            Public Calendars 
     399          </xsl:when> 
     400          <xsl:when test="/bedeworkadmin/page='subscriptions' or /bedeworkadmin/page='modSubscription'"> 
     401            Manage Subscriptions 
     402          </xsl:when> 
     403          <xsl:when test="/bedeworkadmin/page='views' or /bedeworkadmin/page='modView'"> 
     404            Manage Views 
     405          </xsl:when> 
     406          <xsl:when test="/bedeworkadmin/page='modSyspars'"> 
     407            Manage System Preferences 
     408          </xsl:when> 
     409          <xsl:when test="/bedeworkadmin/page='authUserList' or /bedeworkadmin/page='modAuthUser'"> 
     410            Manage Public Events Administrators 
     411          </xsl:when> 
     412          <xsl:when test="/bedeworkadmin/page='chooseGroup'"> 
     413            Choose Administrative Group 
     414          </xsl:when> 
     415          <xsl:when test="/bedeworkadmin/page='adminGroupList' or /bedeworkadmin/page='modAdminGroup' or /bedeworkadmin/page='modAdminGroup' or /bedeworkadmin/page='modAdminGroupMembers'"> 
     416            Manage Administrative Groups 
     417          </xsl:when> 
     418          <xsl:when test="/bedeworkadmin/page='noGroup'"> 
     419            No Administrative Group 
     420          </xsl:when> 
     421          <xsl:when test="/bedeworkadmin/page='uploadTimezones'"> 
     422            Manage Time Zones 
     423          </xsl:when> 
     424          <xsl:when test="/bedeworkadmin/page='noAccess'"> 
     425            Access Denied 
     426          </xsl:when> 
     427          <xsl:when test="/bedeworkadmin/page='error'"> 
     428            Error 
     429          </xsl:when> 
     430          <xsl:otherwise> 
     431            Bedework Calendar Administration 
     432          </xsl:otherwise> 
     433        </xsl:choose> 
     434      </h1> 
     435 
     436      <xsl:if test="/bedeworkadmin/message"> 
     437        <div id="messages"> 
     438          <p> 
     439            <xsl:apply-templates select="/bedeworkadmin/message"/> 
     440          </p> 
     441        </div> 
     442      </xsl:if> 
     443      <xsl:if test="/bedeworkadmin/error"> 
     444        <div id="errors"> 
     445          <p> 
     446            <xsl:apply-templates select="/bedeworkadmin/error"/> 
     447          </p> 
     448        </div> 
     449      </xsl:if> 
     450 
     451    </div> 
     452    <table id="statusBarTable"> 
     453      <tr> 
     454        <td class="leftCell"> 
     455          <a href="{$setup}">Main Menu</a> | 
     456          <a href="{$publicCal}" target="calendar">Launch Calendar</a> | 
     457          <a href="{$logout}">Log Out</a> 
     458        </td> 
     459        <xsl:if test="/bedeworkadmin/userInfo/user"> 
     460          <td class="rightCell"> 
     461            <xsl:if test="/bedeworkadmin/currentCalSuite/name"> 
     462              Calendar Suite: 
     463              <span class="status"> 
     464                <xsl:value-of select="/bedeworkadmin/currentCalSuite/name"/> 
     465              </span> 
     466              &#160; 
     467            </xsl:if> 
     468            Logged in as: 
     469            <span class="status"> 
     470              <xsl:value-of select="/bedeworkadmin/userInfo/user"/> 
     471            </span> 
     472            &#160; 
     473            <xsl:if test="/bedeworkadmin/userInfo/group"> 
     474              Group: 
     475              <span class="status"> 
     476                <xsl:value-of select="/bedeworkadmin/userInfo/group"/> 
     477              </span> 
     478            </xsl:if> 
     479          </td> 
     480        </xsl:if> 
     481      </tr> 
     482    </table> 
     483    <div id="titleBar"> 
     484      CALENDAR of EVENTS 
     485    </div> 
    367486  </xsl:template> 
    368487 
    …… 
    31663285          <th>Display:</th> 
    31673286          <td> 
    3168             <input type="radio" value="true" name="subscription.display"/> yes 
    3169             <input type="radio" value="false" name="subscription.display" checked="checked"/> no 
     3287            <input type="radio" value="true" name="subscription.display" checked="checked"/> yes 
     3288            <input type="radio" value="false" name="subscription.display"/> no 
    31703289          </td> 
    31713290        </tr> 
    …… 
    50655184  </xsl:template> 
    50665185 
    5067   <!--==== HEADER TEMPLATES and NAVIGATION  ====--> 
    5068  
    5069   <xsl:template name="header"> 
    5070     <div id="header"> 
    5071       <a href="{$urlPrefix}"> 
    5072         <img id="logo" 
    5073             alt="logo" 
    5074             src="{$resourcesRoot}/resources/bedeworkAdminLogo.gif" 
    5075             width="217" 
    5076             height="40" 
    5077             border="0"/> 
    5078       </a> 
    5079       <!-- set the page heading: --> 
    5080       <h1> 
    5081         <xsl:choose> 
    5082           <xsl:when test="/bedeworkadmin/page='modEvent' or /bedeworkadmin/page='eventList' or /bedeworkadmin/page='displayEvent'"> 
    5083             Manage Events 
    5084           </xsl:when> 
    5085           <xsl:when test="/bedeworkadmin/page='contactList' or /bedeworkadmin/page='modContact' or /bedeworkadmin/page='deleteContactConfirm'"> 
    5086             Manage Contacts 
    5087           </xsl:when> 
    5088           <xsl:when test="/bedeworkadmin/page='locationList' or /bedeworkadmin/page='modLocation' or /bedeworkadmin/page='deleteLocationConfirm'"> 
    5089             Manage Locations 
    5090           </xsl:when> 
    5091           <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='modCalendar' or /bedeworkadmin/page='calendarReferenced' or /bedeworkadmin/page='deleteCalendarConfirm'"> 
    5092             Manage Calendars 
    5093           </xsl:when> 
    5094           <xsl:when test="/bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar'"> 
    5095             Public Calendars 
    5096           </xsl:when> 
    5097           <xsl:when test="/bedeworkadmin/page='subscriptions' or /bedeworkadmin/page='modSubscription'"> 
    5098             Manage Subscriptions 
    5099           </xsl:when> 
    5100           <xsl:when test="/bedeworkadmin/page='views' or /bedeworkadmin/page='modView'"> 
    5101             Manage Views 
    5102           </xsl:when> 
    5103           <xsl:when test="/bedeworkadmin/page='modSyspars'"> 
    5104             Manage System Preferences 
    5105           </xsl:when> 
    5106           <xsl:when test="/bedeworkadmin/page='authUserList' or /bedeworkadmin/page='modAuthUser'"> 
    5107             Manage Public Events Administrators 
    5108           </xsl:when> 
    5109           <xsl:when test="/bedeworkadmin/page='chooseGroup'"> 
    5110             Choose Administrative Group 
    5111           </xsl:when> 
    5112           <xsl:when test="/bedeworkadmin/page='adminGroupList' or /bedeworkadmin/page='modAdminGroup' or /bedeworkadmin/page='modAdminGroup' or /bedeworkadmin/page='modAdminGroupMembers'"> 
    5113             Manage Administrative Groups 
    5114           </xsl:when> 
    5115           <xsl:when test="/bedeworkadmin/page='noGroup'"> 
    5116             No Administrative Group 
    5117           </xsl:when> 
    5118           <xsl:when test="/bedeworkadmin/page='uploadTimezones'"> 
    5119             Manage Time Zones 
    5120           </xsl:when> 
    5121           <xsl:when test="/bedeworkadmin/page='noAccess'"> 
    5122             Access Denied 
    5123           </xsl:when> 
    5124           <xsl:when test="/bedeworkadmin/page='error'"> 
    5125             Error 
    5126           </xsl:when> 
    5127           <xsl:otherwise> 
    5128             Bedework Calendar Administration 
    5129           </xsl:otherwise> 
    5130         </xsl:choose> 
    5131       </h1> 
    5132  
    5133       <xsl:if test="/bedeworkadmin/message"> 
    5134         <div id="messages"> 
    5135           <p> 
    5136             <xsl:apply-templates select="/bedeworkadmin/message"/> 
    5137           </p> 
    5138         </div> 
    5139       </xsl:if> 
    5140       <xsl:if test="/bedeworkadmin/error"> 
    5141         <div id="errors"> 
    5142           <p> 
    5143             <xsl:apply-templates select="/bedeworkadmin/error"/> 
    5144           </p> 
    5145         </div> 
    5146       </xsl:if> 
    5147  
    5148     </div> 
    5149     <table id="statusBarTable"> 
    5150       <tr> 
    5151         <td class="leftCell"> 
    5152           <a href="{$setup}">Main Menu</a> | 
    5153           <a href="{$publicCal}" target="calendar">Launch Calendar</a> | 
    5154           <a href="{$logout}">Log Out</a> 
    5155         </td> 
    5156         <xsl:if test="/bedeworkadmin/userInfo/user"> 
    5157           <td class="rightCell"> 
    5158             <xsl:if test="/bedeworkadmin/currentCalSuite/name"> 
    5159               Calendar Suite: 
    5160               <span class="status"> 
    5161                 <xsl:value-of select="/bedeworkadmin/currentCalSuite/name"/> 
    5162               </span> 
    5163               &#160; 
    5164             </xsl:if> 
    5165             Logged in as: 
    5166             <span class="status"> 
    5167               <xsl:value-of select="/bedeworkadmin/userInfo/user"/> 
    5168             </span> 
    5169             &#160; 
    5170             <xsl:if test="/bedeworkadmin/userInfo/group"> 
    5171               Group: 
    5172               <span class="status"> 
    5173                 <xsl:value-of select="/bedeworkadmin/userInfo/group"/> 
    5174               </span> 
    5175             </xsl:if> 
    5176           </td> 
    5177         </xsl:if> 
    5178       </tr> 
    5179     </table> 
    5180     <div id="titleBar"> 
    5181       CALENDAR of EVENTS 
    5182     </div> 
    5183   </xsl:template> 
    5184  
    51855186  <!--==== FOOTER ====--> 
    51865187  <xsl:template name="footer"> 

  • trunk/deployment/webadmin/webapp/resources/resources/bwClock.css

    r952 r1226  
    5555  padding: 0; 
    5656} 
     57#bwClockSwitch { 
     58  position: absolute; 
     59  bottom: 5px; 
     60  left: 15px; 
     61  margin: 0; 
     62} 
    5763#bwClockCloseText { 
    5864  position: absolute; 

  • trunk/deployment/webadmin/webapp/resources/resources/bwClock.js

    r1189 r1226  
    55 
    66function bwClockLaunch(type) { 
    7   if ((document.getElementById("clock").className == "shown") && (bwClockCurrentType == type)) { 
    8     changeClass("clock","invisible"); // if the clock with the same type is showing, toggle it off 
     7  // type: type of clock "eventStartDate" or "eventEndDate" 
     8  if ((document.getElementById("clock").className == "visible") && (bwClockCurrentType == type)) { 
     9    // if the clock with the same type is visible, toggle it off 
     10    changeClass("clock","invisible"); 
    911  } else { // otherwise, turn it on and display the correct type 
    1012    bwClockRequestedType = type; 
    1113    bwClockCurrentType = type; 
    1214    changeClass("clock","shown"); 
    13     // the following is for Internet Explorer.  IE draws "windowed" objects 
    14     // and unwindowed objects on seperate "planes"; windowed objects are always 
    15     // drawn obove unwindowed objects and select boxes are "windowed"; 
    16     // this is required to make IE not overwrite the clock div with 
    17     // the select boxes that fall below it on the page.  Note: we set them 
    18     // to display:hidden (not none) so their space is still occupied (and the 
    19     // browser window doesn't shift around) 
     15    // reset hours and minutes to null 
     16    bwClockHour = null; 
     17    bwClockMinute = null; 
    2018   changeClass("eventFormPrefLocationList","hidden"); 
    2119   changeClass("eventFormLocationList","hidden"); 
    …… 
    2321   changeClass("eventFormPrefContactList","hidden"); 
    2422    bwClockIndicator = document.getElementById("bwClockDateTypeIndicator"); 
     23    bwClockSwitch = document.getElementById("bwClockSwitch"); 
     24    document.getElementById("bwClockTime").innerHTML = "select time"; 
    2525    if (type == 'eventStartDate') { 
    26       bwClockIndicator.innerHTML = "Start Time" 
     26      bwClockIndicator.innerHTML = "Start Time"; 
     27      bwClockSwitch.innerHTML = '<a href="javascript:bwClockLaunch(\'eventEndDate\');">switch to end</a>'; 
    2728    } else { 
    28       bwClockIndicator.innerHTML = "End Time" 
     29      bwClockIndicator.innerHTML = "End Time"; 
     30      bwClockSwitch.innerHTML = '<a href="javascript:bwClockLaunch(\'eventStartDate\');">switch to start</a>'; 
    2931    } 
    3032  } 
    …… 
    3941} 
    4042 
    41 function bwClockUpdateDateTimeForm(type,val) { 
     43function bwClockUpdateDateTimeForm(valType,val) { 
     44  // valType: "hour" or "minute" 
     45  // val: hour or minute value as integer 
    4246  if (bwClockRequestedType) { 
    4347    try { 
    44       if (type == 'minute') { 
     48      if (valType == 'minute') { 
    4549        var fieldName = bwClockRequestedType + ".minute" 
    46         window.document.peForm[fieldName].value = val; 
     50        window.document.eventForm[fieldName].value = val; 
     51        if (val < 10) { 
     52          val = "0" + val; // pad the value for display 
     53        } 
    4754        bwClockMinute = val; 
    4855      } else { 
    4956        var fieldName = bwClockRequestedType + ".hour" 
    50         window.document.peForm[fieldName].value = val; 
     57        window.document.eventForm[fieldName].value = val; 
     58        if (val < 10) { 
     59          val = "0" + val; // pad the value for display 
     60        } 
    5161        bwClockHour = val; 
    5262      } 

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

    r1223 r1226  
    204204    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="logoTable"> 
    205205      <tr> 
    206         <td colspan="3" id="logoCell"><a href="{$urlPrefix}"><img src="{$resourcesRoot}/images/bedeworkLogo.gif" width="292" height="75" border="0" alt="Bedework"/></a></td> 
     206        <td colspan="3" id="logoCell"><a href="/bedework/"><img src="{$resourcesRoot}/images/bedeworkLogo.gif" width="292" height="75" border="0" alt="Bedework"/></a></td> 
    207207        <td colspan="2" id="schoolLinksCell"> 
    208208          <h2>Public Calendar</h2> 

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

    r1223 r1226  
    203203    <div id="headBar"> 
    204204      <div id="bedeworkLogo"> 
    205         <a href="{$urlPrefix}"> 
     205        <a href="/bedework/"> 
    206206          <img src="{$resourcesRoot}/images/soecal/soeBedeworkLogo.gif" width="296" height="69" border="0" alt="Bedework" align="right"/> 
    207207        </a> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.css

    r1220 r1226  
    386386  padding: 0; 
    387387} 
     388#calPageTable a:link, 
     389#calPageTable a:active, 
     390#calPageTable a:visited { 
     391  text-decoration: none; 
     392} 
     393#calPageTable a:hover { 
     394  text-decoration: underline; 
     395} 
    388396#dayCalendarTable { 
    389397  width: 100%; 

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

    r1224 r1226  
    408408    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="logoTable"> 
    409409      <tr> 
    410         <td colspan="3" id="logoCell"><a href="{$urlPrefix}"><img src="{$resourcesRoot}/resources/bedeworkLogo.gif" width="292" height="75" border="0" alt="Bedework"/></a></td> 
     410        <td colspan="3" id="logoCell"><a href="/bedework/"><img src="{$resourcesRoot}/resources/bedeworkLogo.gif" width="292" height="75" border="0" alt="Bedework"/></a></td> 
    411411        <td colspan="2" id="schoolLinksCell"> 
    412412          <h2>Personal Calendar</h2> 
    …… 
    27472747      <!-- recurrence dates (rdates) --> 
    27482748      <div id="recurrenceDatesButton"> 
    2749         <input type="button" value="add/remove recurrence dates" onclick="launchSizedWindow('{$event-showRdates}','500','400')"  class="small"/> 
     2749        <input type="button" value="add/remove recurrence dates" onclick="launchSizedWindow('{$event-showRdates}','560','400')"  class="small"/> 
    27502750      </div> 
    27512751    </div> 
    …… 
    29902990                  <option value="55">55</option> 
    29912991                </select> 
    2992                 <xsl:text> </xsl:text><!-- 
    2993                 <a href="javascript:bwClockLaunch('eventRdate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock"/></a> 
    2994 --> 
    2995                 <select name="eventRdate.tzid" id="startTzid" class="timezones"> 
     2992                <xsl:text> </xsl:text> 
     2993 
     2994                <select name="tzid" id="startTzid" class="timezones"> 
    29962995                  <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if> 
    29972996                  <option value="-1">select timezone...</option> 

  • trunk/deployment/webuser/webapp/resources/demoskins/resources/bwClock.js

    r1219 r1226  
    55 
    66function bwClockLaunch(type) { 
     7  // type: type of clock "eventStartDate" or "eventEndDate" 
    78  if ((document.getElementById("clock").className == "visible") && (bwClockCurrentType == type)) { 
    8     changeClass("clock","invisible"); // if the clock with the same type is showing, toggle it off 
    9   } else { // otherwise, turn it on and display the correct type 
     9    // if the clock with the same type is visible, toggle it off 
     10    changeClass("clock","invisible"); 
     11  } else { 
     12    // otherwise, turn it on and display the correct type 
     13    changeClass("clock","visible"); 
    1014    bwClockRequestedType = type; 
    1115    bwClockCurrentType = type; 
    12     changeClass("clock","visible"); 
     16    // reset hours and minutes to null 
     17    bwClockHour = null; 
     18    bwClockMinute = null; 
    1319    bwClockIndicator = document.getElementById("bwClockDateTypeIndicator"); 
    1420    bwClockSwitch = document.getElementById("bwClockSwitch"); 
    …… 
    2834} 
    2935 
    30 function bwClockUpdateDateTimeForm(type,val) { 
     36function bwClockUpdateDateTimeForm(valType,val) { 
     37  // valType: "hour" or "minute" 
     38  // val: hour or minute value as integer 
    3139  if (bwClockRequestedType) { 
    3240    try { 
    33       if (type == 'minute') { 
     41      if (valType == 'minute') { 
    3442        var fieldName = bwClockRequestedType + ".minute" 
    3543        window.document.eventForm[fieldName].value = val;