Changeset 1069

Show
Ignore:
Timestamp:
11/06/06 17:09:41
Author:
johnsa
Message:

provide proper limits on search result page navigation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r1068 r1069  
    11541154        <th colspan="5"> 
    11551155          <xsl:if test="/bedework/searchResults/numPages &gt; 1"> 
     1156            <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/> 
    11561157            <div id="searchPageForm"> 
    11571158              page: 
    11581159              <xsl:if test="/bedework/searchResults/curPage != 1"> 
    1159                 <xsl:variable name="prevPage" select="/bedework/searchResults/curPage - 1"/> 
     1160                <xsl:variable name="prevPage" select="number($curPage) - 1"/> 
    11601161                &lt;<a href="{$search-next}&amp;pageNum={$prevPage}">prev</a> 
    11611162              </xsl:if> 
    11621163              <xsl:text> </xsl:text> 
    11631164 
    1164               <xsl:call-template name="searchResultPageNav"/> 
     1165              <xsl:call-template name="searchResultPageNav"> 
     1166                <xsl:with-param name="page"> 
     1167                  <xsl:choose> 
     1168                    <xsl:when test="number($curPage) - 10 &lt; 1">1</xsl:when> 
     1169                    <xsl:otherwise><xsl:value-of select="number($curPage) - 6"/></xsl:otherwise> 
     1170                  </xsl:choose> 
     1171                </xsl:with-param> 
     1172              </xsl:call-template> 
    11651173 
    11661174              <xsl:text> </xsl:text> 
    11671175              <xsl:choose> 
    1168                 <xsl:when test="/bedework/searchResults/curPage != /bedework/searchResults/numPages"> 
    1169                   <xsl:variable name="nextPage" select="/bedework/searchResults/curPage + 1"/> 
     1176                <xsl:when test="$curPage != /bedework/searchResults/numPages"> 
     1177                  <xsl:variable name="nextPage" select="number($curPage) + 1"/> 
    11701178                  <a href="{$search-next}&amp;pageNum={$nextPage}">next</a>&gt; 
    11711179                </xsl:when> 
     
    12491257    <xsl:param name="page">1</xsl:param> 
    12501258    <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/> 
     1259    <xsl:variable name="numPages" select="/bedework/searchResults/numPages"/> 
     1260    <xsl:variable name="endPage"> 
     1261      <xsl:choose> 
     1262        <xsl:when test="number($curPage) + 6 &gt; number($numPages)"><xsl:value-of select="$numPages"/></xsl:when> 
     1263        <xsl:otherwise><xsl:value-of select="number($curPage) + 6"/></xsl:otherwise> 
     1264      </xsl:choose> 
     1265    </xsl:variable> 
    12511266    <xsl:choose> 
    12521267      <xsl:when test="$page = $curPage"> 
     
    12601275    </xsl:choose> 
    12611276    <xsl:text> </xsl:text> 
    1262     <xsl:if test="$page &lt; /bedework/searchResults/numPages"> 
     1277    <xsl:if test="$page &lt; $endPage"> 
    12631278       <xsl:call-template name="searchResultPageNav"> 
    12641279         <xsl:with-param name="page" select="number($page)+1"/> 
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1068 r1069  
    51935193        <th colspan="5"> 
    51945194          <xsl:if test="/bedework/searchResults/numPages &gt; 1"> 
     5195            <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/> 
    51955196            <div id="searchPageForm"> 
    51965197              page: 
    51975198              <xsl:if test="/bedework/searchResults/curPage != 1"> 
    5198                 <xsl:variable name="prevPage" select="/bedework/searchResults/curPage - 1"/> 
     5199                <xsl:variable name="prevPage" select="number($curPage) - 1"/> 
    51995200                &lt;<a href="{$search-next}&amp;pageNum={$prevPage}">prev</a> 
    52005201              </xsl:if> 
    52015202              <xsl:text> </xsl:text> 
    52025203 
    5203               <xsl:call-template name="searchResultPageNav"/> 
     5204              <xsl:call-template name="searchResultPageNav"> 
     5205                <xsl:with-param name="page"> 
     5206                  <xsl:choose> 
     5207                    <xsl:when test="number($curPage) - 6 &lt; 1">1</xsl:when> 
     5208                    <xsl:otherwise><xsl:value-of select="number($curPage) - 6"/></xsl:otherwise> 
     5209                  </xsl:choose> 
     5210                </xsl:with-param> 
     5211              </xsl:call-template> 
    52045212 
    52055213              <xsl:text> </xsl:text> 
    52065214              <xsl:choose> 
    5207                 <xsl:when test="/bedework/searchResults/curPage != /bedework/searchResults/numPages"> 
    5208                   <xsl:variable name="nextPage" select="/bedework/searchResults/curPage + 1"/> 
     5215                <xsl:when test="$curPage != /bedework/searchResults/numPages"> 
     5216                  <xsl:variable name="nextPage" select="number($curPage) + 1"/> 
    52095217                  <a href="{$search-next}&amp;pageNum={$nextPage}">next</a>&gt; 
    52105218                </xsl:when> 
     
    52885296    <xsl:param name="page">1</xsl:param> 
    52895297    <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/> 
     5298    <xsl:variable name="numPages" select="/bedework/searchResults/numPages"/> 
     5299    <xsl:variable name="endPage"> 
     5300      <xsl:choose> 
     5301        <xsl:when test="number($curPage) + 6 &gt; number($numPages)"><xsl:value-of select="$numPages"/></xsl:when> 
     5302        <xsl:otherwise><xsl:value-of select="number($curPage) + 6"/></xsl:otherwise> 
     5303      </xsl:choose> 
     5304    </xsl:variable> 
    52905305    <xsl:choose> 
    52915306      <xsl:when test="$page = $curPage"> 
     
    52995314    </xsl:choose> 
    53005315    <xsl:text> </xsl:text> 
    5301     <xsl:if test="$page &lt; /bedework/searchResults/numPages"> 
     5316    <xsl:if test="$page &lt; $endPage"> 
    53025317       <xsl:call-template name="searchResultPageNav"> 
    53035318         <xsl:with-param name="page" select="number($page)+1"/>