[Hyperic-hq-discuss] hq r12342 - in trunk/web: portal resource/common

[<cl...@hy...>]

Author: clee
Date: 2009-01-23 17:33:40 -0800 (Fri, 23 Jan 2009)
New Revision: 12342
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=12342

Modified:
   trunk/web/portal/AttachTabBody.jsp
   trunk/web/resource/common/ControlTab.jsp
Log:
[HHQ-2706] Always include the target div for the Views buttons


Modified: trunk/web/portal/AttachTabBody.jsp
===================================================================
--- trunk/web/portal/AttachTabBody.jsp	2009-01-24 01:13:55 UTC (rev 12341)
+++ trunk/web/portal/AttachTabBody.jsp	2009-01-24 01:33:40 UTC (rev 12342)
@@ -12,10 +12,10 @@
 <c:forEach var="attachment" items="${resourceViewTabAttachments}">
     <c:choose>
     <c:when test="${param.id eq attachment.attachment.id}">
-    <div style="padding:1px;border:1px solid rgb(255, 114, 20);margin-right:2px;width: 100px; float: left;text-align: center;"><a href="<html:rewrite page="/TabBodyAttach.do?id=${attachment.attachment.id}&mode=${param.mode}&eid=${param.eid}"/>"><c:out value="${attachment.HTML}"/></a></div>
+    <div style="padding:1px;border:1px solid rgb(255, 114, 20);margin:2px;width: 100px; float: left;text-align: center;"><a href="<html:rewrite page="/TabBodyAttach.do?id=${attachment.attachment.id}&mode=${param.mode}&eid=${param.eid}"/>"><c:out value="${attachment.HTML}"/></a></div>
     </c:when>
     <c:otherwise>
-    <div style="padding:1px;border:1px solid gray;margin-right:2px;width: 100px; float: left;text-align: center;"><a href="<html:rewrite page="/TabBodyAttach.do?id=${attachment.attachment.id}&mode=${param.mode}&eid=${param.eid}"/>"><c:out value="${attachment.HTML}"/></a></div>
+    <div style="padding:1px;border:1px solid gray;margin:2px;width: 100px; float: left;text-align: center;"><a href="<html:rewrite page="/TabBodyAttach.do?id=${attachment.attachment.id}&mode=${param.mode}&eid=${param.eid}"/>"><c:out value="${attachment.HTML}"/></a></div>
     </c:otherwise>
     </c:choose>
 </c:forEach>

Modified: trunk/web/resource/common/ControlTab.jsp
===================================================================
--- trunk/web/resource/common/ControlTab.jsp	2009-01-24 01:13:55 UTC (rev 12341)
+++ trunk/web/resource/common/ControlTab.jsp	2009-01-24 01:33:40 UTC (rev 12342)
@@ -89,8 +89,9 @@
   </c:forEach>
    <td width="100%" class="TabCell"><html:img page="/images/spacer.gif" width="1" height="1" alt="" border="0"/></td>
   </tr>
-  <c:if test="${subTabList != null}">
   <tr> 
+  <c:choose>
+  <c:when test="${subTabList != null}">
    <td colspan="7">
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
      <tr>
@@ -139,7 +140,11 @@
      </tr>
     </table>
    </td>
+  </c:when>
+  <c:otherwise>
+       <td colspan="7" class="SubTabCell" id="SubTabTarget" style="border-left: 1px solid gray; padding-left: 5px;"><html:img page="/images/spacer.gif" width="1" height="1" alt="" border="0"/></td>
+  </c:otherwise>
+  </c:choose>
   </tr>
-  </c:if>
  </table>