hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-12 04:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/CILEA/DSpace into bootstrap

Browse Source
This commit is contained in:
Andrea Bollini
2013-10-07 16:03:10 +02:00
parent 4463a0c069 ea9e073ecc
commit de9ff7c1c0
11 changed files with 175 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/resources/Messages.properties
View File

@@ -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.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.metadataimport.finished = {0} changes completed successfully.
jsp.dspace-admin.index.heading = Administration Tools 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.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.find = Find
jsp.dspace-admin.item-select.handle = Handle: jsp.dspace-admin.item-select.handle = Handle:

52
dspace-jspui/src/main/webapp/dspace-admin/curate-collection.jsp
View File

@@ -42,7 +42,7 @@
String taskOptions = (String)request.getAttribute("curate_task_options"); String taskOptions = (String)request.getAttribute("curate_task_options");
%> %>
<dspace:layout titlekey="jsp.dspace-admin.curate.collection.title" <dspace:layout style="submission" titlekey="jsp.dspace-admin.curate.collection.title"
navbar="admin" navbar="admin"
locbar="link" locbar="link"
parenttitlekey="jsp.administer" parenttitlekey="jsp.administer"
@@ -55,54 +55,42 @@
</fmt:message> </fmt:message>
</h1> </h1>
<table width="60%">
<form action="<%=request.getContextPath()%>/dspace-admin/curate" method="post"> <form action="<%=request.getContextPath()%>/dspace-admin/curate" method="post">
<% <%
if (groupOptions != null && !"".equals(groupOptions)) if (groupOptions != null && !"".equals(groupOptions))
{ {
%> %>
<tr> <div class="input-group">
<td class="curate heading"> <label class="input-group-addon"><fmt:message key="jsp.dspace-admin.curate.select-group.tag"/>:</label>
<fmt:message key="jsp.dspace-admin.curate.select-group.tag"/>:
</td> <select class="form-control" name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<td class="curate field">
<select name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<%= groupOptions %> <%= groupOptions %>
</select> </select>
</td> </div>
</tr>
<% <%
} }
%> %>
<tr> <div class="input-group">
<td class="curate heading"> <label class="input-group-addon"><fmt:message key="jsp.dspace-admin.curate.select-task.tag"/>:</label>
<fmt:message key="jsp.dspace-admin.curate.select-task.tag"/>:
</td> <select class="form-control" name="curate_task" id="curate_task">
<td class="curate field">
<select name="curate_task" id="curate_task">
<%= taskOptions %> <%= taskOptions %>
</select> </select>
</td> </div>
</tr> <div class="input-group">
<tr> <input type="hidden" name="collection_id" value="<%= collectionID %>"/>
<td class="curate button" colspan="2"> <input class="btn btn-default" type="submit" name="submit_collection_curate" value="<fmt:message key="jsp.dspace-admin.curate.perform.button"/>" />
<input type="hidden" name="collection_id" value="<%= collectionID %>"/> <input class="btn btn-default" type="submit" name="submit_collection_queue" value="<fmt:message key="jsp.dspace-admin.curate.queue.button"/>" />
<input type="submit" name="submit_collection_curate" value="<fmt:message key="jsp.dspace-admin.curate.perform.button"/>" /> </div>
<input type="submit" name="submit_collection_queue" value="<fmt:message key="jsp.dspace-admin.curate.queue.button"/>" />
</form> </form>
</td> <div class="input-group">
</tr>
<tr>
<td class="curate button" colspan="2">
<form method="post" action="<%=request.getContextPath()%>/tools/edit-communities"> <form method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="collection_id" value="<%= collectionID %>"/> <input type="hidden" name="collection_id" value="<%= collectionID %>"/>
<input type="hidden" name="community_id" value="<%= communityID %>" /> <input type="hidden" name="community_id" value="<%= communityID %>" />
<input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_EDIT_COLLECTION %>" /> <input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_EDIT_COLLECTION %>" />
<input type="submit" value="<fmt:message key="jsp.dspace-admin.curate.return.collection.button"/>" /> <input class="btn btn-default" type="submit" value="<fmt:message key="jsp.dspace-admin.curate.return.collection.button"/>" />
</form> </form>
</td> </div>
</tr>
</table>
</dspace:layout> </dspace:layout>

51
dspace-jspui/src/main/webapp/dspace-admin/curate-community.jsp
View File

@@ -41,7 +41,7 @@
String taskOptions = (String)request.getAttribute("curate_task_options"); String taskOptions = (String)request.getAttribute("curate_task_options");
%> %>
<dspace:layout titlekey="jsp.dspace-admin.curate.community.title" <dspace:layout style="submission" titlekey="jsp.dspace-admin.curate.community.title"
navbar="admin" navbar="admin"
locbar="link" locbar="link"
parenttitlekey="jsp.administer" parenttitlekey="jsp.administer"
@@ -54,53 +54,40 @@
</fmt:message> </fmt:message>
</h1> </h1>
<table width="60%">
<form action="<%=request.getContextPath()%>/dspace-admin/curate" method="post"> <form action="<%=request.getContextPath()%>/dspace-admin/curate" method="post">
<% <%
if (groupOptions != null && !"".equals(groupOptions)) if (groupOptions != null && !"".equals(groupOptions))
{ {
%> %>
<tr> <div class="input-group">
<td class="curate heading"> <label class="input-group-addon"><fmt:message key="jsp.dspace-admin.curate.select-group.tag"/>:</label>
<fmt:message key="jsp.dspace-admin.curate.select-group.tag"/>:
</td> <select class="form-control" name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<td class="curate field">
<select name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<%= groupOptions %> <%= groupOptions %>
</select> </select>
</td> </div>
</tr>
<% <%
} }
%> %>
<tr> <div class="input-group">
<td class="curate heading"> <label class="input-group-addon"><fmt:message key="jsp.dspace-admin.curate.select-task.tag"/>:</label>
<fmt:message key="jsp.dspace-admin.curate.select-task.tag"/>:
</td> <select class="form-control" name="curate_task" id="curate_task">
<td class="curate field">
<select name="curate_task" id="curate_task">
<%= taskOptions %> <%= taskOptions %>
</select> </select>
</td> </div>
</tr>
<tr> <div class="input-group">
<td class="curate button" colspan="2">
<input type="hidden" name="community_id" value="<%= communityID %>"/> <input type="hidden" name="community_id" value="<%= communityID %>"/>
<input type="submit" name="submit_community_curate" value="<fmt:message key="jsp.dspace-admin.curate.perform.button"/>" /> <input class="btn btn-default" type="submit" name="submit_community_curate" value="<fmt:message key="jsp.dspace-admin.curate.perform.button"/>" />
<input type="submit" name="submit_community_queue" value="<fmt:message key="jsp.dspace-admin.curate.queue.button"/>" /> <input class="btn btn-default" type="submit" name="submit_community_queue" value="<fmt:message key="jsp.dspace-admin.curate.queue.button"/>" />
</form> </div>
</td> </form>
</tr>
<tr>
<td class="curate button" colspan="2">
<form method="post" action="<%=request.getContextPath()%>/tools/edit-communities"> <form method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="community_id" value="<%= communityID %>"/> <input type="hidden" name="community_id" value="<%= communityID %>"/>
<input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_EDIT_COMMUNITY%>""/> <input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_EDIT_COMMUNITY%>""/>
<input type="submit" value="<fmt:message key="jsp.dspace-admin.curate.return.community.button"/>" /> <input class="btn btn-default" type="submit" value="<fmt:message key="jsp.dspace-admin.curate.return.community.button"/>" />
</form> </form>
</td>
</tr>
</table>
</dspace:layout> </dspace:layout>

64
dspace-jspui/src/main/webapp/dspace-admin/curate-item.jsp
View File

@@ -50,7 +50,7 @@
String taskOptions = (String)request.getAttribute("curate_task_options"); String taskOptions = (String)request.getAttribute("curate_task_options");
%> %>
<dspace:layout titlekey="jsp.dspace-admin.curate.item.title" <dspace:layout style="submission" titlekey="jsp.dspace-admin.curate.item.title"
navbar="admin" navbar="admin"
locbar="link" locbar="link"
parenttitlekey="jsp.administer" parenttitlekey="jsp.administer"
@@ -63,52 +63,42 @@
</fmt:message> </fmt:message>
</h1> </h1>
<table width="60%"> <form action="<%=request.getContextPath()%>/dspace-admin/curate" method="post">
<form action="<%=request.getContextPath()%>/dspace-admin/curate" method="post">
<% <%
if (groupOptions != null && !"".equals(groupOptions)) if (groupOptions != null && !"".equals(groupOptions))
{ {
%> %>
<tr> <div class="input-group">
<td class="curate heading"> <label class="input-group-addon"><fmt:message key="jsp.dspace-admin.curate.select-group.tag"/>:</label>
<fmt:message key="jsp.dspace-admin.curate.select-group.tag"/>:
</td> <select class="form-control" name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<td class="curate field">
<select name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<%= groupOptions %> <%= groupOptions %>
</select> </select>
</td> </div>
</tr>
</p>
<% <%
} }
%> %>
<tr>
<td class="curate heading"> <div class="input-group">
<fmt:message key="jsp.dspace-admin.curate.select-task.tag"/>: <label class="input-group-addon"><fmt:message key="jsp.dspace-admin.curate.select-task.tag"/>:</label>
</td>
<td class="curate field"> <select class="form-control" name="curate_task" id="curate_task">
<select name="curate_task" id="curate_task">
<%= taskOptions %> <%= taskOptions %>
</select> </select>
</td> </div>
</tr>
<tr>
<td class="curate button" colspan="2">
<input type="hidden" name="item_id" value="<%= itemID %>"/>
<input type="submit" name="submit_item_curate" value="<fmt:message key="jsp.dspace-admin.curate.perform.button"/>" />
<input type="submit" name="submit_item_queue" value="<fmt:message key="jsp.dspace-admin.curate.queue.button"/>" />
</form>
</td>
</tr>
<tr>
<td class="curate button" colspan="2">
<form method="get" action="<%=request.getContextPath()%>/tools/edit-item">
<input type="hidden" name="item_id" value="<%= itemID %>"/>
<input type="submit" value="<fmt:message key="jsp.dspace-admin.curate.return.item.button"/>" />
</form>
</td>
</tr>
</table>
<div class="input-group">
<input type="hidden" name="item_id" value="<%= itemID %>"/>
<input class="btn btn-default" type="submit" name="submit_item_curate" value="<fmt:message key="jsp.dspace-admin.curate.perform.button"/>" />
<input class="btn btn-default" type="submit" name="submit_item_queue" value="<fmt:message key="jsp.dspace-admin.curate.queue.button"/>" />
</div>
</form>
<div class="input-group">
<form method="get" action="<%=request.getContextPath()%>/tools/edit-item">
<input type="hidden" name="item_id" value="<%= itemID %>"/>
<input class="btn btn-default" type="submit" value="<fmt:message key="jsp.dspace-admin.curate.return.item.button"/>"/>
</form>
</div>
</dspace:layout> </dspace:layout>

66
dspace-jspui/src/main/webapp/dspace-admin/curate-main.jsp
View File

@@ -42,7 +42,9 @@
String taskOptions = (String)request.getAttribute("curate_task_options"); String taskOptions = (String)request.getAttribute("curate_task_options");
%> %>
<dspace:layout titlekey="jsp.dspace-admin.curate.main.title" <dspace:layout
style="submission"
titlekey="jsp.dspace-admin.curate.main.title"
navbar="admin" navbar="admin"
locbar="link" locbar="link"
parenttitlekey="jsp.administer" parenttitlekey="jsp.administer"
@@ -54,57 +56,41 @@
<h1><fmt:message key="jsp.dspace-admin.curate.main.heading"/></h1> <h1><fmt:message key="jsp.dspace-admin.curate.main.heading"/></h1>
<table width="60%"> <div class="input-group">
<tr> <label class="input-group-addon"><fmt:message key="jsp.dspace-admin.curate.main.info1"/>:</label>
<td class="curate heading"> <input class="form-control" type="text" name="handle" value="<%= handle %>" size="20"/>
<fmt:message key="jsp.dspace-admin.curate.main.info1"/>:<br/> <span class="col-md-10"><fmt:message key="jsp.dspace-admin.curate.main.info2"/></span>
</td> </div>
<td class="curate field">
<input type="text" name="handle" value="<%= handle %>" size="20"/>
</td>
</tr>
<tr>
<td class="curate help" colspan="2">
<fmt:message key="jsp.dspace-admin.curate.main.info2"/>
</td>
</tr>
<% <%
if (groupOptions != null && !"".equals(groupOptions)) if (groupOptions != null && !"".equals(groupOptions))
{ {
%> %>
<tr> <div class="input-group">
<td class="curate heading"> <label class="input-group-addon"><fmt:message key="jsp.tools.curate.select-group.tag"/>:</label>
<fmt:message key="jsp.tools.curate.select-group.tag"/>:
</td> <select class="form-control" name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<td class="curate field">
<select name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<%= groupOptions %> <%= groupOptions %>
</select> </select>
</td> </div>
</tr>
<% <%
} }
%> %>
<tr> <div class="input-group">
<td class="curate heading"> <label class="input-group-addon"><fmt:message key="jsp.tools.curate.select-task.tag"/>:</label>
<fmt:message key="jsp.tools.curate.select-task.tag"/>:
</td> <select class="form-control" name="curate_task" id="curate_task">
<td class="curate field">
<select name="curate_task" id="curate_task">
<%= taskOptions %> <%= taskOptions %>
</select> </select>
</td> </div>
</tr>
<tr>
<td class="curate button" colspan="2">
<input type="hidden" name="handle" value="<%= handle %>"/>
<input type="submit" name="submit_main_curate" value="<fmt:message key="jsp.tools.curate.perform.button"/>" />
<input type="submit" name="submit_main_queue" value="<fmt:message key="jsp.tools.curate.queue.button"/>" />
<input type="submit" name="submit_main_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
<div class="input-group">
<input type="hidden" name="handle" value="<%= handle %>"/>
<input class="btn btn-default" type="submit" name="submit_main_curate" value="<fmt:message key="jsp.tools.curate.perform.button"/>" />
<input class="btn btn-default" type="submit" name="submit_main_queue" value="<fmt:message key="jsp.tools.curate.queue.button"/>" />
<input class="btn btn-default" type="submit" name="submit_main_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form> </form>
</dspace:layout> </dspace:layout>

4
dspace-jspui/src/main/webapp/dspace-admin/index.jsp
View File

@@ -41,12 +41,12 @@
{ {
context = UIUtil.obtainContext(request); context = UIUtil.obtainContext(request);
%> %>
<dspace:layout locbar="link" navbar="admin" titlekey="jsp.administer"> <dspace:layout style="submission" locbar="link" navbar="admin" titlekey="jsp.administer">
<%-- <h1>Administration Tools</h1> --%> <%-- <h1>Administration Tools</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.index.heading"/></h1> <h1><fmt:message key="jsp.dspace-admin.index.heading"/></h1>
<%-- <p>Please select an operation from the navigation bar on the left.</p> --%> <%-- <p>Please select an operation from the main menu bar.</p> --%>
<p><fmt:message key="jsp.dspace-admin.index.text"/></p> <p><fmt:message key="jsp.dspace-admin.index.text"/></p>
</dspace:layout> </dspace:layout>
<% <%

41
dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp
View File

@@ -37,7 +37,8 @@
request.setAttribute("LanguageSwitch", "hide"); request.setAttribute("LanguageSwitch", "hide");
%> %>
<dspace:layout titlekey="jsp.dspace-admin.supervise-confirm-remove.title" <dspace:layout style="submission"
titlekey="jsp.dspace-admin.supervise-confirm-remove.title"
navbar="admin" navbar="admin"
locbar="link" locbar="link"
parentlink="/dspace-admin" parentlink="/dspace-admin"
@@ -47,18 +48,14 @@
<h3><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.subheading"/></h3> <h3><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.subheading"/></h3>
<br/><br/>
<div align="center"/>
<% <%
DCValue[] titleArray = wsItem.getItem().getDC("title", null, Item.ANY); DCValue[] titleArray = wsItem.getItem().getDC("title", null, Item.ANY);
// String title = (titleArray.length > 0 ? titleArray[0].value : "Untitled"); // String title = (titleArray.length > 0 ? titleArray[0].value : "Untitled");
EPerson submitter = wsItem.getItem().getSubmitter(); EPerson submitter = wsItem.getItem().getSubmitter();
%> %>
<div class="row">
<strong><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.titleheader"/></strong>: <label class="col-md-2"><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.titleheader"/>:</label>
<br/> <span class="col-md-3">
<% <%
if (titleArray.length > 0) if (titleArray.length > 0)
{ {
@@ -73,24 +70,32 @@
<% <%
} }
%> %>
<br/><br/> </span>
<strong><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.authorheader"/></strong>: </div>
<br/> <div class="row">
<label class="col-md-2"><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.authorheader"/>:</label>
<span class="col-md-3">
<a href="mailto:<%= submitter.getEmail() %>"><%= Utils.addEntities(submitter.getFullName()) %></a> <a href="mailto:<%= submitter.getEmail() %>"><%= Utils.addEntities(submitter.getFullName()) %></a>
<br/><br/> </span>
<strong><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.supervisorgroupheader"/></strong>: </div>
<br/> <div class="row">
<label class="col-md-2"><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.supervisorgroupheader"/>:</label>
<span class="col-md-3">
<%= group.getName() %> <%= group.getName() %>
<br/><br/> </span>
</div>
<fmt:message key="jsp.dspace-admin.supervise-confirm-remove.confirm"/> <div class="row">
<label class="col-md-5"><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.confirm"/></label>
</div>
<%-- form to request removal of supervisory linking --%> <%-- form to request removal of supervisory linking --%>
<form method="post" action=""> <form method="post" action="">
<input type="hidden" name="gID" value="<%= group.getID() %>"/> <input type="hidden" name="gID" value="<%= group.getID() %>"/>
<input type="hidden" name="siID" value="<%= wsItem.getID() %>"/> <input type="hidden" name="siID" value="<%= wsItem.getID() %>"/>
<input type="submit" name="submit_doremove" value="<fmt:message key="jsp.dspace-admin.general.remove"/>"/> <input class="btn btn-default" type="submit" name="submit_doremove" value="<fmt:message key="jsp.dspace-admin.general.remove"/>"/>
<input type="submit" name="submit_base" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>"/> <input class="btn btn-default" type="submit" name="submit_base" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>"/>
</form> </form>
</dspace:layout> </dspace:layout>

4
dspace-jspui/src/main/webapp/dspace-admin/supervise-duplicate.jsp
View File

@@ -20,7 +20,9 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"
prefix="fmt" %> prefix="fmt" %>
<dspace:layout titlekey="jsp.dspace-admin.supervise-duplicate.title" <dspace:layout
style="submission"
titlekey="jsp.dspace-admin.supervise-duplicate.title"
navbar="admin" navbar="admin"
locbar="link" locbar="link"
parentlink="/dspace-admin" parentlink="/dspace-admin"

51
dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp
View File

@@ -29,6 +29,7 @@
<%@ page import="org.dspace.eperson.Group" %> <%@ page import="org.dspace.eperson.Group" %>
<%@ page import="org.dspace.eperson.Supervisor" %> <%@ page import="org.dspace.eperson.Supervisor" %>
<%@ page import="org.dspace.core.Utils" %> <%@ page import="org.dspace.core.Utils" %>
<%@page import="javax.servlet.jsp.jstl.fmt.LocaleSupport"%>
<% <%
// get objects from request // get objects from request
@@ -37,24 +38,26 @@
request.setAttribute("LanguageSwitch", "hide"); request.setAttribute("LanguageSwitch", "hide");
%> %>
<dspace:layout titlekey="jsp.dspace-admin.supervise-link.title" <dspace:layout style="submission"
titlekey="jsp.dspace-admin.supervise-link.title"
navbar="admin" navbar="admin"
locbar="link" locbar="link"
parentlink="/dspace-admin" parentlink="/dspace-admin"
parenttitlekey="jsp.administer"> parenttitlekey="jsp.administer">
<h1><fmt:message key="jsp.dspace-admin.supervise-link.heading"/></h1> <h1><fmt:message key="jsp.dspace-admin.supervise-link.heading"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#supervision\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<h3><fmt:message key="jsp.dspace-admin.supervise-link.choose"/></h3> <h3><fmt:message key="jsp.dspace-admin.supervise-link.choose"/></h3>
<form method="post" action=""> <form method="post" action="">
<table> <div class="input-group">
<%-- Select the group to supervise --%> <%-- Select the group to supervise --%>
<tr>
<td> <label class="input-group-addon"><fmt:message key="jsp.dspace-admin.supervise-link.group"/></label>
<b><fmt:message key="jsp.dspace-admin.supervise-link.group"/></b> <select class="form-control" name="TargetGroup">
<select name="TargetGroup">
<% <%
for (int i = 0; i < groups.length; i++) for (int i = 0; i < groups.length; i++)
{ {
@@ -64,30 +67,24 @@
} }
%> %>
</select> </select>
<br/><br/>
</td>
</tr>
<%-- Select the defaul policy type --%> <%-- Select the defaul policy type --%>
<tr>
<td> <label class="input-group-addon"><fmt:message key="jsp.dspace-admin.supervise-link.policy"/></label>
<b><fmt:message key="jsp.dspace-admin.supervise-link.policy"/></b> <select class="form-control" name="PolicyType">
<select name="PolicyType">
<option value="<%= Supervisor.POLICY_NONE %>" selected="selected"><fmt:message key="jsp.dspace-admin.supervise-link.policynone"/></option> <option value="<%= Supervisor.POLICY_NONE %>" selected="selected"><fmt:message key="jsp.dspace-admin.supervise-link.policynone"/></option>
<option value="<%= Supervisor.POLICY_EDITOR %>"><fmt:message key="jsp.dspace-admin.supervise-link.policyeditor"/></option> <option value="<%= Supervisor.POLICY_EDITOR %>"><fmt:message key="jsp.dspace-admin.supervise-link.policyeditor"/></option>
<option value="<%= Supervisor.POLICY_OBSERVER %>"><fmt:message key="jsp.dspace-admin.supervise-link.policyobserver"/></option> <option value="<%= Supervisor.POLICY_OBSERVER %>"><fmt:message key="jsp.dspace-admin.supervise-link.policyobserver"/></option>
</select> </select>
<br/><br/> </div>
</td>
</tr>
<%-- Select the workspace item to be supervised --%> <%-- Select the workspace item to be supervised --%>
<tr> <tr>
<td> <td>
<b><fmt:message key="jsp.dspace-admin.supervise-link.workspace"/></b> <b><fmt:message key="jsp.dspace-admin.supervise-link.workspace"/></b>
<br/><br/>
<div align="left"> <div align="left">
<table class="miscTable"> <table class="table">
<tr> <tr>
<th class="odRowOddCol"><fmt:message key="jsp.dspace-admin.supervise-link.id"/></th> <th class="odRowOddCol"><fmt:message key="jsp.dspace-admin.supervise-link.id"/></th>
<th class="oddRowEvenCol"><fmt:message key="jsp.dspace-admin.supervise-link.submittedby"/></th> <th class="oddRowEvenCol"><fmt:message key="jsp.dspace-admin.supervise-link.submittedby"/></th>
@@ -141,16 +138,10 @@
%> %>
</table> </table>
</div> </div>
<br/><br/>
</td> <input class="btn btn-default" type="submit" name="submit_link" value="<fmt:message key="jsp.dspace-admin.supervise-link.submit.button"/>"/>
</tr> <input class="btn btn-default" type="submit" name="submit_base" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>"/>
<tr>
<td>
<input type="submit" name="submit_link" value="<fmt:message key="jsp.dspace-admin.supervise-link.submit.button"/>"/>
<input type="submit" name="submit_base" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>"/>
</td>
</tr>
</table>
</form> </form>

20
dspace-jspui/src/main/webapp/dspace-admin/supervise-list.jsp
View File

@@ -20,6 +20,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"
prefix="fmt" %> prefix="fmt" %>
<%@page import="javax.servlet.jsp.jstl.fmt.LocaleSupport"%>
<%@ page import="org.dspace.content.DCValue" %> <%@ page import="org.dspace.content.DCValue" %>
<%@ page import="org.dspace.content.Item" %> <%@ page import="org.dspace.content.Item" %>
<%@ page import="org.dspace.content.SupervisedItem" %> <%@ page import="org.dspace.content.SupervisedItem" %>
@@ -33,26 +34,29 @@
request.setAttribute("LanguageSwitch", "hide"); request.setAttribute("LanguageSwitch", "hide");
%> %>
<dspace:layout titlekey="jsp.dspace-admin.supervise-list.title" <dspace:layout
style="submission"
titlekey="jsp.dspace-admin.supervise-list.title"
navbar="admin" navbar="admin"
locbar="link" locbar="link"
parentlink="/dspace-admin" parentlink="/dspace-admin"
parenttitlekey="jsp.administer"> parenttitlekey="jsp.administer">
<h1><fmt:message key="jsp.dspace-admin.supervise-list.heading"/></h1> <h1><fmt:message key="jsp.dspace-admin.supervise-list.heading"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#supervision\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<h3><fmt:message key="jsp.dspace-admin.supervise-list.subheading"/></h3> <h3><fmt:message key="jsp.dspace-admin.supervise-list.subheading"/></h3>
<br/><br/>
<div align="center" /> <div align="center" />
<%-- form to navigate to the "add supervisory settings" page --%> <%-- form to navigate to the "add supervisory settings" page --%>
<form method="post" action=""> <form method="post" action="">
<input type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.supervise-list.add.button"/>"/> <input class="btn btn-default" type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.supervise-list.add.button"/>"/>
<input type="submit" name="submit_base" value="<fmt:message key="jsp.dspace-admin.supervise-list.back.button"/>"/> <input class="btn btn-default" type="submit" name="submit_base" value="<fmt:message key="jsp.dspace-admin.supervise-list.back.button"/>"/>
</form> </form>
<table class="miscTable"> <table class="table">
<tr> <tr>
<th class="oddRowOddCol"> <th class="oddRowOddCol">
&nbsp; &nbsp;
@@ -91,7 +95,7 @@
<%-- form to navigate to the item policies --%> <%-- form to navigate to the item policies --%>
<form action="<%= request.getContextPath() %>/tools/authorize" method="post"> <form action="<%= request.getContextPath() %>/tools/authorize" method="post">
<input type="hidden" name="item_id" value="<%=supervisedItems[i].getItem().getID() %>"/> <input type="hidden" name="item_id" value="<%=supervisedItems[i].getItem().getID() %>"/>
<input type="submit" name="submit_item_select" value="<fmt:message key="jsp.dspace-admin.supervise-list.policies.button"/>"/> <input class="btn btn-default" type="submit" name="submit_item_select" value="<fmt:message key="jsp.dspace-admin.supervise-list.policies.button"/>"/>
</form> </form>
</td> </td>
<td class="<%= row %>RowEvenCol"> <td class="<%= row %>RowEvenCol">
@@ -121,7 +125,7 @@
<form method="post" action=""> <form method="post" action="">
<input type="hidden" name="gID" value="<%= supervisors[j].getID() %>"/> <input type="hidden" name="gID" value="<%= supervisors[j].getID() %>"/>
<input type="hidden" name="siID" value="<%= supervisedItems[i].getID() %>"/> <input type="hidden" name="siID" value="<%= supervisedItems[i].getID() %>"/>
<input type="submit" name="submit_remove" value="<fmt:message key="jsp.dspace-admin.general.remove"/>"/> <input class="btn btn-default" type="submit" name="submit_remove" value="<fmt:message key="jsp.dspace-admin.general.remove"/>"/>
</form> </form>
</td> </td>
</tr> </tr>

40
dspace-jspui/src/main/webapp/dspace-admin/workflow-abort-confirm.jsp
View File

@@ -30,7 +30,8 @@
request.setAttribute("LanguageSwitch", "hide"); request.setAttribute("LanguageSwitch", "hide");
%> %>
<dspace:layout titlekey="jsp.dspace-admin.workflow-abort-confirm.title" <dspace:layout style="submission"
titlekey="jsp.dspace-admin.workflow-abort-confirm.title"
navbar="admin" navbar="admin"
locbar="link" locbar="link"
parenttitlekey="jsp.administer" parenttitlekey="jsp.administer"
@@ -43,36 +44,33 @@
</fmt:message></h1> </fmt:message></h1>
<%-- <p>Are you sure you want to abort this workflow? It will return to the user's personal workspace</p> --%> <%-- <p>Are you sure you want to abort this workflow? It will return to the user's personal workspace</p> --%>
<p><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.warning"/></p> <p><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.warning"/></p>
<ul> <div class="row">
<%-- <li>Collection: <%= workflow.getCollection().getMetadata("name") %></li> --%> <%-- <li>Collection: <%= workflow.getCollection().getMetadata("name") %></li> --%>
<li><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.collection"> <span class="col-md-4"><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.collection">
<fmt:param><%= workflow.getCollection().getMetadata("name") %></fmt:param> <fmt:param><%= workflow.getCollection().getMetadata("name") %></fmt:param>
</fmt:message></li> </fmt:message></span>
</div>
<div class="row">
<%-- <li>Submitter: <%= WorkflowManager.getSubmitterName(workflow) %></li> --%> <%-- <li>Submitter: <%= WorkflowManager.getSubmitterName(workflow) %></li> --%>
<li><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.submitter"> <span class="col-md-4"><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.submitter">
<fmt:param><%= WorkflowManager.getSubmitterName(workflow) %></fmt:param> <fmt:param><%= WorkflowManager.getSubmitterName(workflow) %></fmt:param>
</fmt:message></li> </fmt:message></span>
</div>
<div class="row">
<%-- <li>Title: <%= WorkflowManager.getItemTitle(workflow) %></li> --%> <%-- <li>Title: <%= WorkflowManager.getItemTitle(workflow) %></li> --%>
<li><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.item-title"> <span class="col-md-4"><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.item-title">
<fmt:param><%= WorkflowManager.getItemTitle(workflow) %></fmt:param> <fmt:param><%= WorkflowManager.getItemTitle(workflow) %></fmt:param>
</fmt:message></li> </fmt:message></span>
</ul> </div>
<form method="post" action=""> <form method="post" action="">
<input type="hidden" name="workflow_id" value="<%= workflow.getID() %>"/> <input type="hidden" name="workflow_id" value="<%= workflow.getID() %>"/>
<center>
<table width="70%">
<tr>
<td align="left">
<%-- <input type="submit" name="submit_abort_confirm" value="Abort"/> --%> <%-- <input type="submit" name="submit_abort_confirm" value="Abort"/> --%>
<input type="submit" name="submit_abort_confirm" value="<fmt:message key="jsp.dspace-admin.workflow-abort-confirm.button"/>" /> <input class="btn btn-default" type="submit" name="submit_abort_confirm" value="<fmt:message key="jsp.dspace-admin.workflow-abort-confirm.button"/>" />
</td>
<td align="right">
<%-- <input type="submit" name="submit_cancel" value="Cancel"/> --%> <%-- <input type="submit" name="submit_cancel" value="Cancel"/> --%>
<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" /> <input class="btn btn-default" type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
</form> </form>
</dspace:layout> </dspace:layout>