svn commit: [jahia] r14937 - /trunk/core/src/webapp/jsp/jahia/engines/navigation.jsp

[xlawrence]

Author: xlawrence
Date: Fri Aug 18 16:04:07 2006
New Revision: 14937

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14937&repname=jahia
Log:
don't display the navigation toolbar, if we don't have a properly set Container 
in the HashMap. In others words, it will only display the toolbar if we are 
using addcontainer or updateContainer

Modified:
    trunk/core/src/webapp/jsp/jahia/engines/navigation.jsp

Modified: trunk/core/src/webapp/jsp/jahia/engines/navigation.jsp
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/webapp/jsp/jahia/engines/navigation.jsp&rev=14937&repname=jahia
==============================================================================
--- trunk/core/src/webapp/jsp/jahia/engines/navigation.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/navigation.jsp Fri Aug 18 16:04:07 
2006
@@ -53,6 +53,7 @@
     final HashMap engineMap = (HashMap) 
request.getAttribute("org.jahia.engines.EngineHashMap");
     final JahiaData jData = (JahiaData) 
request.getAttribute("org.jahia.data.JahiaData");
     final JahiaContainer theEditedContainer = (JahiaContainer) 
engineMap.get("theContainer");
+    if (theEditedContainer != null) {
     final int listID = theEditedContainer.getListID();
     Vector ctnIds = (Vector) 
session.getAttribute("getSorteredAndFilteredCtnIds" + listID);
     if (ctnIds == null) {
@@ -230,11 +231,13 @@
 <% } %>
 <tr>
     <% if (isAddContainer) { %>
-    <td>&nbsp;</td><td>&nbsp;</td><td colspan="3"><%=ctnIds.size() + 1%> / 
<%=ctnIds.size() + 1%></td>
+    <td>&nbsp;</td><td>&nbsp;</td><td colspan="3"><input style="width:40px;" 
type="text" name="goToId" value="<%=ctnIds.size() + 1%>"/> /
+    <%=ctnIds.size() + 1%></td>
     <% } else { %>
-    <td>&nbsp;</td><td>&nbsp;</td><td colspan="3"><%=getCtnIndex(ctnIds, 
theEditedContainer.getID())%>
-    / <%=ctnIds.size()%></td>
+    <td>&nbsp;</td><td>&nbsp;</td><td colspan="3"><input style="width:40px;" 
type="text" name="goToId" value="<%=getCtnIndex(ctnIds, 
theEditedContainer.getID())%>"/> /
+    <%=ctnIds.size()%></td>
     <% } %>
 </tr>
 </table>
 </div>
+<% } %>