diff --git a/dspace-api/src/main/resources/Messages.properties b/dspace-api/src/main/resources/Messages.properties index 5b8289f1f6..e8da057ad1 100644 --- a/dspace-api/src/main/resources/Messages.properties +++ b/dspace-api/src/main/resources/Messages.properties @@ -327,7 +327,7 @@ jsp.dspace-admin.metadataimport.reinstated = Item Reinstate jsp.dspace-admin.metadataimport.toomany = There are too many changes. Please import fewer changes, adjust the limit, or perform the input directly on the server. jsp.dspace-admin.metadataimport.finished = {0} changes completed successfully. jsp.dspace-admin.index.heading = Administration Tools -jsp.dspace-admin.index.text = Please select an operation from the navigation bar on the left. +jsp.dspace-admin.index.text = Please select an operation from the main menu. jsp.dspace-admin.item-select.enter = Enter the Handle or internal item ID of the item you wish to select. jsp.dspace-admin.item-select.find = Find jsp.dspace-admin.item-select.handle = Handle: diff --git a/dspace-jspui/src/main/webapp/dspace-admin/curate-collection.jsp b/dspace-jspui/src/main/webapp/dspace-admin/curate-collection.jsp index d9ac3f1895..280c831d35 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/curate-collection.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/curate-collection.jsp @@ -42,7 +42,7 @@ String taskOptions = (String)request.getAttribute("curate_task_options"); %> - - + <% if (groupOptions != null && !"".equals(groupOptions)) { %> - - - - + <% } %> - - - - - - - - - - -
- : - - <%= groupOptions %> -
- : - - <%= taskOptions %> -
- - " /> - " /> + +
+ + " /> + " /> +
-
+
- " /> + " />
-
- +
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/curate-community.jsp b/dspace-jspui/src/main/webapp/dspace-admin/curate-community.jsp index 123021ac2c..82a48ed100 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/curate-community.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/curate-community.jsp @@ -41,7 +41,7 @@ String taskOptions = (String)request.getAttribute("curate_task_options"); %> - - - <% if (groupOptions != null && !"".equals(groupOptions)) { %> - - - - + <% } %> - - - - - - - - - - -
- : - - <%= groupOptions %> -
- : - - <%= taskOptions %> -
+ + +
- " /> - " /> - -
+ " /> + " /> + + +
- " /> + " />
-
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/curate-item.jsp b/dspace-jspui/src/main/webapp/dspace-admin/curate-item.jsp index 4f86d589de..e4f0216293 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/curate-item.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/curate-item.jsp @@ -50,7 +50,7 @@ String taskOptions = (String)request.getAttribute("curate_task_options"); %> - - - + <% if (groupOptions != null && !"".equals(groupOptions)) { %> - - - - -

+ + <% } %> - - - - - - - - - - -
- : - - <%= groupOptions %> -
- : - - <%= taskOptions %> -
+ + +
- " /> - " /> - -
-
- - " /> -
-
- + " /> + " /> + + + +
+
+ + "/> +
+
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/curate-main.jsp b/dspace-jspui/src/main/webapp/dspace-admin/curate-main.jsp index d1f1fb028a..6d9cb06a09 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/curate-main.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/curate-main.jsp @@ -42,7 +42,9 @@ String taskOptions = (String)request.getAttribute("curate_task_options"); %> - - - - - - - - - - +
+ + + +
+ + + <% if (groupOptions != null && !"".equals(groupOptions)) { %> - - - - + <% } %> - - - - - - - -
- :
-
- -
- -
- : - - <%= groupOptions %> -
- : - - <%= taskOptions %> -
- - " /> - " /> - " /> -
- + + +
+ + " /> + " /> + " /> +
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/index.jsp b/dspace-jspui/src/main/webapp/dspace-admin/index.jsp index c6350927d0..f53a794abb 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/index.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/index.jsp @@ -41,12 +41,12 @@ { context = UIUtil.obtainContext(request); %> - + <%--

Administration Tools

--%>

- <%--

Please select an operation from the navigation bar on the left.

--%> + <%--

Please select an operation from the main menu bar.

--%>

<% diff --git a/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp b/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp index 5c76409ce5..6ed3410357 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp @@ -37,7 +37,8 @@ request.setAttribute("LanguageSwitch", "hide"); %> - -

- -
- <% DCValue[] titleArray = wsItem.getItem().getDC("title", null, Item.ANY); // String title = (titleArray.length > 0 ? titleArray[0].value : "Untitled"); EPerson submitter = wsItem.getItem().getSubmitter(); %> - -: -
+
+ + <% if (titleArray.length > 0) { @@ -73,24 +70,32 @@ <% } %> -

-: -
+
+
+ +
+ + <%= group.getName() %> -

+
+
- +
+ +
<%-- form to request removal of supervisory linking --%>
- "/> - "/> + "/> + "/>
+ diff --git a/dspace-jspui/src/main/webapp/dspace-admin/supervise-duplicate.jsp b/dspace-jspui/src/main/webapp/dspace-admin/supervise-duplicate.jsp index da18b52b35..df9c603ac8 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/supervise-duplicate.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/supervise-duplicate.jsp @@ -20,7 +20,9 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> - <%@ page import="org.dspace.eperson.Supervisor" %> <%@ page import="org.dspace.core.Utils" %> +<%@page import="javax.servlet.jsp.jstl.fmt.LocaleSupport"%> <% // get objects from request @@ -37,24 +38,26 @@ request.setAttribute("LanguageSwitch", "hide"); %> - -

+

+"> +

- +
<%-- Select the group to supervise --%> -
- - + <%-- Select the defaul policy type --%> - - - - + <%-- Select the workspace item to be supervised --%> - - - - -
- - <% for (int i = 0; i < groups.length; i++) { @@ -64,30 +67,24 @@ } %> -

-
- - -

-
-

+
- +
@@ -141,16 +138,10 @@ %>
-

-
- "/> - "/> -
+ + "/> + "/> +
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/supervise-list.jsp b/dspace-jspui/src/main/webapp/dspace-admin/supervise-list.jsp index bac956bbcb..a4e6ae3c2e 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/supervise-list.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/supervise-list.jsp @@ -20,6 +20,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@page import="javax.servlet.jsp.jstl.fmt.LocaleSupport"%> <%@ page import="org.dspace.content.DCValue" %> <%@ page import="org.dspace.content.Item" %> <%@ page import="org.dspace.content.SupervisedItem" %> @@ -33,26 +34,29 @@ request.setAttribute("LanguageSwitch", "hide"); %> - -

+

+"> +

-

<%-- form to navigate to the "add supervisory settings" page --%>
- "/> - "/> + "/> + "/>
- +
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/workflow-abort-confirm.jsp b/dspace-jspui/src/main/webapp/dspace-admin/workflow-abort-confirm.jsp index 3afe42e8fb..80ae8e0b22 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/workflow-abort-confirm.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/workflow-abort-confirm.jsp @@ -30,7 +30,8 @@ request.setAttribute("LanguageSwitch", "hide"); %> - <%--

Are you sure you want to abort this workflow? It will return to the user's personal workspace

--%>

-
    +
    <%--
  • Collection: <%= workflow.getCollection().getMetadata("name") %>
  • --%> -
  • + <%= workflow.getCollection().getMetadata("name") %> -
  • + +
    +
    <%--
  • Submitter: <%= WorkflowManager.getSubmitterName(workflow) %>
  • --%> -
  • + <%= WorkflowManager.getSubmitterName(workflow) %> -
  • + +
    +
    <%--
  • Title: <%= WorkflowManager.getItemTitle(workflow) %>
  • --%> -
  • + <%= WorkflowManager.getItemTitle(workflow) %> -
  • -
+ +
-
-
  @@ -91,7 +95,7 @@ <%-- form to navigate to the item policies --%>
- "/> + "/>
@@ -121,7 +125,7 @@
- "/> + "/>
- - - - -
+ <%-- --%> - " /> - + " /> + <%-- --%> - " /> -
- + " /> +