[Strandmapservic-developers] nsdl-client-project/web/AAAS-Collection NSDLbenchmarksContent.jsp, 1.7, 1.8

[S C. <sl...@us...>]

Update of /cvsroot/strandmapservic/nsdl-client-project/web/AAAS-Collection
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16454/web/AAAS-Collection

Modified Files:
	NSDLbenchmarksContent.jsp 
Log Message:
When accessing from NSDL search, parent map id is not available and shouldn't be included in the related benchmarks url.

Index: NSDLbenchmarksContent.jsp
===================================================================
RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/AAAS-Collection/NSDLbenchmarksContent.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NSDLbenchmarksContent.jsp	19 Oct 2007 22:27:38 -0000	1.7
--- NSDLbenchmarksContent.jsp	18 Mar 2008 19:54:22 -0000	1.8
***************
*** 344,353 ****
                <label>
                <br>
!      <!--      <input name="benchmarkMap" type="image" id="benchmarkMap" src="images/mapButton2.png" alt="Show map of benchmarks" />  -->
! 	 <!--   <a href="http://preview.dlese.org/jsp/cms/populatemaps?mapid=<c:out value="${mapid}" />" target=_blank onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('mapButton2','','images/mapButton2_f2.jpg',1);"><img name="mapButton2" src="images/mapButton2.jpg" width="63" height="52" border="0" id="mapButton2" alt="" /></a>  --> 
!          
! 			<a href="/?id=${mapId}&bm=${bm}" target="_blank" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('mapButton2','','images/mapButton2_f2.jpg',1);"><img name="mapButton2" src="images/mapButton2.jpg" width="63" height="52" border="0" id="mapButton2" alt="" /></a> 
!           
!               </label>
              </form>
            <p align="left">View a map of how this benchmark relates to other benchmarks.</p>        
--- 344,356 ----
                <label>
                <br>
!    			<c:choose>
! 	  		<c:when test="${not empty mapId}">
! 	  			<a href="/?parentmap=${mapId}&id=${bm}" target="_blank" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('mapButton2','','images/mapButton2_f2.jpg',1);"><img name="mapButton2" src="images/mapButton2.jpg" width="63" height="52" border="0" id="mapButton2" alt="" /></a> 
!           	</c:when>
!           	<c:otherwise>
! 	  			<a href="/?id=${bm}" target="_blank" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('mapButton2','','images/mapButton2_f2.jpg',1);"><img name="mapButton2" src="images/mapButton2.jpg" width="63" height="52" border="0" id="mapButton2" alt="" /></a> 
!             </c:otherwise>
! 	  		</c:choose>
! 	 	 </label>
              </form>
            <p align="left">View a map of how this benchmark relates to other benchmarks.</p>