Changeset 1064

Show
Ignore:
Timestamp:
11/01/06 13:54:54
Author:
johnsa
Message:

search page navigation in place for public client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1061 r1064  
    8383  <xsl:variable name="addEventRef" select="/bedework/urlPrefixes/addEventRef"/> 
    8484  <xsl:variable name="export" select="/bedework/urlPrefixes/export/a/@href"/> 
    85   <xsl:variable name="search" select="/bedework/urlPrefixes/search"/> 
     85  <xsl:variable name="search" select="/bedework/urlPrefixes/search/search"/> 
     86  <xsl:variable name="search-next" select="/bedework/urlPrefixes/search/next"/> 
    8687  <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mailEvent"/> 
    8788  <xsl:variable name="showPage" select="/bedework/urlPrefixes/showPage"/> 
    …… 
    11541155          <div id="searchPageForm"> 
    11551156            page: 
    1156             <xsl:if test="/bedework/searhResults/curPage != 1">previous</xsl:if> 
     1157            <xsl:choose> 
     1158              <xsl:when test="/bedework/searchResults/curPage != 1"> 
     1159                <xsl:variable name="prevPage" select="/bedework/searchResults/curPage - 1"/> 
     1160                <a href="{$search-next}&amp;pageNum={$prevPage}">&lt;prev</a> 
     1161              </xsl:when> 
     1162              <xsl:otherwise> 
     1163                &lt;prev 
     1164              </xsl:otherwise> 
     1165            </xsl:choose> 
     1166            <xsl:text> </xsl:text> 
     1167 
    11571168            <xsl:call-template name="searchResultPageNav"/> 
    1158             <xsl:if test="/bedework/searhResults/curPage != /bedework/searhResults/numPages">next</xsl:if> 
     1169 
     1170            <xsl:text> </xsl:text> 
     1171            <xsl:choose> 
     1172              <xsl:when test="/bedework/searchResults/curPage != /bedework/searchResults/numPages"> 
     1173                <xsl:variable name="nextPage" select="/bedework/searchResults/curPage + 1"/> 
     1174                <a href="{$search-next}&amp;pageNum={$nextPage}">next&gt;</a> 
     1175              </xsl:when> 
     1176              <xsl:otherwise> 
     1177                next&gt; 
     1178              </xsl:otherwise> 
     1179            </xsl:choose> 
    11591180          </div> 
    11601181          <xsl:value-of select="/bedework/searchResults/resultSize"/> 
    …… 
    12301251  <xsl:template name="searchResultPageNav"> 
    12311252    <xsl:param name="page">1</xsl:param> 
     1253    <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/> 
    12321254    <xsl:choose> 
    1233       <xsl:when test="$page = /bedework/searchResults/curPage"> 
     1255      <xsl:when test="$page = $curPage"> 
    12341256        <xsl:value-of select="$page"/> 
    12351257      </xsl:when> 
    12361258      <xsl:otherwise> 
    1237         <a href="{$search}&amp;pageNum={$page}"> 
     1259        <a href="{$search-next}&amp;pageNum={$page}"> 
    12381260          <xsl:value-of select="$page"/> 
    12391261        </a> 
    …… 
    12411263    </xsl:choose> 
    12421264    <xsl:text> </xsl:text> 
    1243     <!--<xsl:if test="$curPage != /bedework/searchResults/numPages"> 
    1244       <xsl:call-template name="searchResultPageNav"> 
    1245         <xsl:with-param name="page" select="number($curPage)+1"/> 
     1265    <xsl:if test="$page &lt; /bedework/searchResults/numPages"> 
     1266      <xsl:call-template name="searchResultPageNav"> 
     1267        <xsl:with-param name="page" select="number($page)+1"/> 
    12461268      </xsl:call-template> 
    1247     </xsl:if>--> 
     1269    </xsl:if> 
    12481270  </xsl:template> 
    12491271