diff --git a/dspace-api/src/main/resources/Messages.properties b/dspace-api/src/main/resources/Messages.properties index 818bf1ef2e..0590ba4221 100644 --- a/dspace-api/src/main/resources/Messages.properties +++ b/dspace-api/src/main/resources/Messages.properties @@ -81,6 +81,7 @@ itemlist.thumbnail = Preview jsp.adminhelp = jsp.administer = Administer jsp.admintools = Admin Tools +jsp.actiontools = Actions jsp.browse.authors.enter = or enter first few letters: jsp.browse.authors.jump = Jump to: jsp.browse.authors.show = Showing authors {0}-{1} of {2}. @@ -1304,7 +1305,8 @@ jsp.tools.edit-item-form.elem12 = Order jsp.tools.edit-item-form.form.label1 = Item's Curations: jsp.tools.edit-item-form.handle = Handle: jsp.tools.edit-item-form.heading = Bitstreams -jsp.tools.edit-item-form.item = Item's Authorizations: +jsp.tools.edit-item-form.details = Item's Details +jsp.tools.edit-item-form.item = Authorizations... jsp.tools.edit-item-form.itemID = Item internal ID: jsp.tools.edit-item-form.itempage = Item page: jsp.tools.edit-item-form.modified = Last modified: diff --git a/dspace-jspui/src/main/webapp/components/login-form.jsp b/dspace-jspui/src/main/webapp/components/login-form.jsp index 00db43d10d..e603c24bb3 100644 --- a/dspace-jspui/src/main/webapp/components/login-form.jsp +++ b/dspace-jspui/src/main/webapp/components/login-form.jsp @@ -18,13 +18,13 @@

- +
- +
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/list-metadata-schemas.jsp b/dspace-jspui/src/main/webapp/dspace-admin/list-metadata-schemas.jsp index 1c5071b023..a9c3e8ef20 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/list-metadata-schemas.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/list-metadata-schemas.jsp @@ -98,20 +98,22 @@ if (error!=null) {

-
-
- : - -
-
-
- : - +
+
+ : +
+ +
+
+
+ : +
+ +
+


+
+ "/>
-
- - - "/> diff --git a/dspace-jspui/src/main/webapp/register/edit-profile.jsp b/dspace-jspui/src/main/webapp/register/edit-profile.jsp index fcc41efb40..52d2964e30 100644 --- a/dspace-jspui/src/main/webapp/register/edit-profile.jsp +++ b/dspace-jspui/src/main/webapp/register/edit-profile.jsp @@ -44,17 +44,19 @@ boolean ldap_eperson = (ldap_enabled && (eperson.getNetid() != null) && (eperson.getNetid().equals("") == false)); %> - + <%--

Edit Your Profile

--%> -

+

+ "> +

<% if (missingFields) { %> <%--

Please fill out all of the required fields.

--%> -

+

<% } @@ -63,15 +65,14 @@ %> <%--

The passwords you enter below must match, and need to be at least 6 characters long.

--%> -

+

<% } %> -
- ">
+
-
+ @@ -83,30 +84,27 @@ %> <%--

Optionally, you can choose a new password and enter it into the box below, and confirm it by typing it again into the second box for verification. It should be at least six characters long.

--%> -

- - - - - -
- - +

+
<%--
--%> - - - - - <%-- --%> - - - -
Again to Confirm:
-
+ +
+ +
+
+
+ <%-- Again to Confirm: --%> + +
+ +
+
<% } %> +
<%--

--%> -

" />

+ " /> +
diff --git a/dspace-jspui/src/main/webapp/register/new-password.jsp b/dspace-jspui/src/main/webapp/register/new-password.jsp index 5ac119a4e0..227bfb6d08 100644 --- a/dspace-jspui/src/main/webapp/register/new-password.jsp +++ b/dspace-jspui/src/main/webapp/register/new-password.jsp @@ -39,13 +39,13 @@ boolean passwordProblem = (attr != null && attr.booleanValue()); %> - + <%--

Enter a New Password

--%>

-

+

<%= Utils.addEntities(eperson.getFullName()) %>

@@ -55,7 +55,7 @@ %> <%--

The passwords you enter below must match, and need to be at least 6 characters long.

--%> -

+

<% } %> @@ -64,33 +64,31 @@ again into the second box. It should be at least six characters long.

--%>

-
- - - - -
- - + + + + + +
<%--
--%> - - - - - <%-- --%> - - - - - - -
New Password:
Again to Confirm:
- <%-- --%> - " /> -
-
- - + +
+ +
+
+
+ <%-- Again to Confirm: --%> + +
+ +
+
+
+ <%--

--%> + " /> +
+ + diff --git a/dspace-jspui/src/main/webapp/register/new-user.jsp b/dspace-jspui/src/main/webapp/register/new-user.jsp index 2206ee2e3b..080e430adb 100644 --- a/dspace-jspui/src/main/webapp/register/new-user.jsp +++ b/dspace-jspui/src/main/webapp/register/new-user.jsp @@ -30,7 +30,7 @@ boolean retry = (request.getAttribute("retry") != null); %> - + <%--

User Registration

--%>

@@ -38,40 +38,32 @@ if (retry) { %> <%--

The e-mail address you entered was invalid. Please try again.

--%> -

+

<% } %> <%--

If you've never logged on to DSpace before, please enter your e-mail address in the box below and click "Register".

--%> -

+

-
+ - - - - -
- - + <%-- --%> - - - - - - -
E-mail Address:
+
+ +
+
+
<%-- --%> - " /> -
-
+ " /> +
<%--

If you or your department are interested in registering with DSpace, please contact the DSpace site administrators.

--%> -

+
+
diff --git a/dspace-jspui/src/main/webapp/register/profile-form.jsp b/dspace-jspui/src/main/webapp/register/profile-form.jsp index aac7b17f62..235e0887e4 100644 --- a/dspace-jspui/src/main/webapp/register/profile-form.jsp +++ b/dspace-jspui/src/main/webapp/register/profile-form.jsp @@ -56,27 +56,23 @@ if (language == null) language = ""; } %> - - - - <%-- --%> - - - - +
+ +
+
+
<%--
--%> - - - - - <%-- --%> - - - - - - - -
First name*:
Contact telephone:
- + +
+ +
+
+
+ +
+ -
+ + diff --git a/dspace-jspui/src/main/webapp/register/profile-updated.jsp b/dspace-jspui/src/main/webapp/register/profile-updated.jsp index 9ceada8379..b316ce6286 100644 --- a/dspace-jspui/src/main/webapp/register/profile-updated.jsp +++ b/dspace-jspui/src/main/webapp/register/profile-updated.jsp @@ -35,7 +35,7 @@ <%--

Thank you, your profile information <%= (passwordUpdated ? "and password have" : "has") %> been updated.

--%> -

+

<% if(passwordUpdated) { %> diff --git a/dspace-jspui/src/main/webapp/register/registration-form.jsp b/dspace-jspui/src/main/webapp/register/registration-form.jsp index f14c533266..17e76be6d9 100644 --- a/dspace-jspui/src/main/webapp/register/registration-form.jsp +++ b/dspace-jspui/src/main/webapp/register/registration-form.jsp @@ -49,7 +49,7 @@ boolean setPassword = (attr != null && attr.booleanValue()); %> - + <%--

Registration Information

--%>

@@ -59,7 +59,7 @@ { %> <%--

Please fill out all of the required fields.

--%> -

+

<% } @@ -68,15 +68,15 @@ %> <%--

The passwords you enter below must match, and need to be at least 6 characters long.

--%> -

+

<% } %> <%--

Please enter the following information. The fields marked with a * are required.

--%> -

-
+

+ <% if (netid!=null) { %> <% } %> <% if (email!=null) { %> <% } %> @@ -87,26 +87,23 @@ %> <%--

Please choose a password and enter it into the box below, and confirm it by typing it again into the second box. It should be at least six characters long.

--%> -

- - - - - -
- - - <%-- --%> - - - - - <%-- --%> - - - -
Password:
Again to Confirm:
-
+

+ +
+ <%-- New Password: --%> + +
+ +
+
+
+ <%-- Again to Confirm: --%> + +
+ +
+
+ <% } %> @@ -115,6 +112,9 @@ <%--

--%> -

" />

+
+ " /> +
+
diff --git a/dspace-jspui/src/main/webapp/register/registration-sent.jsp b/dspace-jspui/src/main/webapp/register/registration-sent.jsp index b95999f36b..06249e3f30 100644 --- a/dspace-jspui/src/main/webapp/register/registration-sent.jsp +++ b/dspace-jspui/src/main/webapp/register/registration-sent.jsp @@ -26,6 +26,6 @@ <%--

You have been sent an e-mail containing a special URL, or "token". When you visit this URL, you will need to fill out some simple information. After that, you'll be ready to log into DSpace!

--%> -

+

diff --git a/dspace-jspui/src/main/webapp/submit/choose-file.jsp b/dspace-jspui/src/main/webapp/submit/choose-file.jsp index f7f1e308fc..26badf3ec4 100644 --- a/dspace-jspui/src/main/webapp/submit/choose-file.jsp +++ b/dspace-jspui/src/main/webapp/submit/choose-file.jsp @@ -135,7 +135,7 @@ $('#spanFile').remove(); $('#selectedFile').remove(); $('').appendTo(parent); - $('#tfile').wrap('  '); + $('#tfile').wrap('  '); $('#tfile').on('change', function(){ decorateFileInputChangeEvent($); }); @@ -151,7 +151,7 @@ progressbarArea.find('p.progressBarProgressMsg').hide(); progressbarArea.find('p.progressBarCompleteMsg').hide(); progressbarArea.hide(); - $('#tfile').wrap('  '); + $('#tfile').wrap('  '); $('#tfile').on('change', function(){ decorateFileInputChangeEvent($); }); @@ -313,7 +313,27 @@ onkeydown="return disableEnterKey(event);"> - + +<% + if (bSherpa) + { +%> +
+
+
+ +
+
+ + + +
+
+
+
+<% + } +%> <%-- Hidden fields needed for SubmissionController servlet to know which step is next--%> <%= SubmissionController.getSubmissionParameters(context, request) %> @@ -342,9 +362,9 @@
-
+
<%-- Document File: --%> - +

<% if (ajaxProgress) @@ -425,25 +445,12 @@ } %> " /> -
- -<% +
+ <% if (bSherpa) { %> - -
-
- -
-
- - - -
-
-
-<% - } -%> + +<% } %> + diff --git a/dspace-jspui/src/main/webapp/submit/upload-error.jsp b/dspace-jspui/src/main/webapp/submit/upload-error.jsp index af001bac70..4fde427b61 100644 --- a/dspace-jspui/src/main/webapp/submit/upload-error.jsp +++ b/dspace-jspui/src/main/webapp/submit/upload-error.jsp @@ -42,7 +42,7 @@ SubmissionInfo subInfo = SubmissionController.getSubmissionInfo(context, request); %> - @@ -57,17 +57,15 @@ <%--

There was a problem uploading your file. Either the filename you entered was incorrect, or there was a network problem which prevented the file from reaching us correctly. Please try again.

--%> -

+

<%-- Hidden fields needed for SubmissionController servlet to know which step is next--%> <%= SubmissionController.getSubmissionParameters(context, request) %> <%-- HACK:
tag needed for broken Netscape 4.78 behaviour --%> -
-

- " /> -

-
+ + " /> + diff --git a/dspace-jspui/src/main/webapp/tools/edit-item-form.jsp b/dspace-jspui/src/main/webapp/tools/edit-item-form.jsp index e19446a18a..37c0ef387a 100644 --- a/dspace-jspui/src/main/webapp/tools/edit-item-form.jsp +++ b/dspace-jspui/src/main/webapp/tools/edit-item-form.jsp @@ -222,7 +222,7 @@
-
+
@@ -268,57 +268,6 @@ - <% - if (bPolicy) - { -%> - <%-- =========================================================== - Edit item's policies - =========================================================== --%> - - <%-- --%> - - - - <% - } -%> - - - <% - if (isItemAdmin) - { -%> - <%-- =========================================================== - Curate Item - =========================================================== --%> - - <%-- --%> - - - - <% - } - %>
Item's Authorizations: - -
- " /> - - <%-- --%> - " /> -
Item's Curations: - -
- - " /> -
@@ -329,30 +278,34 @@
-
+
- +
<% if (!item.isWithdrawn() && bWithdraw) { %> +
<%-- --%> - "/> + "/>
+
<% } else if (item.isWithdrawn() && bReinstate) { %> +
<%-- --%> - "/> + "/>
+
<% } %> @@ -360,23 +313,28 @@ if (bDelete) { %> +
<%-- --%> - "/> + "/>
+
<% } %> <% if (isItemAdmin) { -%>
+%> +
+ - "/> + "/> +
<% } %> @@ -384,25 +342,71 @@ if (item.isDiscoverable() && bPrivating) { %> +
- "/> + "/>
+
<% } else if (!item.isDiscoverable() && bPublicize) { %> +
- "/> + "/>
+
<% } %> - + +<% + if (bPolicy) + { +%> + <%-- =========================================================== + Edit item's policies + =========================================================== --%> +
+
+ " /> + + <%-- --%> + " /> +
+
+<% + } +%> +<% + if (isItemAdmin) + { +%> +<%-- =========================================================== + Curate Item + =========================================================== --%> +
+
+ + " /> +
+
+ <% + } + %> +
@@ -529,7 +533,7 @@ <%-- --%> - @@ -556,13 +560,13 @@ Description Format User Format Description --%> - - - - - - - +   + + + + + +   @@ -586,6 +590,10 @@ BitstreamFormat bf = bitstreams[j].getFormat(); %> "> + + <%-- View  --%> +   + <% if (bundles[i].getName().equals("ORIGINAL")) { %> @@ -643,10 +651,14 @@
- " <%=j==0 ? "disabled=\"disabled\"" : ""%>/> +
- " <%=j==(bitstreams.length-1) ? "disabled=\"disabled\"" : ""%>/> +
@@ -660,8 +672,7 @@ } %> - <%-- View  --%> -   + <% if (bRemoveBits) { %>
diff --git a/dspace-jspui/src/main/webapp/tools/itemmap-browse.jsp b/dspace-jspui/src/main/webapp/tools/itemmap-browse.jsp index 0104944136..9fdbe5fb86 100644 --- a/dspace-jspui/src/main/webapp/tools/itemmap-browse.jsp +++ b/dspace-jspui/src/main/webapp/tools/itemmap-browse.jsp @@ -49,7 +49,7 @@ .getAttribute("page") : 1; %> - + <%--

Browse <%=browsetext%>

--%>

@@ -67,14 +67,14 @@ <%--

Check the box next to items you wish to add or remove, and choose 'add' or 'remove'.

--%> <% if (browsetype.equals("Add")){ %> -

+

<%= collection.getName() %>

<% }%> <% if (browsetype.equals("Remove")){ %> -

+

<%= collection.getName() %> @@ -84,22 +84,18 @@ <%-- %>p>

- - - - - - -
+
+ <% if (browsetype.equals("Add")) { %> - " /> + " /> <% } else if (browsetype.equals("Remove")) { %> - " /> + " /> <% } %> -
" />
- - - + + " /> + +
+
@@ -110,9 +106,9 @@ <% } else { %> <% } %> @@ -189,53 +185,50 @@ <% } %>
<% if (browsetype.equals("Add")) { %> - " /> + " /> <% } else if (browsetype.equals("Remove")) { %> - " /> + " /> <% } %>
- - - - - - -
+ +
+ <% if (browsetype.equals("Add")) { %> - " /> + " /> <% } else if (browsetype.equals("Remove")) { %> - " /> + " /> <% } %> -
" />
- + + " /> +

+ <% if (bMore || pageResult > 1) { %> - - - + +

+
<% if (pageResult > 1) { %> -
+ <% } if (bMore) { %> - - -<% } + +<% } %> + +<% } %> diff --git a/dspace-jspui/src/main/webapp/tools/itemmap-info.jsp b/dspace-jspui/src/main/webapp/tools/itemmap-info.jsp index 363f28ce41..0975041abf 100644 --- a/dspace-jspui/src/main/webapp/tools/itemmap-info.jsp +++ b/dspace-jspui/src/main/webapp/tools/itemmap-info.jsp @@ -38,11 +38,11 @@ LinkedList processedItems = (LinkedList)request.getAttribute("processedItems"); %> - +

-

+

<% if (message.equals("none-selected")) { %> <% } else if (message.equals("none-removed")) { %> @@ -62,10 +62,10 @@
<% } %> <% } %> -

+
- "/> + "/>
diff --git a/dspace-jspui/src/main/webapp/tools/itemmap-main.jsp b/dspace-jspui/src/main/webapp/tools/itemmap-main.jsp index d21a5eab14..acef6eab30 100644 --- a/dspace-jspui/src/main/webapp/tools/itemmap-main.jsp +++ b/dspace-jspui/src/main/webapp/tools/itemmap-main.jsp @@ -52,19 +52,19 @@ boolean bSearchError = searchError != null?searchError:false; %> - + <%--

Item Mapper - Map Items from Other Collections

--%> -

+

<%--

Collection: "<%=collection.getMetadata("name")%>"

--%> -

+

<%=collection.getMetadata("name")%> -

+

<%--

There are <%=count_native%> items owned by this collection, and <%=count_import%> items mapped in from other collections.

--%> -

+

<%=count_native%> <%=count_import%>

@@ -125,9 +125,12 @@

- - - + + + - - " /> -
+
+ + + + + + + " /> + + <% if (bSearchError) { %> -

+

<% } %> <%--

Browse Items Imported From Collections:

--%>

@@ -159,7 +168,7 @@ { %> <%--

This collection has no items mapped into it.

--%> -

+

<% } diff --git a/dspace-jspui/src/main/webapp/tools/move-item.jsp b/dspace-jspui/src/main/webapp/tools/move-item.jsp index c1053c1d97..c95a80fc8e 100644 --- a/dspace-jspui/src/main/webapp/tools/move-item.jsp +++ b/dspace-jspui/src/main/webapp/tools/move-item.jsp @@ -25,28 +25,19 @@ Item item = (Item)request.getAttribute("item"); %> - - -
- -
-

-
+
- "/> + "/>
-
+
- "/> + "/>
-
- - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - <%=item.getMetadata("dc", "title", null, Item.ANY)[0].value%> -
- - - <% for (int i = 0; i < linkedCollections.length; i++) { @@ -56,14 +47,14 @@ } %> -
- - - <% //Later on find a away to display in a tree format with the linked one disabled? for (int i = 0; i < notLinkedCollections.length; i++) @@ -74,25 +65,22 @@ } %> -
- "/> -
-
+
+ +
+
+ + + + +
+
+
+ "/> +
- + diff --git a/dspace-jspui/src/main/webapp/tools/upload-bitstream.jsp b/dspace-jspui/src/main/webapp/tools/upload-bitstream.jsp index 103814d571..bfffcf8a0d 100644 --- a/dspace-jspui/src/main/webapp/tools/upload-bitstream.jsp +++ b/dspace-jspui/src/main/webapp/tools/upload-bitstream.jsp @@ -28,7 +28,7 @@ request.setAttribute("LanguageSwitch", "hide"); %> - <%--

Select the bitstream to upload

--%> -

+

-

- -

+
+ +
- +
-

" />

+
" />