Changeset 1104

Show
Ignore:
Timestamp:
11/28/06 19:53:47
Author:
johnsa
Message:

overhaul of recipients and attendees - for now it is a pop-up window;

make logo of each web client link to the home state of the web client rather than the bedework homepage; make homepage link more explicit in footer.

error and message work in personal client.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1098 r1104  
    178178  <xsl:variable name="admingroup-switch" select="/bedeworkadmin/urlPrefixes/admingroup/switch/a/@href"/> 
    179179 
    180   <!-- URL of the web application - includes web context 
    181   <xsl:variable name="urlPrefix" select="/bedeworkadmin/urlprefix"/> --> 
     180  <!-- URL of the web application - includes web context --> 
     181  <xsl:variable name="urlPrefix" select="/bedeworkadmin/urlprefix"/> 
    182182 
    183183  <!-- Other generally useful global variables --> 
    …… 
    40514051  <xsl:template name="header"> 
    40524052    <div id="header"> 
    4053       <a href="http://www.bedework.org"> 
     4053      <a href="{$urlPrefix}"> 
    40544054        <img id="logo" 
    40554055            alt="logo" 
    …… 
    41684168  <xsl:template name="footer"> 
    41694169    <div id="footer"> 
    4170       <a href="http://www.bedework.org/">Bedework Calendar</a> | 
     4170      <a href="http://www.bedework.org/">Bedework Website</a> | 
    41714171      <!-- Enable the following two items when debugging skins only --> 
    41724172      <a href="?noxslt=yes">show XML</a> | 

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

    r1103 r1104  
    8888  <xsl:variable name="showPage" select="/bedework/urlPrefixes/showPage"/> 
    8989  <xsl:variable name="stats" select="/bedework/urlPrefixes/stats"/> 
     90 
     91  <!-- URL of the web application - includes web context --> 
     92  <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> 
    9093 
    9194  <!-- Other generally useful global variables --> 
    …… 
    192195    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="logoTable"> 
    193196      <tr> 
    194         <td colspan="3" id="logoCell"><a href="http://www.bedework.org/"><img src="{$resourcesRoot}/images/bedeworkLogo.gif" width="292" height="75" border="0" alt="Bedework"/></a></td> 
     197        <td colspan="3" id="logoCell"><a href="{$urlPrefix}"><img src="{$resourcesRoot}/images/bedeworkLogo.gif" width="292" height="75" border="0" alt="Bedework"/></a></td> 
    195198        <td colspan="2" id="schoolLinksCell"> 
    196199          <h2>Public Calendar</h2> 
    …… 
    13801383      <tr> 
    13811384        <td class="leftCell"> 
    1382           Based on the <a href="http://www.bedework.org/">Bedework Calendar</a> | 
     1385          Based on the <a href="http://www.bedework.org/">Bedework Website</a> | 
    13831386          <a href="?noxslt=yes">show XML</a> | 
    13841387          <a href="?refreshXslt=yes">refresh XSLT</a> 

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

    r1103 r1104  
    9898  <xsl:variable name="showPage" select="/bedework/urlPrefixes/showPage"/> 
    9999  <xsl:variable name="stats" select="/bedework/urlPrefixes/stats"/> 
     100 
     101  <!-- URL of the web application - includes web context --> 
     102  <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> 
    100103 
    101104  <!-- Other generally useful global variables --> 
    …… 
    185188    <div id="headBar"> 
    186189      <div id="bedeworkLogo"> 
    187         <a href="http://www.bedework.org/"> 
     190        <a href="{$urlPrefix}"> 
    188191          <img src="{$resourcesRoot}/images/soecal/soeBedeworkLogo.gif" width="296" height="69" border="0" alt="Bedework" align="right"/> 
    189192        </a> 

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

    r1094 r1104  
    697697#recipientsAndAttendees { 
    698698  position: relative; 
     699  margin: 0; 
     700  padding: 0; 
    699701} 
    700702#recipientsAndAttendeesBox { 
    701   position: absolute; 
     703  /*position: absolute; 
    702704  top: -300px; 
    703705  left: 150px; 
    704706  width: 500px; 
    705   padding: 18px; 
    706   border: 2px solid #ccc; 
     707  padding: 18px;*/ 
     708  margin: 0; 
     709  /*border: 2px solid #ccc;*/ 
    707710  background: white; 
    708711  color: black; 
    …… 
    710713#recipientsAndAttendeesBox h4 { 
    711714  padding: 4px; 
    712   margin: -20px -20px 10px -20px; 
     715  /*margin: -20px -20px 10px -20px;*/ 
     716  margin: 0; 
    713717  text-align: center; 
    714718  color: #eee; 
    715719  background: #233979 url(../../resources/glassFill-02.gif) repeat-x bottom; 
    716720  border: 2px solid #233979; 
     721} 
     722#recipientsAndAttendeesBox #errors, 
     723#recipientsAndAttendeesBox #messages { 
     724  margin: 0; 
    717725} 
    718726#recipientsAndAttendeesBox table { 

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

    r1103 r1104  
    136136  <xsl:variable name="schedule-processAttendeeReply" select="/bedework/urlPrefixes/schedule/processAttendeeReply/a/@href"/> 
    137137 
    138   <!-- URL of the web application - includes web context 
    139   <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> --> 
     138  <!-- URL of the web application - includes web context --> 
     139  <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> 
    140140 
    141141  <!-- Other generally useful global variables --> 
    …… 
    160160          <xsl:call-template name="selectCalForEvent"/> 
    161161        </xsl:when> 
     162        <xsl:when test="/bedework/page='attendees'"> 
     163          <xsl:call-template name="attendees"/> 
     164        </xsl:when> 
    162165        <xsl:otherwise> 
    163166            <xsl:call-template name="headBar"/> 
    164             <xsl:if test="/bedework/message"> 
    165               <div id="messages"> 
    166                 <xsl:apply-templates select="/bedework/message"/> 
    167               </div> 
    168             </xsl:if> 
    169             <xsl:if test="/bedework/error"> 
    170               <div id="errors"> 
    171                 <xsl:apply-templates select="/bedework/error"/> 
    172               </div> 
    173             </xsl:if> 
     167            <xsl:call-template name="messagesAndErrors"/> 
    174168            <table id="bodyBlock" cellspacing="0"> 
    175169              <tr> 
    …… 
    323317    <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/> 
    324318    <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" /> 
    325     <script type="text/javascript" src="{$resourcesRoot}/resources/dojo-0.3.1-ajax/dojo.js"></script> 
    326     <script type="text/javascript"> 
    327       dojo.require("dojo.event.*"); 
    328       dojo.require("dojo.io.*"); 
    329       dojo.require("dojo.widget.FloatingPane"); 
    330     </script> 
    331319    <link rel="icon" type="image/ico" href="{$resourcesRoot}/resources/bedework.ico" /> 
    332320    <xsl:if test="/bedework/page='addEvent' or 
    …… 
    366354  <!--==== HEADER TEMPLATES and NAVIGATION  ====--> 
    367355 
     356  <xsl:template name="messagesAndErrors"> 
     357    <xsl:if test="/bedework/message"> 
     358      <div id="messages"> 
     359        <xsl:apply-templates select="/bedework/message"/> 
     360      </div> 
     361    </xsl:if> 
     362    <xsl:if test="/bedework/error"> 
     363      <div id="errors"> 
     364        <xsl:apply-templates select="/bedework/error"/> 
     365      </div> 
     366    </xsl:if> 
     367  </xsl:template> 
     368 
     369 
     370  <!--==== HEADER TEMPLATES and NAVIGATION  ====--> 
     371 
    368372  <xsl:template name="headBar"> 
    369373    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="logoTable"> 
    370374      <tr> 
    371         <td colspan="3" id="logoCell"><a href="http://www.bedework.org/"><img src="{$resourcesRoot}/resources/bedeworkLogo.gif" width="292" height="75" border="0" alt="Bedework"/></a></td> 
     375        <td colspan="3" id="logoCell"><a href="{$urlPrefix}"><img src="{$resourcesRoot}/resources/bedeworkLogo.gif" width="292" height="75" border="0" alt="Bedework"/></a></td> 
    372376        <td colspan="2" id="schoolLinksCell"> 
    373377          <h2>Personal Calendar</h2> 
    …… 
    18451849          </td> 
    18461850          <td class="fieldval posrelative"> 
    1847             <input type="button" value="Manage recipients and attendees" onclick="changeClass('recipientsAndAttendees','shown')"/> 
     1851            <!--<input type="button" value="Manage recipients and attendees" onclick="changeClass('recipientsAndAttendees','shown')"/>--> 
     1852            <input type="button" value="Manage recipients and attendees" onclick="launchSizedWindow('{$event-showAttendeesForEvent}','500','400')"/> 
    18481853          </td> 
    18491854        </tr> 
    …… 
    19181923    </div> 
    19191924 
    1920     <form name="raForm" id="recipientsAndAttendees" class="invisible"> 
     1925    <!--<form name="raForm" id="recipientsAndAttendees" class="invisible"> 
    19211926      <div id="recipientsAndAttendeesBox"> 
    1922         <h4 id="dialogTitle"><!--onmousedown="bwDrag('recipientsAndAttendeesBox')" onmouseup="bwDrop('recipientsAndAttendeesBox')"--> 
     1927        <h4 id="dialogTitle"> 
    19231928          Recipients and Attendees 
    19241929        </h4> 
    …… 
    19711976        </div> 
    19721977      </div> 
    1973     </form> 
     1978    </form>--> 
    19741979  </xsl:template> 
    19751980 
    …… 
    20422047      </map> 
    20432048    </div> 
     2049  </xsl:template> 
     2050 
     2051  <xsl:template name="attendees"> 
     2052    <form name="raForm" id="recipientsAndAttendees" action="{$event-attendeesForEvent}" method="post"> 
     2053      <div id="recipientsAndAttendeesBox"> 
     2054        <h4 id="dialogTitle"> 
     2055          Recipients and Attendees 
     2056        </h4> 
     2057        <xsl:call-template name="messagesAndErrors"/> 
     2058        <div id="raContent"> 
     2059          <table cellspacing="0"> 
     2060            <tr> 
     2061              <td> 
     2062                <input name="uri" width="40"/> 
     2063                <input type="submit" value="add" /> 
     2064                <br/> 
     2065                <input type="checkbox" name="recipient" value="true" checked="checked"/> recipient 
     2066                <input type="checkbox" name="attendee" value="true" checked="checked"/> attendee 
     2067              </td> 
     2068              <td> 
     2069                Role: 
     2070                <select name="role"> 
     2071                  <option value="REQ-PARTICIPANT">required participant</option> 
     2072                  <option value="OPT-PARTICIPANT">optional participant</option> 
     2073                  <option value="CHAIR">chair</option> 
     2074                  <option value="NON-PARTICIPANT">non-participant</option> 
     2075                </select><br/> 
     2076                Status: 
     2077                <select name="partstat"> 
     2078                  <option value="NEEDS-ACTION">needs action</option> 
     2079                  <option value="ACCEPTED">accepted</option> 
     2080                  <option value="DECLINED">declined</option> 
     2081                  <option value="TENTATIVE">tentative</option> 
     2082                  <option value="DELEGATED">delegated</option> 
     2083                </select> 
     2084              </td> 
     2085            </tr> 
     2086          </table> 
     2087          <table cellspacing="0"> 
     2088            <tr> 
     2089              <th>Recipients</th> 
     2090              <th>Attendees</th> 
     2091            </tr> 
     2092            <tr> 
     2093              <td> 
     2094                <div id="recipientList"> 
     2095                </div> 
     2096              </td> 
     2097              <td> 
     2098                <div id="attendeeList"> 
     2099                </div> 
     2100              </td> 
     2101            </tr> 
     2102          </table> 
     2103          <input type="button" value="done" onclick="window.close()"/> 
     2104        </div> 
     2105      </div> 
     2106    </form> 
    20442107  </xsl:template> 
    20452108 
    …… 
    56835746      <tr> 
    56845747        <td class="leftCell"> 
    5685           <a href="http://www.bedework.org/">Bedework Calendar</a> | 
     5748          <a href="http://www.bedework.org/">Bedework Website</a> | 
    56865749          <a href="?noxslt=yes">show XML</a> | 
    56875750          <a href="?refreshXslt=yes">refresh XSLT</a> 

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

    r952 r1104  
    6363          <p>User not found.</p> 
    6464      </xsl:when> 
     65      <xsl:when test="id='org.bedework.client.error.invaliduser'"> 
     66          <p>Invalid user.</p> 
     67      </xsl:when> 
    6568      <xsl:when test="id='org.bedework.client.error.location.referenced'"> 
    6669          <p>Location is in use.  It cannot be deleted while referenced by an event.</p> 

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

    r1019 r1104  
    4848} 
    4949 
     50// launch a size parameterized window for displaying information; no header or status bar 
     51function launchSizedWindow(URL,width,height) { 
     52  paramStr = "width=" + width + ",height=" + height + ",scrollbars=yes,resizable=yes,alwaysRaised=yes,menubar=no,toolbar=no"; 
     53  sizedWindow = window.open(URL, "sizedWindow", paramStr); 
     54  window.sizedWindow.focus(); 
     55} 
     56 
    5057// launches new browser window with print-friendly version of page when 
    5158// print icon is clicked