Scarab commit: svn commit: r11047 - trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm

Author: dabbous
Date: 2011-11-15 11:48:14-0800
New Revision: 11047

Modified:
   trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm

Log:
when only one issue is returned from a search, the navigation line contained '1 of 1'. I removed this superflous display

Modified: trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&pathrev=11047&r1=11046&r2=11047
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	2011-11-15 11:48:14-0800
@@ -623,7 +623,7 @@
   #set ($prevLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.PrevPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPage($scarabR.getCurrentTemplate()))
   <a href="$prevLink">$l10n.PaginatePrevious</a> |
  #end
- $pageNum of $scarabR.NbrPages
+ $pageNum l10n.Of $scarabR.NbrPages
  #if ($scarabR.NextPage != 0)
   #set ($nextLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.NextPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPage($scarabR.getCurrentTemplate()))
   | <a href="$nextLink">$l10n.PaginateNext</a>
@@ -641,7 +641,7 @@
   #set ($prevLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.PrevPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPathInfo("searchType", "$searchType").setPage($scarabR.getCurrentTemplate()))
   <a href="$prevLink" title="$l10n.PaginatePrevious" class="previous_element" ></a> |
  #end
- $pageNum of $scarabR.NbrPages
+ $pageNum $l10n.Of $scarabR.NbrPages
  #if ($scarabR.NextPage != 0)
   #set ($nextLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.NextPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPathInfo("searchType", "$searchType").setPage($scarabR.getCurrentTemplate()))
   | <a href="$nextLink" title="$l10n.PaginateNext" class="next_element"></a>
@@ -659,7 +659,7 @@
   #set ($prevLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.PrevPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPathInfo("searchType", "$searchType").setPathInfo("view","$view").setPage($scarabR.getCurrentTemplate()))
   <a href="$prevLink">$l10n.PaginatePrevious</a> |
  #end
- $pageNum of $scarabR.NbrPages
+ $pageNum $l10n.Of $scarabR.NbrPages
  #if ($scarabR.NextPage != 0)
   #set ($nextLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.NextPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPathInfo("searchType", "$searchType").setPathInfo("view","$view").setPage($scarabR.getCurrentTemplate()))
   | <a href="$nextLink">$l10n.PaginateNext</a>
@@ -680,7 +680,7 @@
  #end
   <a href="$prevLink">$l10n.PaginatePrevious</a> |
  #end
- $pageNum of $scarabR.NbrPages
+ $pageNum $l10n.Of $scarabR.NbrPages
  #if ($scarabR.NextPage != 0)
   #set ($nextLink = $link.setPathInfo("resultsperpage", "$resultsPerPage.toString()").addPathInfo("pageNum", "$scarabR.NextPage").addPathInfo("sortColumn", "$sortColumn").addPathInfo("sortPolarity", "$sortPolarity").setPage($scarabR.getCurrentTemplate()).addPathInfo("searchString", $searchString).addPathInfo("searchField", $searchField).addPathInfo($scarabG.Constant.CANCEL_TEMPLATE, $cancelTemplate))
  
@@ -707,7 +707,9 @@
    #set ($prevLink = $link.setPathInfo("id", "$prevIssue").setPage($scarabR.getCurrentTemplate()).addPathInfo("posInList", $scarabR.PrevIssuePosInList))
    <a href="$prevLink">$l10n.PaginatePrevious</a> |
   #end
-  $scarabR.IssuePosInList of $scarabR.CurrentSearchResultsSize
+  #if ($scarabR.CurrentSearchResultsSize > 1)
+    $scarabR.IssuePosInList $l10n.Of $scarabR.CurrentSearchResultsSize
+  #end
   #set ($nextIssue=$scarabR.NextIssue)
   #if ($nextIssue)
    #set ($nextLink = $link.setPathInfo("id", "$nextIssue").setPage($scarabR.getCurrentTemplate()).addPathInfo("posInList", $scarabR.NextIssuePosInList))

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2878355