Add back in more difficult changes left out of previous merge from 1.5.x branch

git-svn-id: http://scm.dspace.org/svn/repo/trunk@2918 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-jspui/dspace-jspui-webapp/src/main/webapp/layout/location-bar.jsp

@@ -67,6 +67,12 @@
         String s = (String) parentTitles.get(i);
         String u = (String) parentLinks.get(i);
 
+        // New line for each breadcrumb (no <br> needed for first)
+        if (i > 0)
+        {
+%><br/><%
+        }
+
         if (u.equals(""))
         {
 %>
@@ -76,7 +82,7 @@
         else
         {
 %>
-<a href="<%= u %>"><%= s %></a>&nbsp;&gt;
+<a href="<%= request.getContextPath() %><%= u %>"><%= s %></a>&nbsp;&gt;
 <%
         }
 }

dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/complete.jsp

@@ -47,12 +47,12 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"
     prefix="fmt" %>
 
-<%@ page import="org.dspace.app.util.SubmissionInfo" %>
+<%@ page import="org.dspace.core.Context" %>
 <%@ page import="org.dspace.app.webui.servlet.SubmissionController" %>
 <%@ page import="org.dspace.app.webui.util.UIUtil" %>
-<%@ page import="org.dspace.content.Collection" %>
+<%@ page import="org.dspace.app.util.SubmissionInfo" %>
-<%@ page import="org.dspace.core.ConfigurationManager"%>
+<%@ page import="org.dspace.content.InProgressSubmission" %>
-<%@ page import="org.dspace.core.Context" %>
+<%@ page import="org.dspace.content.Collection"%>
 
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 
@@ -84,9 +84,9 @@
     or if for some reason there is a problem with your submission. You can also
     check on the status of your submission by going to the My DSpace page.</p> --%>
 	<p><fmt:message key="jsp.submit.complete.info"/></p> 
-    <p><a href="<%= ConfigurationManager.getProperty("dspace.url") %>/mydspace"><fmt:message key="jsp.submit.complete.link"/></a></p>
+    <p><a href="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.submit.complete.link"/></a></p>
      
-    <p><a href="<%= ConfigurationManager.getProperty("dspace.url") %>/community-list"><fmt:message key="jsp.community-list.title"/></a></p>
+    <p><a href="<%= request.getContextPath() %>/community-list"><fmt:message key="jsp.community-list.title"/></a></p>
      
     <form action="<%= request.getContextPath() %>/submit" method="POST" onkeydown="return disableEnterKey(event);">
         <input type="hidden" name="collection" value="<%= collection.getID() %>">

dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/edit-metadata.jsp

@@ -348,7 +348,23 @@
       int fieldCount = defaults.length + fieldCountIncr;
       StringBuffer sb = new StringBuffer();
       org.dspace.content.DCSeriesNumber sn;
+      StringBuffer headers = new StringBuffer();
 
+      //Width hints used here to affect whole table 
+      headers.append("<tr><td width=\"40%\">&nbsp;</td>")
+          .append("<td class=\"submitFormDateLabel\" width=\"5%\">")
+//          .append("Series Name</td>")
+			 .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.seriesname"))
+          .append("</td>")
+          .append("<td class=\"submitFormDateLabel\" width=\"5%\">")
+//          .append("Report or Paper No.</td>")
+			 .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.paperno"))
+          .append("</td>")
+          .append("<td width=\"40%\">&nbsp;</td>")
+          .append("</tr>");
+      out.write(headers.toString());
+      
+      
       if (fieldCount == 0)
          fieldCount = 1;
 

dspace-jspui/dspace-jspui-webapp/src/main/webapp/tools/edit-collection.jsp

@@ -235,6 +235,7 @@
                     <input type="submit" name="submit_submitters_create" value="<fmt:message key="jsp.tools.edit-collection.form.button.create"/>" />
 <%  } else { %>
                     <input type="submit" name="submit_submitters_edit" value="<fmt:message key="jsp.tools.edit-collection.form.button.edit"/>" />
+                    <input type="submit" name="submit_submitters_delete" value="<fmt:message key="jsp.tools.edit-collection.form.button.delete"/>" />
 <%  } %>                    
                 </td>
             </tr>   
@@ -276,6 +277,7 @@
                     <input type="submit" name="submit_admins_create" value="<fmt:message key="jsp.tools.edit-collection.form.button.create"/>" />
 <%  } else { %>
                     <input type="submit" name="submit_admins_edit" value="<fmt:message key="jsp.tools.edit-collection.form.button.edit"/>" />
+                    <input type="submit" name="submit_admins_delete" value="<fmt:message key="jsp.tools.edit-collection.form.button.delete"/>" />
 <%  } %>                    
                 </td>
             </tr>