Changeset 1085

Show
Ignore:
Timestamp:
11/14/06 00:50:24
Author:
douglm
Message:

Large number of updates mostly due to renaming sponsor to contact.
BwContact? class is used for rfc contact field with some non-rfc extensions used as contact in public events.

Renamed all sponsor admin jsp pages to contact
Changed jsp to refer to contact
Changed struts-config

Changed admin and public events stylesheet to refer to contact - contacts largely unused in user client to date.

Changes to configuration properties and xml files - change sponsor to contact

Sponsor code removed from admin app and added to common code

In addition the contact class has a language capable name. The icalendar classes have been modified appropriately

Collation classes and methods added to allow correct sorting of entities

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/configs/democal.options.xml

    r1039 r1085  
    7575             ================================================================== --> 
    7676        <CalAdmin classname="org.bedework.calfacade.configs.AdminConfig"> 
    77           <autoCreateSponsors>false</autoCreateSponsors> 
    78           <autoDeleteSponsors>false</autoDeleteSponsors> 
     77          <autoCreateContacts>false</autoCreateContacts> 
     78          <autoDeleteContacts>false</autoDeleteContacts> 
    7979          <autoCreateLocations>false</autoCreateLocations> 
    8080          <autoDeleteLocations>false</autoDeleteLocations> 
    8181          <allowEditAllCategories>false</allowEditAllCategories> 
    8282          <allowEditAllLocations>false</allowEditAllLocations> 
    83           <allowEditAllSponsors>false</allowEditAllSponsors> 
     83          <allowEditAllContacts>false</allowEditAllContacts> 
    8484          <categoryOptional>true</categoryOptional> 
    8585 
    …… 
    100100             ================================================================== --> 
    101101        <Events classname="org.bedework.calfacade.configs.ClientConfig"> 
    102           <autoCreateSponsors>false</autoCreateSponsors> 
    103           <autoDeleteSponsors>false</autoDeleteSponsors> 
     102          <autoCreateContacts>false</autoCreateContacts> 
     103          <autoDeleteContacts>false</autoDeleteContacts> 
    104104          <autoCreateLocations>false</autoCreateLocations> 
    105105          <autoDeleteLocations>false</autoDeleteLocations> 
    …… 
    128128             ================================================================== --> 
    129129        <SoEDept classname="org.bedework.calfacade.configs.ClientConfig"> 
    130           <autoCreateSponsors>false</autoCreateSponsors> 
    131           <autoDeleteSponsors>false</autoDeleteSponsors> 
     130          <autoCreateContacts>false</autoCreateContacts> 
     131          <autoDeleteContacts>false</autoDeleteContacts> 
    132132          <autoCreateLocations>false</autoCreateLocations> 
    133133          <autoDeleteLocations>false</autoDeleteLocations> 
    …… 
    156156             ================================================================== --> 
    157157        <UserCal classname="org.bedework.calfacade.configs.ClientConfig"> 
    158           <autoCreateSponsors>false</autoCreateSponsors> 
    159           <autoDeleteSponsors>false</autoDeleteSponsors> 
     158          <autoCreateContacts>false</autoCreateContacts> 
     159          <autoDeleteContacts>false</autoDeleteContacts> 
    160160          <autoCreateLocations>false</autoCreateLocations> 
    161161          <autoDeleteLocations>false</autoDeleteLocations> 

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

    r1081 r1085  
    377377  position: relative; 
    378378} 
    379 #sponsorEmailAlert { 
     379#contactEmailAlert { 
    380380  display: none; 
    381381  background: transparent url('../../resources/email.gif') no-repeat top left; 

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

    r1084 r1085  
    8484  <xsl:variable name="event-initUpload" select="/bedeworkadmin/urlPrefixes/event/initUpload/a/@href"/> 
    8585  <xsl:variable name="event-upload" select="/bedeworkadmin/urlPrefixes/event/upload/a/@href"/> 
    86   <!-- sponsors --> 
    87   <xsl:variable name="sponsor-showSponsor" select="/bedeworkadmin/urlPrefixes/sponsor/showSponsor/a/@href"/> 
    88   <xsl:variable name="sponsor-showReferenced" select="/bedeworkadmin/urlPrefixes/sponsor/showReferenced/a/@href"/> 
    89   <xsl:variable name="sponsor-showModForm" select="/bedeworkadmin/urlPrefixes/sponsor/showModForm/a/@href"/> 
    90   <xsl:variable name="sponsor-showUpdateList" select="/bedeworkadmin/urlPrefixes/sponsor/showUpdateList/a/@href"/> 
    91   <xsl:variable name="sponsor-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/sponsor/showDeleteConfirm/a/@href"/> 
    92   <xsl:variable name="sponsor-initAdd" select="/bedeworkadmin/urlPrefixes/sponsor/initAdd/a/@href"/> 
    93   <xsl:variable name="sponsor-initUpdate" select="/bedeworkadmin/urlPrefixes/sponsor/initUpdate/a/@href"/> 
    94   <xsl:variable name="sponsor-delete" select="/bedeworkadmin/urlPrefixes/sponsor/delete/a/@href"/> 
    95   <xsl:variable name="sponsor-fetchForDisplay" select="/bedeworkadmin/urlPrefixes/sponsor/fetchForDisplay/a/@href"/> 
    96   <xsl:variable name="sponsor-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/sponsor/fetchForUpdate/a/@href"/> 
    97   <xsl:variable name="sponsor-update" select="/bedeworkadmin/urlPrefixes/sponsor/update/a/@href"/> 
     86  <!-- contacts --> 
     87  <xsl:variable name="contact-showContact" select="/bedeworkadmin/urlPrefixes/contact/showContact/a/@href"/> 
     88  <xsl:variable name="contact-showReferenced" select="/bedeworkadmin/urlPrefixes/contact/showReferenced/a/@href"/> 
     89  <xsl:variable name="contact-showModForm" select="/bedeworkadmin/urlPrefixes/contact/showModForm/a/@href"/> 
     90  <xsl:variable name="contact-showUpdateList" select="/bedeworkadmin/urlPrefixes/contact/showUpdateList/a/@href"/> 
     91  <xsl:variable name="contact-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/contact/showDeleteConfirm/a/@href"/> 
     92  <xsl:variable name="contact-initAdd" select="/bedeworkadmin/urlPrefixes/contact/initAdd/a/@href"/> 
     93  <xsl:variable name="contact-initUpdate" select="/bedeworkadmin/urlPrefixes/contact/initUpdate/a/@href"/> 
     94  <xsl:variable name="contact-delete" select="/bedeworkadmin/urlPrefixes/contact/delete/a/@href"/> 
     95  <xsl:variable name="contact-fetchForDisplay" select="/bedeworkadmin/urlPrefixes/contact/fetchForDisplay/a/@href"/> 
     96  <xsl:variable name="contact-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/contact/fetchForUpdate/a/@href"/> 
     97  <xsl:variable name="contact-update" select="/bedeworkadmin/urlPrefixes/contact/update/a/@href"/> 
    9898  <!-- locations --> 
    9999  <xsl:variable name="location-showLocation" select="/bedeworkadmin/urlPrefixes/location/showLocation/a/@href"/> 
    …… 
    238238                  <xsl:apply-templates select="/bedeworkadmin/event" mode="displayEvent"/> 
    239239                </xsl:when> 
    240                 <xsl:when test="/bedeworkadmin/page='sponsorList'"> 
    241                   <xsl:call-template name="sponsorList"/> 
    242                 </xsl:when> 
    243                 <xsl:when test="/bedeworkadmin/page='modSponsor'"> 
    244                   <xsl:call-template name="modSponsor"/> 
    245                 </xsl:when> 
    246                 <xsl:when test="/bedeworkadmin/page='deleteSponsorConfirm' or /bedeworkadmin/page='sponsorReferenced'"> 
    247                   <xsl:call-template name="deleteSponsorConfirm"/> 
     240                <xsl:when test="/bedeworkadmin/page='contactList'"> 
     241                  <xsl:call-template name="contactList"/> 
     242                </xsl:when> 
     243                <xsl:when test="/bedeworkadmin/page='modContact'"> 
     244                  <xsl:call-template name="modContact"/> 
     245                </xsl:when> 
     246                <xsl:when test="/bedeworkadmin/page='deleteContactConfirm' or /bedeworkadmin/page='contactReferenced'"> 
     247                  <xsl:call-template name="deleteContactConfirm"/> 
    248248                </xsl:when> 
    249249                <xsl:when test="/bedeworkadmin/page='locationList'"> 
    …… 
    402402          <th>Contacts</th> 
    403403          <td> 
    404             <a id="addSponsorLink" href="{$sponsor-initAdd}"> 
     404            <a id="addContactLink" href="{$contact-initAdd}"> 
    405405              Add 
    406406            </a> 
    407407          </td> 
    408408          <td> 
    409             <a href="{$sponsor-initUpdate}"> 
     409            <a href="{$contact-initUpdate}"> 
    410410              Edit / Delete 
    411411            </a> 
    …… 
    979979        </xsl:if> 
    980980 
    981         <!-- Sponsor --> 
     981        <!-- Contact --> 
    982982        <tr> 
    983983          <td class="fieldName"> 
    …… 
    985985          </td> 
    986986          <td> 
    987             <xsl:if test="/bedeworkadmin/formElements/form/sponsor/preferred/select/option"> 
    988               <select name="prefSponsorId" id="eventFormSponsorList"> 
     987            <xsl:if test="/bedeworkadmin/formElements/form/contact/preferred/select/option"> 
     988              <select name="prefContactId" id="eventFormContactList"> 
    989989                <option value="-1"> 
    990990                  Select preferred: 
    991991                </option>option> 
    992                 <xsl:copy-of select="/bedeworkadmin/formElements/form/sponsor/preferred/select/*"/> 
     992                <xsl:copy-of select="/bedeworkadmin/formElements/form/contact/preferred/select/*"/> 
    993993              </select> 
    994994              or Contact (all): 
    995995            </xsl:if> 
    996             <select name="allSponsorId" id="eventFormPrefSponsorList"> 
     996            <select name="allContactId" id="eventFormPrefContactList"> 
    997997              <option value="-1"> 
    998998                Select: 
    999999              </option> 
    1000               <xsl:copy-of select="/bedeworkadmin/formElements/form/sponsor/all/select/*"/> 
     1000              <xsl:copy-of select="/bedeworkadmin/formElements/form/contact/all/select/*"/> 
    10011001            </select> 
    10021002          </td> 
    …… 
    11011101        </tr> 
    11021102 
    1103         <xsl:if test="/bedeworkadmin/formElements/form/sponsor/name"> 
     1103        <xsl:if test="/bedeworkadmin/formElements/form/contact/name"> 
    11041104          <tr> 
    11051105            <td class="fieldName" colspan="2"> 
    …… 
    11131113            </td> 
    11141114            <td> 
    1115               <xsl:copy-of select="/bedeworkadmin/formElements/form/sponsor/name/*"/> 
     1115              <xsl:copy-of select="/bedeworkadmin/formElements/form/contact/name/*"/> 
    11161116            </td> 
    11171117          </tr> 
    …… 
    11211121            </td> 
    11221122            <td> 
    1123               <xsl:copy-of select="/bedeworkadmin/formElements/form/sponsor/phone/*"/> 
     1123              <xsl:copy-of select="/bedeworkadmin/formElements/form/contact/phone/*"/> 
    11241124              <xsl:text> </xsl:text> 
    11251125              <span class="fieldInfo">(optional)</span> 
    …… 
    11311131            </td> 
    11321132            <td> 
    1133               <xsl:copy-of select="/bedeworkadmin/formElements/form/sponsor/link/*"/> 
     1133              <xsl:copy-of select="/bedeworkadmin/formElements/form/contact/link/*"/> 
    11341134              <xsl:text> </xsl:text> 
    11351135              <span class="fieldInfo">(optional)</span> 
    …… 
    11411141            </td> 
    11421142            <td> 
    1143               <xsl:copy-of select="/bedeworkadmin/formElements/form/sponsor/email/*"/> 
     1143              <xsl:copy-of select="/bedeworkadmin/formElements/form/contact/email/*"/> 
    11441144              <xsl:text> </xsl:text> 
    11451145              <span class="fieldInfo">(optional)</span> test 
    1146               <div id="sponsorEmailAlert">&#160;</div> <!-- space for email warning --> 
     1146              <div id="contactEmailAlert">&#160;</div> <!-- space for email warning --> 
    11471147            </td> 
    11481148          </tr> 
    …… 
    13981398      </tr> 
    13991399 
    1400       <!-- Sponsor --> 
     1400      <!-- Contact --> 
    14011401      <tr> 
    14021402        <th> 
    …… 
    14041404        </th> 
    14051405        <td> 
    1406           <xsl:value-of select="sponsor"/> 
     1406          <xsl:value-of select="contact"/> 
    14071407        </td> 
    14081408      </tr> 
    …… 
    14341434  </xsl:template> 
    14351435 
    1436   <!--+++++++++++++++ Sponsors (Contacts) ++++++++++++++++++++--> 
    1437   <xsl:template name="sponsorList"> 
     1436  <!--+++++++++++++++ Contacts ++++++++++++++++++++--> 
     1437  <xsl:template name="contactList"> 
    14381438    <h2>Edit Contacts</h2> 
    14391439    <p> 
    14401440      Select the contact you would like to update: 
    1441       <input type="button" name="return" value="Add new contact" onclick="javascript:location.replace('{$sponsor-initAdd}')"/> 
     1441      <input type="button" name="return" value="Add new contact" onclick="javascript:location.replace('{$contact-initAdd}')"/> 
    14421442    </p> 
    14431443 
    …… 
    14501450      </tr> 
    14511451 
    1452       <xsl:for-each select="/bedeworkadmin/sponsors/sponsor"> 
     1452      <xsl:for-each select="/bedeworkadmin/contacts/contact"> 
    14531453        <tr> 
    14541454          <td> 
    …… 
    14751475  </xsl:template> 
    14761476 
    1477   <xsl:template name="modSponsor"> 
    1478     <form action="{$sponsor-update}" method="post"> 
     1477  <xsl:template name="modContact"> 
     1478    <form action="{$contact-update}" method="post"> 
    14791479      <h2>Contact Information</h2> 
    14801480 
    …… 
    15221522            <xsl:when test="/bedeworkadmin/creating='true'"> 
    15231523              <td> 
    1524                 <input type="submit" name="addSponsor" value="Add Contact"/> 
     1524                <input type="submit" name="addContact" value="Add Contact"/> 
    15251525                <input type="submit" name="cancelled" value="Cancel"/> 
    15261526                <input type="reset" value="Clear"/> 
    …… 
    15291529            <xsl:otherwise> 
    15301530              <td> 
    1531                 <input type="submit" name="updateSponsor" value="Update Contact"/> 
     1531                <input type="submit" name="updateContact" value="Update Contact"/> 
    15321532                <input type="submit" name="cancelled" value="Cancel"/> 
    15331533                <input type="reset" value="Reset"/> 
    …… 
    15441544  </xsl:template> 
    15451545 
    1546   <xsl:template name="deleteSponsorConfirm"> 
     1546  <xsl:template name="deleteContactConfirm"> 
    15471547    <h2>Ok to delete this contact?</h2> 
    15481548    <p id="confirmButtons"> 
    …… 
    15541554        <th>Name</th> 
    15551555        <td> 
    1556           <xsl:value-of select="/bedeworkadmin/sponsor/name" /> 
     1556          <xsl:value-of select="/bedeworkadmin/contact/name" /> 
    15571557        </td> 
    15581558      </tr> 
    …… 
    15601560        <th>Phone</th> 
    15611561        <td> 
    1562           <xsl:value-of select="/bedeworkadmin/sponsor/phone" /> 
     1562          <xsl:value-of select="/bedeworkadmin/contact/phone" /> 
    15631563        </td> 
    15641564      </tr> 
    …… 
    15661566        <th>Email</th> 
    15671567        <td> 
    1568           <xsl:value-of select="/bedeworkadmin/sponsor/email" /> 
     1568          <xsl:value-of select="/bedeworkadmin/contact/email" /> 
    15691569        </td> 
    15701570      </tr> 
    …… 
    15721572        <th>URL</th> 
    15731573        <td> 
    1574           <xsl:value-of select="/bedeworkadmin/sponsor/link" /> 
     1574          <xsl:value-of select="/bedeworkadmin/contact/link" /> 
    15751575        </td> 
    15761576      </tr> 
    …… 
    40264026            Manage Events 
    40274027          </xsl:when> 
    4028           <xsl:when test="/bedeworkadmin/page='sponsorList' or /bedeworkadmin/page='modSponsor' or /bedeworkadmin/page='deleteSponsorConfirm'"> 
     4028          <xsl:when test="/bedeworkadmin/page='contactList' or /bedeworkadmin/page='modContact' or /bedeworkadmin/page='deleteContactConfirm'"> 
    40294029            Manage Contacts 
    40304030          </xsl:when> 

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

    r952 r1085  
    9494        for an all day event. 
    9595      </xsl:when> 
    96       <xsl:when test="id='org.bedework.validation.error.nosponsorname'"> 
     96      <xsl:when test="id='org.bedework.validation.error.nocontactname'"> 
    9797        You must enter a contact <em>name</em>. 
    9898      </xsl:when> 
    …… 
    121121        Please correct your data input for <em><xsl:value-of select="param"/></em> 
    122122      </xsl:when> 
    123       <xsl:when test="id='org.bedework.client.error.nosuchsponsor'"> 
     123      <xsl:when test="id='org.bedework.client.error.nosuchcontact'"> 
    124124        Not found: there is no contact <em><xsl:value-of select="param"/></em> 
    125125      </xsl:when> 
    126       <xsl:when test="id='org.bedework.client.error.sponsor.referenced'"> 
     126      <xsl:when test="id='org.bedework.client.error.contact.referenced'"> 
    127127        Cannot delete: the contact is referenced by events 
    128128      </xsl:when> 
    129       <xsl:when test="id='org.bedework.client.error.sponsor.alreadyexists'"> 
     129      <xsl:when test="id='org.bedework.client.error.contact.alreadyexists'"> 
    130130        Cannot add: the contact already exists 
    131131      </xsl:when> 

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

    r952 r1085  
    4040        Folder updated 
    4141      </xsl:when> 
    42       <xsl:when test="id='org.bedework.client.message.sponsor.deleted'"> 
     42      <xsl:when test="id='org.bedework.client.message.contact.deleted'"> 
    4343        Contact deleted 
    4444      </xsl:when> 
    45       <xsl:when test="id='org.bedework.client.message.sponsor.added'"> 
     45      <xsl:when test="id='org.bedework.client.message.contact.added'"> 
    4646        Contact added 
    4747      </xsl:when> 
    48       <xsl:when test="id='org.bedework.client.message.sponsor.updated'"> 
     48      <xsl:when test="id='org.bedework.client.message.contact.updated'"> 
    4949        Contact updated 
    5050      </xsl:when> 
    51       <xsl:when test="id='org.bedework.client.message.sponsor.referenced'"> 
     51      <xsl:when test="id='org.bedework.client.message.contact.referenced'"> 
    5252        Contact is referenced 
    5353      </xsl:when> 
    54       <xsl:when test="id='org.bedework.client.message.sponsor.alreadyexists'"> 
     54      <xsl:when test="id='org.bedework.client.message.contact.alreadyexists'"> 
    5555        Contact already exists 
    5656      </xsl:when> 

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

    r1069 r1085  
    665665        </tr> 
    666666      </xsl:if> 
    667       <xsl:if test="sponsor/name!='none'"> 
     667      <xsl:if test="contact/name!='none'"> 
    668668        <tr> 
    669669          <td class="fieldname">Contact:</td> 
    670670          <td colspan="2" class="fieldval"> 
    671671            <xsl:choose> 
    672               <xsl:when test="sponsor/link=''"> 
    673                 <xsl:value-of select="sponsor/name"/> 
     672              <xsl:when test="contact/link=''"> 
     673                <xsl:value-of select="contact/name"/> 
    674674              </xsl:when> 
    675675              <xsl:otherwise> 
    676                 <xsl:variable name="sponsorLink" select="sponsor/link"/> 
    677                 <a href="{$sponsorLink}"> 
    678                   <xsl:value-of select="sponsor/name"/> 
     676                <xsl:variable name="contactLink" select="contact/link"/> 
     677                <a href="{$contactLink}"> 
     678                  <xsl:value-of select="contact/name"/> 
    679679                </a> 
    680680              </xsl:otherwise> 
    681681            </xsl:choose> 
    682             <xsl:if test="sponsor/phone!=''"> 
    683               <br /><xsl:value-of select="sponsor/phone"/> 
     682            <xsl:if test="contact/phone!=''"> 
     683              <br /><xsl:value-of select="contact/phone"/> 
    684684            </xsl:if> 
    685685            <!-- If you want to display email addresses, uncomment the 
    686686                 following 8 lines. --> 
    687             <!-- <xsl:if test="sponsor/email!=''"> 
     687            <!-- <xsl:if test="contact/email!=''"> 
    688688              <br /> 
    689               <xsl:variable name="email" select="sponsor/email"/> 
     689              <xsl:variable name="email" select="contact/email"/> 
    690690              <xsl:variable name="subject" select="summary"/> 
    691691              <a href="mailto:{$email}&amp;subject={$subject}"> 
    692                 <xsl:value-of select="sponsor/email"/> 
     692                <xsl:value-of select="contact/email"/> 
    693693              </a> 
    694694            </xsl:if> --> 
    …… 
    843843                            <xsl:value-of select="cost"/>.&#160; 
    844844                          </xsl:if> 
    845                           <xsl:if test="sponsor/name!='none'"> 
    846                             Contact: <xsl:value-of select="sponsor/name"/> 
     845                          <xsl:if test="contact/name!='none'"> 
     846                            Contact: <xsl:value-of select="contact/name"/> 
    847847                          </xsl:if> 
    848848                        </em>