Changeset 1067

Show
Ignore:
Timestamp:
11/03/06 16:56:56
Author:
johnsa
Message:

added search to personal client.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webadmin/webapp/resources/default/default/subColors.css

    r1059 r1067  
    44   "important" to override more specific selectors in 
    55   the default.css stylesheet. */ 
     6 
     7     /* ********************************************************************** 
     8    Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved. 
     9 
     10    Redistribution and use of this distribution in source and binary forms, 
     11    with or without modification, are permitted provided that: 
     12       The above copyright notice and this permission notice appear in all 
     13        copies and supporting documentation; 
     14 
     15        The name, identifiers, and trademarks of Rensselaer Polytechnic 
     16        Institute are not used in advertising or publicity without the 
     17        express prior written permission of Rensselaer Polytechnic Institute; 
     18 
     19    DISCLAIMER: The software is distributed" AS IS" without any express or 
     20    implied warranty, including but not limited to, any implied warranties 
     21    of merchantability or fitness for a particular purpose or any warrant)' 
     22    of non-infringement of any current or pending patent rights. The authors 
     23    of the software make no representations about the suitability of this 
     24    software for any particular purpose. The entire risk as to the quality 
     25    and performance of the software is with the user. Should the software 
     26    prove defective, the user assumes the cost of all necessary servicing, 
     27    repair or correction. In particular, neither Rensselaer Polytechnic 
     28    Institute, nor the authors of the software are liable for any indirect, 
     29    special, consequential, or incidental damages related to the software, 
     30    to the maximum extent the law permits. */ 
    631 
    732.bwwhite { 
  • trunk/deployment/webadmin/webapp/resources/default/default/subColors.xml

    r1059 r1067  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<!-- Bedework Calendar subscription colors --> 
     3 
     4<!-- ********************************************************************** 
     5    Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved. 
     6 
     7    Redistribution and use of this distribution in source and binary forms, 
     8    with or without modification, are permitted provided that: 
     9       The above copyright notice and this permission notice appear in all 
     10        copies and supporting documentation; 
     11 
     12        The name, identifiers, and trademarks of Rensselaer Polytechnic 
     13        Institute are not used in advertising or publicity without the 
     14        express prior written permission of Rensselaer Polytechnic Institute; 
     15 
     16    DISCLAIMER: The software is distributed" AS IS" without any express or 
     17    implied warranty, including but not limited to, any implied warranties 
     18    of merchantability or fitness for a particular purpose or any warrant)' 
     19    of non-infringement of any current or pending patent rights. The authors 
     20    of the software make no representations about the suitability of this 
     21    software for any particular purpose. The entire risk as to the quality 
     22    and performance of the software is with the user. Should the software 
     23    prove defective, the user assumes the cost of all necessary servicing, 
     24    repair or correction. In particular, neither Rensselaer Polytechnic 
     25    Institute, nor the authors of the software are liable for any indirect, 
     26    special, consequential, or incidental damages related to the software, 
     27    to the maximum extent the law permits. --> 
     28 
    329<subscriptionColors> 
    430  <!-- light pastels --> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r1065 r1067  
    141141          </xsl:when> 
    142142          <xsl:when test="/bedework/page='searchResult'"> 
    143             <!-- show a list of all calendars --> 
     143            <!-- display search results --> 
    144144            <xsl:call-template name="searchResult"/> 
    145145          </xsl:when> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/subColors.css

    r1059 r1067  
    44   "important" to override more specific selectors in 
    55   the default.css stylesheet. */ 
     6 
     7     /* ********************************************************************** 
     8    Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved. 
     9 
     10    Redistribution and use of this distribution in source and binary forms, 
     11    with or without modification, are permitted provided that: 
     12       The above copyright notice and this permission notice appear in all 
     13        copies and supporting documentation; 
     14 
     15        The name, identifiers, and trademarks of Rensselaer Polytechnic 
     16        Institute are not used in advertising or publicity without the 
     17        express prior written permission of Rensselaer Polytechnic Institute; 
     18 
     19    DISCLAIMER: The software is distributed" AS IS" without any express or 
     20    implied warranty, including but not limited to, any implied warranties 
     21    of merchantability or fitness for a particular purpose or any warrant)' 
     22    of non-infringement of any current or pending patent rights. The authors 
     23    of the software make no representations about the suitability of this 
     24    software for any particular purpose. The entire risk as to the quality 
     25    and performance of the software is with the user. Should the software 
     26    prove defective, the user assumes the cost of all necessary servicing, 
     27    repair or correction. In particular, neither Rensselaer Polytechnic 
     28    Institute, nor the authors of the software are liable for any indirect, 
     29    special, consequential, or incidental damages related to the software, 
     30    to the maximum extent the law permits. */ 
     31 
    632 
    733.bwwhite { 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/subColors.xml

    r1059 r1067  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<!-- Bedework Calendar subscription colors --> 
     3 
     4<!-- ********************************************************************** 
     5    Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved. 
     6 
     7    Redistribution and use of this distribution in source and binary forms, 
     8    with or without modification, are permitted provided that: 
     9       The above copyright notice and this permission notice appear in all 
     10        copies and supporting documentation; 
     11 
     12        The name, identifiers, and trademarks of Rensselaer Polytechnic 
     13        Institute are not used in advertising or publicity without the 
     14        express prior written permission of Rensselaer Polytechnic Institute; 
     15 
     16    DISCLAIMER: The software is distributed" AS IS" without any express or 
     17    implied warranty, including but not limited to, any implied warranties 
     18    of merchantability or fitness for a particular purpose or any warrant)' 
     19    of non-infringement of any current or pending patent rights. The authors 
     20    of the software make no representations about the suitability of this 
     21    software for any particular purpose. The entire risk as to the quality 
     22    and performance of the software is with the user. Should the software 
     23    prove defective, the user assumes the cost of all necessary servicing, 
     24    repair or correction. In particular, neither Rensselaer Polytechnic 
     25    Institute, nor the authors of the software are liable for any indirect, 
     26    special, consequential, or incidental damages related to the software, 
     27    to the maximum extent the law permits. --> 
     28 
    329<subscriptionColors> 
    430  <!-- light pastels --> 
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css

    r1027 r1067  
    1414  /*border-top: 1px solid #ccc;*/ 
    1515} 
     16#bodyBlock h2 { 
     17  color: black; 
     18  background: #f5f5f5; 
     19} 
    1620h2 a:link, 
    1721h2 a:active, 
     
    280284  white-space: nowrap; 
    281285} 
    282 #utilBarTable form { 
     286#utilBarTable form, 
     287#searchPageForm { 
     288  display: inline; 
    283289  margin: 0px 0px 1px 0px; 
    284290  padding: 0em; 
     291  white-space: nowrap; 
     292} 
     293#searchPageForm { 
     294  float: right; 
     295} 
     296#utilBarTable form input { 
     297  font-size: 0.7em; 
     298} 
     299#utilBarTable img { 
     300  vertical-align: middle; 
     301} 
     302#searchTable { 
     303  width: 100%; 
     304  font-size: 0.9em; 
     305  margin: 0px; 
     306  padding: 0px; 
     307  border-bottom: 2px solid #aaa; 
     308  border-left: 2px solid #aaa; 
     309  border-right: 2px solid #aaa; 
     310} 
     311#searchTable th { 
     312  padding-left: 0.5em; 
     313  padding-right: 0.5em; 
     314  padding-top: 2px; 
     315  padding-bottom: 2px; 
     316  text-align: left; 
     317  background: #e5e5e5; 
     318  color: #000; 
     319  font-weight: normal; 
     320} 
     321#searchTable td { 
     322  padding: 4px; 
     323} 
     324#searchTable tr.fieldNames td { 
     325  background: #eee; 
     326  border-bottom: 1px solid #ccc; 
     327} 
     328#searchTable .searchRelevance { 
     329  background-color: #2c5f89; 
     330  color: black; 
     331} 
     332#searchFilter { 
     333  float: right; 
     334  font-size: 10pt; 
     335  font-weight: normal; 
     336  margin-top: 5px; 
    285337} 
    286338#tabsTable { 
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1063 r1067  
    8282  <xsl:variable name="addEventRef" select="/bedework/urlPrefixes/addEventRef"/> 
    8383  <xsl:variable name="export" select="/bedework/urlPrefixes/export/a/@href"/> 
    84   <xsl:variable name="search" select="/bedework/urlPrefixes/search"/> 
     84  <xsl:variable name="search" select="/bedework/urlPrefixes/search/search"/> 
     85  <xsl:variable name="search-next" select="/bedework/urlPrefixes/search/next"/> 
    8586  <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mailEvent"/> 
    8687  <xsl:variable name="showPage" select="/bedework/urlPrefixes/showPage"/> 
     
    180181                  <xsl:call-template name="tabs"/> 
    181182                  <xsl:call-template name="navigation"/> 
     183                  <xsl:call-template name="utilBar"/> 
    182184                  <xsl:choose> 
    183185                    <xsl:when test="/bedework/page='event'"> 
     
    251253                    <xsl:otherwise> 
    252254                      <!-- otherwise, show the eventsCalendar --> 
    253                       <xsl:call-template name="utilBar"/> 
    254255                      <!-- main eventCalendar content --> 
    255256                      <xsl:choose> 
     
    670671         </td> 
    671672         <td class="rightCell"> 
     673 
     674           <!-- search --> 
     675           <form name="searchForm" method="post" action="{$search}"> 
     676             Search: 
     677             <input type="text" name="query" size="15"> 
     678               <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
     679             </input> 
     680             <input type="submit" name="submit" value="go"/> 
     681           </form> 
    672682 
    673683           <!-- show free / busy --> 
     
    51705180  <!--==== SEARCH RESULT ====--> 
    51715181  <xsl:template name="searchResult"> 
    5172     <h2>Search Result</h2> 
    5173     <p><xsl:value-of select="/bedework/resultSize"/> result<xsl:if test="/bedework/resultSize != 1">s</xsl:if> returned</p> 
     5182    <h2 class="bwStatusConfirmed"> 
     5183      <div id="searchFilter"> 
     5184        Limit search to: 
     5185        <input type="radio" name="searchLimit" value="future"/>today forward 
     5186        <input type="radio" name="searchLimit" value="future"/>past dates 
     5187        <input type="radio" name="searchLimit" value="all" checked="checked"/>all dates 
     5188      </div> 
     5189      Search Result 
     5190    </h2> 
     5191    <table id="searchTable" cellpadding="0" cellspacing="0"> 
     5192      <tr> 
     5193        <th colspan="5"> 
     5194          <xsl:if test="/bedework/searchResults/numPages &gt; 1"> 
     5195            <div id="searchPageForm"> 
     5196              page: 
     5197              <xsl:if test="/bedework/searchResults/curPage != 1"> 
     5198                <xsl:variable name="prevPage" select="/bedework/searchResults/curPage - 1"/> 
     5199                &lt;<a href="{$search-next}&amp;pageNum={$prevPage}">prev</a> 
     5200              </xsl:if> 
     5201              <xsl:text> </xsl:text> 
     5202 
     5203              <xsl:call-template name="searchResultPageNav"/> 
     5204 
     5205              <xsl:text> </xsl:text> 
     5206              <xsl:choose> 
     5207                <xsl:when test="/bedework/searchResults/curPage != /bedework/searchResults/numPages"> 
     5208                  <xsl:variable name="nextPage" select="/bedework/searchResults/curPage + 1"/> 
     5209                  <a href="{$search-next}&amp;pageNum={$nextPage}">next</a>&gt; 
     5210                </xsl:when> 
     5211                <xsl:otherwise> 
     5212                  <span class="hidden">next&gt;</span><!-- occupy the space to keep the navigation from moving around --> 
     5213                </xsl:otherwise> 
     5214              </xsl:choose> 
     5215            </div> 
     5216          </xsl:if> 
     5217          <xsl:value-of select="/bedework/searchResults/resultSize"/> 
     5218          result<xsl:if test="/bedework/searchResults/resultSize != 1">s</xsl:if> returned 
     5219          for <em><xsl:value-of select="/bedework/searchResults/query"/></em> 
     5220        </th> 
     5221      </tr> 
     5222      <xsl:if test="/bedework/searchResults/searchResult"> 
     5223        <tr class="fieldNames"> 
     5224          <td> 
     5225            relevance 
     5226          </td> 
     5227          <td> 
     5228            summary 
     5229          </td> 
     5230          <td> 
     5231            date &amp; time 
     5232          </td> 
     5233          <td> 
     5234            calendar 
     5235          </td> 
     5236          <td> 
     5237            location 
     5238          </td> 
     5239        </tr> 
     5240      </xsl:if> 
     5241      <xsl:for-each select="/bedework/searchResults/searchResult"> 
     5242        <xsl:variable name="subscriptionId" select="event/subscription/id"/> 
     5243        <xsl:variable name="calPath" select="event/calendar/encodedPath"/> 
     5244        <xsl:variable name="guid" select="event/guid"/> 
     5245        <xsl:variable name="recurrenceId" select="event/recurrenceId"/> 
     5246        <tr> 
     5247          <td> 
     5248            <xsl:value-of select="ceiling(number(score)*100)"/>% 
     5249            <img src="{$resourcesRoot}/resources/spacer.gif" height="4" class="searchRelevance"> 
     5250              <xsl:attribute name="width"><xsl:value-of select="ceiling(number(score)*100)"/></xsl:attribute> 
     5251            </img> 
     5252          </td> 
     5253          <td> 
     5254            <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     5255              <xsl:value-of select="event/summary"/> 
     5256            </a> 
     5257          </td> 
     5258          <td> 
     5259            <xsl:value-of select="event/start/longdate"/> 
     5260            <xsl:text> </xsl:text> 
     5261            <xsl:value-of select="event/start/time"/> 
     5262            <xsl:choose> 
     5263              <xsl:when test="event/start/longdate != event/end/longdate"> 
     5264                - <xsl:value-of select="event/start/longdate"/> 
     5265                <xsl:text> </xsl:text> 
     5266                <xsl:value-of select="event/end/time"/> 
     5267              </xsl:when> 
     5268              <xsl:when test="event/start/time != event/end/time"> 
     5269                - <xsl:value-of select="event/end/time"/> 
     5270              </xsl:when> 
     5271            </xsl:choose> 
     5272          </td> 
     5273          <td> 
     5274            <xsl:variable name="calUrl" select="event/calendar/encodedPath"/> 
     5275            <a href="{$setSelection}&amp;calUrl={$calUrl}"> 
     5276              <xsl:value-of select="event/calendar/name"/> 
     5277            </a> 
     5278          </td> 
     5279          <td> 
     5280            <xsl:value-of select="event/location/address"/> 
     5281          </td> 
     5282        </tr> 
     5283      </xsl:for-each> 
     5284    </table> 
     5285  </xsl:template> 
     5286 
     5287  <xsl:template name="searchResultPageNav"> 
     5288    <xsl:param name="page">1</xsl:param> 
     5289    <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/> 
     5290    <xsl:choose> 
     5291      <xsl:when test="$page = $curPage"> 
     5292        <xsl:value-of select="$page"/> 
     5293      </xsl:when> 
     5294      <xsl:otherwise> 
     5295        <a href="{$search-next}&amp;pageNum={$page}"> 
     5296          <xsl:value-of select="$page"/> 
     5297        </a> 
     5298      </xsl:otherwise> 
     5299    </xsl:choose> 
     5300    <xsl:text> </xsl:text> 
     5301    <xsl:if test="$page &lt; /bedework/searchResults/numPages"> 
     5302       <xsl:call-template name="searchResultPageNav"> 
     5303         <xsl:with-param name="page" select="number($page)+1"/> 
     5304      </xsl:call-template> 
     5305    </xsl:if> 
    51745306  </xsl:template> 
    51755307 
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css

    r1059 r1067  
    44   "important" to override more specific selectors in 
    55   the default.css stylesheet. */ 
     6 
     7    /* ********************************************************************** 
     8    Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved. 
     9 
     10    Redistribution and use of this distribution in source and binary forms, 
     11    with or without modification, are permitted provided that: 
     12       The above copyright notice and this permission notice appear in all 
     13        copies and supporting documentation; 
     14 
     15        The name, identifiers, and trademarks of Rensselaer Polytechnic 
     16        Institute are not used in advertising or publicity without the 
     17        express prior written permission of Rensselaer Polytechnic Institute; 
     18 
     19    DISCLAIMER: The software is distributed" AS IS" without any express or 
     20    implied warranty, including but not limited to, any implied warranties 
     21    of merchantability or fitness for a particular purpose or any warrant)' 
     22    of non-infringement of any current or pending patent rights. The authors 
     23    of the software make no representations about the suitability of this 
     24    software for any particular purpose. The entire risk as to the quality 
     25    and performance of the software is with the user. Should the software 
     26    prove defective, the user assumes the cost of all necessary servicing, 
     27    repair or correction. In particular, neither Rensselaer Polytechnic 
     28    Institute, nor the authors of the software are liable for any indirect, 
     29    special, consequential, or incidental damages related to the software, 
     30    to the maximum extent the law permits. */ 
     31 
    632 
    733.bwwhite { 
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml

    r1057 r1067  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<!-- Bedework Calendar subscription colors --> 
     3 
     4  <!-- ********************************************************************** 
     5    Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved. 
     6 
     7    Redistribution and use of this distribution in source and binary forms, 
     8    with or without modification, are permitted provided that: 
     9       The above copyright notice and this permission notice appear in all 
     10        copies and supporting documentation; 
     11 
     12        The name, identifiers, and trademarks of Rensselaer Polytechnic 
     13        Institute are not used in advertising or publicity without the 
     14        express prior written permission of Rensselaer Polytechnic Institute; 
     15 
     16    DISCLAIMER: The software is distributed" AS IS" without any express or 
     17    implied warranty, including but not limited to, any implied warranties 
     18    of merchantability or fitness for a particular purpose or any warrant)' 
     19    of non-infringement of any current or pending patent rights. The authors 
     20    of the software make no representations about the suitability of this 
     21    software for any particular purpose. The entire risk as to the quality 
     22    and performance of the software is with the user. Should the software 
     23    prove defective, the user assumes the cost of all necessary servicing, 
     24    repair or correction. In particular, neither Rensselaer Polytechnic 
     25    Institute, nor the authors of the software are liable for any indirect, 
     26    special, consequential, or incidental damages related to the software, 
     27    to the maximum extent the law permits. --> 
     28 
    329<subscriptionColors> 
    430  <!-- light pastels -->