diff --git a/dspace-api/src/main/resources/Messages.properties b/dspace-api/src/main/resources/Messages.properties index ce0a61fa24..5b8289f1f6 100644 --- a/dspace-api/src/main/resources/Messages.properties +++ b/dspace-api/src/main/resources/Messages.properties @@ -1663,3 +1663,8 @@ org.dspace.app.webui.jsptag.policies-list.label_action = Action org.dspace.app.webui.jsptag.policies-list.label_group = Group org.dspace.app.webui.jsptag.policies-list.label_sdate = Start Date org.dspace.app.webui.jsptag.policies-list.label_edate = End Date + +jsp.layout.navbar-admin.accesscontrol = Access Control +jsp.layout.navbar-admin.contents = Content +jsp.layout.navbar-admin.items = Items +jsp.layout.navbar-admin.settings = General Settings \ No newline at end of file diff --git a/dspace-jspui/src/main/webapp/dspace-admin/supervise-main.jsp b/dspace-jspui/src/main/webapp/dspace-admin/supervise-main.jsp index 88852e01bd..3e806d62aa 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/supervise-main.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/supervise-main.jsp @@ -17,13 +17,18 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - + + -

+

+"> +

@@ -32,11 +37,11 @@
<%-- form to navigate to any of the three options available --%>
- "/> + "/>

- "/> + "/>

- "/> + "/>
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/workflow-list.jsp b/dspace-jspui/src/main/webapp/dspace-admin/workflow-list.jsp index e0663644dc..7f096597ee 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/workflow-list.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/workflow-list.jsp @@ -37,25 +37,17 @@ (WorkflowItem[]) request.getAttribute("workflows"); %> - - - - <%-- - - -

Currently Active Workflows

--%> -

-
- "> -
+

">

- +
@@ -82,7 +74,7 @@ diff --git a/dspace-jspui/src/main/webapp/layout/bootstrap/navbar-admin.jsp b/dspace-jspui/src/main/webapp/layout/bootstrap/navbar-admin.jsp index f2162a6c30..cf0657e8e8 100644 --- a/dspace-jspui/src/main/webapp/layout/bootstrap/navbar-admin.jsp +++ b/dspace-jspui/src/main/webapp/layout/bootstrap/navbar-admin.jsp @@ -21,12 +21,16 @@ <%@ page import="org.dspace.browse.BrowseInfo" %> <%@ page import="org.dspace.sort.SortOption" %> <%@ page import="org.dspace.app.webui.util.UIUtil" %> - +<%@ page import="org.dspace.eperson.EPerson" %> +<%@page import="org.apache.commons.lang.StringUtils"%> <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <% + // Is anyone logged in? + EPerson user = (EPerson) request.getAttribute("dspace.current.user"); + // Get the current page, minus query string String currentPage = UIUtil.getOriginalURL(request); int c = currentPage.indexOf( '?' ); @@ -34,173 +38,81 @@ { currentPage = currentPage.substring(0, c); } -%> - -<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> -
ID
- " /> + " />
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + // E-mail may have to be truncated + String navbarEmail = null; + + if (user != null) + { + navbarEmail = user.getEmail(); + } -<% - // get the browse indices - BrowseInfo binfo = (BrowseInfo) request.getAttribute("browse.info"); %> - - - - - - - - - - - - + + - - - -
 
 
+ + <%= StringUtils.abbreviate(navbarEmail, 20) %> + + + + + +
+ diff --git a/dspace-jspui/src/main/webapp/tools/get-item-id.jsp b/dspace-jspui/src/main/webapp/tools/get-item-id.jsp index 42cf9c8329..abc7f2aa60 100644 --- a/dspace-jspui/src/main/webapp/tools/get-item-id.jsp +++ b/dspace-jspui/src/main/webapp/tools/get-item-id.jsp @@ -26,14 +26,16 @@ <%@ page import="org.dspace.core.ConfigurationManager" %> - <%--

Edit or Delete Item

--%> -

+

+ "> +

<% if (request.getAttribute("invalid.id") != null) { %> @@ -48,31 +50,20 @@ <%--

Enter the Handle or internal item ID of the item you want to edit or delete. More help...

--%> -
">
+
-
- - - <%-- --%> - - - - - - <%-- --%> - - - -
Handle: - /" size="12"/> - <%-- --%> - " /> -
Internal ID: - - <%-- --%> - " /> -
-
+
+ + /" size="12"/> + <%-- --%> + " /> +
+
+ + + <%-- --%> + " /> +