hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 18:14:26 +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-13 16:43:13 +02:00
parent b13f6837cb 255ee71b5e
commit a440235d29
18 changed files with 359 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,7 @@ itemlist.thumbnail = Preview
jsp.adminhelp = <span class="glyphicon glyphicon-question-sign"></span> jsp.adminhelp = <span class="glyphicon glyphicon-question-sign"></span>
jsp.administer = Administer jsp.administer = Administer
jsp.admintools = Admin Tools jsp.admintools = Admin Tools
jsp.actiontools = Actions
jsp.browse.authors.enter = or enter first few letters: jsp.browse.authors.enter = or enter first few letters:
jsp.browse.authors.jump = Jump to: jsp.browse.authors.jump = Jump to:
jsp.browse.authors.show = Showing authors {0}-{1} of {2}. 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.form.label1 = Item's Curations:
jsp.tools.edit-item-form.handle = Handle: jsp.tools.edit-item-form.handle = Handle:
jsp.tools.edit-item-form.heading = Bitstreams 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&nbsp;internal&nbsp;ID: jsp.tools.edit-item-form.itemID = Item&nbsp;internal&nbsp;ID:
jsp.tools.edit-item-form.itempage = Item page: jsp.tools.edit-item-form.itempage = Item page:
jsp.tools.edit-item-form.modified = Last modified: jsp.tools.edit-item-form.modified = Last modified:

4
dspace-jspui/src/main/webapp/components/login-form.jsp
View File

@@ -18,13 +18,13 @@
<p><strong><a href="<%= request.getContextPath() %>/register"><fmt:message key="jsp.components.login-form.newuser"/></a></strong></p> <p><strong><a href="<%= request.getContextPath() %>/register"><fmt:message key="jsp.components.login-form.newuser"/></a></strong></p>
<p><fmt:message key="jsp.components.login-form.enter"/></p> <p><fmt:message key="jsp.components.login-form.enter"/></p>
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label" for="tlogin_email"><fmt:message key="jsp.components.login-form.email"/></label> <label class="col-md-offset-3 col-md-2 control-label" for="tlogin_email"><fmt:message key="jsp.components.login-form.email"/></label>
<div class="col-md-3"> <div class="col-md-3">
<input class="form-control" type="text" name="login_email" id="tlogin_email" tabindex="1" /> <input class="form-control" type="text" name="login_email" id="tlogin_email" tabindex="1" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label" for="tlogin_password"><fmt:message key="jsp.components.login-form.password"/></label> <label class="col-md-offset-3 col-md-2 control-label" for="tlogin_password"><fmt:message key="jsp.components.login-form.password"/></label>
<div class="col-md-3"> <div class="col-md-3">
<input class="form-control" type="password" name="login_password" id="tlogin_password" tabindex="2" /> <input class="form-control" type="password" name="login_password" id="tlogin_password" tabindex="2" />
</div> </div>

28
dspace-jspui/src/main/webapp/dspace-admin/list-metadata-schemas.jsp
View File

@@ -98,20 +98,22 @@ if (error!=null) {
<p class="alert alert-info"> <p class="alert alert-info">
<fmt:message key="jsp.dspace-admin.list-metadata-schemas.instruction"/> <fmt:message key="jsp.dspace-admin.list-metadata-schemas.instruction"/>
</p> </p>
<div class="input-group"> <div class="input-group col-md-6">
<div class="input-group-addon"> <div class="input-group-addon">
<span class="col-md-2"><fmt:message key="jsp.dspace-admin.list-metadata-schemas.namespace"/>:</span> <span class="col-md-2"><fmt:message key="jsp.dspace-admin.list-metadata-schemas.namespace"/>:</span>
<span class="col-md-3"><input type="text" name="namespace" value=""/></span> </div>
</div></div> <input class="form-control" type="text" name="namespace" value=""/>
<div class="input-group"> </div>
<div class="input-group-addon"> <div class="input-group col-md-6">
<span class="col-md-2"><fmt:message key="jsp.dspace-admin.list-metadata-schemas.name"/>:</span> <div class="input-group-addon">
<span class="col-md-3"><input type="text" name="short_name" value=""/></span> <span class="col-md-2"><fmt:message key="jsp.dspace-admin.list-metadata-schemas.name"/>:</span>
</div>
<input class="form-control" type="text" name="short_name" value=""/>
</div>
<br/><br/><br/>
<div class="row col-md-offset-5">
<input class="btn btn-success col-md-3" type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.general.save"/>"/>
</div> </div>
</div>
<input class="btn btn-primary pull-right" type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.general.save"/>"/>
</form> </form>
</dspace:layout> </dspace:layout>

52
dspace-jspui/src/main/webapp/register/edit-profile.jsp
View File

@@ -44,17 +44,19 @@
boolean ldap_eperson = (ldap_enabled && (eperson.getNetid() != null) && (eperson.getNetid().equals("") == false)); boolean ldap_eperson = (ldap_enabled && (eperson.getNetid() != null) && (eperson.getNetid().equals("") == false));
%> %>
<dspace:layout titlekey="jsp.register.edit-profile.title" nocache="true"> <dspace:layout style="submission" titlekey="jsp.register.edit-profile.title" nocache="true">
<%-- <h1>Edit Your Profile</h1> --%> <%-- <h1>Edit Your Profile</h1> --%>
<h1><fmt:message key="jsp.register.edit-profile.title"/></h1> <h1><fmt:message key="jsp.register.edit-profile.title"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\") + \"#editprofile\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<% <%
if (missingFields) if (missingFields)
{ {
%> %>
<%-- <p><strong>Please fill out all of the required fields.</strong></p> --%> <%-- <p><strong>Please fill out all of the required fields.</strong></p> --%>
<p><strong><fmt:message key="jsp.register.edit-profile.info1"/></strong></p> <p class="alert alert-info"><fmt:message key="jsp.register.edit-profile.info1"/></p>
<% <%
} }
@@ -63,15 +65,14 @@
%> %>
<%-- <p><strong>The passwords you enter below must match, and need to be at <%-- <p><strong>The passwords you enter below must match, and need to be at
least 6 characters long.</strong></p> --%> least 6 characters long.</strong></p> --%>
<p><strong><fmt:message key="jsp.register.edit-profile.info2"/></strong></p> <p class="alert alert-warning"><fmt:message key="jsp.register.edit-profile.info2"/></p>
<% <%
} }
%> %>
<div><fmt:message key="jsp.register.edit-profile.info3"/> <div class="alert alert-info"><fmt:message key="jsp.register.edit-profile.info3"/></div>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\") + \"#editprofile\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup></div>
<form action="<%= request.getContextPath() %>/profile" method="post"> <form class="form-horizontal" action="<%= request.getContextPath() %>/profile" method="post">
<dspace:include page="/register/profile-form.jsp" /> <dspace:include page="/register/profile-form.jsp" />
@@ -83,30 +84,27 @@
%> %>
<%-- <p><strong>Optionally</strong>, you can choose a new password and enter it into the box below, and confirm it by typing it <%-- <p><strong>Optionally</strong>, 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.</p> --%> again into the second box for verification. It should be at least six characters long.</p> --%>
<p><fmt:message key="jsp.register.edit-profile.info5"/></p> <p class="alert"><fmt:message key="jsp.register.edit-profile.info5"/></p>
<div class="form-group">
<table class="misc" align="center">
<tr>
<td class="oddRowEvenCol">
<table border="0" cellpadding="5">
<tr>
<%-- <td align="right" class="standard"><label for="tpassword"><strong>New Password:</strong></label></td> --%> <%-- <td align="right" class="standard"><label for="tpassword"><strong>New Password:</strong></label></td> --%>
<td align="right" class="standard"><label for="tpassword"><strong><fmt:message key="jsp.register.edit-profile.pswd.field"/></strong></label></td> <label class="col-md-offset-3 col-md-2 control-label" for="tpassword"><fmt:message key="jsp.register.edit-profile.pswd.field"/></label>
<td class="standard"><input type="password" name="password" id="tpassword" /></td> <div class="col-md-3">
</tr> <input class="form-control" type="password" name="password" id="tpassword" />
<tr> </div>
<%-- <td align="right" class="standard"><strong>Again to Confirm:</strong></td> --%> </div>
<td align="right" class="standard"><label for="tpassword_confirm"><strong><fmt:message key="jsp.register.edit-profile.confirm.field"/></strong></label></td> <div class="form-group">
<td class="standard"><input type="password" name="password_confirm" id="tpassword_confirm" /></td> <%-- <td align="right" class="standard"><strong>Again to Confirm:</strong></td> --%>
</tr> <label class="col-md-offset-3 col-md-2 control-label" for="tpassword_confirm"><fmt:message key="jsp.register.edit-profile.confirm.field"/></label>
</table> <div class="col-md-3">
</td> <input class="form-control" type="password" name="password_confirm" id="tpassword_confirm" /></td>
</tr> </div>
</table> </div>
<% <%
} }
%> %>
<div class="col-md-offset-5">
<%-- <p align="center"><input type="submit" name="submit" value="Update Profile"></p> --%> <%-- <p align="center"><input type="submit" name="submit" value="Update Profile"></p> --%>
<p align="center"><input type="submit" name="submit" value="<fmt:message key="jsp.register.edit-profile.update.button"/>" /></p> <input class="btn btn-success col-md-4" type="submit" name="submit" value="<fmt:message key="jsp.register.edit-profile.update.button"/>" />
</div>
</form> </form>
</dspace:layout> </dspace:layout>

56
dspace-jspui/src/main/webapp/register/new-password.jsp
View File

@@ -39,13 +39,13 @@
boolean passwordProblem = (attr != null && attr.booleanValue()); boolean passwordProblem = (attr != null && attr.booleanValue());
%> %>
<dspace:layout titlekey="jsp.register.new-password.title" nocache="true"> <dspace:layout style="submission" titlekey="jsp.register.new-password.title" nocache="true">
<%-- <h1>Enter a New Password</h1> --%> <%-- <h1>Enter a New Password</h1> --%>
<h1><fmt:message key="jsp.register.new-password.title"/></h1> <h1><fmt:message key="jsp.register.new-password.title"/></h1>
<!-- <p>Hello <%= Utils.addEntities(eperson.getFullName()) %>,</p> --> <!-- <p>Hello <%= Utils.addEntities(eperson.getFullName()) %>,</p> -->
<p><fmt:message key="jsp.register.new-password.hello"> <p class="alert"><fmt:message key="jsp.register.new-password.hello">
<fmt:param><%= Utils.addEntities(eperson.getFullName()) %></fmt:param> <fmt:param><%= Utils.addEntities(eperson.getFullName()) %></fmt:param>
</fmt:message></p> </fmt:message></p>
@@ -55,7 +55,7 @@
%> %>
<%-- <p><strong>The passwords you enter below must match, and need to be at <%-- <p><strong>The passwords you enter below must match, and need to be at
least 6 characters long.</strong></p> --%> least 6 characters long.</strong></p> --%>
<p><strong><fmt:message key="jsp.register.new-password.info1"/></strong></p> <p class="alert alert-warning"><strong><fmt:message key="jsp.register.new-password.info1"/></strong></p>
<% <%
} }
%> %>
@@ -64,33 +64,31 @@
again into the second box. It should be at least six characters long.</p> --%> again into the second box. It should be at least six characters long.</p> --%>
<p><fmt:message key="jsp.register.new-password.info2"/></p> <p><fmt:message key="jsp.register.new-password.info2"/></p>
<form action="<%= request.getContextPath() %>/forgot" method="post"> <form class="form-horizontal" action="<%= request.getContextPath() %>/forgot" method="post">
<table class="misc" align="center">
<tr>
<td class="oddRowEvenCol">
<table border="0" cellpadding="5">
<tr>
<%-- <td align="right" class="standard"><strong>New Password:</strong></td> --%>
<td align="right" class="standard"><label for="tpassword"><strong><fmt:message key="jsp.register.new-password.pswd.field"/></strong></label></td>
<td class="standard"><input type="password" name="password" id="tpassword" /></td>
</tr>
<tr>
<%-- <td align="right" class="standard"><strong>Again to Confirm:</strong></td> --%>
<td align="right" class="standard"><label for="tpassword_confirm"><strong><fmt:message key="jsp.register.new-password.confirm.field"/></strong></label></td>
<td class="standard"><input type="password" name="password_confirm" id="tpassword_confirm" /></td>
</tr>
<tr>
<td align="center" colspan="2">
<%-- <input type="submit" name="submit" value="Set New Password"> --%>
<input type="submit" name="submit" value="<fmt:message key="jsp.register.new-password.set.button"/>" />
</td>
</tr>
</table>
</td>
</tr>
</table>
<input type="hidden" name="step" value="<%= RegisterServlet.NEW_PASSWORD_PAGE %>"/>
<div class="form-group">
<%-- <td align="right" class="standard"><strong>New Password:</strong></td> --%>
<label class="col-md-offset-3 col-md-2 control-label" for="tpassword"><fmt:message key="jsp.register.new-password.pswd.field"/></label>
<div class="col-md-3">
<input class="form-control" type="password" name="password" id="tpassword" />
</div>
</div>
<div class="form-group">
<%-- <td align="right" class="standard"><strong>Again to Confirm:</strong></td> --%>
<label class="col-md-offset-3 col-md-2 control-label" for="tpassword_confirm"><fmt:message key="jsp.register.new-password.confirm.field"/></label>
<div class="col-md-3">
<input class="form-control" type="password" name="password_confirm" id="tpassword_confirm" /></td>
</div>
</div>
<div class="col-md-offset-5">
<%-- <p align="center"><input type="submit" name="submit" value="Update Profile"></p> --%>
<input class="btn btn-success col-md-4" type="submit" name="submit" value="<fmt:message key="jsp.register.new-password.set.button"/>" />
</div>
<input type="hidden" name="step" value="<%= RegisterServlet.NEW_PASSWORD_PAGE %>"/>
<input type="hidden" name="token" value="<%= token %>"/> <input type="hidden" name="token" value="<%= token %>"/>
</form> </form>

36
dspace-jspui/src/main/webapp/register/new-user.jsp
View File

@@ -30,7 +30,7 @@
boolean retry = (request.getAttribute("retry") != null); boolean retry = (request.getAttribute("retry") != null);
%> %>
<dspace:layout titlekey="jsp.register.new-user.title"> <dspace:layout style="submission" titlekey="jsp.register.new-user.title">
<%-- <h1>User Registration</h1> --%> <%-- <h1>User Registration</h1> --%>
<h1><fmt:message key="jsp.register.new-user.title"/></h1> <h1><fmt:message key="jsp.register.new-user.title"/></h1>
@@ -38,40 +38,32 @@
if (retry) if (retry)
{ %> { %>
<%-- <p><strong>The e-mail address you entered was invalid.</strong> Please try again.</strong></p> --%> <%-- <p><strong>The e-mail address you entered was invalid.</strong> Please try again.</strong></p> --%>
<p><fmt:message key="jsp.register.new-user.info1"/></p> <p class="alert alert-warning"><fmt:message key="jsp.register.new-user.info1"/></p>
<% } %> <% } %>
<%-- <p>If you've never logged on to DSpace before, please enter your e-mail <%-- <p>If you've never logged on to DSpace before, please enter your e-mail
address in the box below and click "Register".</p> --%> address in the box below and click "Register".</p> --%>
<p><fmt:message key="jsp.register.new-user.info2"/></p> <p class="alert"><fmt:message key="jsp.register.new-user.info2"/></p>
<form action="<%= request.getContextPath() %>/register" method="post"> <form class="form-horizontal" action="<%= request.getContextPath() %>/register" method="post">
<input type="hidden" name="step" value="<%= RegisterServlet.ENTER_EMAIL_PAGE %>"/> <input type="hidden" name="step" value="<%= RegisterServlet.ENTER_EMAIL_PAGE %>"/>
<table class="miscTable" align="center">
<tr>
<td class="oddRowEvenCol">
<table border="0" cellpadding="5">
<tr>
<%-- <td class="standard"><strong>E-mail Address:</strong></td> --%> <%-- <td class="standard"><strong>E-mail Address:</strong></td> --%>
<td class="standard"><label for="temail"><strong><fmt:message key="jsp.register.new-user.email.field"/></strong></label></td> <div class="form-group">
<td class="standard"><input type="text" name="email" id="temail" /></td> <label class="col-md-offset-3 col-md-2 control-label" for="temail"><fmt:message key="jsp.register.new-user.email.field"/></label>
</tr> <div class="col-md-3"><input class="form-control" type="text" name="email" id="temail" /></div>
<tr> </div>
<td align="center" colspan="2"> <div class="row col-md-offset-5">
<%-- <input type="submit" name="submit" value="Register"> --%> <%-- <input type="submit" name="submit" value="Register"> --%>
<input type="submit" name="submit" value="<fmt:message key="jsp.register.new-user.register.button"/>" /> <input class="btn btn-default col-md-4" type="submit" name="submit" value="<fmt:message key="jsp.register.new-user.register.button"/>" />
</td> </div>
</tr>
</table>
</td>
</tr>
</table>
</form> </form>
<%-- <p>If you or your department are interested in registering with DSpace, please <%-- <p>If you or your department are interested in registering with DSpace, please
contact the DSpace site administrators.</p> --%> contact the DSpace site administrators.</p> --%>
<p><fmt:message key="jsp.register.new-user.info3"/></p> <br/>
<div class="alert alert-info"><fmt:message key="jsp.register.new-user.info3"/></div>
<dspace:include page="/components/contact-info.jsp" /> <dspace:include page="/components/contact-info.jsp" />

41
dspace-jspui/src/main/webapp/register/profile-form.jsp
View File

@@ -56,27 +56,23 @@
if (language == null) language = ""; if (language == null) language = "";
} }
%> %>
<div class="form-group">
<table border="0" align="center" cellpadding="5"> <label class="col-md-offset-3 col-md-2 control-label" for="first_name"><fmt:message key="jsp.register.profile-form.fname.field"/></label>
<tr> <div class="col-md-3"><input class="form-control" type="text" name="first_name" id="tfirst_name" size="40" value="<%= Utils.addEntities(firstName) %>"/></div>
<%-- <td align="right" class="standard"><strong>First name*:</strong></td> --%> </div>
<td align="right" class="standard"><strong><fmt:message key="jsp.register.profile-form.fname.field"/></strong></td> <div class="form-group">
<td class="standard"><input type="text" name="first_name" id="tfirst_name" size="40" value="<%= Utils.addEntities(firstName) %>"/></td>
</tr>
<tr>
<%-- <td align="right" class="standard"><label for="tlast_name"><strong>Last name*:</strong></label></td> --%> <%-- <td align="right" class="standard"><label for="tlast_name"><strong>Last name*:</strong></label></td> --%>
<td align="right" class="standard"><label for="tlast_name"><strong><fmt:message key="jsp.register.profile-form.lname.field"/></strong></label></td> <label class="col-md-offset-3 col-md-2 control-label" for="tlast_name"><fmt:message key="jsp.register.profile-form.lname.field"/></label>
<td class="standard"><input type="text" name="last_name" id="tlast_name" size="40" value="<%= Utils.addEntities(lastName) %>" /></td> <div class="col-md-3"><input class="form-control" type="text" name="last_name" id="tlast_name" size="40" value="<%= Utils.addEntities(lastName) %>" /></div>
</tr> </div>
<tr> <div class="form-group">
<%-- <td align="right" class="standard"><strong>Contact telephone:</strong></td> --%> <label class="col-md-offset-3 col-md-2 control-label" for="tphone"><fmt:message key="jsp.register.profile-form.phone.field"/></label>
<td align="right" class="standard"><label for="tphone"><strong><fmt:message key="jsp.register.profile-form.phone.field"/></strong></label></td> <div class="col-md-3"><input class="form-control" type="text" name="phone" id="tphone" size="40" maxlength="32" value="<%= Utils.addEntities(phone) %>"/></div>
<td class="standard"><input type="text" name="phone" id="tphone" size="40" maxlength="32" value="<%= Utils.addEntities(phone) %>"/></td> </div>
</tr> <div class="form-group">
<tr> <label class="col-md-offset-3 col-md-2 control-label" for="tlanguage"><strong><fmt:message key="jsp.register.profile-form.language.field"/></strong></label>
<td align="right" class="standard"><label for="tlanguage"><strong><fmt:message key="jsp.register.profile-form.language.field"/></strong></label></td> <div class="col-md-3">
<td class="standard"> <select class="form-control" name="language" id="tlanguage">
<select name="language" id="tlanguage">
<% <%
for (int i = supportedLocales.length-1; i >= 0; i--) for (int i = supportedLocales.length-1; i >= 0; i--)
{ {
@@ -98,6 +94,5 @@
} }
%> %>
</select> </select>
</td> </div>
</tr> </div>
</table>

2
dspace-jspui/src/main/webapp/register/profile-updated.jsp
View File

@@ -35,7 +35,7 @@
<%-- <p>Thank you, your profile information <%-- <p>Thank you, your profile information
<%= (passwordUpdated ? "and password have" : "has") %> <%= (passwordUpdated ? "and password have" : "has") %>
been updated.</p> --%> been updated.</p> --%>
<p> <p class="alert alert-info">
<% if(passwordUpdated) <% if(passwordUpdated)
{ %> { %>
<fmt:message key="jsp.register.profile-updated.info1"/> <fmt:message key="jsp.register.profile-updated.info1"/>

50
dspace-jspui/src/main/webapp/register/registration-form.jsp
View File

@@ -49,7 +49,7 @@
boolean setPassword = (attr != null && attr.booleanValue()); boolean setPassword = (attr != null && attr.booleanValue());
%> %>
<dspace:layout titlekey="jsp.register.registration-form.title" nocache="true"> <dspace:layout style="submission" titlekey="jsp.register.registration-form.title" nocache="true">
<%-- <h1>Registration Information</h1> --%> <%-- <h1>Registration Information</h1> --%>
<h1><fmt:message key="jsp.register.registration-form.title"/></h1> <h1><fmt:message key="jsp.register.registration-form.title"/></h1>
@@ -59,7 +59,7 @@
{ {
%> %>
<%-- <p><strong>Please fill out all of the required fields.</strong></p> --%> <%-- <p><strong>Please fill out all of the required fields.</strong></p> --%>
<p><strong><fmt:message key="jsp.register.registration-form.instruct1"/></strong></p> <p class="alert alert-warning"><strong><fmt:message key="jsp.register.registration-form.instruct1"/></strong></p>
<% <%
} }
@@ -68,15 +68,15 @@
%> %>
<%-- <p><strong>The passwords you enter below must match, and need to be at <%-- <p><strong>The passwords you enter below must match, and need to be at
least 6 characters long.</strong></p> --%> least 6 characters long.</strong></p> --%>
<p><strong><fmt:message key="jsp.register.registration-form.instruct2"/></strong></p> <p class="alert alert-warning"><strong><fmt:message key="jsp.register.registration-form.instruct2"/></strong></p>
<% <%
} }
%> %>
<%-- <p>Please enter the following information. The fields marked with a * are <%-- <p>Please enter the following information. The fields marked with a * are
required.</p> --%> required.</p> --%>
<p><fmt:message key="jsp.register.registration-form.instruct3"/></p> <p class="alert"><fmt:message key="jsp.register.registration-form.instruct3"/></p>
<form action="<%= request.getContextPath() %>/register" method="post"> <form class="form-horizontal" action="<%= request.getContextPath() %>/register" method="post">
<% if (netid!=null) { %> <input type="hidden" name="netid" value="<%= netid %>" /> <% } %> <% if (netid!=null) { %> <input type="hidden" name="netid" value="<%= netid %>" /> <% } %>
<% if (email!=null) { %> <input type="hidden" name="email" value="<%= email %>" /> <% } %> <% if (email!=null) { %> <input type="hidden" name="email" value="<%= email %>" /> <% } %>
<dspace:include page="/register/profile-form.jsp" /> <dspace:include page="/register/profile-form.jsp" />
@@ -87,26 +87,23 @@
%> %>
<%-- <p>Please choose a password and enter it into the box below, and confirm it by typing it <%-- <p>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.</p> --%> again into the second box. It should be at least six characters long.</p> --%>
<p><fmt:message key="jsp.register.registration-form.instruct4"/></p> <p class="alert"><fmt:message key="jsp.register.registration-form.instruct4"/></p>
<div class="form-group">
<%-- <td align="right" class="standard"><strong>New Password:</strong></td> --%>
<label class="col-md-offset-3 col-md-2 control-label" for="tpassword"><fmt:message key="jsp.register.registration-form.pswd.field"/></label>
<div class="col-md-3">
<input class="form-control" type="password" name="password" id="tpassword" />
</div>
</div>
<div class="form-group">
<%-- <td align="right" class="standard"><strong>Again to Confirm:</strong></td> --%>
<label class="col-md-offset-3 col-md-2 control-label" for="tpassword_confirm"><fmt:message key="jsp.register.registration-form.confirm.field"/></label>
<div class="col-md-3">
<input class="form-control" type="password" name="password_confirm" id="tpassword_confirm" /></td>
</div>
</div>
<table class="misc" align="center">
<tr>
<td class="oddRowEvenCol">
<table border="0" cellpadding="5">
<tr>
<%-- <td align="right" class="standard"><strong>Password:</strong></td> --%>
<td align="right" class="standard"><label for="tpassword"><strong><fmt:message key="jsp.register.registration-form.pswd.field"/></strong></label></td>
<td class="standard"><input type="password" name="password" id="tpassword" /></td>
</tr>
<tr>
<%-- <td align="right" class="standard"><strong>Again to Confirm:</strong></td> --%>
<td align="right" class="standard"><label for="tpassword_confirm"><strong><fmt:message key="jsp.register.registration-form.confirm.field"/></strong></label></td>
<td class="standard"><input type="password" name="password_confirm" id="tpassword_confirm" /></td>
</tr>
</table>
</td>
</tr>
</table>
<% <%
} }
%> %>
@@ -115,6 +112,9 @@
<input type="hidden" name="token" value="<%= token %>"/> <input type="hidden" name="token" value="<%= token %>"/>
<%-- <p align="center"><input type="submit" name="submit" value="Complete Registration"></p> --%> <%-- <p align="center"><input type="submit" name="submit" value="Complete Registration"></p> --%>
<p align="center"><input type="submit" name="submit" value="<fmt:message key="jsp.register.registration-form.complete.button"/>" /></p> <div class="col-md-offset-5">
<input class="btn btn-success col-md-4" type="submit" name="submit" value="<fmt:message key="jsp.register.registration-form.complete.button"/>" />
</div>
</form> </form>
</dspace:layout> </dspace:layout>

2
dspace-jspui/src/main/webapp/register/registration-sent.jsp
View File

@@ -26,6 +26,6 @@
<%-- <p>You have been sent an e-mail containing a special URL, or "token". When <%-- <p>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. you visit this URL, you will need to fill out some simple information.
After that, you'll be ready to log into DSpace!</p> --%> After that, you'll be ready to log into DSpace!</p> --%>
<p><fmt:message key="jsp.register.registration-sent.info"/></p> <p class="alert alert-info"><fmt:message key="jsp.register.registration-sent.info"/></p>
</dspace:layout> </dspace:layout>

49
dspace-jspui/src/main/webapp/submit/choose-file.jsp
View File

@@ -135,7 +135,7 @@
$('#spanFile').remove(); $('#spanFile').remove();
$('#selectedFile').remove(); $('#selectedFile').remove();
$('<input type="file" name="file" id="tfile">').appendTo(parent); $('<input type="file" name="file" id="tfile">').appendTo(parent);
$('#tfile').wrap('<span id="spanFile" class="fileinput-button btn btn-success col-md-2"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;<fmt:message key="jsp.submit.choose-file.upload-ajax.button.select-file"/></span>'); $('#tfile').wrap('<span id="spanFile" class="fileinput-button btn btn-success"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;<fmt:message key="jsp.submit.choose-file.upload-ajax.button.select-file"/></span>');
$('#tfile').on('change', function(){ $('#tfile').on('change', function(){
decorateFileInputChangeEvent($); decorateFileInputChangeEvent($);
}); });
@@ -151,7 +151,7 @@
progressbarArea.find('p.progressBarProgressMsg').hide(); progressbarArea.find('p.progressBarProgressMsg').hide();
progressbarArea.find('p.progressBarCompleteMsg').hide(); progressbarArea.find('p.progressBarCompleteMsg').hide();
progressbarArea.hide(); progressbarArea.hide();
$('#tfile').wrap('<span id="spanFile" class="fileinput-button btn btn-success col-md-2"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;<fmt:message key="jsp.submit.choose-file.upload-ajax.button.select-file"/></span>'); $('#tfile').wrap('<span id="spanFile" class="fileinput-button btn btn-success"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;<fmt:message key="jsp.submit.choose-file.upload-ajax.button.select-file"/></span>');
$('#tfile').on('change', function(){ $('#tfile').on('change', function(){
decorateFileInputChangeEvent($); decorateFileInputChangeEvent($);
}); });
@@ -314,6 +314,26 @@
<jsp:include page="/submit/progressbar.jsp"/> <jsp:include page="/submit/progressbar.jsp"/>
<%
if (bSherpa)
{
%>
<div class="pull-right well col-md-5" style="overflow:hidden; text-align:center;">
<div id="sherpaBox" class="panel panel-info">
<div class="panel-heading">
<span id="ui-id-1"><fmt:message key="jsp.sherpa.title" /></span>
</div>
<div id="sherpaContent" class="panel-body">
<fmt:message key="jsp.sherpa.loading">
<fmt:param value="<%=request.getContextPath()%>" />
</fmt:message>
</div>
</div>
</div>
<div class="col-md-7">
<%
}
%>
<%-- Hidden fields needed for SubmissionController servlet to know which step is next--%> <%-- Hidden fields needed for SubmissionController servlet to know which step is next--%>
<%= SubmissionController.getSubmissionParameters(context, request) %> <%= SubmissionController.getSubmissionParameters(context, request) %>
@@ -342,9 +362,9 @@
</div> </div>
<div class="container"> <div class="container">
<div class="row"> <div class="row col-md-offset-3">
<%-- Document File: --%> <%-- Document File: --%>
<label class="col-md-2" for="tfile"><fmt:message key="jsp.submit.choose-file.document"/></label> <label class="label label-default" for="tfile"><fmt:message key="jsp.submit.choose-file.document"/></label>
<input type="file" size="40" name="file" id="tfile" /> <input type="file" size="40" name="file" id="tfile" />
</div><br/> </div><br/>
<% if (ajaxProgress) <% if (ajaxProgress)
@@ -426,24 +446,11 @@
%> %>
<input class="btn btn-primary col-md-<%= 12 / (col + 2) %>" type="submit" name="<%=UploadStep.SUBMIT_UPLOAD_BUTTON%>" value="<fmt:message key="jsp.submit.general.next"/>" /> <input class="btn btn-primary col-md-<%= 12 / (col + 2) %>" type="submit" name="<%=UploadStep.SUBMIT_UPLOAD_BUTTON%>" value="<fmt:message key="jsp.submit.general.next"/>" />
</div> </div>
</form> <%
<%
if (bSherpa) if (bSherpa)
{ {
%> %>
<dspace:sidebar> </div>
<div id="sherpaBox" class="panel panel-info"> <% } %>
<div class="panel-heading"> </form>
<span id="ui-id-1"><fmt:message key="jsp.sherpa.title" /></span>
</div>
<div id="sherpaContent" class="panel-body">
<fmt:message key="jsp.sherpa.loading">
<fmt:param value="<%=request.getContextPath()%>" />
</fmt:message>
</div>
</div>
</dspace:sidebar>
<%
}
%>
</dspace:layout> </dspace:layout>

12
dspace-jspui/src/main/webapp/submit/upload-error.jsp
View File

@@ -42,7 +42,7 @@
SubmissionInfo subInfo = SubmissionController.getSubmissionInfo(context, request); SubmissionInfo subInfo = SubmissionController.getSubmissionInfo(context, request);
%> %>
<dspace:layout locbar="off" <dspace:layout style="submission" locbar="off"
navbar="off" navbar="off"
titlekey="jsp.submit.upload-error.title" titlekey="jsp.submit.upload-error.title"
nocache="true"> nocache="true">
@@ -57,17 +57,15 @@
<%-- <p>There was a problem uploading your file. Either the filename you entered <%-- <p>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 was incorrect, or there was a network problem which prevented the file from
reaching us correctly. Please try again.</p> --%> reaching us correctly. Please try again.</p> --%>
<p><fmt:message key="jsp.submit.upload-error.info"/></p> <p class="alert alert-warning"><fmt:message key="jsp.submit.upload-error.info"/></p>
<%-- Hidden fields needed for SubmissionController servlet to know which step is next--%> <%-- Hidden fields needed for SubmissionController servlet to know which step is next--%>
<%= SubmissionController.getSubmissionParameters(context, request) %> <%= SubmissionController.getSubmissionParameters(context, request) %>
<%-- HACK: <center> tag needed for broken Netscape 4.78 behaviour --%> <%-- HACK: <center> tag needed for broken Netscape 4.78 behaviour --%>
<center>
<p> <input class="btn btn-primary col-md-offset-5" type="submit" name="submit_retry" value="<fmt:message key="jsp.submit.upload-error.retry.button"/>" />
<input type="submit" name="submit_retry" value="<fmt:message key="jsp.submit.upload-error.retry.button"/>" />
</p>
</center>
</form> </form>
</dspace:layout> </dspace:layout>

165
dspace-jspui/src/main/webapp/tools/edit-item-form.jsp
View File

@@ -222,7 +222,7 @@
<div class="col-md-9"> <div class="col-md-9">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"></div> <div class="panel-heading"><fmt:message key="jsp.tools.edit-item-form.details" /></div>
<div class="panel-body"> <div class="panel-body">
<table class="table"> <table class="table">
@@ -268,57 +268,6 @@
</td> </td>
</tr> </tr>
<%
if (bPolicy)
{
%>
<%-- ===========================================================
Edit item's policies
=========================================================== --%>
<tr>
<%-- <td class="submitFormLabel">Item's Authorizations:</td> --%>
<td><fmt:message key="jsp.tools.edit-item-form.item" />
</td>
<td>
<form method="post"
action="<%= request.getContextPath() %>/tools/authorize">
<input type="hidden" name="handle"
value="<%= ConfigurationManager.getProperty("handle.prefix") %>" />
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<%-- <input type="submit" name="submit_item_select" value="Edit..."> --%>
<input class="btn btn-default pull-right col-md-8" type="submit"
name="submit_item_select"
value="<fmt:message key="jsp.tools.general.edit"/>" />
</form></td>
</tr>
<%
}
%>
<%
if (isItemAdmin)
{
%>
<%-- ===========================================================
Curate Item
=========================================================== --%>
<tr>
<%-- <td class="submitFormLabel">Item's Curations:</td> --%>
<td><fmt:message key="jsp.tools.edit-item-form.form.label1" />
</td>
<td>
<form method="post"
action="<%= request.getContextPath() %>/tools/curate">
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input class="btn btn-default pull-right col-md-8" type="submit"
name="submit_item_select"
value="<fmt:message key="jsp.tools.edit-item-form.form.button.curate"/>" />
</form></td>
</tr>
<%
}
%>
</table> </table>
</div> </div>
@@ -329,30 +278,34 @@
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"><fmt:message key="jsp.admintools"/></div> <div class="panel-heading"><fmt:message key="jsp.actiontools"/></div>
<div class="panel-body"> <div class="panel-body">
<span class="col-md-offset-2 btn-group"> <div class="btn-group col-md-offset-2">
<% <%
if (!item.isWithdrawn() && bWithdraw) if (!item.isWithdrawn() && bWithdraw)
{ {
%> %>
<div class="row">
<form method="post" action="<%= request.getContextPath() %>/tools/edit-item"> <form method="post" action="<%= request.getContextPath() %>/tools/edit-item">
<input type="hidden" name="item_id" value="<%= item.getID() %>" /> <input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="hidden" name="action" value="<%= EditItemServlet.START_WITHDRAW %>" /> <input type="hidden" name="action" value="<%= EditItemServlet.START_WITHDRAW %>" />
<%-- <input type="submit" name="submit" value="Withdraw..."> --%> <%-- <input type="submit" name="submit" value="Withdraw..."> --%>
<input class="btn btn-primary" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.withdraw-w-confirm.button"/>"/> <input class="btn btn-warning col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.withdraw-w-confirm.button"/>"/>
</form> </form>
</div>
<% <%
} }
else if (item.isWithdrawn() && bReinstate) else if (item.isWithdrawn() && bReinstate)
{ {
%> %>
<div class="row">
<form method="post" action="<%= request.getContextPath() %>/tools/edit-item"> <form method="post" action="<%= request.getContextPath() %>/tools/edit-item">
<input type="hidden" name="item_id" value="<%= item.getID() %>" /> <input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="hidden" name="action" value="<%= EditItemServlet.REINSTATE %>" /> <input type="hidden" name="action" value="<%= EditItemServlet.REINSTATE %>" />
<%-- <input type="submit" name="submit" value="Reinstate"> --%> <%-- <input type="submit" name="submit" value="Reinstate"> --%>
<input class="btn btn-primary" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.reinstate.button"/>"/> <input class="btn btn-warning col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.reinstate.button"/>"/>
</form> </form>
</div>
<% <%
} }
%> %>
@@ -360,23 +313,28 @@
if (bDelete) if (bDelete)
{ {
%> %>
<div class="row">
<form method="post" action="<%= request.getContextPath() %>/tools/edit-item"> <form method="post" action="<%= request.getContextPath() %>/tools/edit-item">
<input type="hidden" name="item_id" value="<%= item.getID() %>" /> <input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="hidden" name="action" value="<%= EditItemServlet.START_DELETE %>" /> <input type="hidden" name="action" value="<%= EditItemServlet.START_DELETE %>" />
<%-- <input type="submit" name="submit" value="Delete (Expunge)..."> --%> <%-- <input type="submit" name="submit" value="Delete (Expunge)..."> --%>
<input class="btn btn-primary" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.delete-w-confirm.button"/>"/> <input class="btn btn-danger col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.delete-w-confirm.button"/>"/>
</form> </form>
</div>
<% <%
} }
%> %>
<% <%
if (isItemAdmin) if (isItemAdmin)
{ {
%> <form method="post" action="<%= request.getContextPath() %>/tools/edit-item"> %>
<div class="row">
<form method="post" action="<%= request.getContextPath() %>/tools/edit-item">
<input type="hidden" name="item_id" value="<%= item.getID() %>" /> <input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="hidden" name="action" value="<%= EditItemServlet.START_MOVE_ITEM %>" /> <input type="hidden" name="action" value="<%= EditItemServlet.START_MOVE_ITEM %>" />
<input class="btn btn-primary" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.move-item.button"/>"/> <input class="btn btn-default col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.move-item.button"/>"/>
</form> </form>
</div>
<% <%
} }
%> %>
@@ -384,25 +342,71 @@
if (item.isDiscoverable() && bPrivating) if (item.isDiscoverable() && bPrivating)
{ {
%> %>
<div class="row">
<form method="post" action="<%= request.getContextPath() %>/tools/edit-item"> <form method="post" action="<%= request.getContextPath() %>/tools/edit-item">
<input type="hidden" name="item_id" value="<%= item.getID() %>" /> <input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="hidden" name="action" value="<%= EditItemServlet.START_PRIVATING %>" /> <input type="hidden" name="action" value="<%= EditItemServlet.START_PRIVATING %>" />
<input class="btn btn-primary" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.privating-w-confirm.button"/>"/> <input class="btn btn-default col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.privating-w-confirm.button"/>"/>
</form> </form>
</div>
<% <%
} }
else if (!item.isDiscoverable() && bPublicize) else if (!item.isDiscoverable() && bPublicize)
{ {
%> %>
<div class="row">
<form method="post" action="<%= request.getContextPath() %>/tools/edit-item"> <form method="post" action="<%= request.getContextPath() %>/tools/edit-item">
<input type="hidden" name="item_id" value="<%= item.getID() %>" /> <input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="hidden" name="action" value="<%= EditItemServlet.PUBLICIZE %>" /> <input type="hidden" name="action" value="<%= EditItemServlet.PUBLICIZE %>" />
<input class="btn btn-primary" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.publicize.button"/>"/> <input class="btn btn-default col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.publicize.button"/>"/>
</form> </form>
</div>
<% <%
} }
%> %>
</span>
<%
if (bPolicy)
{
%>
<%-- ===========================================================
Edit item's policies
=========================================================== --%>
<div class="row">
<form method="post"
action="<%= request.getContextPath() %>/tools/authorize">
<input type="hidden" name="handle"
value="<%= ConfigurationManager.getProperty("handle.prefix") %>" />
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<%-- <input type="submit" name="submit_item_select" value="Edit..."> --%>
<input class="btn btn-default col-md-12" type="submit"
name="submit_item_select"
value="<fmt:message key="jsp.tools.edit-item-form.item" />" />
</form>
</div>
<%
}
%>
<%
if (isItemAdmin)
{
%>
<%-- ===========================================================
Curate Item
=========================================================== --%>
<div class="row">
<form method="post"
action="<%= request.getContextPath() %>/tools/curate">
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input class="btn btn-default col-md-12" type="submit"
name="submit_item_select"
value="<fmt:message key="jsp.tools.edit-item-form.form.button.curate"/>" />
</form>
</div>
<%
}
%>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -529,7 +533,7 @@
</td> </td>
<td headers="t5" class="<%= row %>RowOddCol"> <td headers="t5" class="<%= row %>RowOddCol">
<%-- <input type="submit" name="submit_addfield" value="Add"> --%> <%-- <input type="submit" name="submit_addfield" value="Add"> --%>
<button class="btn btn-success" name="submit_addfield" value="<fmt:message key="jsp.tools.general.add"/>"> <button class="btn btn-default" name="submit_addfield" value="<fmt:message key="jsp.tools.general.add"/>">
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
</button> </button>
</td> </td>
@@ -556,13 +560,13 @@
<th class="oddRowOddCol"><strong>Description</strong></th> <th class="oddRowOddCol"><strong>Description</strong></th>
<th class="oddRowEvenCol"><strong>Format</strong></th> <th class="oddRowEvenCol"><strong>Format</strong></th>
<th class="oddRowOddCol"><strong>User&nbsp;Format&nbsp;Description</strong></th> --%> <th class="oddRowOddCol"><strong>User&nbsp;Format&nbsp;Description</strong></th> --%>
<th id="t10" class="oddRowEvenCol">&nbsp;</th>
<th id="t11" class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem5"/></strong></th> <th id="t11" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem5"/></strong></th>
<th id="t12" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem7"/></strong></th> <th id="t12" class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem7"/></strong></th>
<th id="t13" class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem8"/></strong></th> <th id="t13" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem8"/></strong></th>
<th id="t14" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem9"/></strong></th> <th id="t14" class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem9"/></strong></th>
<th id="t15" class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem10"/></strong></th> <th id="t15" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem10"/></strong></th>
<th id="t16" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem11"/></strong></th> <th id="t16" class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem11"/></strong></th>
<th id="t17" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem12"/></strong></th> <th id="t17" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem12"/></strong></th>
<th id="t18" class="oddRowEvenCol">&nbsp;</th> <th id="t18" class="oddRowEvenCol">&nbsp;</th>
</tr> </tr>
@@ -586,6 +590,10 @@
BitstreamFormat bf = bitstreams[j].getFormat(); BitstreamFormat bf = bitstreams[j].getFormat();
%> %>
<tr id="<%="row_" + bundles[i].getName() + "_" + bitstreams[j].getID()%>"> <tr id="<%="row_" + bundles[i].getName() + "_" + bitstreams[j].getID()%>">
<td headers="t10" class="<%= row %>RowEvenCol" align="center">
<%-- <a target="_blank" href="<%= request.getContextPath() %>/retrieve/<%= bitstreams[j].getID() %>">View</a>&nbsp;<input type="submit" name="submit_delete_bitstream_<%= key %>" value="Remove"> --%>
<a target="_blank" href="<%= request.getContextPath() %>/retrieve/<%= bitstreams[j].getID() %>"><fmt:message key="jsp.tools.general.view"/></a>&nbsp;
</td>
<% if (bundles[i].getName().equals("ORIGINAL")) <% if (bundles[i].getName().equals("ORIGINAL"))
{ %> { %>
<td headers="t11" class="<%= row %>RowEvenCol" align="center"> <td headers="t11" class="<%= row %>RowEvenCol" align="center">
@@ -643,10 +651,14 @@
<input type="hidden" value="<%=upButtonValue%>" name="<%=bundles[i].getID()%>_<%=bitstreams[j].getID()%>_up_value"> <input type="hidden" value="<%=upButtonValue%>" name="<%=bundles[i].getID()%>_<%=bitstreams[j].getID()%>_up_value">
<input type="hidden" value="<%=downButtonValue%>" name="<%=bundles[i].getID()%>_<%=bitstreams[j].getID()%>_down_value"> <input type="hidden" value="<%=downButtonValue%>" name="<%=bundles[i].getID()%>_<%=bitstreams[j].getID()%>_down_value">
<div> <div>
<input class="btn btn-default" name="submit_order_<%=key%>_up" type="submit" value="<fmt:message key="jsp.tools.edit-item-form.move-up"/> " <%=j==0 ? "disabled=\"disabled\"" : ""%>/> <button class="btn btn-default" name="submit_order_<%=key%>_up" value="<fmt:message key="jsp.tools.edit-item-form.move-up"/> " <%=j==0 ? "disabled=\"disabled\"" : ""%>>
<span class="glyphicon glyphicon-arrow-up"></span>
</button>
</div> </div>
<div> <div>
<input class="btn btn-default" name="submit_order_<%=key%>_down" type="submit" value="<fmt:message key="jsp.tools.edit-item-form.move-down"/> " <%=j==(bitstreams.length-1) ? "disabled=\"disabled\"" : ""%>/> <button class="btn btn-default" name="submit_order_<%=key%>_down" value="<fmt:message key="jsp.tools.edit-item-form.move-down"/> " <%=j==(bitstreams.length-1) ? "disabled=\"disabled\"" : ""%>>
<span class="glyphicon glyphicon-arrow-down"></span>
</button>
</div> </div>
</td> </td>
@@ -660,8 +672,7 @@
} }
%> %>
<td headers="t18" class="<%= row %>RowEvenCol"> <td headers="t18" class="<%= row %>RowEvenCol">
<%-- <a target="_blank" href="<%= request.getContextPath() %>/retrieve/<%= bitstreams[j].getID() %>">View</a>&nbsp;<input type="submit" name="submit_delete_bitstream_<%= key %>" value="Remove"> --%>
<a target="_blank" href="<%= request.getContextPath() %>/retrieve/<%= bitstreams[j].getID() %>"><fmt:message key="jsp.tools.general.view"/></a>&nbsp;
<% if (bRemoveBits) { %> <% if (bRemoveBits) { %>
<button class="btn btn-danger" name="submit_delete_bitstream_<%= key %>" value="<fmt:message key="jsp.tools.general.remove"/>"> <button class="btn btn-danger" name="submit_delete_bitstream_<%= key %>" value="<fmt:message key="jsp.tools.general.remove"/>">
<span class="glyphicon glyphicon-trash"></span> <span class="glyphicon glyphicon-trash"></span>
@@ -683,7 +694,7 @@
<% <%
if (bCreateBits) { if (bCreateBits) {
%> %>
<input class="btn btn-primary col-md-2" type="submit" name="submit_addbitstream" value="<fmt:message key="jsp.tools.edit-item-form.addbit.button"/>"/> <input class="btn btn-success col-md-2" type="submit" name="submit_addbitstream" value="<fmt:message key="jsp.tools.edit-item-form.addbit.button"/>"/>
<% } <% }
if(breOrderBitstreams){ if(breOrderBitstreams){
%> %>
@@ -697,7 +708,7 @@
Bundle[] ccBundle = item.getBundles("CC-LICENSE"); Bundle[] ccBundle = item.getBundles("CC-LICENSE");
s = ccBundle.length > 0 ? LocaleSupport.getLocalizedMessage(pageContext, "jsp.tools.edit-item-form.replacecc.button") : LocaleSupport.getLocalizedMessage(pageContext, "jsp.tools.edit-item-form.addcc.button"); s = ccBundle.length > 0 ? LocaleSupport.getLocalizedMessage(pageContext, "jsp.tools.edit-item-form.replacecc.button") : LocaleSupport.getLocalizedMessage(pageContext, "jsp.tools.edit-item-form.addcc.button");
%> %>
<input class="btn btn-primary col-md-2" type="submit" name="submit_addcc" value="<%= s %>" /> <input class="btn btn-success col-md-2" type="submit" name="submit_addcc" value="<%= s %>" />
<input type="hidden" name="handle" value="<%= ConfigurationManager.getProperty("handle.prefix") %>"/> <input type="hidden" name="handle" value="<%= ConfigurationManager.getProperty("handle.prefix") %>"/>
<input type="hidden" name="item_id" value="<%= item.getID() %>"/> <input type="hidden" name="item_id" value="<%= item.getID() %>"/>
@@ -711,7 +722,7 @@
<input type="hidden" name="action" value="<%= EditItemServlet.UPDATE_ITEM %>"/> <input type="hidden" name="action" value="<%= EditItemServlet.UPDATE_ITEM %>"/>
<%-- <input type="submit" name="submit" value="Update" /> --%> <%-- <input type="submit" name="submit" value="Update" /> --%>
<input class="btn btn-success pull-right col-md-3" type="submit" name="submit" value="<fmt:message key="jsp.tools.general.update"/>" /> <input class="btn btn-primary pull-right col-md-3" type="submit" name="submit" value="<fmt:message key="jsp.tools.general.update"/>" />
<%-- <input type="submit" name="submit_cancel" value="Cancel" /> --%> <%-- <input type="submit" name="submit_cancel" value="Cancel" /> --%>
<input class="btn btn-default pull-right col-md-3" type="submit" name="submit_cancel" value="<fmt:message key="jsp.tools.general.cancel"/>" /> <input class="btn btn-default pull-right col-md-3" type="submit" name="submit_cancel" value="<fmt:message key="jsp.tools.general.cancel"/>" />
</div> </div>

71
dspace-jspui/src/main/webapp/tools/itemmap-browse.jsp
View File

@@ -49,7 +49,7 @@
.getAttribute("page") : 1; .getAttribute("page") : 1;
%> %>
<dspace:layout titlekey="jsp.tools.itemmap-browse.title"> <dspace:layout style="submission" titlekey="jsp.tools.itemmap-browse.title">
<%-- <h2>Browse <%=browsetext%></h2> --%> <%-- <h2>Browse <%=browsetext%></h2> --%>
<h2> <h2>
@@ -67,14 +67,14 @@
<%-- <p>Check the box next to items you wish to add or remove, and choose 'add' or 'remove'.</p> --%> <%-- <p>Check the box next to items you wish to add or remove, and choose 'add' or 'remove'.</p> --%>
<% if (browsetype.equals("Add")){ %> <% if (browsetype.equals("Add")){ %>
<p> <p class="alert alert-info">
<fmt:message key="jsp.tools.itemmap-browse.add"> <fmt:message key="jsp.tools.itemmap-browse.add">
<fmt:param><%= collection.getName() %></fmt:param> <fmt:param><%= collection.getName() %></fmt:param>
</fmt:message> </fmt:message>
</p> </p>
<% }%> <% }%>
<% if (browsetype.equals("Remove")){ %> <% if (browsetype.equals("Remove")){ %>
<p> <p class="alert alert-warning">
<fmt:message key="jsp.tools.itemmap-browse.remove"> <fmt:message key="jsp.tools.itemmap-browse.remove">
<fmt:param><%= collection.getName() %></fmt:param> <fmt:param><%= collection.getName() %></fmt:param>
</fmt:message> </fmt:message>
@@ -84,22 +84,18 @@
<%-- %>p><fmt:message key="jsp.tools.itemmap-browse.infomsg"/></p--%> <%-- %>p><fmt:message key="jsp.tools.itemmap-browse.infomsg"/></p--%>
<form method="post" action="<%= request.getContextPath() %>/tools/itemmap"> <form method="post" action="<%= request.getContextPath() %>/tools/itemmap">
<input type="hidden" name="cid" value="<%=collection.getID()%>" /> <input type="hidden" name="cid" value="<%=collection.getID()%>" />
<div class="btn-group">
<table> <input type="hidden" name="action" value="<%=browsetype%>" />
<tr>
<td><input type="hidden" name="action" value="<%=browsetype%>" />
<% if (browsetype.equals("Add")) { %> <% if (browsetype.equals("Add")) { %>
<input type="submit" value="<fmt:message key="jsp.tools.general.add"/>" /> <input class="btn btn-success" type="submit" value="<fmt:message key="jsp.tools.general.add"/>" />
<% } else if (browsetype.equals("Remove")) { %> <% } else if (browsetype.equals("Remove")) { %>
<input type="submit" value="<fmt:message key="jsp.tools.general.remove"/>" /> <input class="btn btn-danger" type="submit" value="<fmt:message key="jsp.tools.general.remove"/>" />
<% } %> <% } %>
</td>
<td><input type="submit" name="cancel" value="<fmt:message key="jsp.tools.general.cancel"/>" /></td>
</tr>
</table>
<input class="btn btn-default" type="submit" name="cancel" value="<fmt:message key="jsp.tools.general.cancel"/>" />
<table class="miscTable" align="center"> </div>
<div class="table-responsive">
<table class="table">
<tr> <tr>
<th class="oddRowOddCol"><strong><fmt:message key="jsp.tools.itemmap-browse.th.date"/></strong></th> <th class="oddRowOddCol"><strong><fmt:message key="jsp.tools.itemmap-browse.th.date"/></strong></th>
<th class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.itemmap-browse.th.author"/></strong></th> <th class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.itemmap-browse.th.author"/></strong></th>
@@ -110,9 +106,9 @@
<% } else { %> <% } else { %>
<th class="oddRowEvenCol"> <th class="oddRowEvenCol">
<% if (browsetype.equals("Add")) { %> <% if (browsetype.equals("Add")) { %>
<input type="submit" value="<fmt:message key="jsp.tools.general.add"/>" /> <input class="btn btn-success" type="submit" value="<fmt:message key="jsp.tools.general.add"/>" />
<% } else if (browsetype.equals("Remove")) { %> <% } else if (browsetype.equals("Remove")) { %>
<input type="submit" value="<fmt:message key="jsp.tools.general.remove"/>" /> <input class="btn btn-danger" type="submit" value="<fmt:message key="jsp.tools.general.remove"/>" />
<% } %> <% } %>
</th> </th>
<% } %> <% } %>
@@ -189,53 +185,50 @@
<% } %> <% } %>
</table> </table>
</div>
<table> <div class="btn-group">
<tr> <input type="hidden" name="action" value="<%=browsetype%>" />
<td>
<% if (browsetype.equals("Add")) { %> <% if (browsetype.equals("Add")) { %>
<input type="submit" value="<fmt:message key="jsp.tools.general.add"/>" /> <input class="btn btn-success" type="submit" value="<fmt:message key="jsp.tools.general.add"/>" />
<% } else if (browsetype.equals("Remove")) { %> <% } else if (browsetype.equals("Remove")) { %>
<input type="submit" value="<fmt:message key="jsp.tools.general.remove"/>" /> <input class="btn btn-danger" type="submit" value="<fmt:message key="jsp.tools.general.remove"/>" />
<% } %> <% } %>
</td>
<td><input type="submit" name="cancel" value="<fmt:message key="jsp.tools.general.cancel"/>" /></td> <input class="btn btn-default" type="submit" name="cancel" value="<fmt:message key="jsp.tools.general.cancel"/>" />
</tr> </div>
</table>
</form> </form>
<% if (bMore || pageResult > 1) { %> <% if (bMore || pageResult > 1) { %>
<table>
<tr> <p class="alert"><fmt:message key="jsp.tools.itemmap-browse.info.change-page"/></p>
<td> <div class="col-md-12">
<p><fmt:message key="jsp.tools.itemmap-browse.info.change-page"/></p>
</td>
<% if (pageResult > 1) { %> <% if (pageResult > 1) { %>
<td>
<form method="post" class="standard10" action=""> <form method="post" class="standard10" action="">
<input type="hidden" name="cid" value="<%=collection.getID()%>"/> <input type="hidden" name="cid" value="<%=collection.getID()%>"/>
<input type="hidden" name="action" value="search"/> <input type="hidden" name="action" value="search"/>
<input type="hidden" name="index" id="index" value="<%= index %>"/> <input type="hidden" name="index" id="index" value="<%= index %>"/>
<input type="hidden" name="query" id="query" value="<%= query %>"/> <input type="hidden" name="query" id="query" value="<%= query %>"/>
<input type="hidden" name="page" id="page" value="<%= pageResult -1 %>"/> <input type="hidden" name="page" id="page" value="<%= pageResult -1 %>"/>
<input type="submit" value="<fmt:message key="jsp.tools.itemmap-browse.previous.button"/>"/> <input class="btn btn-default col-md-6" type="submit" value="<fmt:message key="jsp.tools.itemmap-browse.previous.button"/>"/>
</form> </form>
</td>
<% } <% }
if (bMore) { %> if (bMore) { %>
<td>
<form method="post" class="standard10" action=""> <form method="post" class="standard10" action="">
<input type="hidden" name="cid" value="<%=collection.getID()%>"/> <input type="hidden" name="cid" value="<%=collection.getID()%>"/>
<input type="hidden" name="action" value="search"/> <input type="hidden" name="action" value="search"/>
<input type="hidden" name="index" id="index" value="<%= index %>"/> <input type="hidden" name="index" id="index" value="<%= index %>"/>
<input type="hidden" name="query" id="query" value="<%= query %>"/> <input type="hidden" name="query" id="query" value="<%= query %>"/>
<input type="hidden" name="page" id="page" value="<%= pageResult +1 %>"/> <input type="hidden" name="page" id="page" value="<%= pageResult +1 %>"/>
<input type="submit" value="<fmt:message key="jsp.tools.itemmap-browse.next.button"/>"/> <input class="btn btn-primary col-md-6" type="submit" value="<fmt:message key="jsp.tools.itemmap-browse.next.button"/>"/>
</form> </form>
</td>
<% } <% } %>
</div>
<%
} }
%> %>
</dspace:layout> </dspace:layout>

8
dspace-jspui/src/main/webapp/tools/itemmap-info.jsp
View File

@@ -38,11 +38,11 @@
LinkedList processedItems = (LinkedList)request.getAttribute("processedItems"); LinkedList processedItems = (LinkedList)request.getAttribute("processedItems");
%> %>
<dspace:layout titlekey="jsp.tools.itemmap-info.title"> <dspace:layout style="submission" titlekey="jsp.tools.itemmap-info.title">
<h2><fmt:message key="jsp.tools.itemmap-info.heading"/></h2> <h2><fmt:message key="jsp.tools.itemmap-info.heading"/></h2>
<p> <div class="alert">
<% if (message.equals("none-selected")) { %> <% if (message.equals("none-selected")) { %>
<fmt:message key="jsp.tools.itemmap-info.msg.none-selected" /> <fmt:message key="jsp.tools.itemmap-info.msg.none-selected" />
<% } else if (message.equals("none-removed")) { %> <% } else if (message.equals("none-removed")) { %>
@@ -62,10 +62,10 @@
</fmt:message><br/> </fmt:message><br/>
<% } %> <% } %>
<% } %> <% } %>
</p> </div>
<form method="post"> <form method="post">
<input type="hidden" name="cid" value="<%=collection.getID()%>"/> <input type="hidden" name="cid" value="<%=collection.getID()%>"/>
<input type="submit" name="submit" value="<fmt:message key="jsp.tools.itemmap-info.button.continue"/>"/> <input class="btn btn-default" type="submit" name="submit" value="<fmt:message key="jsp.tools.itemmap-info.button.continue"/>"/>
</form> </form>
</dspace:layout> </dspace:layout>

37
dspace-jspui/src/main/webapp/tools/itemmap-main.jsp
View File

@@ -52,19 +52,19 @@
boolean bSearchError = searchError != null?searchError:false; boolean bSearchError = searchError != null?searchError:false;
%> %>
<dspace:layout titlekey="jsp.tools.itemmap-main.title"> <dspace:layout style="submission" titlekey="jsp.tools.itemmap-main.title">
<%-- <h2>Item Mapper - Map Items from Other Collections</h2> --%> <%-- <h2>Item Mapper - Map Items from Other Collections</h2> --%>
<h2><fmt:message key="jsp.tools.itemmap-main.heading"/></h2> <h1><fmt:message key="jsp.tools.itemmap-main.heading"/></h1>
<%-- <p>Collection: "<%=collection.getMetadata("name")%>"</p> --%> <%-- <p>Collection: "<%=collection.getMetadata("name")%>"</p> --%>
<p><fmt:message key="jsp.tools.itemmap-main.collection"> <h2><fmt:message key="jsp.tools.itemmap-main.collection">
<fmt:param><%=collection.getMetadata("name")%></fmt:param> <fmt:param><%=collection.getMetadata("name")%></fmt:param>
</fmt:message></p> </fmt:message></h2>
<%-- <p>There are <%=count_native%> items owned by this collection, and <%-- <p>There are <%=count_native%> items owned by this collection, and
<%=count_import%> items mapped in from other collections.</p> --%> <%=count_import%> items mapped in from other collections.</p> --%>
<p><fmt:message key="jsp.tools.itemmap-main.info1"> <p class="alert alert-info"><fmt:message key="jsp.tools.itemmap-main.info1">
<fmt:param><%=count_native%></fmt:param> <fmt:param><%=count_native%></fmt:param>
<fmt:param><%=count_import%></fmt:param> <fmt:param><%=count_import%></fmt:param>
</fmt:message></p> </fmt:message></p>
@@ -125,9 +125,12 @@
<p><fmt:message key="jsp.tools.itemmap-main.info5"/></p> <p><fmt:message key="jsp.tools.itemmap-main.info5"/></p>
<form method="post" class="standard10" action=""> <form method="post" class="standard10" action="">
<input type="hidden" name="cid" value="<%=collection.getID()%>"/> <div class="form-group">
<input type="hidden" name="action" value="search"/> <div class="input-group col-md-10">
<select name="index" id="index"> <input type="hidden" name="cid" value="<%=collection.getID()%>"/>
<input type="hidden" name="action" value="search"/>
<span class="col-md-4">
<select class="form-control" name="index" id="index">
<% <%
for (String index : searchIndices) for (String index : searchIndices)
{ {
@@ -137,13 +140,19 @@
<% <%
} }
%> %>
</select> </select></span>
<input id="query" name="query" size="50"/> <span class="col-md-8">
<input type="submit" value="<fmt:message key="jsp.tools.itemmap-main.search.button"/>" /> <input class="form-control" id="query" name="query" size="50"/>
<br/>
</span>
</div>
<input class="btn btn-default" type="submit" value="<fmt:message key="jsp.tools.itemmap-main.search.button"/>" />
</div>
</form> </form>
<% if (bSearchError) { %> <% if (bSearchError) { %>
<p class="submitFormWarn"><fmt:message key="jsp.tools.itemmap-main.search-error"/></p> <p class="alert alert-warning"><fmt:message key="jsp.tools.itemmap-main.search-error"/></p>
<% } %> <% } %>
<%-- <h3>Browse Items Imported From Collections:</h3> --%> <%-- <h3>Browse Items Imported From Collections:</h3> --%>
<h3><fmt:message key="jsp.tools.itemmap-main.info6"/></h3> <h3><fmt:message key="jsp.tools.itemmap-main.info6"/></h3>
@@ -159,7 +168,7 @@
{ {
%> %>
<%-- <p>This collection has no items mapped into it.</p> --%> <%-- <p>This collection has no items mapped into it.</p> --%>
<p><fmt:message key="jsp.tools.itemmap-main.info8"/></p> <p class="alert alert-warning"><fmt:message key="jsp.tools.itemmap-main.info8"/></p>
<% <%
} }

82
dspace-jspui/src/main/webapp/tools/move-item.jsp
View File

@@ -25,28 +25,19 @@
Item item = (Item)request.getAttribute("item"); Item item = (Item)request.getAttribute("item");
%> %>
<dspace:layout titlekey="jsp.tools.move-item.title"> <dspace:layout style="submission" titlekey="jsp.tools.move-item.title">
<div class="container">
<form action="<%=request.getContextPath()%>/tools/edit-item" method="post"> <form class="form-horizontal" action="<%=request.getContextPath()%>/tools/edit-item" method="post">
<div class="form-group">
<table class="miscTable" align="center"> <label><fmt:message key="jsp.tools.move-item.item.name.msg"/></label>
<tr> <%=item.getMetadata("dc", "title", null, Item.ANY)[0].value%></font>
<td class="evenRowEvenCol" colspan="2"> </div>
<table> <div class="form-group">
<tr> <div class="input-group">
<td class="standard"> <span class="input-group-addon">
<small><strong><fmt:message key="jsp.tools.move-item.item.name.msg"/></strong></small> <label for="collection_from_id"><fmt:message key="jsp.tools.move-item.collection.from.msg"/></label>
</td> </span>
<td class="standard"> <select class="form-control" name="collection_from_id">
<font color="#FF0000"><%=item.getMetadata("dc", "title", null, Item.ANY)[0].value%></font>
</td>
</tr>
<tr>
<td class="standard">
<small><strong><fmt:message key="jsp.tools.move-item.collection.from.msg"/></strong></small>
</td>
<td class="standard">
<select name="collection_from_id">
<% <%
for (int i = 0; i < linkedCollections.length; i++) for (int i = 0; i < linkedCollections.length; i++)
{ {
@@ -56,14 +47,14 @@
} }
%> %>
</select> </select>
</td> </div>
</tr> </div>
<tr> <div class="form-group">
<td class="standard"> <div class="input-group">
<small><strong><fmt:message key="jsp.tools.move-item.collection.to.msg"/></strong></small> <span class="input-group-addon">
</td> <label for="collection_to_id"><fmt:message key="jsp.tools.move-item.collection.to.msg"/></label>
<td class="standard"> </span>
<select name="collection_to_id"> <select class="form-control" name="collection_to_id">
<% <%
//Later on find a away to display in a tree format with the linked one disabled? //Later on find a away to display in a tree format with the linked one disabled?
for (int i = 0; i < notLinkedCollections.length; i++) for (int i = 0; i < notLinkedCollections.length; i++)
@@ -74,25 +65,22 @@
} }
%> %>
</select> </select>
</td> </div>
</tr> </div>
<tr> <div class="form-group">
<td class="standard"><small><strong><fmt:message key="jsp.tools.move-item.inheritpolicies"/></strong></small></td> <div class="input-group">
<td class="standard"><input type="checkbox" name="inheritpolicies" /></td> <span class="input-group-addon">
</tr> <input type="checkbox" name="inheritpolicies" />
<tr> </span>
<td class="standard"></td> <span class="form-control"><fmt:message key="jsp.tools.move-item.inheritpolicies"/></span>
<td class="standard"> </div>
<input type="submit" name="submit" value="<fmt:message key="jsp.tools.move-item.button"/>"/> </div>
</td> <div class="col-md-offset-5">
</tr> <input class="btn btn-success col-md-4" type="submit" name="submit" value="<fmt:message key="jsp.tools.move-item.button"/>"/>
</table> </div>
</td>
</tr>
</table>
<input type="hidden" name="action" value="<%=EditItemServlet.CONFIRM_MOVE_ITEM%>" /> <input type="hidden" name="action" value="<%=EditItemServlet.CONFIRM_MOVE_ITEM%>" />
<input type="hidden" name="item_id" value="<%=item.getID() %>"/> <input type="hidden" name="item_id" value="<%=item.getID() %>"/>
</form> </form>
</div>
</dspace:layout> </dspace:layout>

14
dspace-jspui/src/main/webapp/tools/upload-bitstream.jsp
View File

@@ -28,7 +28,7 @@
request.setAttribute("LanguageSwitch", "hide"); request.setAttribute("LanguageSwitch", "hide");
%> %>
<dspace:layout titlekey="jsp.tools.upload-bitstream.title" <dspace:layout style="submission" titlekey="jsp.tools.upload-bitstream.title"
navbar="admin" navbar="admin"
locbar="link" locbar="link"
parenttitlekey="jsp.administer" parenttitlekey="jsp.administer"
@@ -39,17 +39,17 @@
<h1><fmt:message key="jsp.tools.upload-bitstream.title"/></h1> <h1><fmt:message key="jsp.tools.upload-bitstream.title"/></h1>
<%-- <p>Select the bitstream to upload</p> --%> <%-- <p>Select the bitstream to upload</p> --%>
<p><fmt:message key="jsp.tools.upload-bitstream.info"/></p> <p class="alert alert-info"><fmt:message key="jsp.tools.upload-bitstream.info"/></p>
<form method="post" enctype="multipart/form-data" action=""> <form method="post" enctype="multipart/form-data" action="">
<p align="center"> <div class="container row">
<input type="file" size="40" name="file"/> <input class="form-control" type="file" size="40" name="file"/>
</p> </div>
<input type="hidden" name="item_id" value="<%= item.getID() %>"/> <input type="hidden" name="item_id" value="<%= item.getID() %>"/>
<br/>
<!-- <p align="center"><input type="submit" name="submit" value="Upload"></p> --> <!-- <p align="center"><input type="submit" name="submit" value="Upload"></p> -->
<p align="center"><input type="submit" name="submit" value="<fmt:message key="jsp.tools.upload-bitstream.upload"/>" /></p> <div class="container row col-md-offset-5"><input class="btn btn-success col-md-4" type="submit" name="submit" value="<fmt:message key="jsp.tools.upload-bitstream.upload"/>" /></div>
</form> </form>
</dspace:layout> </dspace:layout>