hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master and restyling versioning jsp

Browse Source
This commit is contained in:
Pascarelli Luigi Andrea
2013-10-15 12:24:20 +02:00
parent c96d3a3c53 d1f9b49772
commit 7886088060
212 changed files with 20280 additions and 7762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dspace-api/pom.xml
View File

@@ -208,7 +208,7 @@
</configuration>
</plugin>
<plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
@@ -261,8 +261,12 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers</artifactId>
<artifactId>lucene-analyzers-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
@@ -447,7 +451,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${lucene.version}</version>
<version>${solr.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -479,11 +483,11 @@
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>0.18.6</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>0.90.3</version>
</dependency>
<dependency>
<groupId>com.coverity.security</groupId>

67
dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java
View File

@@ -21,9 +21,12 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -821,16 +824,17 @@ public class ItemExport
// items
// it will be checked against the config file entry
double size = 0;
final ArrayList<Integer> items = new ArrayList<Integer>();
final HashMap<String, List<Integer>> itemsMap = new HashMap<String, List<Integer>>();
for (DSpaceObject dso : dsObjects)
{
if (dso.getType() == Constants.COMMUNITY)
{
Community community = (Community) dso;
// get all the collections in the community
Collection[] collections = community.getCollections();
Collection[] collections = community.getAllCollections();
for (Collection collection : collections)
{
ArrayList<Integer> items = new ArrayList<Integer>();
// get all the items in each collection
ItemIterator iitems = collection.getItems();
try
@@ -859,12 +863,18 @@ public class ItemExport
{
iitems.close();
}
if (items.size() > 0)
{
itemsMap.put("collection_"+collection.getID(), items);
}
}
}
}
else if (dso.getType() == Constants.COLLECTION)
{
Collection collection = (Collection) dso;
ArrayList<Integer> items = new ArrayList<Integer>();
// get all the items in the collection
ItemIterator iitems = collection.getItems();
try
@@ -893,6 +903,10 @@ public class ItemExport
{
iitems.close();
}
if (items.size() > 0)
{
itemsMap.put("collection_"+collection.getID(), items);
}
}
}
else if (dso.getType() == Constants.ITEM)
@@ -910,7 +924,9 @@ public class ItemExport
size += bit.getSize();
}
}
ArrayList<Integer> items = new ArrayList<Integer>();
items.add(item.getID());
itemsMap.put("item_"+item.getID(), items);
}
else
{
@@ -942,7 +958,7 @@ public class ItemExport
}
// if we have any items to process then kick off annonymous thread
if (items.size() > 0)
if (itemsMap.size() > 0)
{
Thread go = new Thread()
{
@@ -955,40 +971,52 @@ public class ItemExport
// create a new dspace context
context = new Context();
// ignore auths
context.setIgnoreAuthorization(true);
iitems = new ItemIterator(context, items);
context.turnOffAuthorisationSystem();
String fileName = assembleFileName("item", eperson,
new Date());
String workDir = getExportWorkDirectory()
String workParentDir = getExportWorkDirectory()
+ System.getProperty("file.separator")
+ fileName;
String downloadDir = getExportDownloadDirectory(eperson
.getID());
File wkDir = new File(workDir);
if (!wkDir.exists() && !wkDir.mkdirs())
{
log.error("Unable to create working directory");
}
File dnDir = new File(downloadDir);
if (!dnDir.exists() && !dnDir.mkdirs())
{
log.error("Unable to create download directory");
}
// export the items using normal export method
exportItem(context, iitems, workDir, 1, migrate);
Iterator<String> iter = itemsMap.keySet().iterator();
while(iter.hasNext())
{
String keyName = iter.next();
iitems = new ItemIterator(context, itemsMap.get(keyName));
String workDir = workParentDir
+ System.getProperty("file.separator")
+ keyName;
File wkDir = new File(workDir);
if (!wkDir.exists() && !wkDir.mkdirs())
{
log.error("Unable to create working directory");
}
// export the items using normal export method
exportItem(context, iitems, workDir, 1, migrate);
iitems.close();
}
// now zip up the export directory created above
zip(workDir, downloadDir
zip(workParentDir, downloadDir
+ System.getProperty("file.separator")
+ fileName + ".zip");
// email message letting user know the file is ready for
// download
emailSuccessMessage(context, eperson, fileName + ".zip");
// return to enforcing auths
context.setIgnoreAuthorization(false);
context.restoreAuthSystemState();
}
catch (Exception e1)
{
@@ -1023,6 +1051,11 @@ public class ItemExport
go.isDaemon();
go.start();
}
else
{
Locale supportedLocale = I18nUtil.getEPersonLocale(eperson);
emailErrorMessage(eperson, I18nUtil.getMessage("org.dspace.app.itemexport.no-result", supportedLocale));
}
}
/**

42
dspace-api/src/main/java/org/dspace/content/Community.java
View File

@@ -793,6 +793,48 @@ public class Community extends DSpaceObject
return communityArray;
}
/**
* Return an array of collections of this community and its subcommunities
*
* @return an array of colections
*/
public Collection[] getAllCollections() throws SQLException
{
List<Collection> collectionList = new ArrayList<Collection>();
for (Community subcommunity : getSubcommunities())
{
addCollectionList(subcommunity, collectionList);
}
for (Collection collection : getCollections())
{
collectionList.add(collection);
}
// Put them in an array
Collection[] collectionArray = new Collection[collectionList.size()];
collectionArray = (Collection[]) collectionList.toArray(collectionArray);
return collectionArray;
}
/**
* Internal method to process subcommunities recursively
*/
private void addCollectionList(Community community, List<Collection> collectionList) throws SQLException
{
for (Community subcommunity : community.getSubcommunities())
{
addCollectionList(subcommunity, collectionList);
}
for (Collection collection : community.getCollections())
{
collectionList.add(collection);
}
}
/**
* Create a new collection within this community. The collection is created
* without any workflow groups or default submitter group.

12
dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java
View File

@@ -334,7 +334,8 @@ public class RoleDisseminator implements PackageDisseminator
{
writer.writeEmptyElement(MEMBER);
writer.writeAttribute(ID, String.valueOf(member.getID()));
writer.writeAttribute(NAME, member.getName());
if (null != member.getName())
writer.writeAttribute(NAME, member.getName());
}
writer.writeEndElement();
}
@@ -444,9 +445,12 @@ public class RoleDisseminator implements PackageDisseminator
writer.writeStartElement(EPERSON);
writer.writeAttribute(ID, String.valueOf(eperson.getID()));
writer.writeStartElement(EMAIL);
writer.writeCharacters(eperson.getEmail());
writer.writeEndElement();
if (eperson.getEmail()!=null)
{
writer.writeStartElement(EMAIL);
writer.writeCharacters(eperson.getEmail());
writer.writeEndElement();
}
if(eperson.getNetid()!=null)
{

106
dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
View File

@@ -13,6 +13,8 @@ import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.sql.SQLException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -23,6 +25,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -41,10 +44,15 @@ import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.validator.routines.UrlValidator;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.params.ClientPNames;
import org.apache.http.client.utils.URIBuilder;
import org.apache.log4j.Logger;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.response.FacetField;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.util.ClientUtils;
@@ -126,10 +134,10 @@ public class SolrServiceImpl implements SearchService, IndexingService {
/**
* Non-Static CommonsHttpSolrServer for processing indexing events.
*/
private CommonsHttpSolrServer solr = null;
private HttpSolrServer solr = null;
protected CommonsHttpSolrServer getSolr()
protected HttpSolrServer getSolr()
{
if ( solr == null)
{
@@ -140,16 +148,14 @@ public class SolrServiceImpl implements SearchService, IndexingService {
{
try {
log.debug("Solr URL: " + solrService);
solr = new CommonsHttpSolrServer(solrService);
solr = new HttpSolrServer(solrService);
solr.setBaseURL(solrService);
SolrQuery solrQuery = new SolrQuery()
.setQuery("search.resourcetype:2 AND search.resourceid:1");
solr.query(solrQuery);
} catch (MalformedURLException e) {
log.error("Error while initialinging solr server", e);
solr.query(solrQuery);
} catch (SolrServerException e) {
log.error("Error while initialinging solr server", e);
}
@@ -1120,13 +1126,38 @@ public class SolrServiceImpl implements SearchService, IndexingService {
if(date != null)
{
String indexField = searchFilter.getIndexFieldName() + ".year";
doc.addField(searchFilter.getIndexFieldName() + "_keyword", DateFormatUtils.formatUTC(date, "yyyy"));
doc.addField(indexField, DateFormatUtils.formatUTC(date, "yyyy"));
String yearUTC = DateFormatUtils.formatUTC(date, "yyyy");
doc.addField(searchFilter.getIndexFieldName() + "_keyword", yearUTC);
// add the year to the autocomplete index
doc.addField(searchFilter.getIndexFieldName() + "_ac", yearUTC);
doc.addField(indexField, yearUTC);
if (yearUTC.startsWith("0"))
{
doc.addField(
searchFilter.getIndexFieldName()
+ "_keyword",
yearUTC.replaceFirst("0*", ""));
// add date without starting zeros for autocomplete e filtering
doc.addField(
searchFilter.getIndexFieldName()
+ "_ac",
yearUTC.replaceFirst("0*", ""));
doc.addField(
searchFilter.getIndexFieldName()
+ "_ac",
value.replaceFirst("0*", ""));
doc.addField(
searchFilter.getIndexFieldName()
+ "_keyword",
value.replaceFirst("0*", ""));
}
//Also save a sort value of this year, this is required for determining the upper & lower bound year of our facet
if(doc.getField(indexField + "_sort") == null)
{
//We can only add one year so take the first one
doc.addField(indexField + "_sort", DateFormatUtils.formatUTC(date, "yyyy"));
doc.addField(indexField + "_sort", yearUTC);
}
}
}else
@@ -1413,6 +1444,14 @@ public class SolrServiceImpl implements SearchService, IndexingService {
// Choose the likely date formats based on string length
switch (t.length())
{
// case from 1 to 3 go through adding anyone a single 0. Case 4 define
// for all the SimpleDateFormat
case 1:
t = "0" + t;
case 2:
t = "0" + t;
case 3:
t = "0" + t;
case 4:
dfArr = new SimpleDateFormat[]{new SimpleDateFormat("yyyy")};
break;
@@ -1789,10 +1828,11 @@ public class SolrServiceImpl implements SearchService, IndexingService {
if(solrQueryResponse.getFacetQuery() != null)
{
//TODO: do not sort when not a date, just retrieve the facets in the order they where requested !
//At the moment facet queries are only used for dates so we need to sort our results
TreeMap<String, Integer> sortedFacetQueries = new TreeMap<String, Integer>(solrQueryResponse.getFacetQuery());
for(String facetQuery : sortedFacetQueries.descendingKeySet())
// just retrieve the facets in the order they where requested!
// also for the date we ask it in proper (reverse) order
// At the moment facet queries are only used for dates
LinkedHashMap<String, Integer> sortedFacetQueries = new LinkedHashMap<String, Integer>(solrQueryResponse.getFacetQuery());
for(String facetQuery : sortedFacetQueries.keySet())
{
//TODO: do not assume this, people may want to use it for other ends, use a regex to make sure
//We have a facet query, the values looks something like: dateissued.year:[1990 TO 2000] AND -2000
@@ -1841,14 +1881,21 @@ public class SolrServiceImpl implements SearchService, IndexingService {
{
return null;
}
org.apache.commons.httpclient.methods.GetMethod method =
new org.apache.commons.httpclient.methods.GetMethod(getSolr().getHttpClient().getHostConfiguration().getHostURL() + "");
HttpHost hostURL = (HttpHost)(getSolr().getHttpClient().getParams().getParameter(ClientPNames.DEFAULT_HOST));
HttpGet method = new HttpGet(hostURL.toHostString() + "");
try
{
URI uri = new URIBuilder(method.getURI()).addParameter("q",query.toString()).build();
}
catch (URISyntaxException e)
{
throw new SearchServiceException(e);
}
method.setQueryString(query.toString());
HttpResponse response = getSolr().getHttpClient().execute(method);
getSolr().getHttpClient().executeMethod(method);
return method.getResponseBodyAsStream();
return response.getEntity().getContent();
}
public List<DSpaceObject> search(Context context, String query, int offset, int max, String... filterquery)
@@ -1928,15 +1975,24 @@ public class SolrServiceImpl implements SearchService, IndexingService {
filterQuery.insert(0, "-");
}
filterQuery.append(":");
if("equals".equals(operator))
if("equals".equals(operator) || "notequals".equals(operator))
{
//DO NOT ESCAPE RANGE QUERIES !
if(!value.matches("\\[.*TO.*\\]"))
{
value = ClientUtils.escapeQueryChars(value);
filterQuery.append(value);
}
else
{
if (value.matches("\\[\\d{1,4} TO \\d{1,4}\\]"))
{
int minRange = Integer.parseInt(value.substring(1, value.length()-1).split(" TO ")[0]);
int maxRange = Integer.parseInt(value.substring(1, value.length()-1).split(" TO ")[1]);
value = "["+String.format("%04d", minRange) + " TO "+ String.format("%04d", maxRange) + "]";
}
filterQuery.append(value);
}
filterQuery.append(value);
}
else{
//DO NOT ESCAPE RANGE QUERIES !
@@ -1944,7 +2000,9 @@ public class SolrServiceImpl implements SearchService, IndexingService {
{
value = ClientUtils.escapeQueryChars(value);
filterQuery.append("(").append(value).append(")");
}else{
}
else
{
filterQuery.append(value);
}
}

12
dspace-api/src/main/java/org/dspace/identifier/IdentifierServiceImpl.java
View File

@@ -88,9 +88,19 @@ public class IdentifierServiceImpl implements IdentifierService {
//We need to commit our context because one of the providers might require the handle created above
// Next resolve all other services
boolean registered = false;
for (IdentifierProvider service : providers)
{
service.register(context, object, identifier);
if (service.supports(identifier))
{
service.register(context, object, identifier);
registered = true;
}
}
if (!registered)
{
throw new IdentifierException("Cannot register identifier: Didn't "
+ "find a provider that supports this identifier.");
}
//Update our item
object.update();

13
dspace-api/src/main/java/org/dspace/search/DSAnalyzer.java
View File

@@ -10,10 +10,11 @@ package org.dspace.search;
import java.io.Reader;
import java.util.Set;
import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.PorterStemFilter;
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.StopwordAnalyzerBase;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.en.PorterStemFilter;
import org.apache.lucene.analysis.core.StopFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardFilter;
@@ -50,7 +51,7 @@ public class DSAnalyzer extends StopwordAnalyzerBase
/*
* Stop table
*/
protected final Set stopSet;
protected final CharArraySet stopSet;
/**
* Builds an analyzer
@@ -66,7 +67,7 @@ public class DSAnalyzer extends StopwordAnalyzerBase
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
final Tokenizer source = new DSTokenizer(matchVersion, reader);
TokenStream result = new StandardFilter(matchVersion, source);
result = new LowerCaseFilter(matchVersion, result);
result = new StopFilter(matchVersion, result, stopSet);
result = new PorterStemFilter(result);

94
dspace-api/src/main/java/org/dspace/search/DSIndexer.java
View File

@@ -35,16 +35,21 @@ import org.apache.commons.cli.PosixParser;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.miscellaneous.LimitTokenCountAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.DateTools;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.Version;
import org.dspace.content.Bitstream;
import org.dspace.content.Bundle;
@@ -103,7 +108,7 @@ public class DSIndexer
private static int batchFlushAfterDocuments = ConfigurationManager.getIntProperty("search.batch.documents", 20);
private static boolean batchProcessingMode = false;
static final Version luceneVersion = Version.LUCENE_35;
static final Version luceneVersion = Version.LUCENE_44;
// Class to hold the index configuration (one instance per config line)
private static class IndexConfig
@@ -219,7 +224,7 @@ public class DSIndexer
*/
try
{
if (!IndexReader.indexExists(FSDirectory.open(new File(indexDirectory))))
if (!DirectoryReader.indexExists(FSDirectory.open(new File(indexDirectory))))
{
if (!new File(indexDirectory).mkdirs())
@@ -387,7 +392,11 @@ public class DSIndexer
try
{
flushIndexingTaskQueue(writer);
writer.optimize();
//With lucene 4.0 this method has been deleted , as it is horribly inefficient and very
//rarely justified. Lucene's multi-segment search performance has improved
//over time, and the default TieredMergePolicy now targets segments with
//deletions. For more info see http://blog.trifork.com/2011/11/21/simon-says-optimize-is-bad-for-you/
//writer.optimize();
}
finally
{
@@ -580,12 +589,18 @@ public class DSIndexer
public static void cleanIndex(Context context) throws IOException, SQLException {
IndexReader reader = DSQuery.getIndexReader();
Bits liveDocs = MultiFields.getLiveDocs(reader);
for(int i = 0 ; i < reader.numDocs(); i++)
{
if(!reader.isDeleted(i))
{
Document doc = reader.document(i);
if (!liveDocs.get(i))
{
// document is deleted...
log.debug("Encountered deleted doc: " + i);
}
else {
Document doc = reader.document(i);
String handle = doc.get("handle");
if (!StringUtils.isEmpty(handle))
{
@@ -603,11 +618,7 @@ public class DSIndexer
log.debug("Keeping: " + handle);
}
}
}
else
{
log.debug("Encountered deleted doc: " + i);
}
}
}
}
@@ -888,23 +899,27 @@ public class DSIndexer
boolean inIndex = false;
IndexReader ir = DSQuery.getIndexReader();
Bits liveDocs = MultiFields.getLiveDocs(ir);
DocsEnum docs = MultiFields.getTermDocsEnum(ir, liveDocs, t.field(), t.bytes());
TermDocs docs = ir.termDocs(t);
int id;
if (docs != null)
{
while ((id = docs.nextDoc()) != DocsEnum.NO_MORE_DOCS)
{
inIndex = true;
Document doc = ir.document(id);
while(docs.next())
{
inIndex = true;
int id = docs.doc();
Document doc = ir.document(id);
Field lastIndexed = doc.getField(LAST_INDEXED_FIELD);
if (lastIndexed == null || Long.parseLong(lastIndexed.stringValue()) <
lastModified.getTime()) {
reindexItem = true;
}
}
IndexableField lastIndexed = doc.getField(LAST_INDEXED_FIELD);
if (lastIndexed == null
|| Long.parseLong(lastIndexed.stringValue()) < lastModified
.getTime())
{
reindexItem = true;
}
}
}
return reindexItem || !inIndex;
}
@@ -915,7 +930,20 @@ public class DSIndexer
throws IOException
{
Directory dir = FSDirectory.open(new File(indexDirectory));
IndexWriterConfig iwc = new IndexWriterConfig(luceneVersion, getAnalyzer());
LimitTokenCountAnalyzer decoratorAnalyzer = null;
/* Set maximum number of terms to index if present in dspace.cfg */
if (maxfieldlength == -1)
{
decoratorAnalyzer = new LimitTokenCountAnalyzer(getAnalyzer(), Integer.MAX_VALUE);
}
else
{
decoratorAnalyzer = new LimitTokenCountAnalyzer(getAnalyzer(), maxfieldlength);
}
IndexWriterConfig iwc = new IndexWriterConfig(luceneVersion, decoratorAnalyzer);
if(wipeExisting){
iwc.setOpenMode(IndexWriterConfig.OpenMode.CREATE);
}else{
@@ -924,16 +952,6 @@ public class DSIndexer
IndexWriter writer = new IndexWriter(dir, iwc);
/* Set maximum number of terms to index if present in dspace.cfg */
if (maxfieldlength == -1)
{
writer.setMaxFieldLength(Integer.MAX_VALUE);
}
else
{
writer.setMaxFieldLength(maxfieldlength);
}
return writer;
}

4
dspace-api/src/main/java/org/dspace/search/DSNonStemmingAnalyzer.java
View File

@@ -9,8 +9,8 @@ package org.dspace.search;
import java.io.Reader;
import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.core.StopFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.StandardFilter;

50
dspace-api/src/main/java/org/dspace/search/DSQuery.java
View File

@@ -16,10 +16,11 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.queryParser.TokenMgrError;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.queryparser.classic.TokenMgrError;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
@@ -221,16 +222,16 @@ public class DSQuery
if (args.getSortOption() == null)
{
SortField[] sortFields = new SortField[] {
new SortField("search.resourcetype", SortField.INT, true),
new SortField(null, SortField.SCORE, SortOption.ASCENDING.equals(args.getSortOrder()))
new SortField("search.resourcetype", SortField.Type.INT, true),
new SortField(null, SortField.FIELD_SCORE.getType(), SortOption.ASCENDING.equals(args.getSortOrder()))
};
hits = searcher.search(myquery, max, new Sort(sortFields));
}
else
{
SortField[] sortFields = new SortField[] {
new SortField("search.resourcetype", SortField.INT, true),
new SortField("sort_" + args.getSortOption().getName(), SortField.STRING, SortOption.DESCENDING.equals(args.getSortOrder())),
new SortField("search.resourcetype", SortField.Type.INT, true),
new SortField("sort_" + args.getSortOption().getName(), SortField.Type.STRING, SortOption.DESCENDING.equals(args.getSortOrder())),
SortField.FIELD_SCORE
};
hits = searcher.search(myquery, max, new Sort(sortFields));
@@ -396,7 +397,7 @@ public class DSQuery
{
try
{
searcher.close();
searcher.getIndexReader().close();
searcher = null;
}
catch (IOException ioe)
@@ -439,13 +440,13 @@ public class DSQuery
// If it has, we need to close the existing searcher - we will open a new one later
Directory searchDir = FSDirectory.open(new File(indexDir));
if (searcher != null && lastModified != IndexReader.getCurrentVersion(searchDir))
DirectoryReader reader = DirectoryReader.open(searchDir);
if (searcher != null && lastModified != reader.getVersion())
{
try
{
// Close the cached IndexSearcher
searcher.close();
searcher.getIndexReader().close();
}
catch (IOException ioe)
{
@@ -462,30 +463,11 @@ public class DSQuery
// There is no existing searcher - either this is the first execution,
// or the index has been updated and we closed the old index.
if (searcher == null)
{
{
// So, open a new searcher
lastModified = IndexReader.getCurrentVersion(searchDir);
String osName = System.getProperty("os.name");
if (osName != null && osName.toLowerCase().contains("windows"))
{
searcher = new IndexSearcher(searchDir){
/*
* TODO: Has Lucene fixed this bug yet?
* Lucene doesn't release read locks in
* windows properly on finalize. Our hack
* extend IndexSearcher to force close().
*/
@Override
protected void finalize() throws Throwable {
this.close();
super.finalize();
}
};
}
else
{
searcher = new IndexSearcher(searchDir);
}
lastModified = reader.getVersion();
searcher = new IndexSearcher(reader);
}
return searcher;

2
dspace-api/src/main/java/org/dspace/search/DSTokenizer.java
View File

@@ -9,7 +9,7 @@ package org.dspace.search;
import java.io.Reader;
import org.apache.lucene.analysis.CharTokenizer;
import org.apache.lucene.analysis.util.CharTokenizer;
import org.apache.lucene.util.Version;
/**

12
dspace-api/src/main/java/org/dspace/statistics/ElasticSearchLogger.java
View File

@@ -22,12 +22,14 @@ import org.dspace.statistics.util.DnsLookup;
import org.dspace.statistics.util.LocationUtils;
import org.dspace.statistics.util.SpiderDetector;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.admin.indices.exists.IndicesExistsRequest;
import org.elasticsearch.action.admin.indices.exists.IndicesExistsResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.action.admin.indices.mapping.put.PutMappingRequestBuilder;
import org.elasticsearch.client.action.index.IndexRequestBuilder;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
@@ -242,7 +244,7 @@ public class ElasticSearchLogger {
putMappingRequestBuilder.setSource(stringMappingJSON);
PutMappingResponse response = putMappingRequestBuilder.execute().actionGet();
if(!response.getAcknowledged()) {
if(!response.isAcknowledged()) {
log.info("Could not define mapping for type ["+indexName+"]/["+indexType+"]");
} else {
log.info("Successfully put mapping for ["+indexName+"]/["+indexType+"]");

20
dspace-api/src/main/java/org/dspace/statistics/SolrLogger.java
View File

@@ -24,7 +24,7 @@ import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.log4j.Logger;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
@@ -70,7 +70,7 @@ public class SolrLogger
{
private static final Logger log = Logger.getLogger(SolrLogger.class);
private static final CommonsHttpSolrServer solr;
private static final HttpSolrServer solr;
public static final String DATE_FORMAT_8601 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
@@ -105,13 +105,13 @@ public class SolrLogger
log.info("solr-statistics.server:" + ConfigurationManager.getProperty("solr-statistics", "server"));
log.info("usage-statistics.dbfile:" + ConfigurationManager.getProperty("usage-statistics", "dbfile"));
CommonsHttpSolrServer server = null;
HttpSolrServer server = null;
if (ConfigurationManager.getProperty("solr-statistics", "server") != null)
{
try
{
server = new CommonsHttpSolrServer(ConfigurationManager.getProperty("solr-statistics", "server"));
server = new HttpSolrServer(ConfigurationManager.getProperty("solr-statistics", "server"));
SolrQuery solrQuery = new SolrQuery()
.setQuery("type:2 AND id:1");
server.query(solrQuery);
@@ -1213,7 +1213,7 @@ public class SolrLogger
//Start by creating a new core
String coreName = "statistics-" + dcStart.getYear();
CommonsHttpSolrServer statisticsYearServer = createCore(solr, coreName);
HttpSolrServer statisticsYearServer = createCore(solr, coreName);
System.out.println("Moving: " + totalRecords + " into core " + coreName);
log.info("Moving: " + totalRecords + " records into core " + coreName);
@@ -1240,7 +1240,7 @@ public class SolrLogger
ContentStreamUpdateRequest contentStreamUpdateRequest = new ContentStreamUpdateRequest("/update/csv");
contentStreamUpdateRequest.setParam("stream.contentType", "text/plain;charset=utf-8");
contentStreamUpdateRequest.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
contentStreamUpdateRequest.addFile(tempCsv);
contentStreamUpdateRequest.addFile(tempCsv, "text/plain;charset=utf-8");
statisticsYearServer.request(contentStreamUpdateRequest);
}
@@ -1257,17 +1257,17 @@ public class SolrLogger
FileUtils.deleteDirectory(tempDirectory);
}
private static CommonsHttpSolrServer createCore(CommonsHttpSolrServer solr, String coreName) throws IOException, SolrServerException {
private static HttpSolrServer createCore(HttpSolrServer solr, String coreName) throws IOException, SolrServerException {
String solrDir = ConfigurationManager.getProperty("dspace.dir") + File.separator + "solr" +File.separator;
String baseSolrUrl = solr.getBaseURL().replace("statistics", "");
CoreAdminRequest.Create create = new CoreAdminRequest.Create();
create.setCoreName(coreName);
create.setInstanceDir("statistics");
create.setDataDir(solrDir + coreName + File.separator + "data");
CommonsHttpSolrServer solrServer = new CommonsHttpSolrServer(baseSolrUrl);
HttpSolrServer solrServer = new HttpSolrServer(baseSolrUrl);
create.process(solrServer);
log.info("Created core with name: " + coreName);
return new CommonsHttpSolrServer(baseSolrUrl + "/" + coreName);
return new HttpSolrServer(baseSolrUrl + "/" + coreName);
}
@@ -1378,7 +1378,7 @@ public class SolrLogger
ContentStreamUpdateRequest contentStreamUpdateRequest = new ContentStreamUpdateRequest("/update/csv");
contentStreamUpdateRequest.setParam("stream.contentType", "text/plain;charset=utf-8");
contentStreamUpdateRequest.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
contentStreamUpdateRequest.addFile(tempCsv);
contentStreamUpdateRequest.addFile(tempCsv, "text/plain;charset=utf-8");
solr.request(contentStreamUpdateRequest);
}

4
dspace-api/src/main/java/org/dspace/statistics/util/StatisticsDataGenerator.java
View File

@@ -10,7 +10,7 @@ package org.dspace.statistics.util;
import org.apache.commons.cli.*;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.dspace.core.Context;
import org.dspace.core.Constants;
import org.dspace.core.ConfigurationManager;
@@ -191,7 +191,7 @@ public class StatisticsDataGenerator {
// We got all our parameters now get the rest
Context context = new Context();
// Find our solr server
CommonsHttpSolrServer solr = new CommonsHttpSolrServer(
HttpSolrServer solr = new HttpSolrServer(
ConfigurationManager.getProperty("solr-statistics", "server"));
solr.deleteByQuery("*:*");
solr.commit();

6
dspace-api/src/main/java/org/dspace/statistics/util/StatisticsImporter.java
View File

@@ -11,7 +11,7 @@ import org.apache.commons.cli.*;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.log4j.Logger;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.SolrServerException;
import org.dspace.content.*;
import org.dspace.content.Collection;
@@ -41,7 +41,7 @@ public class StatisticsImporter
private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
/** Solr server connection */
private static CommonsHttpSolrServer solr;
private static HttpSolrServer solr;
/** GEOIP lookup service */
private static LookupService geoipLookup;
@@ -467,7 +467,7 @@ public class StatisticsImporter
{
System.out.println("Writing to solr server at: " + sserver);
}
solr = new CommonsHttpSolrServer(sserver);
solr = new HttpSolrServer(sserver);
metadataStorageInfo = SolrLogger.getMetadataStorageInfo();
String dbfile = ConfigurationManager.getProperty("usage-statistics", "dbfile");

6
dspace-api/src/main/java/org/dspace/statistics/util/StatisticsImporterElasticSearch.java
View File

@@ -21,12 +21,14 @@ import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.statistics.ElasticSearchLogger;
import org.dspace.statistics.SolrLogger;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.action.bulk.BulkRequestBuilder;
import org.elasticsearch.common.geo.GeoPoint;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.mapper.geo.GeoPoint;
import java.io.*;
import java.text.DecimalFormat;

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

@@ -78,9 +78,10 @@ itemlist.dc.type.degree = Degree
itemlist.et-al = et al
itemlist.thumbnail = Preview
jsp.adminhelp = Admin Help...
jsp.adminhelp = <span class="glyphicon glyphicon-question-sign"></span>
jsp.administer = Administer
jsp.admintools = Admin Tools
jsp.actiontools = Actions
jsp.browse.authors.enter = or enter first few letters:
jsp.browse.authors.jump = Jump to:
jsp.browse.authors.show = Showing authors {0}-{1} of {2}.
@@ -138,7 +139,7 @@ jsp.collection-home.subscribe = Subscribe
jsp.collection-home.subscribe.msg = Subscribe to this collection to receive daily e-mail notification of new additions
jsp.collection-home.subscribed = You are subscribed to this collection.
jsp.collection-home.unsub = Unsubscribe
jsp.collection-home.display-statistics = View Statistics
jsp.collection-home.display-statistics = <span class="glyphicon glyphicon-stats"></span>
jsp.community-home.create1.button = Create collection
jsp.community-home.create2.button = Create Sub-community
jsp.community-home.feeds = RSS Feeds
@@ -146,7 +147,7 @@ jsp.community-home.heading1 = Community home
jsp.community-home.heading2 = Collections in this community
jsp.community-home.heading3 = Sub-communities within this community
jsp.community-home.recentsub = Recent&nbsp;Submissions
jsp.community-home.display-statistics = View Statistics
jsp.community-home.display-statistics = <span class="glyphicon glyphicon-stats"></span>
jsp.community-list.create.button = Create Top-Level Community...
jsp.community-list.text1 = Shown below is a list of communities and the collections and sub-communities within them. Click on a name to view that community or collection home page.
jsp.community-list.title = Communities and Collections
@@ -188,7 +189,7 @@ jsp.display-item.suggest = Recommend this
jsp.display-item.text1 = Show simple item record
jsp.display-item.text2 = Show full item record
jsp.display-item.text3 = This item is licensed under a
jsp.display-item.display-statistics = View Statistics
jsp.display-item.display-statistics = <span class="glyphicon glyphicon-stats"></span>
jsp.dspace-admin.authorize-advanced.add = Add Policy
jsp.dspace-admin.authorize-advanced.advanced = Advanced Policy Manager
jsp.dspace-admin.authorize-advanced.clear = Clear Policies
@@ -327,7 +328,7 @@ jsp.dspace-admin.metadataimport.reinstated = Item Reinstate
jsp.dspace-admin.metadataimport.toomany = There are too many changes. Please import fewer changes, adjust the limit, or perform the input directly on the server.
jsp.dspace-admin.metadataimport.finished = {0} changes completed successfully.
jsp.dspace-admin.index.heading = Administration Tools
jsp.dspace-admin.index.text = Please select an operation from the navigation bar on the left.
jsp.dspace-admin.index.text = Please select an operation from the main menu.
jsp.dspace-admin.item-select.enter = Enter the Handle or internal item ID of the item you wish to select.
jsp.dspace-admin.item-select.find = Find
jsp.dspace-admin.item-select.handle = Handle:
@@ -529,6 +530,7 @@ jsp.feedback.form.text1 = Thanks for tak
jsp.feedback.form.text2 = Please fill out all of the information below.
jsp.feedback.form.title = Feedback Form
jsp.general.authors.button = Authors
jsp.general.browse = Browse
jsp.general.date.button = By Date
jsp.general.edit.button = Edit...
jsp.general.genericScope = All of DSpace
@@ -549,7 +551,7 @@ jsp.general.untitled = Untitled
jsp.general.update = Update
jsp.general.without-contributor = Anonymous
jsp.general.without-date = No date given
jsp.help = Help...
jsp.help = <span class="glyphicon glyphicon-question-sign"></span>
jsp.help.formats.contact1 = Please contact your
jsp.help.formats.contact2 = DSpace Administrator
jsp.help.formats.contact3 = if you have questions about a particular format.
@@ -574,7 +576,8 @@ jsp.home.search1 = Search
jsp.home.search2 = Enter some text in the box below to search DSpace.
jsp.home.title = Home
jsp.layout.footer-default.feedback = Feedback
jsp.layout.footer-default.text = <a target="_blank" href="http://www.dspace.org/">DSpace Software</a> Copyright&nbsp;&copy;&nbsp;2002-2010&nbsp; <a target="_blank" href="http://www.duraspace.org/">Duraspace</a>
jsp.layout.footer-default.text = <a target="_blank" href="http://www.dspace.org/">DSpace Software</a> Copyright&nbsp;&copy;&nbsp;2002-2013&nbsp; <a target="_blank" href="http://www.duraspace.org/">Duraspace</a>
jsp.layout.footer-default.theme-by = Theme by
jsp.layout.header-default.about = About DSpace Software
jsp.layout.header-default.alt = DSpace
jsp.layout.navbar-admin.authorization = Authorization
@@ -637,7 +640,7 @@ jsp.login.not-in-records.text = You have a val
jsp.login.not-in-records.title = No User Record Available
jsp.login.password.heading = Log In to DSpace
jsp.login.password.title = Log In
jsp.morehelp = More Help...
jsp.morehelp = <span class="glyphicon glyphicon-question-sign"></span>
jsp.mydspace = My DSpace
jsp.mydspace.general.approve = Approve
jsp.mydspace.general.backto-mydspace = Back to My DSpace
@@ -892,7 +895,7 @@ jsp.sherpa.generalconditions = <p><b>General conditions:</b></p>
jsp.sherpa.paidoption = <p><b>Paid open access:</b> <a href="{1}" target="_blank">{0}</a>. {2}</p>
jsp.sherpa.copyright = <p><b>Copyright:</b></p>
jsp.sherpa.publisher.romeocolour = <p><b>RoMEO:</b> This is a RoMEO {0} publisher</p>
jsp.sherpa.legend = <div class="sherpaLegend"><table cellspacing="3" cellpadding="5" border="0" class="romeoColour"><thead><tr><th>ROMEO colour</th><th>Archiving policy</th></tr></thead><tbody><tr><td class="greenRomeoPublisher">green</td><td>can archive pre-print <i>and</i> post-print or publisher's version/PDF</td></tr><tr><td class="blueRomeoPublisher">blue</td><td>can archive post-print (ie final draft post-refereeing) or publisher's version/PDF</td></tr><tr><td class="yellowRomeoPublisher">yellow</td><td>can archive pre-print (ie pre-refereeing)</td></tr><tr><td class="grayRomeoPublisher">gray</td><td>publishers found in DOAJ that have not yet been analyzed by RoMEO</td></tr><tr><td class="whiteRomeoPublisher">white</td><td>archiving not formally supported</td></tr></tbody></table></div>
jsp.sherpa.legend = <div class="sherpaLegend"><table class="romeoColour table"><thead><tr><th>ROMEO colour</th><th>Archiving policy</th></tr></thead><tbody><tr><td class="greenRomeoPublisher">green</td><td>can archive pre-print <i>and</i> post-print or publisher's version/PDF</td></tr><tr><td class="blueRomeoPublisher">blue</td><td>can archive post-print (ie final draft post-refereeing) or publisher's version/PDF</td></tr><tr><td class="yellowRomeoPublisher">yellow</td><td>can archive pre-print (ie pre-refereeing)</td></tr><tr><td class="grayRomeoPublisher">gray</td><td>publishers found in DOAJ that have not yet been analyzed by RoMEO</td></tr><tr><td class="whiteRomeoPublisher">white</td><td>archiving not formally supported</td></tr></tbody></table></div>
jsp.statistics.title = Statistics
jsp.statistics.heading.visits = Total Visits
jsp.statistics.heading.monthlyvisits = Total Visits per Month
@@ -979,12 +982,12 @@ jsp.submit.edit-metadata.button.remove2 = Remove
jsp.submit.edit-metadata.cancelsave = Cancel/Save
jsp.submit.edit-metadata.controlledvocabulary = Subject Categories
jsp.submit.edit-metadata.day = Day:
jsp.submit.edit-metadata.firstname = First name(s) + "Jr"<br/> e.g. <strong>Donald Jr</strong>
jsp.submit.edit-metadata.firstname = First name(s) + "Jr", e.g. Donald Jr
jsp.submit.edit-metadata.heading = Submit: Describe this Item
jsp.submit.edit-metadata.help = (More Help...)
jsp.submit.edit-metadata.help = <span class="glyphicon glyphicon-question-sign"></span>
jsp.submit.edit-metadata.info1 = Please fill in the requested information about this submission below. In most browsers, you can use the tab key to move the cursor to the next input box or button, to save you having to use the mouse each time.
jsp.submit.edit-metadata.info2 = Please fill further information about this submission below.
jsp.submit.edit-metadata.lastname = Last name<br/>e.g. <strong>Smith</strong>
jsp.submit.edit-metadata.lastname = Last name, e.g. Smith
jsp.submit.edit-metadata.month = Month:
jsp.submit.edit-metadata.next = Next &gt;
jsp.submit.edit-metadata.no_month = (No Month)
@@ -1077,9 +1080,9 @@ jsp.submit.show-license.info2 = <strong>Not gr
jsp.submit.show-license.notgrant.button = I Do Not Grant the License
jsp.submit.show-license.title = DSpace Distribution License
jsp.submit.show-uploaded-file.checksum = Checksum
jsp.submit.show-uploaded-file.click1.button = Click here if this is the wrong format
jsp.submit.show-uploaded-file.click2.button = Click here if this is the wrong file
jsp.submit.show-uploaded-file.click3.button = Click here if you change the embargo settings
jsp.submit.show-uploaded-file.click1.button = Change format
jsp.submit.show-uploaded-file.click2.button = Change file
jsp.submit.show-uploaded-file.click3.button = Embargo settings
jsp.submit.show-uploaded-file.file = File
jsp.submit.show-uploaded-file.format = File Format
jsp.submit.show-uploaded-file.heading1 = Submit: File Uploaded Successfully
@@ -1210,6 +1213,8 @@ jsp.tools.curate.select-group.tag = Choose from th
jsp.tools.curate.select-task.tag = Task
jsp.tools.curate.task.name = Task: {0}
jsp.tools.edit-collection.button.delete = Delete this Collection...
jsp.tools.edit-collection.form.basic-metadata = Collection's Metadata
jsp.tools.edit-collection.form.collection-settings = Collection's settings
jsp.tools.edit-collection.form.button.add-logo = Upload new logo...
jsp.tools.edit-collection.form.button.cancel = Cancel
jsp.tools.edit-collection.form.button.create = Create...
@@ -1227,7 +1232,7 @@ jsp.tools.edit-collection.form.label12 = Collection Adm
jsp.tools.edit-collection.form.label13 = Item template:
jsp.tools.edit-collection.form.label14 = Collection's Authorizations:
jsp.tools.edit-collection.form.label15 = Harvesting Settings
jsp.tools.edit-collection.form.label16 = Content Source
jsp.tools.edit-collection.form.label16 = Content<br/> Source
jsp.tools.edit-collection.form.label17 = This is a standard DSpace collection
jsp.tools.edit-collection.form.label18 = This collection harvests its content from an external source
jsp.tools.edit-collection.form.label19 = OAI Provider
@@ -1236,7 +1241,7 @@ jsp.tools.edit-collection.form.label21 = Metadata Forma
jsp.tools.edit-collection.form.label21.select.qdc = Qualified Dublin Core
jsp.tools.edit-collection.form.label21.select.dc = Dublin Core
jsp.tools.edit-collection.form.label21.select.dim = DSpace Intermediate Format
jsp.tools.edit-collection.form.label22 = Content being Harvested
jsp.tools.edit-collection.form.label22 = Content<br/> being<br/> Harvested
jsp.tools.edit-collection.form.label23 = Harvest metadata only.
jsp.tools.edit-collection.form.label24 = Harvest metadata and references to bitstreams (requires ORE support).
jsp.tools.edit-collection.form.label25 = Harvest metadata and bitstreams (requires ORE support).
@@ -1257,6 +1262,8 @@ jsp.tools.edit-collection.wf-role1 = Accept/Reject
jsp.tools.edit-collection.wf-role2 = Accept/Reject/Edit Metadata
jsp.tools.edit-collection.wf-role3 = Edit Metadata
jsp.tools.edit-community.button.delete = Delete this Community...
jsp.tools.edit-community.form.basic-metadata = Community's metadata
jsp.tools.edit-community.form.community-settings = Community's settings
jsp.tools.edit-community.form.button.add-logo = Upload new logo...
jsp.tools.edit-community.form.button.cancel = Cancel
jsp.tools.edit-community.form.button.create = Create
@@ -1298,7 +1305,8 @@ jsp.tools.edit-item-form.elem12 = Order
jsp.tools.edit-item-form.form.label1 = Item's Curations:
jsp.tools.edit-item-form.handle = Handle:
jsp.tools.edit-item-form.heading = Bitstreams
jsp.tools.edit-item-form.item = Item's Authorizations:
jsp.tools.edit-item-form.details = Item's Details
jsp.tools.edit-item-form.item = Authorizations...
jsp.tools.edit-item-form.itemID = Item&nbsp;internal&nbsp;ID:
jsp.tools.edit-item-form.itempage = Item page:
jsp.tools.edit-item-form.modified = Last modified:
@@ -1464,6 +1472,7 @@ news-side.html = news-side.html
news-top.html = news-top.html
org.dspace.app.itemexport.no-result = The DSpaceObject that you specified has no items.
org.dspace.app.webui.jsptag.CollectionListTag.collectionName = Collection Name
org.dspace.app.webui.jsptag.CommunityListTag.communityName = Community Name
org.dspace.app.webui.jsptag.ItemListTag.authors = Authors
@@ -1663,6 +1672,11 @@ org.dspace.app.webui.jsptag.policies-list.label_group = Group
org.dspace.app.webui.jsptag.policies-list.label_sdate = Start Date
org.dspace.app.webui.jsptag.policies-list.label_edate = End Date
jsp.layout.navbar-admin.accesscontrol = Access Control
jsp.layout.navbar-admin.contents = Content
jsp.layout.navbar-admin.items = Items
jsp.layout.navbar-admin.settings = General Settings
#Versioning
jsp.general.version.button = Create version of this item
jsp.general.version.history.button = Show version history
@@ -1697,4 +1711,4 @@ jsp.version.notice.new_version_head = Notice
jsp.version.notice.new_version_help = This is not the latest version of this item. The latest version can be found at:
jsp.version.notice.workflow_version_head = Notice
jsp.version.notice.workflow_version_help = A more recent version of this item is in the Workflow.
#End Versioning
#End Versioning

31
dspace-api/src/test/java/org/dspace/content/CommunityTest.java
View File

@@ -766,6 +766,37 @@ public class CommunityTest extends AbstractDSpaceObjectTest
assertThat("testGetAllParents 4", son.getAllParents()[0], equalTo(c));
}
/**
* Test of getAllCollections method, of class Community.
*/
@Test
public void testGetAllCollections() throws Exception
{
new NonStrictExpectations()
{
AuthorizeManager authManager;
{
AuthorizeManager.authorizeAction((Context) any, (Community) any,
Constants.ADD); result = null;
AuthorizeManager.authorizeActionBoolean((Context) any, (Community) any,
Constants.ADD); result = true;
}
};
//empty by default
assertThat("testGetAllCollections 0",c.getAllCollections(), notNullValue());
assertTrue("testGetAllCollections 1", c.getAllCollections().length == 0);
//community has a collection and a subcommunity, subcommunity has a collection
Collection collOfC = c.createCollection();
Community sub = Community.create(c, context);
Collection collOfSub = sub.createCollection();
assertThat("testGetAllCollections 2",c.getAllCollections(), notNullValue());
assertTrue("testGetAllCollections 3", c.getAllCollections().length == 2);
assertThat("testGetAllCollections 4", c.getAllCollections()[0], equalTo(collOfSub));
assertThat("testGetAllCollections 5", c.getAllCollections()[1], equalTo(collOfC));
}
/**
* Test of createCollection method, of class Community.
*/

56
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/AccessSettingTag.java
View File

@@ -128,19 +128,19 @@ public class AccessSettingTag extends TagSupport
if (!advanced) {
disabled = "";
}
sb.append("<center>\n");
sb.append("<table class=\"miscTable\" width=\"80%\">\n");
if (embargo)
{
// Name
sb.append("<tr><th class=\"accessOdd\">").append(label_name).append("</th>\n");
sb.append("<td class=\"accessOdd\">");
sb.append("<input name=\"name\" id=\"policy_name\" type=\"text\" value=\"").append(name).append("\" />\n");
sb.append("</td></tr>\n");
sb.append("<div class=\"form-group\">");
sb.append(label_name).append("\n");
sb.append("<input class=\"form-control\" name=\"name\" id=\"policy_name\" type=\"text\" value=\"").append(name).append("\" />\n");
sb.append("</div>");
// Group
sb.append("<tr><th class=\"accessEven\">").append(label_group).append("</th>\n");
sb.append("<td class=\"accessEven\"><select name=\"group_id\" id=\"select_group\">\n");
sb.append("<div class=\"form-group\">");
sb.append(label_group).append("\n");
sb.append("<select class=\"form-control\" name=\"group_id\" id=\"select_group\">\n");
Group[] groups = getGroups(context, hrq, subInfo);
if (groups != null)
@@ -159,12 +159,16 @@ public class AccessSettingTag extends TagSupport
sb.append("<option value=\"0\" selected=\"selected\">Anonymous</option>\n");
}
sb.append("</select>\n");
sb.append("</td></tr>\n");
sb.append("</div>");
// Select open or embargo
sb.append("<tr><th class=\"accessOdd\">").append(label_embargo).append("</th>\n");
sb.append("<td class=\"accessOdd\"><label><input name=\"open_access_radios\" type=\"radio\" value=\"0\"").append(radio0Checked).append(" />").append(radio0).append("</label>\n");
sb.append(label_embargo).append("\n");
sb.append("<div class=\"radio\">");
sb.append("<label><input name=\"open_access_radios\" type=\"radio\" value=\"0\"").append(radio0Checked).append(" />").append(radio0).append("</label>\n");
sb.append("</div>");
sb.append("<div class=\"radio\">");
sb.append("<label><input name=\"open_access_radios\" type=\"radio\" value=\"1\"").append(radio1Checked).append(" />").append(radio1).append("</label>\n");
sb.append("</td></tr>\n");
sb.append("</div>");
}
// Embargo Date
@@ -175,26 +179,24 @@ public class AccessSettingTag extends TagSupport
}
else
{
sb.append("<tr><th class=\"accessEven\">").append(label_date).append("</th>\n");
sb.append("<td class=\"accessEven\">\n");
sb.append("<input name=\"embargo_until_date\" id=\"embargo_until_date\" type=\"text\" value=\"").append(startDate).append("\"").append(disabled).append(" />\n");;
sb.append(radio_help);
sb.append("</td></tr>\n");
// Reason
sb.append("<tr>\n");
sb.append("<th class=\"accessOdd\">").append(label_reason).append("</th>\n");
sb.append("<td class=\"accessOdd\"><textarea name=\"reason\" id=\"reason\" cols=\"30\" rows=\"5\"").append(disabled).append(">").append(reason).append("</textarea>\n");
sb.append("</td></tr>\n");
sb.append("<div class=\"form-group\">");
sb.append(label_date).append("\n");
sb.append("<input class=\"form-control\" name=\"embargo_until_date\" id=\"embargo_until_date\" type=\"text\" value=\"").append(startDate).append("\"").append(disabled).append(" />\n");;
sb.append("<span class=\"help-block\">"+radio_help+"</span><br/>");
// Reason
sb.append(label_reason).append("\n");
sb.append("<textarea class=\"form-control\" name=\"reason\" id=\"reason\" cols=\"30\" rows=\"5\"").append(disabled).append(">").append(reason).append("</textarea>\n");
sb.append("</div>");
}
// Add policy button
if (addpolicy)
{
sb.append("<tr>\n");
sb.append("<td class=\"accessOdd\" colspan=\"2\" align=\"center\"><input name=\"submit_add_policy\" type=\"submit\" value=\"").append(button_confirm).append("\" />\n");
sb.append("</</td></tr>\n");
sb.append("<input class=\"btn btn-success col-md-offset-5\" name=\"submit_add_policy\" type=\"submit\" value=\"").append(button_confirm).append("\" />\n");
}
sb.append("</table></center>\n");
out.println(sb.toString());
}

8
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java
View File

@@ -300,12 +300,12 @@ public class BrowseListTag extends TagSupport
// If the table width has been specified, we can make this a fixed layout
if (!StringUtils.isEmpty(tablewidth))
{
out.println("<table style=\"width: " + tablewidth + "; table-layout: fixed;\" align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
out.println("<table style=\"width: " + tablewidth + "; table-layout: fixed;\" align=\"center\" class=\"table\" summary=\"This table browses all dspace content\">");
}
else
{
// Otherwise, don't constrain the width
out.println("<table align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
out.println("<table align=\"center\" class=\"table\" summary=\"This table browses all dspace content\">");
}
// Output the known column widths
@@ -332,11 +332,11 @@ public class BrowseListTag extends TagSupport
}
else if (!StringUtils.isEmpty(tablewidth))
{
out.println("<table width=\"" + tablewidth + "\" align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
out.println("<table width=\"" + tablewidth + "\" align=\"center\" class=\"table\" summary=\"This table browses all dspace content\">");
}
else
{
out.println("<table align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
out.println("<table align=\"center\" class=\"table\" summary=\"This table browses all dspace content\">");
}
// Output the table headers

2
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/CollectionListTag.java
View File

@@ -42,7 +42,7 @@ public class CollectionListTag extends TagSupport
try
{
out.println("<table align=\"center\" class=\"miscTable\" title=\"Collection List\">");
out.println("<table align=\"center\" class=\"table\" title=\"Collection List\">");
// Write column headings
out.print("<tr><th id=\"t4\" class=\"oddRowOddCol\">"

2
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/CommunityListTag.java
View File

@@ -42,7 +42,7 @@ public class CommunityListTag extends TagSupport
try
{
out.println("<table align=\"center\" class=\"miscTable\" title=\"Community List\">");
out.println("<table align=\"center\" class=\"table\" title=\"Community List\">");
// Write column headings
out.print("<tr><th id=\"t5\" class=\"oddRowOddCol\">"

8
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/ItemListTag.java
View File

@@ -267,12 +267,12 @@ public class ItemListTag extends TagSupport
// If the table width has been specified, we can make this a fixed layout
if (!StringUtils.isEmpty(tablewidth))
{
out.println("<table style=\"width: " + tablewidth + "; table-layout: fixed;\" align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
out.println("<table style=\"width: " + tablewidth + "; table-layout: fixed;\" align=\"center\" class=\"table\" summary=\"This table browses all dspace content\">");
}
else
{
// Otherwise, don't constrain the width
out.println("<table align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
out.println("<table align=\"center\" class=\"table\" summary=\"This table browses all dspace content\">");
}
// Output the known column widths
@@ -299,11 +299,11 @@ public class ItemListTag extends TagSupport
}
else if (!StringUtils.isEmpty(tablewidth))
{
out.println("<table width=\"" + tablewidth + "\" align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
out.println("<table width=\"" + tablewidth + "\" align=\"center\" class=\"table\" summary=\"This table browses all dspace content\">");
}
else
{
out.println("<table align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
out.println("<table align=\"center\" class=\"table\" summary=\"This table browses all dspace content\">");
}
// Output the table headers

41
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java
View File

@@ -391,7 +391,7 @@ public class ItemTag extends TagSupport
configLine = defaultFields;
}
out.println("<center><table class=\"itemDisplayTable\">");
out.println("<table class=\"table itemDisplayTable\">");
/*
* Break down the configuration into fields and display them
@@ -623,7 +623,7 @@ public class ItemTag extends TagSupport
listCollections();
out.println("</table></center><br/>");
out.println("</table><br/>");
listBitstreams();
@@ -648,12 +648,12 @@ public class ItemTag extends TagSupport
// Get all the metadata
DCValue[] values = item.getMetadata(Item.ANY, Item.ANY, Item.ANY, Item.ANY);
out.println("<p align=\"center\">"
out.println("<div class=\"panel panel-info\"><div class=\"panel-heading\">"
+ LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.ItemTag.full") + "</p>");
"org.dspace.app.webui.jsptag.ItemTag.full") + "</div>");
// Three column table - DC field, value, language
out.println("<center><table class=\"itemDisplayTable\">");
out.println("<table class=\"panel-body table itemDisplayTable\">");
out.println("<tr><th id=\"s1\" class=\"standard\">"
+ LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.ItemTag.dcfield")
@@ -697,7 +697,7 @@ public class ItemTag extends TagSupport
listCollections();
out.println("</table></center><br/>");
out.println("</table></div><br/>");
listBitstreams();
@@ -757,11 +757,11 @@ public class ItemTag extends TagSupport
HttpServletRequest request = (HttpServletRequest) pageContext
.getRequest();
out.print("<table align=\"center\" class=\"miscTable\"><tr>");
out.println("<td class=\"evenRowEvenCol\"><p><strong>"
out.print("<div class=\"panel panel-info\">");
out.println("<div class=\"panel-heading\">"
+ LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.ItemTag.files")
+ "</strong></p>");
+ "</div>");
try
{
@@ -781,10 +781,10 @@ public class ItemTag extends TagSupport
// if user already has uploaded at least one file
if (!filesExist)
{
out.println("<p>"
out.println("<div class=\"panel-body\">"
+ LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.ItemTag.files.no")
+ "</p>");
+ "</div>");
}
else
{
@@ -824,7 +824,7 @@ public class ItemTag extends TagSupport
}
out
.println("<table cellpadding=\"6\"><tr><th id=\"t1\" class=\"standard\">"
.println("<table class=\"table panel-body\"><tr><th id=\"t1\" class=\"standard\">"
+ LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.ItemTag.file")
+ "</th>");
@@ -846,7 +846,7 @@ public class ItemTag extends TagSupport
+ "</th><th id=\"t4\" class=\"standard\">"
+ LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.ItemTag.fileformat")
+ "</th></tr>");
+ "</th><th>&nbsp;</th></tr>");
// if primary bitstream is html, display a link for only that one to
// HTMLServlet
@@ -886,7 +886,7 @@ public class ItemTag extends TagSupport
out.print("</td><td headers=\"t4\" class=\"standard\">");
out.print(primaryBitstream.getFormatDescription());
out
.print("</td><td class=\"standard\"><a target=\"_blank\" href=\"");
.print("</td><td class=\"standard\"><a class=\"btn btn-primary\" target=\"_blank\" href=\"");
out.print(request.getContextPath());
out.print("/html/");
out.print(handle + "/");
@@ -913,7 +913,7 @@ public class ItemTag extends TagSupport
// Work out what the bitstream link should be
// (persistent
// ID if item has Handle)
String bsLink = "<a target=\"_blank\" href=\""
String bsLink = "target=\"_blank\" href=\""
+ request.getContextPath();
if ((handle != null)
@@ -936,7 +936,8 @@ public class ItemTag extends TagSupport
out
.print("<tr><td headers=\"t1\" class=\"standard\">");
out.print(bsLink);
out.print("<a ");
out.print(bsLink);
out.print(bitstreams[k].getName());
out.print("</a>");
@@ -977,6 +978,7 @@ public class ItemTag extends TagSupport
.getName(),
Constants.DEFAULT_ENCODING);
out.print("<a ");
out.print(bsLink);
out.print("<img src=\"" + myPath + "\" ");
out.print("alt=\"" + tAltText
@@ -984,6 +986,7 @@ public class ItemTag extends TagSupport
}
}
out.print("<a class=\"btn btn-primary\" ");
out
.print(bsLink
+ LocaleSupport
@@ -1004,7 +1007,7 @@ public class ItemTag extends TagSupport
throw new IOException(sqle.getMessage(), sqle);
}
out.println("</td></tr></table>");
out.println("</div>");
}
private void getThumbSettings()
@@ -1032,7 +1035,7 @@ public class ItemTag extends TagSupport
throw new IOException(sqle.getMessage(), sqle);
}
out.println("<table align=\"center\" class=\"attentionTable\"><tr>");
out.println("<table align=\"center\" class=\"table attentionTable\"><tr>");
out.println("<td class=\"attentionCell\"><p><strong>"
+ LocaleSupport.getLocalizedMessage(pageContext,
@@ -1046,7 +1049,7 @@ public class ItemTag extends TagSupport
for (int k = 0; k < bitstreams.length; k++)
{
out.print("<div align=\"center\" class=\"standard\">");
out.print("<strong><a target=\"_blank\" href=\"");
out.print("<strong><a class=\"btn btn-primary\" target=\"_blank\" href=\"");
out.print(request.getContextPath());
out.print("/retrieve/");
out.print(bitstreams[k].getID() + "/");

108
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/LayoutTag.java
View File

@@ -19,13 +19,14 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.jstl.fmt.LocaleSupport;
import javax.servlet.jsp.tagext.TagSupport;
import javax.servlet.jsp.tagext.BodyTagSupport;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.dspace.app.webui.servlet.FeedServlet;
import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.core.ConfigurationManager;
import org.dspace.app.webui.servlet.FeedServlet;
/**
* Tag for HTML page layout ("skin").
@@ -74,7 +75,7 @@ import org.dspace.app.webui.servlet.FeedServlet;
* @author Robert Tansley
* @version $Revision$
*/
public class LayoutTag extends TagSupport
public class LayoutTag extends BodyTagSupport
{
/** log4j logger */
private static Logger log = Logger.getLogger(LayoutTag.class);
@@ -112,24 +113,27 @@ public class LayoutTag extends TagSupport
/** Syndication feed "autodiscovery" link data */
private String feedData;
private String templatePath;
public LayoutTag()
{
super();
String template = ConfigurationManager.getProperty("jspui", "template.name");
if (StringUtils.isNotBlank(template)
&& !"default".equalsIgnoreCase(template))
{
templatePath = "/layout/" + template + "/";
}
else
{
templatePath = "/layout/";
}
}
public int doStartTag() throws JspException
{
ServletRequest request = pageContext.getRequest();
// header file
String header = "/layout/header-default.jsp";
// Choose default style unless one is specified
if (style != null)
{
header = "/layout/header-" + style.toLowerCase() + ".jsp";
}
// Sort out location bar
if (locbar == null)
{
@@ -246,7 +250,7 @@ public class LayoutTag extends TagSupport
}
else
{
request.setAttribute("dspace.layout.navbar", "/layout/navbar-"
request.setAttribute("dspace.layout.navbar", templatePath + "navbar-"
+ navbar + ".jsp");
}
@@ -323,12 +327,34 @@ public class LayoutTag extends TagSupport
request.setAttribute("dspace.layout.feedref", "NONE" );
}
return EVAL_BODY_BUFFERED;
}
public int doEndTag() throws JspException
{
// Context objects
ServletRequest request = pageContext.getRequest();
HttpServletResponse response = (HttpServletResponse) pageContext
.getResponse();
ServletConfig config = pageContext.getServletConfig();
// header file
String header = templatePath + "header-default.jsp";
// Choose default style unless one is specified
if (style != null)
{
header = templatePath + "header-" + style.toLowerCase() + ".jsp";
}
if (sidebar != null)
{
request.setAttribute("dspace.layout.sidebar", sidebar);
}
// Now include the header
try
{
HttpServletResponse response = (HttpServletResponse) pageContext
.getResponse();
// Set headers to prevent browser caching, if appropriate
if ((noCache != null) && noCache.equalsIgnoreCase("true"))
{
@@ -341,12 +367,13 @@ public class LayoutTag extends TagSupport
// in the response.
response.setContentType("text/html; charset=UTF-8");
ServletConfig config = pageContext.getServletConfig();
RequestDispatcher rd = config.getServletContext()
.getRequestDispatcher(header);
rd.include(request, response);
//pageContext.getOut().write(getBodyContent().getString());
getBodyContent().writeOut(pageContext.getOut());
}
catch (IOException ioe)
{
@@ -357,19 +384,14 @@ public class LayoutTag extends TagSupport
log.warn("Exception", se.getRootCause());
throw new JspException("Got ServletException: " + se);
}
return EVAL_BODY_INCLUDE;
}
public int doEndTag() throws JspException
{
// Footer file to use
String footer = "/layout/footer-default.jsp";
String footer = templatePath + "footer-default.jsp";
// Choose default flavour unless one is specified
if (style != null)
{
footer = "/layout/footer-" + style.toLowerCase() + ".jsp";
footer = templatePath + "footer-" + style.toLowerCase() + ".jsp";
}
try
@@ -377,16 +399,6 @@ public class LayoutTag extends TagSupport
// Ensure body is included before footer
pageContext.getOut().flush();
// Context objects
ServletRequest request = pageContext.getRequest();
ServletResponse response = pageContext.getResponse();
ServletConfig config = pageContext.getServletConfig();
if (sidebar != null)
{
request.setAttribute("dspace.layout.sidebar", sidebar);
}
RequestDispatcher rd = config.getServletContext()
.getRequestDispatcher(footer);
@@ -401,6 +413,15 @@ public class LayoutTag extends TagSupport
throw new JspException("Got IOException: " + ioe);
}
style = null;
title = null;
sidebar = null;
navbar = null;
locbar = null;
parentTitle = null;
parentLink = null;
noCache = null;
feedData = null;
return EVAL_PAGE;
}
@@ -628,17 +649,4 @@ public class LayoutTag extends TagSupport
{
this.feedData = v;
}
public void release()
{
style = null;
title = null;
sidebar = null;
navbar = null;
locbar = null;
parentTitle = null;
parentLink = null;
noCache = null;
feedData = null;
}
}

13
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/PoliciesListTag.java
View File

@@ -11,7 +11,6 @@ import java.io.IOException;
import java.sql.SQLException;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.jstl.fmt.LocaleSupport;
@@ -19,9 +18,7 @@ import javax.servlet.jsp.tagext.TagSupport;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.log4j.Logger;
import org.dspace.app.webui.util.UIUtil;
import org.dspace.authorize.ResourcePolicy;
import org.dspace.core.Context;
/**
* Tag to display embargo settings
@@ -55,12 +52,7 @@ public class PoliciesListTag extends TagSupport
try
{
HttpServletRequest hrq = (HttpServletRequest) pageContext.getRequest();
Context context = UIUtil.obtainContext(hrq);
sb.append("<center>\n");
sb.append("<table class=\"miscTable\">\n");
sb.append("<table class=\"miscTable\">\n");
sb.append("<table class=\"table\">\n");
sb.append("<tr>\n");
sb.append("<th class=\"accessHeadOdd\">").append(label_name).append("</th>\n");
sb.append("<th class=\"accessHeadEven\">").append(label_action).append("</th>\n");
@@ -90,12 +82,11 @@ public class PoliciesListTag extends TagSupport
sb.append("<td class=\"access").append(column2).append("\">").append(startDate).append("</td>\n");
sb.append("<td class=\"access").append(column1).append("\">").append(endDate).append("</td>\n");
sb.append("<td class=\"accessButton\">\n");
sb.append("<input name=\"submit_edit_edit_policies_").append(policy.getID()).append("\" type=\"submit\" value=\"Edit\" /> <input name=\"submit_delete_edit_policies_").append(policy.getID()).append("\" type=\"submit\" value=\"Remove\" />\n");
sb.append("<input class=\"btn btn-default\" name=\"submit_edit_edit_policies_").append(policy.getID()).append("\" type=\"submit\" value=\"Edit\" /> <input class=\"btn btn-danger\" name=\"submit_delete_edit_policies_").append(policy.getID()).append("\" type=\"submit\" value=\"Remove\" />\n");
sb.append("</td></tr>\n");
}
}
sb.append("</table>\n");
sb.append("</center>\n");
out.println(sb.toString());
}

30
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java
View File

@@ -108,7 +108,7 @@ public class SelectEPersonTag extends TagSupport
HttpServletRequest req = (HttpServletRequest) pageContext
.getRequest();
out.print("<table><tr><td colspan=\"2\" align=\"center\"><select multiple=\"multiple\" name=\"eperson_id\" size=\"");
out.print("<select class=\"form-control\" multiple=\"multiple\" name=\"eperson_id\" size=\"");
out.print(multiple ? "10" : "1");
out.println("\">");
// ensure that if no eperson is selected that a blank option is displayed - xhtml compliance
@@ -129,37 +129,27 @@ public class SelectEPersonTag extends TagSupport
}
// add blank option value if no person selected to ensure that code is xhtml compliant
//out.print("<option/>");
out.print("</select></td>");
if (multiple)
{
out.print("</tr><tr><td width=\"50%\" align=\"center\">");
}
else
{
out.print("<td>");
}
out.print("</select>");
out.print("<br/><div class=\"row container\">");
String p = (multiple ?
LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.SelectEPersonTag.selectPeople")
: LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.SelectEPersonTag.selectPerson") );
out.print("<input type=\"button\" value=\"" + p
+ "\" onclick=\"javascript:popup_window('"
+ req.getContextPath() + "/tools/eperson-list?multiple="
+ multiple + "', 'eperson_popup');\" />");
if (multiple)
{
out.print("</td><td width=\"50%\" align=\"center\">");
out.print("<input type=\"button\" value=\""
out.print("<input class=\"btn btn-danger\" type=\"button\" value=\""
+ LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.SelectEPersonTag.removeSelected")
+ "\" onclick=\"javascript:removeSelected(window.document.epersongroup.eperson_id);\"/>");
}
out.println("</td></tr></table>");
out.print("<input class=\"btn btn-primary pull-right\" type=\"button\" value=\"" + p
+ "\" onclick=\"javascript:popup_window('"
+ req.getContextPath() + "/tools/eperson-list?multiple="
+ multiple + "', 'eperson_popup');\" />");
out.print("</div>");
}
catch (IOException ie)
{

34
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java
View File

@@ -104,7 +104,7 @@ public class SelectGroupTag extends TagSupport
JspWriter out = pageContext.getOut();
HttpServletRequest req = (HttpServletRequest) pageContext.getRequest();
out.print("<table><tr><td colspan=\"2\" align=\"center\"><select multiple=\"multiple\" name=\"group_ids\" size=\"");
out.print("<select class=\"form-control\" multiple=\"multiple\" name=\"group_ids\" size=\"");
out.print(multiple ? "10" : "1");
out.println("\">");
@@ -124,37 +124,27 @@ public class SelectGroupTag extends TagSupport
}
}
out.print("</select></td>");
if (multiple)
{
out.print("</tr><tr><td width=\"50%\" align=\"center\">");
}
else
{
out.print("<td>");
}
out.print("</select>");
out.print("<br/><div class=\"row container\">");
String p = (multiple ?
LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.SelectGroupTag.selectGroups")
: LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.SelectGroupTag.selectGroup") );
out.print("<input type=\"button\" value=\"" + p
+ "\" onclick=\"javascript:popup_window('"
+ req.getContextPath() + "/tools/group-select-list?multiple="
+ multiple + "', 'group_popup');\" />");
if (multiple)
if (multiple)
{
out.print("</td><td width=\"50%\" align=\"center\">");
out.print("<input type=\"button\" value=\""
out.print("<input class=\"btn btn-danger\" type=\"button\" value=\""
+ LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.SelectGroupTag.removeSelected")
+ "\" onclick=\"javascript:removeSelected(window.document.epersongroup.group_ids);\"/>");
}
out.println("</td></tr></table>");
out.print("<input class=\"btn btn-primary pull-right\" type=\"button\" value=\"" + p
+ "\" onclick=\"javascript:popup_window('"
+ req.getContextPath() + "/tools/group-select-list?multiple="
+ multiple + "', 'group_popup');\" />");
out.print("</div>");
}
catch (IOException ie)
{

2
dspace-jspui/src/main/webapp/WEB-INF/dspace-tags.tld
View File

@@ -19,7 +19,7 @@
<taglib>
<tlibversion>1.0</tlibversion>
<jspversion>1.1</jspversion>
<jspversion>2.0</jspversion>
<shortname>dspace</shortname>
<uri>http://www.dspace.org/dspace-tags.tld</uri>
<info>DSpace JSP tags</info>

158
dspace-jspui/src/main/webapp/browse/full.jsp
View File

@@ -182,7 +182,7 @@
<%-- Include the main navigation for all the browse pages --%>
<%-- This first part is where we render the standard bits required by both possibly navigations --%>
<div align="center" id="browse_navigation">
<div id="browse_navigation" class="well text-center">
<form method="get" action="<%= formaction %>">
<input type="hidden" name="type" value="<%= bix.getName() %>"/>
<input type="hidden" name="sort_by" value="<%= so.getNumber() %>"/>
@@ -205,58 +205,40 @@
if (so.isDate() || (bix.isDate() && so.isDefault()))
{
%>
<table align="center" border="0" bgcolor="#CCCCCC" cellpadding="0" summary="Browsing by date">
<tr>
<td>
<table border="0" bgcolor="#EEEEEE" cellpadding="2">
<tr>
<td class="browseBar">
<span class="browseBarLabel"><fmt:message key="browse.nav.date.jump"/> </span>
<select name="year">
<option selected="selected" value="-1"><fmt:message key="browse.nav.year"/></option>
<span><fmt:message key="browse.nav.date.jump"/></span>
<select name="year">
<option selected="selected" value="-1"><fmt:message key="browse.nav.year"/></option>
<%
int thisYear = DCDate.getCurrent().getYear();
for (int i = thisYear; i >= 1990; i--)
{
%>
<option><%= i %></option>
<option><%= i %></option>
<%
}
%>
<option>1985</option>
<option>1980</option>
<option>1975</option>
<option>1970</option>
<option>1960</option>
<option>1950</option>
</select>
<select name="month">
<option selected="selected" value="-1"><fmt:message key="browse.nav.month"/></option>
<option>1985</option>
<option>1980</option>
<option>1975</option>
<option>1970</option>
<option>1960</option>
<option>1950</option>
</select>
<select name="month">
<option selected="selected" value="-1"><fmt:message key="browse.nav.month"/></option>
<%
for (int i = 1; i <= 12; i++)
{
%>
<option value="<%= i %>"><%= DCDate.getMonthName(i, UIUtil.getSessionLocale(request)) %></option>
<option value="<%= i %>"><%= DCDate.getMonthName(i, UIUtil.getSessionLocale(request)) %></option>
<%
}
%>
</select>
</td>
<td class="browseBar" rowspan="2">
<input type="submit" value="<fmt:message key="browse.nav.go"/>" />
</td>
</tr>
<tr>
<%-- HACK: Shouldn't use align here --%>
<td class="browseBar" align="center">
<span class="browseBarLabel"><fmt:message key="browse.nav.type-year"/></span>
<input type="text" name="starts_with" size="4" maxlength="4"/>
</td>
</tr>
</table>
</td>
</tr>
</table>
</select>
<input type="submit" class="btn btn-default" value="<fmt:message key="browse.nav.go"/>" />
<br/>
<label for="starts_with"><fmt:message key="browse.nav.type-year"/></label>
<input type="text" name="starts_with" size="4" maxlength="4"/>
<%
}
@@ -264,34 +246,18 @@
else
{
%>
<table align="center" border="0" bgcolor="#CCCCCC" cellpadding="0" summary="Browse the respository">
<tr>
<td>
<table border="0" bgcolor="#EEEEEE" cellpadding="2">
<tr>
<td class="browseBar">
<span class="browseBarLabel"><fmt:message key="browse.nav.jump"/></span>
<a href="<%= sharedLink %>&amp;starts_with=0">0-9</a>
<span><fmt:message key="browse.nav.jump"/></span>
<a class="label label-default" href="<%= sharedLink %>&amp;starts_with=0">0-9</a>
<%
for (char c = 'A'; c <= 'Z'; c++)
{
%>
<a href="<%= sharedLink %>&amp;starts_with=<%= c %>"><%= c %></a>
<a class="label label-default" href="<%= sharedLink %>&amp;starts_with=<%= c %>"><%= c %></a>
<%
}
%>
</td>
</tr>
<tr>
<td class="browseBar" align="center">
<span class="browseBarLabel"><fmt:message key="browse.nav.enter"/>&nbsp;</span>
<input type="text" name="starts_with"/>&nbsp;<input type="submit" value="<fmt:message key="browse.nav.go"/>" />
</td>
</tr>
</table>
</td>
</tr>
</table>
%><br/>
<span><fmt:message key="browse.nav.enter"/></span>
<input type="text" name="starts_with"/>&nbsp;<input type="submit" class="btn btn-default" value="<fmt:message key="browse.nav.go"/>" />
<%
}
%>
@@ -300,7 +266,7 @@
<%-- End of Navigation Headers --%>
<%-- Include a component for modifying sort by, order, results per page, and et-al limit --%>
<div align="center" id="browse_controls">
<div id="browse_controls" class="well text-center">
<form method="get" action="<%= formaction %>">
<input type="hidden" name="type" value="<%= bix.getName() %>"/>
<%
@@ -333,7 +299,7 @@
if (sortOptions.size() > 1) // && bi.getBrowseLevel() > 0
{
%>
<fmt:message key="browse.full.sort-by"/>
<label for="sort_by"><fmt:message key="browse.full.sort-by"/></label>
<select name="sort_by">
<%
for (SortOption sortBy : sortOptions)
@@ -350,14 +316,13 @@
<%
}
%>
<fmt:message key="browse.full.order"/>
<label for="order"><fmt:message key="browse.full.order"/></label>
<select name="order">
<option value="ASC" <%= ascSelected %>><fmt:message key="browse.order.asc" /></option>
<option value="DESC" <%= descSelected %>><fmt:message key="browse.order.desc" /></option>
</select>
<fmt:message key="browse.full.rpp"/>
<label for="rpp"><fmt:message key="browse.full.rpp"/></label>
<select name="rpp">
<%
for (int i = 5; i <= 100 ; i += 5)
@@ -369,8 +334,8 @@
}
%>
</select>
<fmt:message key="browse.full.etal" />
<label for="etal"><fmt:message key="browse.full.etal" /></label>
<select name="etal">
<%
String unlimitedSelect = "";
@@ -422,35 +387,33 @@
}
%>
</select>
<input type="submit" name="submit_browse" value="<fmt:message key="jsp.general.update"/>"/>
<input type="submit" class="btn btn-default" name="submit_browse" value="<fmt:message key="jsp.general.update"/>"/>
<%
if (admin_button && !withdrawn && !privateitems)
{
%><input type="submit" name="submit_export_metadata" value="<fmt:message key="jsp.general.metadataexport.button"/>" /><%
%><input type="submit" class="btn btn-default" name="submit_export_metadata" value="<fmt:message key="jsp.general.metadataexport.button"/>" /><%
}
%>
</form>
</div>
<div class="panel panel-primary">
<%-- give us the top report on what we are looking at --%>
<div align="center" class="browse_range">
<div class="panel-heading text-center">
<fmt:message key="browse.full.range">
<fmt:param value="<%= Integer.toString(bi.getStart()) %>"/>
<fmt:param value="<%= Integer.toString(bi.getFinish()) %>"/>
<fmt:param value="<%= Integer.toString(bi.getTotal()) %>"/>
</fmt:message>
</div>
<%-- do the top previous and next page links --%>
<div align="center">
<%
if (bi.hasPrevPage())
{
%>
<a href="<%= prev %>"><fmt:message key="browse.full.prev"/></a>&nbsp;
<a class="pull-left" href="<%= prev %>"><fmt:message key="browse.full.prev"/></a>&nbsp;
<%
}
%>
@@ -459,7 +422,7 @@
if (bi.hasNextPage())
{
%>
&nbsp;<a href="<%= next %>"><fmt:message key="browse.full.next"/></a>
&nbsp;<a class="pull-right" href="<%= next %>"><fmt:message key="browse.full.next"/></a>
<%
}
%>
@@ -487,21 +450,19 @@
}
%>
<%-- give us the bottom report on what we are looking at --%>
<div align="center" class="browse_range">
<div class="panel-footer text-center">
<fmt:message key="browse.full.range">
<fmt:param value="<%= Integer.toString(bi.getStart()) %>"/>
<fmt:param value="<%= Integer.toString(bi.getFinish()) %>"/>
<fmt:param value="<%= Integer.toString(bi.getTotal()) %>"/>
</fmt:message>
</div>
<%-- do the bottom previous and next page links --%>
<div align="center">
<%
if (bi.hasPrevPage())
{
%>
<a href="<%= prev %>"><fmt:message key="browse.full.prev"/></a>&nbsp;
<a class="pull-left" href="<%= prev %>"><fmt:message key="browse.full.prev"/></a>&nbsp;
<%
}
%>
@@ -510,44 +471,15 @@
if (bi.hasNextPage())
{
%>
&nbsp;<a href="<%= next %>"><fmt:message key="browse.full.next"/></a>
&nbsp;<a class="pull-right" href="<%= next %>"><fmt:message key="browse.full.next"/></a>
<%
}
%>
</div>
</div>
<%-- dump the results for debug (uncomment to enable) --%>
<%--
<!-- <%= bi.toString() %> -->
--%>
</dspace:layout>
</dspace:layout>

135
dspace-jspui/src/main/webapp/browse/single.jsp
View File

@@ -125,7 +125,7 @@
<%-- Include the main navigation for all the browse pages --%>
<%-- This first part is where we render the standard bits required by both possibly navigations --%>
<div align="center" id="browse_navigation">
<div id="browse_navigation" class="well text-center">
<form method="get" action="<%= formaction %>">
<input type="hidden" name="type" value="<%= bix.getName() %>"/>
<input type="hidden" name="order" value="<%= direction %>"/>
@@ -136,58 +136,40 @@
if (bix.isDate())
{
%>
<table align="center" border="0" bgcolor="#CCCCCC" cellpadding="0" summary="Browsing by date">
<tr>
<td>
<table border="0" bgcolor="#EEEEEE" cellpadding="2">
<tr>
<td class="browseBar">
<span class="browseBarLabel"><fmt:message key="browse.nav.date.jump"/> </span>
<select name="year">
<option selected="selected" value="-1"><fmt:message key="browse.nav.year"/></option>
<span><fmt:message key="browse.nav.date.jump"/> </span>
<select name="year">
<option selected="selected" value="-1"><fmt:message key="browse.nav.year"/></option>
<%
int thisYear = DCDate.getCurrent().getYear();
for (int i = thisYear; i >= 1990; i--)
{
%>
<option><%= i %></option>
<option><%= i %></option>
<%
}
%>
<option>1985</option>
<option>1980</option>
<option>1975</option>
<option>1970</option>
<option>1960</option>
<option>1950</option>
</select>
<select name="month">
<option selected="selected" value="-1"><fmt:message key="browse.nav.month"/></option>
<option>1985</option>
<option>1980</option>
<option>1975</option>
<option>1970</option>
<option>1960</option>
<option>1950</option>
</select>
<select name="month">
<option selected="selected" value="-1"><fmt:message key="browse.nav.month"/></option>
<%
for (int i = 1; i <= 12; i++)
{
%>
<option value="<%= i %>"><%= DCDate.getMonthName(i, UIUtil.getSessionLocale(request)) %></option>
<option value="<%= i %>"><%= DCDate.getMonthName(i, UIUtil.getSessionLocale(request)) %></option>
<%
}
%>
</select>
</td>
<td class="browseBar" rowspan="2">
<input type="submit" value="<fmt:message key="browse.nav.go"/>" />
</td>
</tr>
<tr>
<%-- HACK: Shouldn't use align here --%>
<td class="browseBar" align="center">
<span class="browseBarLabel"><fmt:message key="browse.nav.type-year"/></span>
<input type="text" name="starts_with" size="4" maxlength="4"/>
</td>
</tr>
</table>
</td>
</tr>
</table>
</select>
<input type="submit" class="btn btn-default" value="<fmt:message key="browse.nav.go"/>" />
<br/>
<label for="starts_with"><fmt:message key="browse.nav.type-year"/></label>
<input type="text" name="starts_with" size="4" maxlength="4"/>
<%
}
@@ -195,34 +177,20 @@
else
{
%>
<table align="center" border="0" bgcolor="#CCCCCC" cellpadding="0" summary="Browse the respository">
<tr>
<td>
<table border="0" bgcolor="#EEEEEE" cellpadding="2">
<tr>
<td class="browseBar">
<span class="browseBarLabel"><fmt:message key="browse.nav.jump"/></span>
<a href="<%= sharedLink %>&amp;starts_with=0">0-9</a>
<span><fmt:message key="browse.nav.jump"/></span>
<a class="label label-default" href="<%= sharedLink %>&amp;starts_with=0">0-9</a>
<%
for (char c = 'A'; c <= 'Z'; c++)
{
%>
<a href="<%= sharedLink %>&amp;starts_with=<%= c %>"><%= c %></a>
<a href="<%= sharedLink %>&amp;starts_with=<%= c %>"><%= c %></a>
<%
}
%>
</td>
</tr>
<tr>
<td class="browseBar" align="center">
<span class="browseBarLabel"><fmt:message key="browse.nav.enter"/>&nbsp;</span>
<input type="text" name="starts_with"/>&nbsp;<input type="submit" value="<fmt:message key="browse.nav.go"/>" />
</td>
</tr>
</table>
</td>
</tr>
</table>
<br/>
<label for="starts_with"><fmt:message key="browse.nav.enter"/></label>
<input type="text" name="starts_with"/>
<input type="submit" class="btn btn-default" value="<fmt:message key="browse.nav.go"/>" />
<%
}
%>
@@ -231,7 +199,7 @@
<%-- End of Navigation Headers --%>
<%-- Include a component for modifying sort by, order and results per page --%>
<div align="center" id="browse_controls">
<div id="browse_controls" class="well text-center">
<form method="get" action="<%= formaction %>">
<input type="hidden" name="type" value="<%= bix.getName() %>"/>
@@ -243,13 +211,13 @@
%><input type="hidden" name="vfocus" value="<%= bi.getFocus() %>"/><%
}
--%>
<fmt:message key="browse.single.order"/>
<label for="order"><fmt:message key="browse.single.order"/></label>
<select name="order">
<option value="ASC" <%= ascSelected %>><fmt:message key="browse.order.asc" /></option>
<option value="DESC" <%= descSelected %>><fmt:message key="browse.order.desc" /></option>
</select>
<fmt:message key="browse.single.rpp"/>
<label for="rpp"><fmt:message key="browse.single.rpp"/></label>
<select name="rpp">
<%
for (int i = 5; i <= 100 ; i += 5)
@@ -261,26 +229,26 @@
}
%>
</select>
<input type="submit" name="submit_browse" value="<fmt:message key="jsp.general.update"/>"/>
<input type="submit" class="btn btn-default" name="submit_browse" value="<fmt:message key="jsp.general.update"/>"/>
</form>
</div>
<div class="row col-md-offset-3 col-md-6">
<%-- give us the top report on what we are looking at --%>
<div align="center" class="browse_range">
<div class="panel panel-primary">
<div class="panel-heading text-center">
<fmt:message key="browse.single.range">
<fmt:param value="<%= Integer.toString(bi.getStart()) %>"/>
<fmt:param value="<%= Integer.toString(bi.getFinish()) %>"/>
<fmt:param value="<%= Integer.toString(bi.getTotal()) %>"/>
</fmt:message>
</div>
<%-- do the top previous and next page links --%>
<div align="center">
<%
if (bi.hasPrevPage())
{
%>
<a href="<%= prev %>"><fmt:message key="browse.single.prev"/></a>&nbsp;
<a class="pull-left" href="<%= prev %>"><fmt:message key="browse.single.prev"/></a>&nbsp;
<%
}
%>
@@ -289,51 +257,41 @@
if (bi.hasNextPage())
{
%>
&nbsp;<a href="<%= next %>"><fmt:message key="browse.single.next"/></a>
&nbsp;<a class="pull-right" href="<%= next %>"><fmt:message key="browse.single.next"/></a>
<%
}
%>
</div>
<%-- THE RESULTS --%>
<table align="center" class="miscTable" summary="This table displays a list of results">
<ul class="list-group">
<%
// Row: toggles between Odd and Even
String row = "odd";
String[][] results = bi.getStringResults();
for (int i = 0; i < results.length; i++)
{
%>
<tr>
<td class="<%= row %>RowOddCol">
<li class="list-group-item">
<a href="<%= sharedLink %><% if (results[i][1] != null) { %>&amp;authority=<%= URLEncoder.encode(results[i][1], "UTF-8") %>" class="authority <%= bix.getName() %>"><%= Utils.addEntities(results[i][0]) %></a> <% } else { %>&amp;value=<%= URLEncoder.encode(results[i][0], "UTF-8") %>"><%= Utils.addEntities(results[i][0]) %></a> <% } %>
<%= StringUtils.isNotBlank(results[i][2])?" ["+results[i][2]+"]":""%>
</td>
</tr>
<%= StringUtils.isNotBlank(results[i][2])?" <span class=\"badge\">"+results[i][2]+"</span>":""%>
</li>
<%
row = ( row.equals( "odd" ) ? "even" : "odd" );
}
%>
</table>
</ul>
<%-- give us the bottom report on what we are looking at --%>
<div align="center" class="browse_range">
<div class="panel-footer text-center">
<fmt:message key="browse.single.range">
<fmt:param value="<%= Integer.toString(bi.getStart()) %>"/>
<fmt:param value="<%= Integer.toString(bi.getFinish()) %>"/>
<fmt:param value="<%= Integer.toString(bi.getTotal()) %>"/>
</fmt:message>
</div>
<%-- do the bottom previous and next page links --%>
<div align="center">
<%
if (bi.hasPrevPage())
{
%>
<a href="<%= prev %>"><fmt:message key="browse.single.prev"/></a>&nbsp;
<a class="pull-left" href="<%= prev %>"><fmt:message key="browse.single.prev"/></a>&nbsp;
<%
}
%>
@@ -342,12 +300,13 @@
if (bi.hasNextPage())
{
%>
&nbsp;<a href="<%= next %>"><fmt:message key="browse.single.next"/></a>
&nbsp;<a class="pull-right" href="<%= next %>"><fmt:message key="browse.single.next"/></a>
<%
}
%>
</div>
</div>
</div>
<%-- dump the results for debug (uncomment to enable) --%>
<%--
<!-- <%= bi.toString() %> -->

258
dspace-jspui/src/main/webapp/collection-home.jsp
View File

@@ -105,11 +105,8 @@
<%@page import="org.dspace.app.webui.servlet.MyDSpaceServlet"%>
<dspace:layout locbar="commLink" title="<%= name %>" feedData="<%= feedData %>">
<table border="0" cellpadding="5" width="100%">
<tr>
<td width="100%">
<h1><%= name %>
<div class="well">
<div class="row"><div class="col-md-8"><h2><%= name %>
<%
if(ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
@@ -118,108 +115,93 @@
<%
}
%>
</h1>
<h3><fmt:message key="jsp.collection-home.heading1"/></h3>
</td>
<td valign="top">
<small><fmt:message key="jsp.collection-home.heading1"/></small>
<a class="statisticsLink btn btn-info" href="<%= request.getContextPath() %>/handle/<%= collection.getHandle() %>/statistics"><fmt:message key="jsp.collection-home.display-statistics"/></a>
</h2></div>
<% if (logo != null) { %>
<img alt="Logo" src="<%= request.getContextPath() %>/retrieve/<%= logo.getID() %>" />
<% } %></td>
</tr>
</table>
<%-- Search/Browse --%>
<table class="miscTable" align="center" summary="This table allows you to search through all collections in the repository">
<tr>
<td class="evenRowEvenCol" colspan="2">
<form method="get" action="">
<table>
<tr>
<td class="standard" align="center">
<label for="tlocation"><small><strong><fmt:message key="jsp.general.location"/></strong></small></label>&nbsp;
<select name="location" id="tlocation">
<option value="/"><fmt:message key="jsp.general.genericScope"/></option>
<option selected="selected" value="<%= community.getHandle() %>"><%= communityName %></option>
<option selected="selected" value="<%= collection.getHandle() %>"><%= name %></option>
</select>
</td>
</tr>
<tr>
<td class="standard" align="center">
<label for="tquery"><small><fmt:message key="jsp.general.searchfor"/>&nbsp;</small></label><input type="text" name="query" id="tquery"/>&nbsp;
<input type="submit" name="submit_search" value="<fmt:message key="jsp.general.go"/>" />
</td>
</tr>
</table>
</form>
</td>
</tr>
<tr>
<td align="center" class="standard" valign="middle">
<small><fmt:message key="jsp.general.orbrowse"/>&nbsp;</small>
<%-- Insert the dynamic list of browse options --%>
<div class="col-md-4">
<img class="img-responsive pull-right" alt="Logo" src="<%= request.getContextPath() %>/retrieve/<%= logo.getID() %>" />
</div>
<% } %>
</div>
<%
if (StringUtils.isNotBlank(intro)) { %>
<%= intro %>
<% } %>
</div>
<p class="copyrightText"><%= copyright %></p>
<%-- Browse --%>
<div class="panel panel-primary">
<div class="panel-heading">
<fmt:message key="jsp.general.browse"/>
</div>
<div class="panel-body">
<%-- Insert the dynamic list of browse options --%>
<%
for (int i = 0; i < bis.length; i++)
{
String key = "browse.menu." + bis[i].getName();
%>
<div class="browse_buttons">
<form method="get" action="<%= request.getContextPath() %>/handle/<%= collection.getHandle() %>/browse">
<form method="get" class="btn-group" action="<%= request.getContextPath() %>/handle/<%= collection.getHandle() %>/browse">
<input type="hidden" name="type" value="<%= bis[i].getName() %>"/>
<%-- <input type="hidden" name="collection" value="<%= collection.getHandle() %>" /> --%>
<input type="submit" name="submit_browse" value="<fmt:message key="<%= key %>"/>"/>
<input type="submit" class="btn btn-default" name="submit_browse" value="<fmt:message key="<%= key %>"/>"/>
</form>
</div>
<%
}
%>
</td>
</tr>
</table>
<table width="100%" align="center" cellspacing="10">
<tr>
<td>
<%-- HACK: <center> used for Netscape 4.x, which doesn't accept align="center"
for a paragraph with a button in it --%>
%> </div>
</div>
<% if (submit_button)
{ %>
<center>
<form action="<%= request.getContextPath() %>/submit" method="post">
<form class="form-group" action="<%= request.getContextPath() %>/submit" method="post">
<input type="hidden" name="collection" value="<%= collection.getID() %>" />
<input type="submit" name="submit" value="<fmt:message key="jsp.collection-home.submit.button"/>" />
<input class="btn btn-success col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.collection-home.submit.button"/>" />
</form>
</center>
<% } %>
</td>
<td class="oddRowEvenCol">
<form method="get" action="">
<table>
<tr>
<td class="standard">
<form class="well" method="get" action="">
<% if (loggedIn && subscribed)
{ %>
<small><fmt:message key="jsp.collection-home.subscribed"/> <a href="<%= request.getContextPath() %>/subscribe"><fmt:message key="jsp.collection-home.info"/></a></small>
</td>
<td class="standard">
<input type="submit" name="submit_unsubscribe" value="<fmt:message key="jsp.collection-home.unsub"/>" />
<input class="btn btn-sm btn-warning" type="submit" name="submit_unsubscribe" value="<fmt:message key="jsp.collection-home.unsub"/>" />
<% } else { %>
<small>
<fmt:message key="jsp.collection-home.subscribe.msg"/>
</small>
</td>
<td class="standard">
<input type="submit" name="submit_subscribe" value="<fmt:message key="jsp.collection-home.subscribe"/>" />
<% } %>
</td>
</tr>
</table>
<input class="btn btn-sm btn-info" type="submit" name="submit_subscribe" value="<fmt:message key="jsp.collection-home.subscribe"/>" />
<% }
if(feedEnabled)
{ %>
<span class="pull-right">
<%
String[] fmts = feedData.substring(5).split(",");
String icon = null;
int width = 0;
for (int j = 0; j < fmts.length; j++)
{
if ("rss_1.0".equals(fmts[j]))
{
icon = "rss1.gif";
width = 80;
}
else if ("rss_2.0".equals(fmts[j]))
{
icon = "rss2.gif";
width = 80;
}
else
{
icon = "rss.gif";
width = 36;
}
%>
<a href="<%= request.getContextPath() %>/feed/<%= fmts[j] %>/<%= collection.getHandle() %>"><img src="<%= request.getContextPath() %>/image/<%= icon %>" alt="RSS Feed" width="<%= width %>" height="15" vspace="3" border="0" /></a>
<%
} %>
</span><%
}
%>
</form>
</td>
</tr>
</table>
<%= intro %>
<% if (show_items)
{
@@ -327,95 +309,54 @@
} // end of if (show_title)
%>
<div align="center">
<a class="statisticsLink" href="<%= request.getContextPath() %>/handle/<%= collection.getHandle() %>/statistics"><fmt:message key="jsp.collection-home.display-statistics"/></a>
</div>
<p class="copyrightText"><%= copyright %></p>
<dspace:sidebar>
<% if(admin_button || editor_button ) { %>
<table class="miscTable" align="center">
<tr>
<td class="evenRowEvenCol" colspan="2">
<table>
<tr>
<th id="t1" class="standard">
<strong><fmt:message key="jsp.admintools"/></strong>
</th>
</tr>
<div class="panel panel-warning">
<div class="panel-heading"><fmt:message key="jsp.admintools"/>
<span class="pull-right"><dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.collection-admin\")%>"><fmt:message key="jsp.adminhelp"/></dspace:popup></span>
</div>
<div class="panel-body">
<% if( editor_button ) { %>
<tr>
<td headers="t1" class="standard" align="center">
<form method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="collection_id" value="<%= collection.getID() %>" />
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="hidden" name="action" value="<%= EditCommunitiesServlet.START_EDIT_COLLECTION %>" />
<input type="submit" value="<fmt:message key="jsp.general.edit.button"/>" />
<input class="btn btn-default col-md-12" type="submit" value="<fmt:message key="jsp.general.edit.button"/>" />
</form>
</td>
</tr>
<% } %>
<% if( admin_button ) { %>
<tr>
<td headers="t1" class="standard" align="center">
<form method="post" action="<%=request.getContextPath()%>/tools/itemmap">
<input type="hidden" name="cid" value="<%= collection.getID() %>" />
<input type="submit" value="<fmt:message key="jsp.collection-home.item.button"/>" />
<input class="btn btn-default col-md-12" type="submit" value="<fmt:message key="jsp.collection-home.item.button"/>" />
</form>
</td>
</tr>
<% if(submitters != null) { %>
<tr>
<td headers="t1" class="standard" align="center">
<form method="get" action="<%=request.getContextPath()%>/tools/group-edit">
<input type="hidden" name="group_id" value="<%=submitters.getID()%>" />
<input type="submit" name="submit_edit" value="<fmt:message key="jsp.collection-home.editsub.button"/>" />
<input class="btn btn-default col-md-12" type="submit" name="submit_edit" value="<fmt:message key="jsp.collection-home.editsub.button"/>" />
</form>
</td>
</tr>
<% } %>
<% if( editor_button || admin_button) { %>
<tr>
<td headers="t1" class="standard" align="center">
<form method="post" action="<%=request.getContextPath()%>/mydspace">
<input type="hidden" name="collection_id" value="<%= collection.getID() %>" />
<input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_EXPORT_ARCHIVE %>" />
<input type="submit" value="<fmt:message key="jsp.mydspace.request.export.collection"/>" />
<input class="btn btn-default col-md-12" type="submit" value="<fmt:message key="jsp.mydspace.request.export.collection"/>" />
</form>
</td>
</tr>
<tr>
<td headers="t1" class="standard" align="center">
<form method="post" action="<%=request.getContextPath()%>/mydspace">
<input type="hidden" name="collection_id" value="<%= collection.getID() %>" />
<input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_MIGRATE_ARCHIVE %>" />
<input type="submit" value="<fmt:message key="jsp.mydspace.request.export.migratecollection"/>" />
<input class="btn btn-default col-md-12" type="submit" value="<fmt:message key="jsp.mydspace.request.export.migratecollection"/>" />
</form>
</td>
</tr>
<tr>
<td headers="t1" class="standard" align="center">
<form method="post" action="<%=request.getContextPath()%>/dspace-admin/metadataexport">
<input type="hidden" name="handle" value="<%= collection.getHandle() %>" />
<input type="submit" value="<fmt:message key="jsp.general.metadataexport.button"/>" />
<input class="btn btn-default col-md-12" type="submit" value="<fmt:message key="jsp.general.metadataexport.button"/>" />
</form>
</td>
</tr>
</div>
</div>
<% } %>
<tr>
<td headers="t1" class="standard" align="center">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.collection-admin\")%>"><fmt:message key="jsp.adminhelp"/></dspace:popup>
</td>
</tr>
<% } %>
</table>
</td>
</tr>
</table>
<% } %>
<%
@@ -442,44 +383,11 @@
<p>&nbsp;</p>
<% } %>
<%
if(feedEnabled)
{
%>
<center>
<h4><fmt:message key="jsp.collection-home.feeds"/></h4>
<%
String[] fmts = feedData.substring(5).split(",");
String icon = null;
int width = 0;
for (int j = 0; j < fmts.length; j++)
{
if ("rss_1.0".equals(fmts[j]))
{
icon = "rss1.gif";
width = 80;
}
else if ("rss_2.0".equals(fmts[j]))
{
icon = "rss2.gif";
width = 80;
}
else
{
icon = "rss.gif";
width = 36;
}
%>
<a href="<%= request.getContextPath() %>/feed/<%= fmts[j] %>/<%= collection.getHandle() %>"><img src="<%= request.getContextPath() %>/image/<%= icon %>" alt="RSS Feed" width="<%= width %>" height="15" vspace="3" border="0" /></a>
<%
}
%>
</center>
<%
}
%>
<%= sidebar %>
<%
int discovery_panel_cols = 12;
int discovery_facet_cols = 12;
%>
<%@ include file="discovery/static-sidebar-facet.jsp" %>
</dspace:sidebar>

567
dspace-jspui/src/main/webapp/community-home.jsp
View File

@@ -74,11 +74,10 @@
<%@page import="org.dspace.app.webui.servlet.MyDSpaceServlet"%>
<dspace:layout locbar="commLink" title="<%= name %>" feedData="<%= feedData %>">
<table border="0" cellpadding="5" width="100%">
<tr>
<td width="100%">
<h1><%= name %>
<div class="well">
<div class="row">
<div class="col-md-8">
<h2><%= name %>
<%
if(ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
@@ -87,291 +86,34 @@
<%
}
%>
</h1>
<h3><fmt:message key="jsp.community-home.heading1"/></h3>
</td>
<td valign="top">
<% if (logo != null) { %>
<img alt="Logo" src="<%= request.getContextPath() %>/retrieve/<%= logo.getID() %>" />
<% } %></td>
</tr>
</table>
<%-- Search/Browse --%>
<table class="miscTable" align="center" summary="This table allows you to search through all communities held in the repository">
<tr>
<td class="evenRowEvenCol" colspan="2">
<form method="get" action="">
<table>
<tr>
<td class="standard" align="center">
<small><label for="tlocation"><strong><fmt:message key="jsp.general.location"/></strong></label></small>&nbsp;<select name="location" id="tlocation">
<option value="/"><fmt:message key="jsp.general.genericScope"/></option>
<option selected="selected" value="<%= community.getHandle() %>"><%= name %></option>
<%
for (int i = 0; i < collections.length; i++)
{
%>
<option value="<%= collections[i].getHandle() %>"><%= collections[i].getMetadata("name") %></option>
<%
}
%>
<%
for (int j = 0; j < subcommunities.length; j++)
{
%>
<option value="<%= subcommunities[j].getHandle() %>"><%= subcommunities[j].getMetadata("name") %></option>
<%
}
%>
</select>
</td>
</tr>
<tr>
<td class="standard" align="center">
<small><label for="tquery"><strong><fmt:message key="jsp.general.searchfor"/>&nbsp;</strong></label></small><input type="text" name="query" id="tquery" />&nbsp;<input type="submit" name="submit_search" value="<fmt:message key="jsp.general.go"/>" />
</td>
</tr>
</table>
</form>
</td>
</tr>
<tr>
<td align="center" class="standard" valign="middle">
<small><fmt:message key="jsp.general.orbrowse"/>&nbsp;</small>
<%-- Insert the dynamic list of browse options --%>
<%
for (int i = 0; i < bis.length; i++)
{
String key = "browse.menu." + bis[i].getName();
%>
<div class="browse_buttons">
<form method="get" action="<%= request.getContextPath() %>/handle/<%= community.getHandle() %>/browse">
<input type="hidden" name="type" value="<%= bis[i].getName() %>"/>
<%-- <input type="hidden" name="community" value="<%= community.getHandle() %>" /> --%>
<input type="submit" name="submit_browse" value="<fmt:message key="<%= key %>"/>"/>
</form>
<small><fmt:message key="jsp.community-home.heading1"/></small>
<a class="statisticsLink btn btn-info" href="<%= request.getContextPath() %>/handle/<%= community.getHandle() %>/statistics"><fmt:message key="jsp.community-home.display-statistics"/></a>
</h2>
</div>
<%
}
%>
</td>
</tr>
</table>
<% if (logo != null) { %>
<div class="col-md-4">
<img class="img-responsive" alt="Logo" src="<%= request.getContextPath() %>/retrieve/<%= logo.getID() %>" />
</div>
<% } %>
</div>
<% if (StringUtils.isNotBlank(intro)) { %>
<%= intro %>
<%
if (collections.length != 0)
{
%>
<%-- <h2>Collections in this community</h2> --%>
<h2><fmt:message key="jsp.community-home.heading2"/></h2>
<ul class="collectionListItem">
<%
for (int i = 0; i < collections.length; i++)
{
%>
<li>
<table>
<tr>
<td>
<a href="<%= request.getContextPath() %>/handle/<%= collections[i].getHandle() %>">
<%= collections[i].getMetadata("name") %></a>
<%
if(ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
%>
[<%= ic.getCount(collections[i]) %>]
<%
}
%>
</td>
<% if (remove_button) { %>
<td>
<form method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="parent_community_id" value="<%= community.getID() %>" />
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="hidden" name="collection_id" value="<%= collections[i].getID() %>" />
<input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_DELETE_COLLECTION%>" />
<input type="image" src="<%= request.getContextPath() %>/image/remove.gif" />
</form>
</td>
<% } %>
</tr>
</table>
<p class="collectionDescription"><%= collections[i].getMetadata("short_description") %></p>
</li>
<%
}
%>
</ul>
<%
}
%>
<%
if (subcommunities.length != 0)
{
%>
<%--<h2>Sub-communities within this community</h2>--%>
<h2><fmt:message key="jsp.community-home.heading3"/></h2>
<ul class="collectionListItem">
<%
for (int j = 0; j < subcommunities.length; j++)
{
%>
<li>
<table>
<tr>
<td>
<a href="<%= request.getContextPath() %>/handle/<%= subcommunities[j].getHandle() %>">
<%= subcommunities[j].getMetadata("name") %></a>
<%
if (ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
%>
[<%= ic.getCount(subcommunities[j]) %>]
<%
}
%>
</td>
<% if (remove_button) { %>
<td>
<form method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="parent_community_id" value="<%= community.getID() %>" />
<input type="hidden" name="community_id" value="<%= subcommunities[j].getID() %>" />
<input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_DELETE_COMMUNITY%>" />
<input type="image" src="<%= request.getContextPath() %>/image/remove.gif" />
</form>
</td>
<% } %>
</tr>
</table>
<p class="collectionDescription"><%= subcommunities[j].getMetadata("short_description") %></p>
</li>
<%
}
%>
</ul>
<%
}
%>
<p class="copyrightText"><%= copyright %></p>
<dspace:sidebar>
<% if(editor_button || add_button) // edit button(s)
{ %>
<table class="miscTable" align="center">
<tr>
<td class="evenRowEvenCol" colspan="2">
<table>
<tr>
<th id="t1" class="standard">
<%--<strong>Admin Tools</strong>--%>
<strong><fmt:message key="jsp.admintools"/></strong>
</th>
</tr>
<tr>
<td headers="t1" class="standard" align="center">
<% if(editor_button) { %>
<form method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_EDIT_COMMUNITY%>" />
<%--<input type="submit" value="Edit..." />--%>
<input type="submit" value="<fmt:message key="jsp.general.edit.button"/>" />
</form>
<% } %>
<% if(add_button) { %>
<form method="post" action="<%=request.getContextPath()%>/tools/collection-wizard">
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="submit" value="<fmt:message key="jsp.community-home.create1.button"/>" />
</form>
<form method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="action" value="<%= EditCommunitiesServlet.START_CREATE_COMMUNITY%>" />
<input type="hidden" name="parent_community_id" value="<%= community.getID() %>" />
<%--<input type="submit" name="submit" value="Create Sub-community" />--%>
<input type="submit" name="submit" value="<fmt:message key="jsp.community-home.create2.button"/>" />
</form>
<% } %>
</td>
</tr>
<% if( editor_button ) { %>
<tr>
<td headers="t1" class="standard" align="center">
<form method="post" action="<%=request.getContextPath()%>/mydspace">
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_EXPORT_ARCHIVE %>" />
<input type="submit" value="<fmt:message key="jsp.mydspace.request.export.community"/>" />
</form>
</td>
</tr>
<tr>
<td headers="t1" class="standard" align="center">
<form method="post" action="<%=request.getContextPath()%>/mydspace">
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_MIGRATE_ARCHIVE %>" />
<input type="submit" value="<fmt:message key="jsp.mydspace.request.export.migratecommunity"/>" />
</form>
</td>
</tr>
<tr>
<td headers="t1" class="standard" align="center">
<form method="post" action="<%=request.getContextPath()%>/dspace-admin/metadataexport">
<input type="hidden" name="handle" value="<%= community.getHandle() %>" />
<input type="submit" value="<fmt:message key="jsp.general.metadataexport.button"/>" />
</form>
</td>
</tr>
<% } %>
<tr>
<td headers="t1" class="standard" align="center">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\")%>"><fmt:message key="jsp.adminhelp"/></dspace:popup>
</td>
</tr>
</table>
</td>
</tr>
</table>
<% } %>
<%-- Recently Submitted items --%>
<h3><fmt:message key="jsp.community-home.recentsub"/></h3>
<% } %>
</div>
<p class="copyrightText"><%= copyright %></p>
<div class="row">
<%
if (rs != null)
{
Item[] items = rs.getRecentSubmissions();
for (int i = 0; i < items.length; i++)
{
DCValue[] dcv = items[i].getMetadata("dc", "title", null, Item.ANY);
String displayTitle = "Untitled";
if (dcv != null)
{
if (dcv.length > 0)
{
displayTitle = dcv[0].value;
}
}
%><p class="recentItem"><a href="<%= request.getContextPath() %>/handle/<%= items[i].getHandle() %>"><%= displayTitle %></a></p><%
}
}
%>
<p>&nbsp;</p>
{ %>
<div class="col-md-8">
<div class="panel panel-primary">
<div id="recent-submissions-carousel" class="panel-heading carousel slide">
<%-- Recently Submitted items --%>
<h3><fmt:message key="jsp.community-home.recentsub"/>
<%
if(feedEnabled)
{
%>
<center>
<h4><fmt:message key="jsp.community-home.feeds"/></h4>
<%
String[] fmts = feedData.substring(5).split(",");
String icon = null;
int width = 0;
@@ -396,20 +138,257 @@
<a href="<%= request.getContextPath() %>/feed/<%= fmts[j] %>/<%= community.getHandle() %>"><img src="<%= request.getContextPath() %>/image/<%= icon %>" alt="RSS Feed" width="<%= width %>" height="15" vspace="3" border="0" /></a>
<%
}
}
%>
</center>
</h3>
<!-- Wrapper for slides -->
<div class="carousel-inner">
<%
Item[] items = rs.getRecentSubmissions();
boolean first = true;
for (int i = 0; i < items.length; i++)
{
DCValue[] dcv = items[i].getMetadata("dc", "title", null, Item.ANY);
String displayTitle = "Untitled";
if (dcv != null)
{
if (dcv.length > 0)
{
displayTitle = dcv[0].value;
}
}
%>
<div style="padding-bottom: 50px; min-height: 200px;" class="item <%= first?"active":""%>">
<div style="padding-left: 80px; padding-right: 80px; display: inline-block;"><%= StringUtils.abbreviate(displayTitle, 400) %>
<a href="<%= request.getContextPath() %>/handle/<%=items[i].getHandle() %>">
<button class="btn btn-success" type="button">See</button>
</a>
</div>
</div>
<%
first = false;
}
%>
</div>
<!-- Controls -->
<a class="left carousel-control" href="#recent-submissions-carousel" data-slide="prev">
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#recent-submissions-carousel" data-slide="next">
<span class="icon-next"></span>
</a>
<ol class="carousel-indicators">
<li data-target="#recent-submissions-carousel" data-slide-to="0" class="active"></li>
<% for (int i = 1; i < rs.count(); i++){ %>
<li data-target="#recent-submissions-carousel" data-slide-to="<%= i %>"></li>
<% } %>
</ol>
</div></div></div>
<%
}
%>
<div class="col-md-4">
<%= sidebar %>
</div>
</div>
<%-- Browse --%>
<div class="panel panel-primary">
<div class="panel-heading"><fmt:message key="jsp.general.browse"/></div>
<div class="panel-body">
<%-- Insert the dynamic list of browse options --%>
<%
for (int i = 0; i < bis.length; i++)
{
String key = "browse.menu." + bis[i].getName();
%>
<form method="get" action="<%= request.getContextPath() %>/handle/<%= community.getHandle() %>/browse">
<input type="hidden" name="type" value="<%= bis[i].getName() %>"/>
<%-- <input type="hidden" name="community" value="<%= community.getHandle() %>" /> --%>
<input class="btn btn-default col-md-3" type="submit" name="submit_browse" value="<fmt:message key="<%= key %>"/>"/>
</form>
<%
}
%>
</div>
</div>
<div class="row">
<%
int discovery_panel_cols = 12;
int discovery_facet_cols = 4;
%>
<%@ include file="discovery/static-sidebar-facet.jsp" %>
</div>
<div class="row">
<%
if (subcommunities.length != 0)
{
%>
<div class="col-md-6">
<h3><fmt:message key="jsp.community-home.heading3"/></h3>
<div class="list-group">
<%
for (int j = 0; j < subcommunities.length; j++)
{
%>
<div class="list-group-item row">
<%
Bitstream logoCom = subcommunities[j].getLogo();
if (logoCom != null) { %>
<div class="col-md-3">
<img alt="Logo" class="img-responsive" src="<%= request.getContextPath() %>/retrieve/<%= logoCom.getID() %>" />
</div>
<div class="col-md-9">
<% } else { %>
<div class="col-md-12">
<% } %>
<h4 class="list-group-item-heading"><a href="<%= request.getContextPath() %>/handle/<%= subcommunities[j].getHandle() %>">
<%= subcommunities[j].getMetadata("name") %></a>
<%
if (ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
%>
[<%= ic.getCount(subcommunities[j]) %>]
<%
}
%>
<% if (remove_button) { %>
<form class="btn-group" method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="parent_community_id" value="<%= community.getID() %>" />
<input type="hidden" name="community_id" value="<%= subcommunities[j].getID() %>" />
<input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_DELETE_COMMUNITY%>" />
<button type="submit" class="btn btn-xs btn-danger"><span class="glyphicon glyphicon-trash"></span></button>
</form>
<% } %>
</h4>
<p class="collectionDescription"><%= subcommunities[j].getMetadata("short_description") %></p>
</div>
</div>
<%
}
%>
</div>
</div>
<%
}
%>
<%= sidebar %>
<%@ include file="discovery/static-sidebar-facet.jsp" %>
<%
if (collections.length != 0)
{
%>
<div class="col-md-6">
<%-- <h2>Collections in this community</h2> --%>
<h3><fmt:message key="jsp.community-home.heading2"/></h3>
<div class="list-group">
<%
for (int i = 0; i < collections.length; i++)
{
%>
<div class="list-group-item row">
<%
Bitstream logoCol = collections[i].getLogo();
if (logoCol != null) { %>
<div class="col-md-3">
<img alt="Logo" class="img-responsive" src="<%= request.getContextPath() %>/retrieve/<%= logoCol.getID() %>" />
</div>
<div class="col-md-9">
<% } else { %>
<div class="col-md-12">
<% } %>
<h4 class="list-group-item-heading"><a href="<%= request.getContextPath() %>/handle/<%= collections[i].getHandle() %>">
<%= collections[i].getMetadata("name") %></a>
<%
if(ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
%>
[<%= ic.getCount(collections[i]) %>]
<%
}
%>
<% if (remove_button) { %>
<form class="btn-group" method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="parent_community_id" value="<%= community.getID() %>" />
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="hidden" name="collection_id" value="<%= collections[i].getID() %>" />
<input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_DELETE_COLLECTION%>" />
<button type="submit" class="btn btn-xs btn-danger"><span class="glyphicon glyphicon-trash"></span></button>
</form>
<% } %>
</h4>
<p class="collectionDescription"><%= collections[i].getMetadata("short_description") %></p>
</div>
</div>
<%
}
%>
</div>
</div>
<%
}
%>
</div>
<% if(editor_button || add_button) // edit button(s)
{ %>
<dspace:sidebar>
<div class="panel panel-warning">
<div class="panel-heading">
<fmt:message key="jsp.admintools"/>
<span class="pull-right">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\")%>"><fmt:message key="jsp.adminhelp"/></dspace:popup>
</span>
</div>
<div class="panel-body">
<% if(editor_button) { %>
<form method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_EDIT_COMMUNITY%>" />
<%--<input type="submit" value="Edit..." />--%>
<input class="btn btn-default col-md-12" type="submit" value="<fmt:message key="jsp.general.edit.button"/>" />
</form>
<% } %>
<% if(add_button) { %>
<form method="post" action="<%=request.getContextPath()%>/tools/collection-wizard">
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input class="btn btn-default col-md-12" type="submit" value="<fmt:message key="jsp.community-home.create1.button"/>" />
</form>
<form method="post" action="<%=request.getContextPath()%>/tools/edit-communities">
<input type="hidden" name="action" value="<%= EditCommunitiesServlet.START_CREATE_COMMUNITY%>" />
<input type="hidden" name="parent_community_id" value="<%= community.getID() %>" />
<%--<input type="submit" name="submit" value="Create Sub-community" />--%>
<input class="btn btn-default col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.community-home.create2.button"/>" />
</form>
<% } %>
<% if( editor_button ) { %>
<form method="post" action="<%=request.getContextPath()%>/mydspace">
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_EXPORT_ARCHIVE %>" />
<input class="btn btn-default col-md-12" type="submit" value="<fmt:message key="jsp.mydspace.request.export.community"/>" />
</form>
<form method="post" action="<%=request.getContextPath()%>/mydspace">
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_MIGRATE_ARCHIVE %>" />
<input class="btn btn-default col-md-12" type="submit" value="<fmt:message key="jsp.mydspace.request.export.migratecommunity"/>" />
</form>
<form method="post" action="<%=request.getContextPath()%>/dspace-admin/metadataexport">
<input type="hidden" name="handle" value="<%= community.getHandle() %>" />
<input class="btn btn-default col-md-12" type="submit" value="<fmt:message key="jsp.general.metadataexport.button"/>" />
</form>
<% } %>
</div>
</div>
</dspace:sidebar>
<div align="center">
<a class="statisticsLink" href="<%= request.getContextPath() %>/handle/<%= community.getHandle() %>/statistics"><fmt:message key="jsp.community-home.display-statistics"/></a>
</div>
</dspace:layout>
<% } %>
</dspace:layout>

201
dspace-jspui/src/main/webapp/community-list.jsp
View File

@@ -20,6 +20,8 @@
- admin_button - Boolean, show admin 'Create Top-Level Community' button
--%>
<%@page import="org.dspace.content.Bitstream"%>
<%@page import="org.apache.commons.lang.StringUtils"%>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
@@ -44,61 +46,78 @@
Map subcommunityMap = (Map) request.getAttribute("subcommunities.map");
Boolean admin_b = (Boolean)request.getAttribute("admin_button");
boolean admin_button = (admin_b == null ? false : admin_b.booleanValue());
boolean showAll = true;
ItemCounter ic = new ItemCounter(UIUtil.obtainContext(request));
%>
<%!
JspWriter out = null;
HttpServletRequest request = null;
void setContext(JspWriter out, HttpServletRequest request)
{
this.out = out;
this.request = request;
}
void showCommunity(Community c) throws ItemCountException, IOException, SQLException
void showCommunity(Community c, JspWriter out, HttpServletRequest request,
Map collectionMap, Map subcommunityMap) throws ItemCountException, IOException, SQLException
{
ItemCounter ic = new ItemCounter(UIUtil.obtainContext(request));
out.println( "<li class=\"communityLink\">" );
out.println( "<strong><a href=\"" + request.getContextPath() + "/handle/" + c.getHandle() + "\">" + c.getMetadata("name") + "</a></strong>");
out.println( "<li class=\"media well\">" );
Bitstream logo = c.getLogo();
if (logo != null)
{
out.println("<a class=\"pull-left col-md-2\" href=\"" + request.getContextPath() + "/handle/"
+ c.getHandle() + "\"><img class=\"media-object img-responsive\" src=\"" +
request.getContextPath() + "/retrieve/" + logo.getID() + "\" alt=\"community logo\"></a>");
}
out.println( "<div class=\"media-body\"><h4 class=\"media-heading\"><a href=\"" + request.getContextPath() + "/handle/"
+ c.getHandle() + "\">" + c.getMetadata("name") + "</a>");
if(ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
out.println(" <span class=\"communityStrength\">[" + ic.getCount(c) + "]</span>");
out.println(" <span class=\"badge\">" + ic.getCount(c) + "</span>");
}
out.println("</h4>");
if (StringUtils.isNotBlank(c.getMetadata("short_description")))
{
out.println(c.getMetadata("short_description"));
}
out.println("<br>");
// Get the collections in this community
Collection[] cols = c.getCollections();
if (cols.length > 0)
Collection[] cols = (Collection[]) collectionMap.get(c.getID());
if (cols != null && cols.length > 0)
{
out.println("<ul>");
out.println("<ul class=\"media-list\">");
for (int j = 0; j < cols.length; j++)
{
out.println("<li class=\"collectionListItem\">");
out.println("<a href=\"" + request.getContextPath() + "/handle/" + cols[j].getHandle() + "\">" + cols[j].getMetadata("name") +"</a>");
out.println("<li class=\"media well\">");
Bitstream logoCol = cols[j].getLogo();
if (logoCol != null)
{
out.println("<a class=\"pull-left col-md-2\" href=\"" + request.getContextPath() + "/handle/"
+ cols[j].getHandle() + "\"><img class=\"media-object img-responsive\" src=\"" +
request.getContextPath() + "/retrieve/" + logoCol.getID() + "\" alt=\"collection logo\"></a>");
}
out.println("<div class=\"media-body\"><h4 class=\"media-heading\"><a href=\"" + request.getContextPath() + "/handle/" + cols[j].getHandle() + "\">" + cols[j].getMetadata("name") +"</a>");
if(ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
out.println(" [" + ic.getCount(cols[j]) + "]");
}
out.println("</h4>");
if (StringUtils.isNotBlank(cols[j].getMetadata("short_description")))
{
out.println(cols[j].getMetadata("short_description"));
}
out.println("</div>");
out.println("</li>");
}
out.println("</ul>");
}
// Get the sub-communities in this community
Community[] comms = c.getSubcommunities();
if (comms.length > 0)
Community[] comms = (Community[]) subcommunityMap.get(c.getID());
if (comms != null && comms.length > 0)
{
out.println("<ul>");
out.println("<ul class=\"media-list\">");
for (int k = 0; k < comms.length; k++)
{
showCommunity(comms[k]);
showCommunity(comms[k], out, request, collectionMap, subcommunityMap);
}
out.println("</ul>");
}
out.println("<br />");
out.println("</div>");
out.println("</li>");
}
%>
@@ -109,130 +128,36 @@
if (admin_button)
{
%>
<table class="miscTableNoColor" align="center">
<tr>
<td>
<h1><fmt:message key="jsp.community-list.title"/></h1>
<p><fmt:message key="jsp.community-list.text1"/></p>
</td>
<td>
<table class="miscTable" align="center">
<tr>
<td class="evenRowEvenCol" colspan="2">
<table>
<tr>
<th class="standard" id="t1">
<strong><fmt:message key="jsp.admintools"/></strong>
</th>
</tr>
<tr>
<td headers="t1" class="standard" align="center">
<form method="post" action="<%=request.getContextPath()%>/dspace-admin/edit-communities">
<input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_CREATE_COMMUNITY%>" />
<%--<input type="submit" name="submit" value="Create Top-Level Community...">--%>
<input type="submit" name="submit" value="<fmt:message key="jsp.community-list.create.button"/>" />
</form>
</td>
</tr>
<tr>
<td headers="t1" class="standard" align="center">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\")%>"><fmt:message key="jsp.adminhelp"/></dspace:popup>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
<dspace:sidebar>
<div class="panel panel-warning">
<div class="panel-heading">
<fmt:message key="jsp.admintools"/>
<span class="pull-right">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\")%>"><fmt:message key="jsp.adminhelp"/></dspace:popup>
</span>
</div>
<div class="panel-body">
<form method="post" action="<%=request.getContextPath()%>/dspace-admin/edit-communities">
<input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_CREATE_COMMUNITY%>" />
<input class="btn btn-default" type="submit" name="submit" value="<fmt:message key="jsp.community-list.create.button"/>" />
</form>
</div>
</dspace:sidebar>
<%
}
else
{
%>
<h1><fmt:message key="jsp.community-list.title"/></h1>
<p><fmt:message key="jsp.community-list.text1"/></p>
<%
}
%>
<% if (communities.length != 0)
{
%>
<ul>
<ul class="media-list">
<%
if (showAll)
{
setContext(out, request);
for (int i = 0; i < communities.length; i++)
{
showCommunity(communities[i]);
showCommunity(communities[i], out, request, collectionMap, subcommunityMap);
}
}
else
{
for (int i = 0; i < communities.length; i++)
{
%>
<li class="communityLink">
<%-- HACK: <strong> tags here for broken Netscape 4.x CSS support --%>
<strong><a href="<%= request.getContextPath() %>/handle/<%= communities[i].getHandle() %>"><%= communities[i].getMetadata("name") %></a></strong>
<ul>
<%
// Get the collections in this community from the map
Collection[] cols = (Collection[]) collectionMap.get(
new Integer(communities[i].getID()));
for (int j = 0; j < cols.length; j++)
{
%>
<li class="collectionListItem">
<a href="<%= request.getContextPath() %>/handle/<%= cols[j].getHandle() %>"><%= cols[j].getMetadata("name") %></a>
<%
if (ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
%>
[<%= ic.getCount(cols[j]) %>]
<%
}
%>
</li>
<%
}
%>
</ul>
<ul>
<%
// Get the sub-communities in this community from the map
Community[] comms = (Community[]) subcommunityMap.get(
new Integer(communities[i].getID()));
for (int k = 0; k < comms.length; k++)
{
%>
<li class="communityLink">
<a href="<%= request.getContextPath() %>/handle/<%= comms[k].getHandle() %>"><%= comms[k].getMetadata("name") %></a>
<%
if (ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
%>
[<%= ic.getCount(comms[k]) %>]
<%
}
%>
</li>
<%
}
%>
</ul>
<br />
</li>
<%
}
}
%>
</ul>

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

@@ -13,34 +13,30 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"
prefix="fmt" %>
<table class="miscTable" align="center" width="70%">
<tr>
<td class="evenRowEvenCol">
<form name="loginform" id="loginform" method="post" action="<%= request.getContextPath() %>/password-login">
<div class="panel-body">
<form name="loginform" class="form-horizontal" id="loginform" method="post" action="<%= request.getContextPath() %>/password-login">
<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>
<table border="0" cellpadding="5" align="center">
<tr>
<td class="standard" align="right"><label for="tlogin_email"><strong><fmt:message key="jsp.components.login-form.email"/></strong></label></td>
<td><input type="text" name="login_email" id="tlogin_email" tabindex="1" /></td>
</tr>
<tr>
<td class="standard" align="right"><label for="tlogin_password"><strong><fmt:message key="jsp.components.login-form.password"/></strong></label></td>
<td><input type="password" name="login_password" id="tlogin_password" tabindex="2" /></td>
</tr>
<tr>
<td align="center" colspan="2">
<input type="submit" name="login_submit" value="<fmt:message key="jsp.components.login-form.login"/>" tabindex="3" />
</td>
</tr>
</table>
<div class="form-group">
<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">
<input class="form-control" type="text" name="login_email" id="tlogin_email" tabindex="1" />
</div>
</div>
<div class="form-group">
<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">
<input class="form-control" type="password" name="login_password" id="tlogin_password" tabindex="2" />
</div>
</div>
<div class="row">
<div class="col-md-6">
<input type="submit" class="btn btn-success pull-right" name="login_submit" value="<fmt:message key="jsp.components.login-form.login"/>" tabindex="3" />
</div>
</div>
<p><a href="<%= request.getContextPath() %>/forgot"><fmt:message key="jsp.components.login-form.forgot"/></a></p>
</form>
<script type="text/javascript">
document.loginform.login_email.focus();
</script>
<p><a href="<%= request.getContextPath() %>/forgot"><fmt:message key="jsp.components.login-form.forgot"/></a></p></td>
</tr>
</table>
</div>

44
dspace-jspui/src/main/webapp/discovery/static-sidebar-facet.jsp
View File

@@ -60,8 +60,9 @@
}
if (brefine) {
%>
<div class="col-md-<%= discovery_panel_cols %>">
<h3 class="facets"><fmt:message key="jsp.search.facet.refine" /></h3>
<div id="facets" class="facetsBox">
<div id="facets" class="facetsBox row panel">
<%
for (DiscoverySearchFilterFacet facetConf : facetsConf)
{
@@ -77,47 +78,50 @@
}
String fkey = "jsp.search.facet.refine."+f;
int limit = facetConf.getFacetLimit()+1;
%><div id="facet_<%= f %>" class="facet">
%><div id="facet_<%= f %>" class="facet col-md-<%= discovery_facet_cols %>">
<span class="facetName"><fmt:message key="<%= fkey %>" /></span>
<ul><%
<ul class="list-group"><%
int idx = 1;
int currFp = UIUtil.getIntParameter(request, f+"_page");
if (currFp < 0)
{
currFp = 0;
}
if (currFp > 0)
{
%><li class="facet-previous"><a href="<%= request.getContextPath()
+ searchScope
+ "?"+f+"_page="+(currFp-1) %>"><fmt:message key="jsp.search.facet.refine.previous" /></a></li>
<%
}
if (facet != null)
{
for (FacetResult fvalue : facet)
{
if (idx == limit)
if (idx != limit)
{
%><li class="facet-next"><a href="<%= request.getContextPath()
+ searchScope
+ "?"+f+"_page="+(currFp+1) %>"><fmt:message key="jsp.search.facet.refine.next" /></a></li>
<%
}
else
{
%><li><a href="<%= request.getContextPath()
%><li class="list-group-item"><a href="<%= request.getContextPath()
+ searchScope
+ "/simple-search?filterquery="+URLEncoder.encode(fvalue.getAsFilterQuery(),"UTF-8")
+ "&amp;filtername="+URLEncoder.encode(f,"UTF-8")
+ "&amp;filtertype="+URLEncoder.encode(fvalue.getFilterType(),"UTF-8") %>"
title="<fmt:message key="jsp.search.facet.narrow"><fmt:param><%=fvalue.getDisplayedValue() %></fmt:param></fmt:message>">
<%= StringUtils.abbreviate(fvalue.getDisplayedValue(),32) + " (" + fvalue.getCount()+")" %></a></li><%
<%= StringUtils.abbreviate(fvalue.getDisplayedValue(),32) %></a><span class="badge"><%= fvalue.getCount() %></span></li><%
}
idx++;
}
if (currFp > 0 || idx > limit)
{
%><li class="list-group-item"><span style="visibility: hidden;">.</span>
<% if (currFp > 0) { %>
<a class="pull-left" href="<%= request.getContextPath()
+ searchScope
+ "?"+f+"_page="+(currFp-1) %>"><fmt:message key="jsp.search.facet.refine.previous" /></a>
<% } %>
<% if (idx > limit) { %>
<a href="<%= request.getContextPath()
+ searchScope
+ "?"+f+"_page="+(currFp+1) %>"><span class="pull-right"><fmt:message key="jsp.search.facet.refine.next" /></span></a>
<%
}
%></li><%
}
}
%></ul></div><%
}
%></div></div><%
}
%>

173
dspace-jspui/src/main/webapp/display-item.jsp
View File

@@ -157,85 +157,72 @@
<%@page import="org.dspace.app.webui.servlet.MyDSpaceServlet"%>
<dspace:layout title="<%= title %>">
<%
if (handle != null)
{
%>
<table align="center" class="miscTable">
<%
if (messageVersionNoticeHead != null)
{
%>
<tr><td>
<b><%=messageVersionNoticeHead%></b>
<div class="alert alert-warning"><b><%=messageVersionNoticeHead%></b>
<%=messageVersionNoticeHelp%>
</td>
</tr>
</div>
<%
}
%>
<tr>
<td class="evenRowEvenCol" align="center">
<%-- <strong>Please use this identifier to cite or link to this item:
<code><%= HandleManager.getCanonicalForm(handle) %></code></strong>--%>
<strong><fmt:message key="jsp.display-item.identifier"/>
<code><%= HandleManager.getCanonicalForm(handle) %></code></strong>
</td>
<div class="well"><fmt:message key="jsp.display-item.identifier"/>
<code><%= HandleManager.getCanonicalForm(handle) %></code></div>
<%
if (admin_button) // admin edit button
{ %>
<td class="evenRowEvenCol" align="center">
<dspace:sidebar>
<div class="panel panel-warning">
<div class="panel-heading"><fmt:message key="jsp.admintools"/></div>
<div class="panel-body">
<form method="get" action="<%= request.getContextPath() %>/tools/edit-item">
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<%--<input type="submit" name="submit" value="Edit...">--%>
<input class="btn btn-default col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.general.edit.button"/>" />
</form>
<form method="post" action="<%= request.getContextPath() %>/mydspace">
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_EXPORT_ARCHIVE %>" />
<input type="submit" name="submit" value="<fmt:message key="jsp.mydspace.request.export.item"/>" />
<input class="btn btn-default col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.mydspace.request.export.item"/>" />
</form>
<form method="post" action="<%= request.getContextPath() %>/mydspace">
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_MIGRATE_ARCHIVE %>" />
<input type="submit" name="submit" value="<fmt:message key="jsp.mydspace.request.export.migrateitem"/>" />
<input class="btn btn-default col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.mydspace.request.export.migrateitem"/>" />
</form>
<form method="post" action="<%= request.getContextPath() %>/dspace-admin/metadataexport">
<input type="hidden" name="handle" value="<%= item.getHandle() %>" />
<input type="submit" name="submit" value="<fmt:message key="jsp.general.metadataexport.button"/>" />
<input class="btn btn-default col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.general.metadataexport.button"/>" />
</form>
</td>
<td class="evenRowEvenCol" align="center">
<form method="get" action="<%= request.getContextPath() %>/tools/edit-item">
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<%--<input type="submit" name="submit" value="Edit...">--%>
<input type="submit" name="submit" value="<fmt:message key="jsp.general.edit.button"/>" />
</form>
</td>
<% if(hasVersionButton || hasVersionHistory) { %>
<% if(hasVersionButton) { %>
<form method="get" action="<%= request.getContextPath() %>/tools/version">
<input type="hidden" name="itemID" value="<%= item.getID() %>" />
<input class="btn btn-default col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.general.version.button"/>" />
</form>
<% } %>
<% if(hasVersionHistory && authorizeToVersion) { %>
<form method="get" action="<%= request.getContextPath() %>/tools/history">
<input type="hidden" name="itemID" value="<%= item.getID() %>" />
<input type="hidden" name="versionID" value="<%= history.getVersion(item)!=null?history.getVersion(item).getVersionId():null %>" />
<input class="btn btn-default col-md-12" type="submit" name="submit" value="<fmt:message key="jsp.general.version.history.button"/>" />
</form>
<% } %>
<% } %>
</div>
</div>
</dspace:sidebar>
<% } %>
</tr>
<% if(hasVersionButton || hasVersionHistory) { %>
<tr>
<td class="evenRowEvenCol" align="center">
<% if(hasVersionButton) { %>
<form method="get" action="<%= request.getContextPath() %>/tools/version">
<input type="hidden" name="itemID" value="<%= item.getID() %>" />
<input type="submit" name="submit" value="<fmt:message key="jsp.general.version.button"/>" />
</form>
<% } %>
<% if(hasVersionHistory && authorizeToVersion) { %>
<form method="get" action="<%= request.getContextPath() %>/tools/history">
<input type="hidden" name="itemID" value="<%= item.getID() %>" />
<input type="hidden" name="versionID" value="<%= history.getVersion(item)!=null?history.getVersion(item).getVersionId():null %>" />
<input type="submit" name="submit" value="<fmt:message key="jsp.general.version.history.button"/>" />
</form>
<% } %>
</td>
</tr>
<% } %>
</table>
<br />
<%
}
@@ -243,91 +230,77 @@
%>
<dspace:item-preview item="<%= item %>" />
<dspace:item item="<%= item %>" collections="<%= collections %>" style="<%= displayStyle %>" />
<div class="container row">
<%
String locationLink = request.getContextPath() + "/handle/" + handle;
if (displayAll)
{
%>
<div align="center">
<%
if (workspace_id != null)
{
%>
<form method="post" action="<%= request.getContextPath() %>/view-workspaceitem">
<form class="col-md-2" method="post" action="<%= request.getContextPath() %>/view-workspaceitem">
<input type="hidden" name="workspace_id" value="<%= workspace_id.intValue() %>" />
<input type="submit" name="submit_simple" value="<fmt:message key="jsp.display-item.text1"/>" />
<input class="btn btn-default" type="submit" name="submit_simple" value="<fmt:message key="jsp.display-item.text1"/>" />
</form>
<%
}
else
{
%>
<form method="get" action="<%=locationLink %>">
<input type="hidden" name="mode" value="simple"/>
<input type="submit" name="submit_simple" value="<fmt:message key="jsp.display-item.text1"/>" />
</form>
<a class="btn btn-default" href="<%=locationLink %>?mode=simple">
<fmt:message key="jsp.display-item.text1"/>
</a>
<%
}
%>
</div>
<%
}
else
{
%>
<div align="center">
<%
if (workspace_id != null)
{
%>
<form method="post" action="<%= request.getContextPath() %>/view-workspaceitem">
<form class="col-md-2" method="post" action="<%= request.getContextPath() %>/view-workspaceitem">
<input type="hidden" name="workspace_id" value="<%= workspace_id.intValue() %>" />
<input type="submit" name="submit_full" value="<fmt:message key="jsp.display-item.text2"/>" />
<input class="btn btn-default" type="submit" name="submit_full" value="<fmt:message key="jsp.display-item.text2"/>" />
</form>
<%
}
else
{
%>
<form method="get" action="<%=locationLink %>">
<input type="hidden" name="mode" value="full"/>
<input type="submit" name="submit_simple" value="<fmt:message key="jsp.display-item.text2"/>" />
</form>
<a class="btn btn-default" href="<%=locationLink %>?mode=full">
<fmt:message key="jsp.display-item.text2"/>
</a>
<%
}
if (suggestLink)
}
if (workspace_id != null)
{
%>
<form class="col-md-2" method="post" action="<%= request.getContextPath() %>/workspace">
<input type="hidden" name="workspace_id" value="<%= workspace_id.intValue() %>"/>
<input class="btn btn-primary" type="submit" name="submit_open" value="<fmt:message key="jsp.display-item.back_to_workspace"/>"/>
</form>
<%
} else {
if (suggestLink)
{
%>
<a href="<%= request.getContextPath() %>/suggest?handle=<%= handle %>" target="new_window">
<a class="btn btn-success" href="<%= request.getContextPath() %>/suggest?handle=<%= handle %>" target="new_window">
<fmt:message key="jsp.display-item.suggest"/></a>
<%
}
%>
</div>
<%
}
%>
<a class="statisticsLink btn btn-primary" href="<%= request.getContextPath() %>/handle/<%= handle %>/statistics"><fmt:message key="jsp.display-item.display-statistics"/></a>
<div align="center">
<a class="statisticsLink" href="<%= request.getContextPath() %>/handle/<%= handle %>/statistics"><fmt:message key="jsp.display-item.display-statistics"/></a>
</div>
<%
if (workspace_id != null)
{
%>
<div align="center">
<form method="post" action="<%= request.getContextPath() %>/workspace">
<input type="hidden" name="workspace_id" value="<%= workspace_id.intValue() %>"/>
<input type="submit" name="submit_open" value="<fmt:message key="jsp.display-item.back_to_workspace"/>"/>
</form>
</div>
<%
}
%>
<%-- SFX Link --%>
<%
if (ConfigurationManager.getProperty("sfx.server.url") != null)
@@ -338,25 +311,26 @@
sfximage = request.getContextPath() + "/image/sfx-link.gif";
}
%>
<p align="center">
<a href="<dspace:sfxlink item="<%= item %>"/>" /><img src="<%= sfximage %>" border="0" alt="SFX Query" /></a>
</p>
<a class="btn btn-default" href="<dspace:sfxlink item="<%= item %>"/>" /><img src="<%= sfximage %>" border="0" alt="SFX Query" /></a>
<%
}
}
%>
</div>
<br/>
<%-- Create Commons Link --%>
<%
if (cc_url != null)
{
%>
<p class="submitFormHelp"><fmt:message key="jsp.display-item.text3"/> <a href="<%= cc_url %>"><fmt:message key="jsp.display-item.license"/></a><br/>
<a href="<%= cc_url %>"><img src="<%= request.getContextPath() %>/image/cc-somerights.gif" border="0" alt="Creative Commons" /></a>
<p class="submitFormHelp alert alert-info"><fmt:message key="jsp.display-item.text3"/> <a href="<%= cc_url %>"><fmt:message key="jsp.display-item.license"/></a>
<a href="<%= cc_url %>"><img src="<%= request.getContextPath() %>/image/cc-somerights.gif" border="0" alt="Creative Commons" style="margin-top: -5px;" class="pull-right"/></a>
</p>
<!--
<%= cc_rdf %>
-->
<%
}
} else {
%>
<%-- Versioning table --%>
<%
@@ -369,10 +343,10 @@
%>
<div id="versionHistory">
<h2><fmt:message key="jsp.version.history.head2" /></h2>
<h2 class="help-block"><fmt:message key="jsp.version.history.head2" /></h2>
<table class="miscTable">
<table class="table">
<tr>
<th id="t1" class="oddRowEvenCol"><fmt:message key="jsp.version.history.column1"/></th>
<th
@@ -414,5 +388,8 @@
}
}
%>
<p class="submitFormHelp"><fmt:message key="jsp.display-item.copyright"/></p>
<p class="submitFormHelp alert alert-info"><fmt:message key="jsp.display-item.copyright"/></p>
<%
}
%>
</dspace:layout>

90
dspace-jspui/src/main/webapp/dspace-admin/authorize-advanced.jsp
View File

@@ -47,92 +47,82 @@
request.setAttribute("LanguageSwitch", "hide");
%>
<dspace:layout titlekey="jsp.dspace-admin.authorize-advanced.advanced"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.authorize-advanced.advanced"
navbar="admin"
locbar="link"
parentlink="/dspace-admin"
parenttitlekey="jsp.administer">
<h1><fmt:message key="jsp.dspace-admin.authorize-advanced.advanced"/></h1>
<h1><fmt:message key="jsp.dspace-admin.authorize-advanced.advanced"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") +\"#advancedpolicies\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<%-- <p>Allows you to do wildcard additions to and clearing
of policies for types of content contained in a collection.
Warning, dangerous - removing READ permissions from
items will make them not viewable! <dspace:popup page="/help/site-admin.html#advancedpolicies">More help...</dspace:popup></p> --%>
<div><fmt:message key="jsp.dspace-admin.authorize-advanced.text"/> <dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") +\"#advancedpolicies\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup></div>
<div class="alert alert-info"><fmt:message key="jsp.dspace-admin.authorize-advanced.text"/></div>
<form method="post" action="">
<table class="miscTable" align="center" summary="Advanced policy manager">
<tr>
<%-- <td>Collection:</td> --%>
<th id="t1"><label for ="tcollection"><fmt:message key="jsp.dspace-admin.authorize-advanced.col"/></label></th>
<td headers="t1">
<select size="10" name="collection_id" id="tcollection">
<div class="input-group">
<span class="col-md-2"><label for="tcollection"><fmt:message key="jsp.dspace-admin.authorize-advanced.col"/></label></span>
<span class="col-md-10">
<select class="form-control" size="10" name="collection_id" id="tcollection">
<% for(int i = 0; i < collections.length; i++ ) { %>
<option value="<%= collections[i].getID() %>"> <%= collections[i].getMetadata("name")%>
</option>
<% } %>
</select>
</td>
</tr>
<tr>
</span>
<%-- <td>Content Type:</td> --%>
<th id="t2"><label for="tresource_type"><fmt:message key="jsp.dspace-admin.authorize-advanced.type"/></label></th>
<td headers="t2">
<select name="resource_type" id="tresource_type">
<span class="col-md-2"><label for="tresource_type"><fmt:message key="jsp.dspace-admin.authorize-advanced.type"/></label></span>
<span class="col-md-10">
<select class="form-control" name="resource_type" id="tresource_type">
<%-- <option value="<%=Constants.ITEM%>">item</option>
<option value="<%=Constants.BITSTREAM%>">bitstream</option> --%>
<option value="<%=Constants.ITEM%>"><fmt:message key="jsp.dspace-admin.authorize-advanced.type1"/></option>
<option value="<%=Constants.BITSTREAM%>"><fmt:message key="jsp.dspace-admin.authorize-advanced.type2"/></option>
</select>
</td>
</tr>
<tr>
</span>
<%-- <td>Group:</td> --%>
<th id="t3"><fmt:message key="jsp.dspace-admin.general.group-colon"/></th>
<td headers="t3">
<select size="10" name="group_id" id="tgroup_id">
<span class="col-md-2">
<label for="tgroup_id"><fmt:message key="jsp.dspace-admin.general.group-colon"/></label>
</span>
<span class="col-md-10">
<select class="form-control" size="10" name="group_id" id="tgroup_id">
<% for(int i = 0; i < groups.length; i++ ) { %>
<option value="<%= groups[i].getID() %>"> <%= groups[i].getName()%>
</option>
<% } %>
</select>
</td>
</tr>
<tr>
<%-- <tr><td>Action:</td> --%>
<th id="t4"><label for="taction_id"><fmt:message key="jsp.dspace-admin.general.action-colon"/></label></th>
<td headers="t4">
<select name="action_id" id="taction_id">
</span>
<span class="col-md-2">
<%-- <tr><td>Action:</td> --%>
<label for="taction_id"><fmt:message key="jsp.dspace-admin.general.action-colon"/></label>
</span>
<span class="col-md-10">
<select class="form-control" name="action_id" id="taction_id">
<% for( int i = 0; i < Constants.actionText.length; i++ ) { %>
<option value="<%= i %>">
<%= Constants.actionText[i]%>
</option>
<% } %>
</select>
</td>
</tr>
</table>
<center>
<table width="70%">
<tr>
<td align="left">
<%-- <input type="submit" name="submit_advanced_add" value="Add Policy"> --%>
<input type="submit" name="submit_advanced_add" value="<fmt:message key="jsp.dspace-admin.authorize-advanced.add"/>" />
</td>
<td align="right">
<%-- <input type="submit" name="submit_advanced_clear" value="Clear Policies"> (warning: clears all policies for a given set of objects) --%>
<input type="submit" name="submit_advanced_clear" value="<fmt:message key="jsp.dspace-admin.authorize-advanced.clear"/>" /></td> <td><fmt:message key="jsp.dspace-admin.authorize-advanced.warning"/>
</td>
</tr>
</table>
</center>
</span>
</div>
<br/>
<div class="btn-group">
<%-- <input type="submit" name="submit_advanced_add" value="Add Policy"> --%>
<input class="btn btn-primary" type="submit" name="submit_advanced_add" value="<fmt:message key="jsp.dspace-admin.authorize-advanced.add"/>" />
<%-- <input type="submit" name="submit_advanced_clear" value="Clear Policies"> (warning: clears all policies for a given set of objects) --%>
<input class="btn btn-danger" type="submit" name="submit_advanced_clear" value="<fmt:message key="jsp.dspace-admin.authorize-advanced.clear"/>" /><span class="alert alert-warning"><fmt:message key="jsp.dspace-admin.authorize-advanced.warning"/></span>
</div>
</form>
</dspace:layout>

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

@@ -50,43 +50,30 @@
(List<ResourcePolicy>) request.getAttribute("policies");
%>
<dspace:layout titlekey="jsp.dspace-admin.authorize-collection-edit.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.authorize-collection-edit.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin"
nocache="true">
<table width="95%">
<tr>
<td align="left">
<h1><fmt:message key="jsp.dspace-admin.authorize-collection-edit.policies">
<h1><fmt:message key="jsp.dspace-admin.authorize-collection-edit.policies">
<fmt:param><%= collection.getMetadata("name") %></fmt:param>
<fmt:param>hdl:<%= collection.getHandle() %></fmt:param>
<fmt:param><%= collection.getID() %></fmt:param>
</fmt:message></h1>
</td>
<td align="right" class="standard">
</fmt:message>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#collectionpolicies\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
</h1>
<form action="<%= request.getContextPath() %>/tools/authorize" method="post">
<p align="center">
<div class="row">
<input type="hidden" name="collection_id" value="<%=collection.getID()%>" />
<input type="submit" name="submit_collection_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>" />
</p>
<input class="btn btn-success col-md-2 col-md-offset-5" type="submit" name="submit_collection_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>" />
</div>
</form>
<%
String row = "even";
for (ResourcePolicy rp : policies)
{
%>
<form action="<%= request.getContextPath() %>/tools/authorize" method="post">
<table class="miscTable" align="center" summary="Collection Policy Edit Form">
<br/>
<table class="table" summary="Collection Policy Edit Form">
<tr>
<th class="oddRowOddCol"><strong><fmt:message key="jsp.general.id" /></strong></th>
<th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.action"/></strong></th>
@@ -94,7 +81,13 @@
<th class="oddRowEvenCol">&nbsp;</th>
<th class="oddRowOddCol">&nbsp;</th>
</tr>
<%
String row = "even";
for (ResourcePolicy rp : policies)
{
%>
<tr>
<td class="<%= row %>RowOddCol"><%= rp.getID() %></td>
<td class="<%= row %>RowEvenCol">
@@ -104,19 +97,24 @@
<%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %>
</td>
<td class="<%= row %>RowEvenCol">
<form action="<%= request.getContextPath() %>/tools/authorize" method="post">
<input type="hidden" name="policy_id" value="<%= rp.getID() %>" />
<input type="hidden" name="collection_id" value="<%= collection.getID() %>" />
<input type="submit" name="submit_collection_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
<input class="btn btn-primary" type="submit" name="submit_collection_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
</form>
</td>
<td class="<%= row %>RowOddCol">
<input type="submit" name="submit_collection_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<form action="<%= request.getContextPath() %>/tools/authorize" method="post">
<input type="hidden" name="policy_id" value="<%= rp.getID() %>" />
<input type="hidden" name="collection_id" value="<%= collection.getID() %>" />
<input class="btn btn-danger" type="submit" name="submit_collection_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
</form>
</td>
</tr>
</table>
</form>
<%
row = (row.equals("odd") ? "even" : "odd");
}
%>
</table>
</dspace:layout>

33
dspace-jspui/src/main/webapp/dspace-admin/authorize-community-edit.jsp
View File

@@ -50,35 +50,30 @@
(List<ResourcePolicy>) request.getAttribute("policies");
%>
<dspace:layout titlekey="jsp.dspace-admin.authorize-community-edit.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.authorize-community-edit.title"
navbar="admin"
locbar="link"
parenttitle="general.administer"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin"
nocache="true">
<table width="95%">
<tr>
<td align="left">
<h1><fmt:message key="jsp.dspace-admin.authorize-community-edit.policies">
<fmt:param><%= community.getMetadata("name") %></fmt:param>
<fmt:param>hdl:<%= community.getHandle() %></fmt:param>
<fmt:param><%=community.getID()%></fmt:param>
</fmt:message></h1>
</td>
<td align="right" class="standard">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#communitypolicies\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
</fmt:message>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#communitypolicies\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</h1>
<form action="<%= request.getContextPath() %>/tools/authorize" method="post">
<p align="center">
<div class="row">
<input type="hidden" name="community_id" value="<%=community.getID()%>" />
<input type="submit" name="submit_community_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>" />
</p>
<input class="btn btn-success col-md-2 col-md-offset-5" type="submit" name="submit_community_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>" />
</div>
</form>
<table class="miscTable" align="center" summary="Community Policy Edit Form">
<br/>
<table class="table" summary="Community Policy Edit Form">
<tr>
<th id="t1" class="oddRowOddCol"><strong><fmt:message key="jsp.general.id" /></strong></th>
@@ -105,14 +100,14 @@
<form action="<%= request.getContextPath() %>/tools/authorize" method="post">
<input type="hidden" name="policy_id" value="<%= rp.getID() %>" />
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="submit" name="submit_community_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
<input class="btn btn-primary" type="submit" name="submit_community_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
</form>
</td>
<td headers="t5" class="<%= row %>RowOddCol">
<form action="<%= request.getContextPath() %>/tools/authorize" method="post">
<input type="hidden" name="policy_id" value="<%= rp.getID() %>" />
<input type="hidden" name="community_id" value="<%= community.getID() %>" />
<input type="submit" name="submit_community_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<input class="btn btn-danger" type="submit" name="submit_community_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
</form>
</td>
</tr>

56
dspace-jspui/src/main/webapp/dspace-admin/authorize-item-edit.jsp
View File

@@ -69,39 +69,33 @@
Map bitstream_policies = (Map)request.getAttribute("bitstream_policies");
%>
<dspace:layout titlekey="jsp.dspace-admin.authorize-item-edit.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.authorize-item-edit.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin"
nocache="true">
<table width="95%">
<tr>
<td align="left">
<h1><fmt:message key="jsp.dspace-admin.authorize-item-edit.policies">
<fmt:param><%= item.getHandle() %></fmt:param>
<fmt:param><%= item.getID() %></fmt:param>
</fmt:message></h1>
</td>
<td align="right" class="standard">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#itempolicies\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
</fmt:message>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#itempolicies\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</h1>
<p><fmt:message key="jsp.dspace-admin.authorize-item-edit.text1"/></p>
<p><fmt:message key="jsp.dspace-admin.authorize-item-edit.text2"/></p>
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.authorize-item-edit.text1"/></p>
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.authorize-item-edit.text2"/></p>
<h3><fmt:message key="jsp.dspace-admin.authorize-item-edit.item"/></h3>
<form method="post" action="">
<p align="center">
<div class="row col-md-offset-5">
<input type="hidden" name="item_id" value="<%=item.getID()%>" />
<input type="submit" name="submit_item_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>" />
</p>
<input class="btn btn-success" type="submit" name="submit_item_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>" />
</div>
</form>
<table class="miscTable" align="center" summary="Item Policy Edit Form">
<table class="table" summary="Item Policy Edit Form">
<tr>
<th class="oddRowOddCol"><strong><fmt:message key="jsp.general.id" /></strong></th>
<th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.action"/></strong></th>
@@ -129,8 +123,8 @@
<form method="post" action="">
<input type="hidden" name="policy_id" value="<%= rp.getID() %>" />
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
<input type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<input class="btn btn-primary" type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
<input class="btn btn-danger" type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
</form>
</td>
</tr>
@@ -155,14 +149,14 @@
</fmt:message></h3>
<form method="post" action="">
<p align="center">
<div class="row col-md-offset-5">
<input type="hidden" name="item_id" value="<%=item.getID()%>" />
<input type="hidden" name="bundle_id" value="<%=myBun.getID()%>" />
<input type="submit" name="submit_bundle_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>" />
</p>
<input class="btn btn-success" type="submit" name="submit_bundle_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>" />
</div>
</form>
<table class="miscTable" align="center" summary="Bundle Policy Edit Form">
<table class="table" summary="Bundle Policy Edit Form">
<tr>
<th class="oddRowOddCol"><strong><fmt:message key="jsp.general.id" /></strong></th>
<th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.action"/></strong></th>
@@ -192,8 +186,8 @@
<input type="hidden" name="policy_id" value="<%= rp.getID() %>" />
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="hidden" name="bundle_id" value="<%= myBun.getID() %>" />
<input type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
<input type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<input class="btn btn-primary" type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
<input class="btn btn-danger" type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
</form>
</td>
</tr>
@@ -220,13 +214,13 @@
<fmt:param><%=myBits.getName()%></fmt:param>
</fmt:message></p>
<form method="post" action="">
<p align="center">
<div class="row col-md-offset-5">
<input type="hidden" name="item_id"value="<%=item.getID()%>" />
<input type="hidden" name="bitstream_id" value="<%=myBits.getID()%>" />
<input type="submit" name="submit_bitstream_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>" />
</p>
<input class="btn btn-success" type="submit" name="submit_bitstream_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>" />
</div>
</form>
<table class="miscTable" align="center" summary="This table displays the bitstream data">
<table class="table" summary="This table displays the bitstream data">
<tr>
<th class="oddRowOddCol"><strong><fmt:message key="jsp.general.id" /></strong></th>
<th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.action"/></strong></th>
@@ -256,8 +250,8 @@
<input type="hidden" name="policy_id" value="<%= rp.getID() %>" />
<input type="hidden" name="item_id" value="<%= item.getID() %>" />
<input type="hidden" name="bitstream_id" value="<%= myBits.getID() %>" />
<input type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
<input type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<input class="btn btn-primary" type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
<input class="btn btn-danger" type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
</form>
</td>
</tr>

59
dspace-jspui/src/main/webapp/dspace-admin/authorize-main.jsp
View File

@@ -41,57 +41,44 @@
// this space intentionally left blank
%>
<dspace:layout titlekey="jsp.dspace-admin.authorize-main.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.authorize-main.title"
navbar="admin"
locbar="link"
parenttitle="general.administer"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin">
<%-- <h1>Administer Authorization Policies</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.authorize-main.adm"/></h1>
<table width="95%">
<tr>
<td align="left">
<h1><fmt:message key="jsp.dspace-admin.authorize-main.adm"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#authorize\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</h1>
<%-- <h3>Choose a resource to manage policies for:</h3> --%>
<h3><fmt:message key="jsp.dspace-admin.authorize-main.choose"/></h3>
</td>
<td align="right" class="standard">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#authorize\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
<form method="post" action="">
<center>
<table width="70%">
<tr>
<td align="center">
<div class="btn-group col-md-offset-5">
<div class="row">
<%-- <input type="submit" name="submit_community" value="Manage a Community's Policies"> --%>
<input type="submit" name="submit_community" value="<fmt:message key="jsp.dspace-admin.authorize-main.manage1"/>" />
</td>
</tr>
<tr>
<td align="center">
<input class="btn btn-default col-md-12" type="submit" name="submit_community" value="<fmt:message key="jsp.dspace-admin.authorize-main.manage1"/>" />
</div>
<div class="row">
<%-- <input type="submit" name="submit_collection" value="Manage Collection's Policies"> --%>
<input type="submit" name="submit_collection" value="<fmt:message key="jsp.dspace-admin.authorize-main.manage2"/>" />
</td>
</tr>
<tr>
<td align="center">
<input class="btn btn-default col-md-12" type="submit" name="submit_collection" value="<fmt:message key="jsp.dspace-admin.authorize-main.manage2"/>" />
</div>
<div class="row">
<%-- <input type="submit" name="submit_item" value="Manage An Item's Policies"> --%>
<input type="submit" name="submit_item" value="<fmt:message key="jsp.dspace-admin.authorize-main.manage3"/>" />
</td>
</tr>
<tr>
<td align="center">
<input class="btn btn-default col-md-12" type="submit" name="submit_item" value="<fmt:message key="jsp.dspace-admin.authorize-main.manage3"/>" />
</div>
<div class="row">
<%-- <input type="submit" name="submit_advanced" value="Advanced/Item Wildcard Policy Admin Tool"> --%>
<input type="submit" name="submit_advanced" value="<fmt:message key="jsp.dspace-admin.authorize-main.advanced"/>" />
</td>
</tr>
</table>
</center>
<input class="btn btn-default col-md-12" type="submit" name="submit_advanced" value="<fmt:message key="jsp.dspace-admin.authorize-main.advanced"/>" />
</div>
</div>
</form>
</dspace:layout>

66
dspace-jspui/src/main/webapp/dspace-admin/authorize-policy-edit.jsp
View File

@@ -65,49 +65,45 @@
request.setAttribute("LanguageSwitch", "hide");
%>
<dspace:layout titlekey="jsp.dspace-admin.authorize-policy-edit.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.authorize-policy-edit.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin"
nocache="true">
<table width="95%">
<tr>
<td align="left">
<%-- <h1>Edit Policy for <%= edit_title %>:</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.authorize-policy-edit.heading">
<fmt:param><%= edit_title %></fmt:param>
</fmt:message></h1>
</td>
<td align="right" class="standard">
</fmt:message>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#authorize\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
</h1>
<form action="<%= request.getContextPath() %>/tools/authorize" method="post">
<table class="miscTable" align="center" summary="Edit Policy Form">
<tr>
<%-- <td>Group:</td> --%>
<th id="t1"><label for="tgroup_id"><fmt:message key="jsp.dspace-admin.general.group-colon"/></label></th>
<td headers="t1">
<select size="15" name="group_id" id="tgroup_id">
<div class="input-group">
<span class="col-md-2">
<%-- <td>Group:</td> --%>
<label for="tgroup_id"><fmt:message key="jsp.dspace-admin.general.group-colon"/></label>
</span>
<span class="col-md-10">
<select class="form-control" size="15" name="group_id" id="tgroup_id">
<% for(int i = 0; i < groups.length; i++ ) { %>
<option value="<%= groups[i].getID() %>" <%= (groups[i].getID() == policy.getGroupID() ? "selected=\"selected\"" : "" ) %> >
<%= groups[i].getName()%>
</option>
<% } %>
</select>
</td>
</tr>
</span>
<%-- <tr><td>Action:</td> --%>
<tr>
<th id="t2"><label for="taction_id"><fmt:message key="jsp.dspace-admin.general.action-colon"/></label></th>
<td headers="t2">
<span class="col-md-2">
<label for="taction_id"><fmt:message key="jsp.dspace-admin.general.action-colon"/></label>
</span>
<span class="col-md-10">
<input type="hidden" name="<%=id_name%>" value="<%=id%>" />
<input type="hidden" name="policy_id" value="<%=policy.getID()%>" />
<select name="action_id" id="taction_id">
<select class="form-control" name="action_id" id="taction_id">
<% for( int i = 0; i < Constants.actionText.length; i++ )
{
// only display if action i is relevant
@@ -121,26 +117,16 @@
<% }
} %>
</select>
</td>
</tr>
</table>
</span>
</div>
<% if( newpolicy != null ) { %> <input name="newpolicy" type="hidden" value="<%=newpolicy%>"/> <% } %>
<center>
<table width="70%">
<tr>
<td align="left">
<div class="btn-group pull-right col-md-2">
<%-- <input type="submit" name="submit_save_policy" value="Save Policy"> --%>
<input type="submit" name="submit_save_policy" value="<fmt:message key="jsp.dspace-admin.general.save"/>" />
</td>
<td align="right">
<%-- <input type="submit" name="submit_cancel_policy" value="Cancel"> --%>
<input type="submit" name="submit_cancel_policy" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
<input class="btn btn-primary" type="submit" name="submit_save_policy" value="<fmt:message key="jsp.dspace-admin.general.save"/>" />
<%-- <input type="submit" name="submit_cancel_policy" value="Cancel"> --%>
<input class="btn btn-default" type="submit" name="submit_cancel_policy" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form>
</dspace:layout>

32
dspace-jspui/src/main/webapp/dspace-admin/collection-select.jsp
View File

@@ -38,7 +38,7 @@
request.setAttribute("LanguageSwitch", "hide");
%>
<dspace:layout titlekey="jsp.dspace-admin.collection-select.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.collection-select.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -48,35 +48,23 @@
<h1><fmt:message key="jsp.dspace-admin.collection-select.col"/></h1>
<form method="post" action="">
<table class="miscTable" align="center" summary="Collection selection table">
<tr>
<td>
<select size="12" name="collection_id">
<div class="row col-md-4 col-md-offset-4">
<select class="form-control" size="12" name="collection_id">
<% for (int i = 0; i < collections.length; i++) { %>
<option value="<%= collections[i].getID()%>">
<%= collections[i].getMetadata("name")%>
</option>
<% } %>
</select>
</td>
</tr>
</table>
<center>
<table width="70%">
<tr>
<td align="left">
</div>
<br/>
<div class="btn-group pull-right col-md-7">
<%-- <input type="submit" name="submit_collection_select" value="Edit Policies"> --%>
<input type="submit" name="submit_collection_select" value="<fmt:message key="jsp.dspace-admin.general.editpolicy"/>" />
</td>
<td align="right">
<input class="btn btn-primary" type="submit" name="submit_collection_select" value="<fmt:message key="jsp.dspace-admin.general.editpolicy"/>" />
<%-- <input type="submit" name="submit_collection_select_cancel" value="Cancel"> --%>
<input type="submit" name="submit_collection_select_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
<input class="btn btn-default" type="submit" name="submit_collection_select_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form>
</dspace:layout>

33
dspace-jspui/src/main/webapp/dspace-admin/community-select.jsp
View File

@@ -38,7 +38,7 @@
request.setAttribute("LanguageSwitch", "hide");
%>
<dspace:layout titlekey="jsp.dspace-admin.community-select.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.community-select.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -49,34 +49,25 @@
<form method="post" action="">
<table class="miscTable" align="center" summary="Community selection table">
<tr>
<td>
<select size="12" name="community_id">
<div class="row col-md-4 col-md-offset-4">
<select class="form-control" size="12" name="community_id">
<% for (int i = 0; i < communities.length; i++) { %>
<option value="<%= communities[i].getID()%>">
<%= communities[i].getMetadata("name")%>
</option>
<% } %>
</select>
</td>
</tr>
</table>
<center>
<table width="70%">
<tr>
<td align="left">
</div>
<br/>
<div class="btn-group pull-right col-md-7">
<%-- <input type="submit" name="submit_community_select" value="Edit Policies"> --%>
<input type="submit" name="submit_community_select" value="<fmt:message key="jsp.dspace-admin.general.editpolicy"/>" />
</td>
<td align="right">
<input class="btn btn-primary" type="submit" name="submit_community_select" value="<fmt:message key="jsp.dspace-admin.general.editpolicy"/>" />
<%-- <input type="submit" name="submit_community_select_cancel" value="Cancel"> --%>
<input type="submit" name="submit_community_select_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
<input class="btn btn-default" type="submit" name="submit_community_select_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form>
</dspace:layout>

26
dspace-jspui/src/main/webapp/dspace-admin/confirm-delete-format.jsp
View File

@@ -27,7 +27,7 @@
BitstreamFormat format = (BitstreamFormat) request.getAttribute("format");
%>
<dspace:layout titlekey="jsp.dspace-admin.confirm-delete-format.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.confirm-delete-format.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -40,30 +40,22 @@
<%-- <p>Are you sure the format <strong><%= format.getShortDescription() %></strong>
should be deleted?</p> --%>
<p><fmt:message key="jsp.dspace-admin.confirm-delete-format.confirm">
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.confirm-delete-format.confirm">
<fmt:param><%= format.getShortDescription() %></fmt:param>
</fmt:message></p>
<%-- <p>Any existing bitstreams of this format will be reverted to the
<em>unknown</em> bitstream format.</p> --%>
<p><fmt:message key="jsp.dspace-admin.confirm-delete-format.warning"/></p>
<p class="alert alert-warning"><fmt:message key="jsp.dspace-admin.confirm-delete-format.warning"/></p>
<form method="post" action="">
<input type="hidden" name="format_id" value="<%= format.getID() %>"/>
<center>
<table width="70%">
<tr>
<td align="left">
<input type="hidden" name="format_id" value="<%= format.getID() %>"/>
<div class="btn-group">
<%-- <input type="submit" name="submit_confirm_delete" value="Delete"> --%>
<input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
</td>
<td align="right">
<input class="btn btn-danger" type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
<input class="btn btn-default" type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form>
</dspace:layout>

22
dspace-jspui/src/main/webapp/dspace-admin/confirm-delete-mdfield.jsp
View File

@@ -36,7 +36,7 @@
}
%>
<dspace:layout titlekey="jsp.dspace-admin.confirm-delete-mdfield.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.confirm-delete-mdfield.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -49,32 +49,26 @@
<%-- <P>Are you sure the metadata field <strong><%= typeName %></strong>
should be deleted?</p> --%>
<p><fmt:message key="jsp.dspace-admin.confirm-delete-mdfield.confirm">
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.confirm-delete-mdfield.confirm">
<fmt:param><%= typeName %></fmt:param>
</fmt:message></p>
<%
if (!failed) { %>
<%-- <P>This will result in an error if any items have values for this metadata field.</P> --%>
<p><fmt:message key="jsp.dspace-admin.confirm-delete-mdfield.warning"/></p>
<p class="alert alert-warning"><fmt:message key="jsp.dspace-admin.confirm-delete-mdfield.warning"/></p>
<form method="post" action="">
<input type="hidden" name="dc_type_id" value="<%= type.getFieldID() %>">
<center>
<table width="70%">
<tr>
<td align="left">
<div class="btn-group">
<%-- <input type="submit" name="submit_confirm_delete" value="Delete"> --%>
<input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<input class="btn btn-danger" type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
<input class="btn btn-default" type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form><%
} else {%>
<%-- <P>Unable to delete this metadata field. This is most likely to be because it is referenced by at least one item.</P> --%>
<p><strong><fmt:message key="jsp.dspace-admin.confirm-delete-mdfield.failed"/></strong></p><%
<p class="alert alert-danger"><fmt:message key="jsp.dspace-admin.confirm-delete-mdfield.failed"/></p><%
}
%>

25
dspace-jspui/src/main/webapp/dspace-admin/confirm-delete-mdschema.jsp
View File

@@ -27,7 +27,7 @@
MetadataSchema schema = (MetadataSchema) request.getAttribute("schema");
%>
<dspace:layout titlekey="jsp.dspace-admin.confirm-delete-dcschema.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.confirm-delete-dcschema.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -40,27 +40,20 @@
<%-- <P>Are you sure the schema <strong><%= schema.getNamespace() %></strong>
should be deleted?</P> --%>
<P><fmt:message key="jsp.dspace-admin.confirm-delete-mdschema.confirm">
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.confirm-delete-mdschema.confirm">
<fmt:param><%= schema.getName() %></fmt:param>
</fmt:message></P>
<%-- <P>This will result in an error if any metadata fields exist within this schema.</P> --%>
<P><fmt:message key="jsp.dspace-admin.confirm-delete-mdschema.warning"/></P>
<p class="alert alert-warning"><fmt:message key="jsp.dspace-admin.confirm-delete-mdschema.warning"/></p>
<form method="post">
<input type="hidden" name="dc_schema_id" value="<%= schema.getSchemaID() %>">
<center>
<table width="70%">
<tr>
<td align="left">
<%-- <input type="submit" name="submit_confirm_delete" value="Delete"> --%>
<input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
<%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
</td>
</tr>
</table>
</center>
<div class="btn-group">
<%-- <input type="submit" name="submit_confirm_delete" value="Delete"> --%>
<input class="btn btn-danger" type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
<%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
<input class="btn btn-default" type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
</div>
</form>
</dspace:layout>

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

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

@@ -50,7 +50,7 @@
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"
locbar="link"
parenttitlekey="jsp.administer"
@@ -62,53 +62,46 @@
<fmt:param value="<%= title %>"/>
</fmt:message>
</h1>
<table width="60%">
<form action="<%=request.getContextPath()%>/dspace-admin/curate" method="post">
<div class="row container">
<form action="<%=request.getContextPath()%>/dspace-admin/curate" method="post">
<%
if (groupOptions != null && !"".equals(groupOptions))
{
%>
<tr>
<td class="curate heading">
<fmt:message key="jsp.dspace-admin.curate.select-group.tag"/>:
</td>
<td class="curate field">
<select name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<div class="input-group">
<label class="input-group-addon"><fmt:message key="jsp.dspace-admin.curate.select-group.tag"/>:</label>
<select class="form-control" name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<%= groupOptions %>
</select>
</td>
</tr>
</p>
</div>
<%
}
%>
<tr>
<td class="curate heading">
<fmt:message key="jsp.dspace-admin.curate.select-task.tag"/>:
</td>
<td class="curate field">
<select name="curate_task" id="curate_task">
<div class="input-group">
<label class="input-group-addon"><fmt:message key="jsp.dspace-admin.curate.select-task.tag"/>:</label>
<select class="form-control" name="curate_task" id="curate_task">
<%= taskOptions %>
</select>
</td>
</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>
<br/>
<div class="col-md-4 row pull-right">
<input type="hidden" name="item_id" value="<%= itemID %>"/>
<input class="btn btn-warning col-md-6" type="submit" name="submit_item_queue" value="<fmt:message key="jsp.tools.curate.queue.button"/>" />
<input class="btn btn-primary col-md-6" type="submit" name="submit_item_curate" value="<fmt:message key="jsp.tools.curate.perform.button"/>" />
</div>
</form>
</div>
<div class="row container">
<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>

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

@@ -42,7 +42,9 @@
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"
locbar="link"
parenttitlekey="jsp.administer"
@@ -54,57 +56,41 @@
<h1><fmt:message key="jsp.dspace-admin.curate.main.heading"/></h1>
<table width="60%">
<tr>
<td class="curate heading">
<fmt:message key="jsp.dspace-admin.curate.main.info1"/>:<br/>
</td>
<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>
<div class="input-group">
<label class="input-group-addon"><fmt:message key="jsp.dspace-admin.curate.main.info1"/>:</label>
<input class="form-control" type="text" name="handle" value="<%= handle %>" size="20"/>
<span class="col-md-10"><fmt:message key="jsp.dspace-admin.curate.main.info2"/></span>
</div>
<%
if (groupOptions != null && !"".equals(groupOptions))
{
%>
<tr>
<td class="curate heading">
<fmt:message key="jsp.tools.curate.select-group.tag"/>:
</td>
<td class="curate field">
<select name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<div class="input-group">
<label class="input-group-addon"><fmt:message key="jsp.tools.curate.select-group.tag"/>:</label>
<select class="form-control" name="select_curate_group" id="select_curate_group" onchange="this.form.submit();">
<%= groupOptions %>
</select>
</td>
</tr>
</div>
<%
}
%>
<tr>
<td class="curate heading">
<fmt:message key="jsp.tools.curate.select-task.tag"/>:
</td>
<td class="curate field">
<select name="curate_task" id="curate_task">
<div class="input-group">
<label class="input-group-addon"><fmt:message key="jsp.tools.curate.select-task.tag"/>:</label>
<select class="form-control" name="curate_task" id="curate_task">
<%= taskOptions %>
</select>
</td>
</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>
<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>
</dspace:layout>

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

@@ -13,14 +13,14 @@
{
String type = result.getType();
boolean isSuccess = result.isSuccess();
String resultClass = (isSuccess ? "success" : "failure");
String resultClass = (isSuccess ? "success" : "danger");
%>
<div class="notice <%= resultClass %>">
<h1 class="task-name">
<div class="alert alert-<%= resultClass %>">
<b>
<fmt:message key="jsp.dspace-admin.curate.task.name">
<fmt:param value="<%= result.getTask() %>"/>
</fmt:message>
</h1>
</b>
<%
if ("perform".equals(type))
{

28
dspace-jspui/src/main/webapp/dspace-admin/eperson-confirm-delete.jsp
View File

@@ -27,7 +27,7 @@
<%
EPerson eperson = (EPerson) request.getAttribute("eperson");
%>
<dspace:layout titlekey="jsp.dspace-admin.eperson-confirm-delete.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.eperson-confirm-delete.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -40,25 +40,19 @@
</fmt:message></h1>
<%-- <p>Are you sure this e-person should be deleted?</p> --%>
<p><fmt:message key="jsp.dspace-admin.eperson-confirm-delete.confirm"/></p>
<div class="row col-md-offset-4">
<span class="col-md-6"><fmt:message key="jsp.dspace-admin.eperson-confirm-delete.confirm"/></span>
</div>
<form method="post" action="">
<input type="hidden" name="eperson_id" value="<%= eperson.getID() %>"/>
<center>
<table width="70%">
<tr>
<td align="left">
<%-- <input type="submit" name="submit_confirm_delete" value="Delete"> --%>
<input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
</td>
<td align="right">
<%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
<div class="btn-group col-md-offset-5">
<%-- <input type="submit" name="submit_confirm_delete" value="Delete"> --%>
<input type="submit" class="btn btn-danger col-md-6" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
<input type="submit" class="btn btn-default col-md-6" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form>
</dspace:layout>

2
dspace-jspui/src/main/webapp/dspace-admin/eperson-deletion-error.jsp
View File

@@ -37,7 +37,7 @@
Iterator tableIt = tableList.iterator();
%>
<dspace:layout titlekey="jsp.dspace-admin.eperson-deletion-error.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.eperson-deletion-error.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"

156
dspace-jspui/src/main/webapp/dspace-admin/eperson-edit.jsp
View File

@@ -68,7 +68,7 @@
boolean ldap_enabled = ConfigurationManager.getBooleanProperty("authentication-ldap", "enable");
%>
<dspace:layout titlekey="jsp.dspace-admin.eperson-edit.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.eperson-edit.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -76,74 +76,69 @@
nocache="true">
<table width="95%">
<tr>
<td align="left">
<%-- <h1>Edit EPerson <%= eperson.getEmail() %>:</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.eperson-edit.heading">
<fmt:param><%= eperson.getEmail() %></fmt:param>
</fmt:message></h1>
</td>
<td align="right" class="standard">
</fmt:message>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#epeople\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
</h1>
<% if (emailExists)
{ %><p><strong>
{ %><p class="alert alert-warning">
<fmt:message key="jsp.dspace-admin.eperson-edit.emailexists"/>
</strong></p>
</p>
<% } %>
<form method="post" action="">
<table class="miscTable" align="center">
<tr>
<div class="row">
<%-- <td>Email:</td> --%>
<td><label for="temail"><fmt:message key="jsp.dspace-admin.eperson-edit.email"/></label></td>
<td>
<input type="hidden" name="eperson_id" value="<%=eperson.getID()%>"/>
<input name="email" id="temail" size="24" value="<%=email == null ? "" : email%>"/>
</td>
</tr>
<label class="col-md-2" for="temail"><fmt:message key="jsp.dspace-admin.eperson-edit.email"/></label>
<div class="col-md-6">
<input type="hidden" name="eperson_id" value="<%=eperson.getID()%>"/>
<input class="form-control" name="email" id="temail" size="24" value="<%=email == null ? "" : email%>"/>
</div>
</div>
<tr>
<div class="row">
<%-- <td>Last Name:</td> --%>
<td><label for="tlastname"><fmt:message key="jsp.dspace-admin.eperson.general.lastname"/></label></td>
<td>
<input name="lastname" id="tlastname" size="24" value="<%=lastName == null ? "" : Utils.addEntities(lastName) %>"/>
</td>
</tr>
<label class="col-md-2" for="tlastname"><fmt:message key="jsp.dspace-admin.eperson.general.lastname"/></label>
<div class="col-md-6">
<input class="form-control" name="lastname" id="tlastname" size="24" value="<%=lastName == null ? "" : Utils.addEntities(lastName) %>"/>
</div>
</div>
<tr>
<div class="row">
<%-- <td>First Name:</td> --%>
<td><label for="tfirstname"><fmt:message key="jsp.dspace-admin.eperson.general.firstname"/></label></td>
<td>
<input name="firstname" id="tfirstname" size="24" value="<%=firstName == null ? "" : Utils.addEntities(firstName) %>"/>
</td>
</tr>
<label class="col-md-2" for="tfirstname"><fmt:message key="jsp.dspace-admin.eperson.general.firstname"/></label>
<div class="col-md-6">
<input class="form-control" name="firstname" id="tfirstname" size="24" value="<%=firstName == null ? "" : Utils.addEntities(firstName) %>"/>
</div>
</div>
<% if (ldap_enabled) { %>
<tr>
<td>LDAP NetID:</td>
<td>
<input name="netid" size="24" value="<%=netid == null ? "" : Utils.addEntities(netid) %>" />
</td>
</tr>
<div class="row">
<label class="col-md-2">LDAP NetID:</label>
<div class="col-md-6">
<input class="form-control" name="netid" size="24" value="<%=netid == null ? "" : Utils.addEntities(netid) %>" />
</div>
</div>
<% } %>
<tr>
<div class="row">
<%-- <td>Phone:</td> --%>
<td><label for="tphone"><fmt:message key="jsp.dspace-admin.eperson-edit.phone"/></label></td>
<td>
<input name="phone" id="tphone" size="24" value="<%=phone == null ? "" : Utils.addEntities(phone) %>"/>
</td>
</tr>
<tr>
<td><label for="tlanguage"><fmt:message key="jsp.register.profile-form.language.field"/></label></td>
<td class="standard">
<select name="language" id="tlanguage">
<label class="col-md-2" for="tphone"><fmt:message key="jsp.dspace-admin.eperson-edit.phone"/></label>
<div class="col-md-6">
<input class="form-control" name="phone" id="tphone" size="24" value="<%=phone == null ? "" : Utils.addEntities(phone) %>"/>
</div>
</div>
<div class="row">
<label class="col-md-2" for="tlanguage"><fmt:message key="jsp.register.profile-form.language.field"/></label>
<div class="col-md-6">
<select class="form-control" name="language" id="tlanguage">
<%
Locale[] supportedLocales = I18nUtil.getSupportedLocales();
@@ -167,49 +162,43 @@
}
%>
</select>
</td>
</tr>
<tr>
<%-- <td>Can Log In:</td> --%>
<td><label for="tcan_log_in"><fmt:message key="jsp.dspace-admin.eperson-edit.can"/></label></td>
<td>
<input type="checkbox" name="can_log_in" id="tcan_log_in" value="true"<%= eperson.canLogIn() ? " checked=\"checked\"" : "" %> />
</td>
</tr>
<tr>
<%-- <td>Require Certificate:</td> --%>
<td><label for="trequire_certificate"><fmt:message key="jsp.dspace-admin.eperson-edit.require"/></label></td>
<td>
<input type="checkbox" name="require_certificate" id="trequire_certificate" value="true"<%= eperson.getRequireCertificate() ? " checked=\"checked\"" : "" %> />
</td>
</tr>
</table>
<center>
<table width="70%">
<tr>
<td align="left">
</div>
</div>
<div class="row">
<%-- <td>Can Log In:</td> --%>
<label class="col-md-2" for="tcan_log_in"><fmt:message key="jsp.dspace-admin.eperson-edit.can"/></label>
<div class="col-md-6">
<input class="form-control" type="checkbox" name="can_log_in" id="tcan_log_in" value="true"<%= eperson.canLogIn() ? " checked=\"checked\"" : "" %> />
</div>
</div>
<div class="row">
<%-- <td>Require Certificate:</td> --%>
<label class="col-md-2" for="trequire_certificate"><fmt:message key="jsp.dspace-admin.eperson-edit.require"/></label>
<div class="col-md-6">
<input class="form-control" type="checkbox" name="require_certificate" id="trequire_certificate" value="true"<%= eperson.getRequireCertificate() ? " checked=\"checked\"" : "" %> />
</div>
</div>
<br/>
<div class="col-md-4 btn-group">
<%-- <input type="submit" name="submit_save" value="Save Edits"> --%>
<input type="submit" name="submit_save" value="<fmt:message key="jsp.dspace-admin.general.save"/>" />
&nbsp;<input type="submit" name="submit_resetpassword" value="<fmt:message key="jsp.dspace-admin.eperson-main.ResetPassword.submit"/>"/>
</td>
<td align="right">
<input class="btn btn-default" type="submit" name="submit_save" value="<fmt:message key="jsp.dspace-admin.general.save"/>" />
<input class="btn btn-default" type="submit" name="submit_resetpassword" value="<fmt:message key="jsp.dspace-admin.eperson-main.ResetPassword.submit"/>"/>
<%-- <input type="submit" name="submit_delete" value="Delete EPerson..."> --%>
<input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
</td>
</tr>
</table>
</center>
<input class="btn btn-danger" type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
</div>
</form>
<%
if((groupMemberships != null) && (groupMemberships.length>0))
{
%>
<h3><fmt:message key="jsp.dspace-admin.eperson-edit.groups"/></h3>
<br/>
<br/>
<h3><fmt:message key="jsp.dspace-admin.eperson-edit.groups"/></h3>
<div class="row">
<ul>
<% for(int i=0; i<groupMemberships.length; i++)
{
@@ -223,6 +212,7 @@
<li><%=myLink%></li>
<% } %>
</ul>
</div>
<% } %>
</dspace:layout>

2
dspace-jspui/src/main/webapp/dspace-admin/eperson-loginas-error.jsp
View File

@@ -19,7 +19,7 @@
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<dspace:layout titlekey="jsp.dspace-admin.eperson-main.loginAs.authorize.title">
<dspace:layout style="submission" titlekey="jsp.dspace-admin.eperson-main.loginAs.authorize.title">
<%-- <h1>Authorization Required</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.eperson-main.loginAs.authorize.title"/></h1>

87
dspace-jspui/src/main/webapp/dspace-admin/eperson-main.jsp
View File

@@ -39,66 +39,61 @@
boolean loginAs = ConfigurationManager.getBooleanProperty("webui.user.assumelogin", false);
%>
<dspace:layout titlekey="jsp.dspace-admin.eperson-main.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.eperson-main.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin">
<%-- <h1>Administer EPeople</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.eperson-main.heading"/></h1>
<table width="95%">
<tr>
<td align="left">
<%-- <h3>Choose an action:</h3> --%>
<h3><fmt:message key="jsp.dspace-admin.eperson-main.choose"/></h3>
</td>
<td align="right" class="standard">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"epeople\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
<h1><fmt:message key="jsp.dspace-admin.eperson-main.heading"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"epeople\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</h1>
<%-- <h3>Choose an action:</h3> --%>
<h3><fmt:message key="jsp.dspace-admin.eperson-main.choose"/></h3>
<% if (noEPersonSelected)
{ %><p><strong>
{ %><p class="alert alert-warning">
<fmt:message key="jsp.dspace-admin.eperson-main.noepersonselected"/>
</strong></p>
</p>
<% } %>
<% if (resetPassword)
{ %><p><strong>
{ %><p class="alert alert-success">
<fmt:message key="jsp.dspace-admin.eperson-main.ResetPassword.success_notice"/>
</strong></p>
</p>
<% } %>
<form name="epersongroup" method="post" action="">
<div class="row">
<%-- <input type="submit" name="submit_add" value="Add EPerson..."> --%>
<input class="btn btn-success col-md-2 col-md-offset-5" type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.eperson-main.add"/>" />
</div>
<br/>
<center>
<table width="90%">
<tr>
<td colspan="3" align="center">
<%-- <input type="submit" name="submit_add" value="Add EPerson..."> --%>
<input type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.eperson-main.add"/>" />
</td>
</tr>
<tr>
<%-- <td colspan="3"><strong>OR</strong></td> --%>
<td colspan="3"><strong><fmt:message key="jsp.dspace-admin.eperson-main.or"/></strong></td>
</tr>
<tr>
<td>
<dspace:selecteperson multiple="false" />
</td>
<td>
<%-- then&nbsp;<input type="submit" name="submit_edit" value="Edit..." onclick="javascript:finishEPerson();"> --%>
<fmt:message key="jsp.dspace-admin.eperson-main.then"/>&nbsp;<input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" onclick="javascript:finishEPerson();"/>
<% if(loginAs) { %>&nbsp;<input type="submit" name="submit_login_as" value="<fmt:message key="jsp.dspace-admin.eperson-main.LoginAs.submit"/>" onclick="javascript:finishEPerson();"/> <% } %>
</td>
<td>
<%-- <input type="submit" name="submit_delete" value="Delete..." onclick="javascript:finishEPerson();"> --%>
<input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>" onclick="javascript:finishEPerson();"/>
</td>
</tr>
</table>
</center>
<fmt:message key="jsp.dspace-admin.eperson-main.or"/>
<div class="row">
<div class="col-md-6">
<dspace:selecteperson multiple="false" />
</div>
<%-- then&nbsp;<input type="submit" name="submit_edit" value="Edit..." onclick="javascript:finishEPerson();"> --%>
<div class="col-md-2">
<fmt:message key="jsp.dspace-admin.eperson-main.then"/>
</div>
<div class="col-md-4">
<input type="submit" class="btn btn-default col-md-4" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" onclick="javascript:finishEPerson();"/>
<% if(loginAs) { %>&nbsp;<input type="submit" class="btn btn-default col-md-4" name="submit_login_as" value="<fmt:message key="jsp.dspace-admin.eperson-main.LoginAs.submit"/>" onclick="javascript:finishEPerson();"/> <% } %>
<%-- <input type="submit" name="submit_delete" value="Delete..." onclick="javascript:finishEPerson();"> --%>
<input type="submit" class="btn btn-danger col-md-4" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>" onclick="javascript:finishEPerson();"/>
</div>
</div>
</form>
</dspace:layout>

2
dspace-jspui/src/main/webapp/dspace-admin/eperson-resetpassword-error.jsp
View File

@@ -20,7 +20,7 @@
<%@ page isErrorPage="true" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<dspace:layout titlekey="jsp.dspace-admin.eperson-main.ResetPassword.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.eperson-main.ResetPassword.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"

27
dspace-jspui/src/main/webapp/dspace-admin/group-confirm-delete.jsp
View File

@@ -22,7 +22,7 @@
<%
Group group = (Group) request.getAttribute("group");
%>
<dspace:layout titlekey="jsp.dspace-admin.group-confirm-delete.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.group-confirm-delete.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -32,25 +32,14 @@
<fmt:param><%= group.getName() %></fmt:param>
</fmt:message></h1>
<p><fmt:message key="jsp.dspace-admin.group-confirm-delete.confirm"/></p>
<center>
<table width="70%">
<tr>
<td align="left">
<p class="alert alert-warning"><fmt:message key="jsp.dspace-admin.group-confirm-delete.confirm"/></p>
<form method="post" action="">
<input type="hidden" name="group_id" value="<%= group.getID() %>"/>
<input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<div class="btn-group col-md-offset-5">
<input type="hidden" name="group_id" value="<%= group.getID() %>"/>
<input class="btn btn-danger" type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>" />
<input class="btn btn-default" type="submit" name="submit_cancel_delete" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form>
</td>
<td align="right">
<form method="post" action="">
<input type="submit" name="submit_cancel_delete" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</form>
</td>
</tr>
</table>
</center>
</dspace:layout>

36
dspace-jspui/src/main/webapp/dspace-admin/group-eperson-select.jsp
View File

@@ -37,7 +37,7 @@
(EPerson []) request.getAttribute("epeople");
%>
<dspace:layout titlekey="jsp.dspace-admin.group-eperson-select.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.group-eperson-select.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -51,36 +51,26 @@
<form method="post" action="">
<table class="miscTable" align="center">
<tr>
<td>
<input type="hidden" name="group_id" value="<%=group.getID()%>"/>
<select size="15" name="eperson_id" multiple="multiple">
<div class="row col-md-4 col-md-offset-4">
<select class="form-control" size="15" name="eperson_id" multiple="multiple">
<% for (int i = 0; i < epeople.length; i++) { %>
<option value="<%= epeople[i].getID()%>">
<%= epeople[i].getEmail()%>
</option>
<% } %>
</select>
</td>
</tr>
</table>
<center>
<table width="70%">
<tr>
<td align="left">
<%-- <input type="submit" name="submit_add_eperson_add" value="Add EPerson"> --%>
<input type="submit" name="submit_add_eperson_add" value="<fmt:message key="jsp.dspace-admin.group-eperson-select.add"/>" />
</td>
<td align="right">
</div>
<br/>
<div class="btn-group pull-right col-md-7">
<%-- <input type="submit" name="submit_add_eperson_add" value="Add EPerson"> --%>
<input class="btn btn-primary" type="submit" name="submit_add_eperson_add" value="<fmt:message key="jsp.dspace-admin.group-eperson-select.add"/>" />
<%-- <input type="submit" name="submit_add_eperson_cancel" value="Cancel"> --%>
<input type="submit" name="submit_add_eperson_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
<input class="btn btn-default" type="submit" name="submit_add_eperson_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form>
</dspace:layout>

35
dspace-jspui/src/main/webapp/dspace-admin/group-group-select.jsp
View File

@@ -36,7 +36,7 @@
(Group []) request.getAttribute("groups");
%>
<dspace:layout titlekey="jsp.dspace-admin.group-group-select.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.group-group-select.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -50,36 +50,25 @@
<form method="post" action="">
<table class="miscTable" align="center">
<tr>
<td>
<input type="hidden" name="group_id" value="<%=group.getID()%>" />
<select size="15" name="groups_id" multiple="multiple">
<div class="row col-md-4 col-md-offset-4">
<select class="form-control" size="15" name="groups_id" multiple="multiple">
<% for (int i = 0; i < groups.length; i++) { %>
<option value="<%= groups[i].getID()%>">
<%= groups[i].getName()%>
</option>
<% } %>
</select>
</td>
</tr>
</table>
<center>
<table width="70%">
<tr>
<td align="left">
<%--<input type="submit" name="submit_add_group_add" value="Add Group" />--%>
<input type="submit" name="submit_add_group_add" value="<fmt:message key="jsp.dspace-admin.group-group-select.add"/>" />
</td>
<td align="right">
</div>
<br/>
<div class="btn-group pull-right col-md-7">
<%--<input type="submit" name="submit_add_group_add" value="Add Group" />--%>
<input class="btn btn-primary" type="submit" name="submit_add_group_add" value="<fmt:message key="jsp.dspace-admin.group-group-select.add"/>" />
<%--<input type="submit" name="submit_add_group_cancel" value="Cancel" />--%>
<input type="submit" name="submit_add_group_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
<input class="btn btn-default" type="submit" name="submit_add_group_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form>
</dspace:layout>

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

@@ -41,12 +41,12 @@
{
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><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>
</dspace:layout>
<%

54
dspace-jspui/src/main/webapp/dspace-admin/item-select.jsp
View File

@@ -27,7 +27,7 @@
<%@ page import="org.dspace.core.ConfigurationManager" %>
<dspace:layout titlekey="jsp.dspace-admin.item-select.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.item-select.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -35,7 +35,9 @@
<%-- <h1>Select an Item</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.item-select.heading"/></h1>
<h1><fmt:message key="jsp.dspace-admin.item-select.heading"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#itempolicies\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<%
if (request.getAttribute("invalid.id") != null) { %>
@@ -43,38 +45,32 @@
edit a community or collection, you need to use the
<a href="<%= request.getContextPath() %>/dspace-admin/edit-communities">communities/collections admin page.</a></p> --%>
<p><fmt:message key="jsp.dspace-admin.item-select.text">
<p class="alert alert-warning"><fmt:message key="jsp.dspace-admin.item-select.text">
<fmt:param><%= request.getContextPath() %>/dspace-admin/edit-communities</fmt:param>
</fmt:message></p>
<% } %>
<%-- <p>Enter the Handle or internal item ID of the item you wish to select. --%>
<div><fmt:message key="jsp.dspace-admin.item-select.enter"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#itempolicies\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup></div>
<div><fmt:message key="jsp.dspace-admin.item-select.enter"/></div>
<form method="post" action="">
<center>
<table class="miscTable">
<tr class="oddRowEvenCol">
<%-- <td class="submitFormLabel">Handle:</td> --%>
<td class="submitFormLabel"><label for="thandle"><fmt:message key="jsp.dspace-admin.item-select.handle"/></label></td>
<td>
<input type="text" name="handle" id="thandle" value="<%= ConfigurationManager.getProperty("handle.prefix") %>/" size=12>
<%-- <input type="submit" name="submit_item_select" value="Find"> --%>
<input type="submit" name="submit_item_select" value="<fmt:message key="jsp.dspace-admin.item-select.find"/>" />
</td>
</tr>
<tr><td></td></tr>
<tr class="oddRowEvenCol">
<%-- <td class="submitFormLabel">Internal ID:</td> --%>
<td class="submitFormLabel"><label for="titem_id"><fmt:message key="jsp.dspace-admin.item-select.id"/></label></td>
<td>
<input type="text" name="item_id" size="12">
<%-- <input type="submit" name="submit_item_select" value="Find"> --%>
<input type="submit" name="submit_item_select" value="<fmt:message key="jsp.dspace-admin.item-select.find"/>" />
</td>
</tr>
</table>
</center>
<div class="row">
<label class="col-md-2" for="thandle"><fmt:message key="jsp.dspace-admin.item-select.handle"/></label>
<span class="col-md-3"><input class="form-control" type="text" name="handle" id="thandle" value="<%= ConfigurationManager.getProperty("handle.prefix") %>/" size="12"/></span>
<%-- <input type="submit" name="submit" value="Find" /> --%>
<input class="btn btn-default" type="submit" name="submit_item_select" value="<fmt:message key="jsp.dspace-admin.item-select.find"/>" />
</div>
<div class="row">
<label class="col-md-2" for="thandle"><fmt:message key="jsp.dspace-admin.item-select.id"/></label>
<span class="col-md-3"><input class="form-control" type="text" name="item_id" id="titem_id" size="12"/></span>
<%-- <input type="submit" name="submit" value="Find"> --%>
<input class="btn btn-default" type="submit" name="submit_item_select" value="<fmt:message key="jsp.dspace-admin.item-select.find"/>" />
</div>
</form>
<br/>
<form method="post" action="">
<div class="row col-md-offset-11">
<input class="btn btn-default" type="submit" name="submit_collection_select_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</div>
</form>
</dspace:layout>

23
dspace-jspui/src/main/webapp/dspace-admin/license-edit.jsp
View File

@@ -19,7 +19,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@page import="javax.servlet.jsp.jstl.fmt.LocaleSupport"%>
<%
// Get the existing license
String license = (String)request.getAttribute("license");
@@ -44,13 +44,15 @@
%>
<dspace:layout titlekey="jsp.dspace-admin.license-edit.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.license-edit.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin">
<h1><fmt:message key="jsp.dspace-admin.license-edit.heading"/></h1>
<h1><fmt:message key="jsp.dspace-admin.license-edit.heading"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#editlicense\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</h1>
<form action="<%= request.getContextPath() %>/dspace-admin/license-edit" method="post">
@@ -58,7 +60,7 @@
if (edited)
{
%>
<p>
<p class="alert alert-warning">
<strong><fmt:message key="jsp.dspace-admin.license-edit.edited"/></strong>
</p>
<%
@@ -68,17 +70,18 @@
if (empty)
{
%>
<p>
<p class="alert alert-warning">
<strong><fmt:message key="jsp.dspace-admin.license-edit.empty"/></strong>
</p>
<%
}
%>
<p><fmt:message key="jsp.dspace-admin.license-edit.description"/></p>
<p><textarea name="license" rows="15" cols="70"><%= license %></textarea><br />
<input type="submit" name="submit_save" value="<fmt:message key="jsp.dspace-admin.general.save"/>" />
<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</p>
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.license-edit.description"/></p>
<textarea class="form-control" name="license" rows="15" cols="70"><%= license %></textarea>
<input class="btn btn-primary" type="submit" name="submit_save" value="<fmt:message key="jsp.dspace-admin.general.save"/>" />
<input class="btn btn-default" type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</form>
</dspace:layout>

88
dspace-jspui/src/main/webapp/dspace-admin/list-formats.jsp
View File

@@ -37,27 +37,28 @@
(BitstreamFormat[]) request.getAttribute("formats");
%>
<dspace:layout titlekey="jsp.dspace-admin.list-formats.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.list-formats.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin">
<h1><fmt:message key="jsp.dspace-admin.list-formats.title"/></h1>
<h1><fmt:message key="jsp.dspace-admin.list-formats.title"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#bitstream\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</h1>
<p><fmt:message key="jsp.dspace-admin.list-formats.text1"/></p>
<p><fmt:message key="jsp.dspace-admin.list-formats.text2"/></p>
&nbsp;&nbsp;<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#bitstream\"%>"><fmt:message key="jsp.help"/></dspace:popup>
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.list-formats.text1"/></p>
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.list-formats.text2"/></p>
<%
Context context = UIUtil.obtainContext(request);
%>
<table class="miscTable" align="center" summary="Bitstream Format Registry data table">
<table class="table" summary="Bitstream Format Registry data table">
<tr>
<th class="oddRowOddCol">
<span class="col-md-offset-3">
<strong>
<fmt:message key="jsp.general.id" />
/ <fmt:message key="jsp.dspace-admin.list-formats.mime"/>
@@ -67,6 +68,7 @@
/ <fmt:message key="jsp.dspace-admin.list-formats.internal"/>
/ <fmt:message key="jsp.dspace-admin.list-formats.extensions"/>
</strong>
</span>
</th>
</tr>
<%
@@ -88,53 +90,55 @@
%>
<tr>
<td>
<form method="post" action="">
<table>
<tr>
<td class="<%= row %>RowOddCol"><%= formats[i].getID() %></td>
<td class="<%= row %>RowEvenCol">
<input type="text" name="mimetype" value="<%= formats[i].getMIMEType() %>" size="14"/>
</td>
<td class="<%= row %>RowOddCol">
<form class="form-inline" method="post" action="">
<span class="col-md-1"><%= formats[i].getID() %></span>
<div class="form-group">
<label class="sr-only" for="mimetype"><fmt:message key="jsp.dspace-admin.list-formats.mime"/></label>
<input class="form-control" type="text" name="mimetype" value="<%= formats[i].getMIMEType()!=null?formats[i].getMIMEType():"" %>" size="14" placeholder="<fmt:message key="jsp.dspace-admin.list-formats.mime"/>"/>
</div>
<div class="form-group">
<label class="sr-only" for="short_description"><fmt:message key="jsp.dspace-admin.list-formats.name"/></label>
<%
if (BitstreamFormat.findUnknown(context).getID() == formats[i].getID()) {
%>
<i><%= formats[i].getShortDescription() %></i>
<% } else { %>
<input type="text" name="short_description" value="<%= formats[i].getShortDescription() %>" size="10"/>
<span class="form-control"><i><%= formats[i].getShortDescription() %></i></span>
<% } else { %>
<input class="form-control" type="text" name="short_description" value="<%= formats[i].getShortDescription()!=null?formats[i].getShortDescription():"" %>" size="10" placeholder="<fmt:message key="jsp.dspace-admin.list-formats.name"/>"/>
<% } %>
</td>
<td class="<%= row %>RowEvenCol">
<input type="text" name="description" value="<%= formats[i].getDescription() %>" size="20"/>
</td>
<td class="<%= row %>RowOddCol">
<select name="support_level">
</div>
<div class="form-group">
<label class="sr-only" for="description"><fmt:message key="jsp.dspace-admin.list-formats.description"/></label>
<input class="form-control" type="text" name="description" value="<%= formats[i].getDescription()!=null?formats[i].getDescription():"" %>" size="20" placeholder="<fmt:message key="jsp.dspace-admin.list-formats.description"/>"/>
</div>
<div class="form-group">
<select class="form-control" name="support_level">
<option value="0" <%= formats[i].getSupportLevel() == 0 ? "selected=\"selected\"" : "" %>><fmt:message key="jsp.dspace-admin.list-formats.unknown"/></option>
<option value="1" <%= formats[i].getSupportLevel() == 1 ? "selected=\"selected\"" : "" %>><fmt:message key="jsp.dspace-admin.list-formats.known"/></option>
<option value="2" <%= formats[i].getSupportLevel() == 2 ? "selected=\"selected\"" : "" %>><fmt:message key="jsp.dspace-admin.list-formats.supported"/></option>
</select>
</td>
<td class="<%= row %>RowEvenCol" align="center">
<input type="checkbox" name="internal" value="true"<%= formats[i].isInternal() ? " checked=\"checked\"" : "" %>/>
</td>
<td class="<%= row %>RowOddCol">
<input type="text" name="extensions" value="<%= extValue %>" size="10"/>
</td>
<td class="<%= row %>RowEvenCol">
</div>
<div class="form-group">
<input class="form-control" type="checkbox" name="internal" value="true"<%= formats[i].isInternal() ? " checked=\"checked\"" : "" %>/>
</div>
<div class="form-group">
<label class="sr-only" for="extensions"><fmt:message key="jsp.dspace-admin.list-formats.extensions"/></label>
<input class="form-control" type="text" name="extensions" value="<%= extValue %>" size="10" placeholder="<fmt:message key="jsp.dspace-admin.list-formats.extensions"/>"/>
</div>
<div class="btn-group pull-right">
<input type="hidden" name="format_id" value="<%= formats[i].getID() %>" />
<input type="submit" name="submit_update" value="<fmt:message key="jsp.dspace-admin.general.update"/>"/>
</td>
<td class="<%= row %>RowOddCol">
<input class="btn btn-primary" type="submit" name="submit_update" value="<fmt:message key="jsp.dspace-admin.general.update"/>"/>
<%
if (BitstreamFormat.findUnknown(context).getID() != formats[i].getID()) {
%>
<input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>" />
<input class="btn btn-danger" type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>" />
<%
}
%>
</td>
</tr>
</table>
</div>
</form>
</td>
</tr>
@@ -146,8 +150,8 @@
</table>
<form method="post" action="">
<p align="center">
<input type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.general.addnew"/>" />
</p>
<input class="btn btn-success col-md-offset-5" type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.general.addnew"/>" />
</form>
</dspace:layout>

143
dspace-jspui/src/main/webapp/dspace-admin/list-metadata-fields.jsp
View File

@@ -41,40 +41,37 @@
(MetadataSchema[]) request.getAttribute("schemas");
%>
<dspace:layout titlekey="jsp.dspace-admin.list-metadata-fields.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.list-metadata-fields.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin">
<table width="95%">
<tr>
<td align="left">
<h1><fmt:message key="jsp.dspace-admin.list-metadata-fields.title"/></h1>
</td>
<td align="right" class="standard">
<a href="<%=request.getContextPath()%>/dspace-admin/metadata-schema-registry">
<fmt:message key="jsp.dspace-admin.list-metadata-fields.schemas"/>
</a> |
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#dublincore\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
<h1><fmt:message key="jsp.dspace-admin.list-metadata-fields.title"/>
<a href="<%=request.getContextPath()%>/dspace-admin/metadata-schema-registry">
<fmt:message key="jsp.dspace-admin.list-metadata-fields.schemas"/>
</a> |
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#dublincore\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</h1>
<%
String error = (String)request.getAttribute("error");
if (error!=null) {
%>
<p align="center">
<font color="red"><%=error%></font>
<p class="alert alert-danger">
<%=error%>
</p>
<% } %>
<p align="center">
<p class="alert alert-info">
<fmt:message key="jsp.dspace-admin.list-metadata-fields.note"/>
</p>
<table width="70%" class="miscTable" align="center" summary="Dublic Core Type Registry data table">
<table class="table" summary="Dublic Core Type Registry data table">
<tr>
<th class="oddRowOddCol">
<strong>
@@ -93,29 +90,29 @@ if (error!=null) {
%>
<tr>
<td>
<form method="post" action="">
<table>
<tr>
<td class="<%= row %>RowOddCol"><%= types[i].getFieldID() %></td>
<td class="<%= row %>RowEvenCol">
<input type="text" name="element" value="<%= types[i].getElement() %>" size="12"/>
</td>
<td class="<%= row %>RowOddCol">
<input type="text" name="qualifier" value="<%= (types[i].getQualifier() == null ? "" : types[i].getQualifier()) %>" size="12"/>
</td>
<td class="<%= row %>RowEvenCol">
<textarea name="scope_note" rows="3" cols="40"><%= (types[i].getScopeNote() == null ? "" : types[i].getScopeNote()) %></textarea>
</td>
<td class="<%= row %>RowOddCol">
<form class="form-inline" method="post" action="">
<span class="col-md-1"><%= types[i].getFieldID() %></span>
<div class="form-group">
<label class="sr-only" for="element"><fmt:message key="jsp.dspace-admin.list-metadata-fields.element"/></label>
<input class="form-control" type="text" name="element" value="<%= types[i].getElement() %>" size="12" placeholder="<fmt:message key="jsp.dspace-admin.list-metadata-fields.element"/>"/>
</div>
<div class="form-group">
<label class="sr-only" for="qualifier"><fmt:message key="jsp.dspace-admin.list-metadata-fields.qualifier"/></label>
<input class="form-control" type="text" name="qualifier" value="<%= (types[i].getQualifier() == null ? "" : types[i].getQualifier()) %>" size="12" placeholder="<fmt:message key="jsp.dspace-admin.list-metadata-fields.qualifier"/>"/>
</div>
<div class="form-group">
<label class="sr-only" for="scope_note"><fmt:message key="jsp.dspace-admin.list-metadata-fields.scope"/></label>
<textarea class="form-control" name="scope_note" rows="3" cols="40"><%= (types[i].getScopeNote() == null ? "" : types[i].getScopeNote()) %></textarea>
</div>
<div class="btn-group pull-right">
<input type="hidden" name="dc_type_id" value="<%= types[i].getFieldID() %>"/>
<input type="submit" name="submit_update" value="<fmt:message key="jsp.dspace-admin.general.update"/>"/>
</td>
<td class="<%= row %>RowEvenCol">
<input type="hidden" name="dc_type_id" value="<%= types[i].getFieldID() %>"/>
<input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>"/>
</td>
</tr>
</table>
<input class="btn btn-primary" type="submit" name="submit_update" value="<fmt:message key="jsp.dspace-admin.general.update"/>"/>
<input class="btn btn-danger" type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>"/>
</div>
</form>
</td>
</tr>
@@ -128,39 +125,33 @@ if (error!=null) {
<form method="post" action="">
<input type="hidden" name="dc_schema_id" value="<%= schema.getSchemaID() %>"/>
<table align="center" width="650">
<tr><td colspan="2"><h2><fmt:message key="jsp.dspace-admin.list-metadata-fields.addfield"/></h2></td></tr>
<tr>
<td colspan="2"><p><fmt:message key="jsp.dspace-admin.list-metadata-fields.addfieldnote"/><br/><br/>
</p></td>
</tr>
<tr>
<td><p><fmt:message key="jsp.dspace-admin.list-metadata-fields.element"/>:</p></td>
<td><input type="text" name="element"/></td>
</tr>
<tr>
<td><p><fmt:message key="jsp.dspace-admin.list-metadata-fields.qualifier"/>:</p></td>
<td><input type="text" name="qualifier"/></td>
</tr>
<tr>
<td valign="top"><p><fmt:message key="jsp.dspace-admin.list-metadata-fields.scope"/>:</p></td>
<td><textarea name="scope_note" rows="3" cols="40"></textarea></td>
</tr>
<tr><td></td><td><input type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.general.addnew"/>"/></td></tr>
</table>
<h2><fmt:message key="jsp.dspace-admin.list-metadata-fields.addfield"/></h2>
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.list-metadata-fields.addfieldnote"/></p>
<p><fmt:message key="jsp.dspace-admin.list-metadata-fields.element"/>:</p>
<input class="form-control" type="text" name="element"/>
<p><fmt:message key="jsp.dspace-admin.list-metadata-fields.qualifier"/>:</p>
<input class="form-control" type="text" name="qualifier"/>
<p><fmt:message key="jsp.dspace-admin.list-metadata-fields.scope"/>:</p>
<textarea class="form-control" name="scope_note" rows="3" cols="40"></textarea>
<input class="btn btn-primary" type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.general.addnew"/>"/>
</form>
<form method="post" action="">
<table align="center" width="650">
<tr><td colspan="2"><h2><fmt:message key="jsp.dspace-admin.list-metadata-fields.move"/></h2></td></tr>
<h2><fmt:message key="jsp.dspace-admin.list-metadata-fields.move"/></h2>
<% if (schemas.length > 1) { %>
<tr><td colspan="2"><p>
<p class="alert alert-info">
<fmt:message key="jsp.dspace-admin.list-metadata-fields.movenote"/></p>
</td></tr>
<tr>
<td valign="top"><p><fmt:message key="jsp.dspace-admin.list-metadata-fields.element"/>:</p></td><td>
<select name="dc_field_id" multiple="multiple" size="5">
<p><fmt:message key="jsp.dspace-admin.list-metadata-fields.element"/>:</p>
<select class="form-control" name="dc_field_id" multiple="multiple" size="5">
<%
for (int i = 0; i < types.length; i++)
{
@@ -168,9 +159,9 @@ if (error!=null) {
%> <option value="<%= types[i].getFieldID() %>"><%= types[i].getElement()+qualifier %></option>
<% }
%>
</select></td></tr>
<tr><td><p><fmt:message key="jsp.dspace-admin.list-metadata-fields.schema"/>: </p></td><td>
<select name="dc_dest_schema_id">
</select>
<p><fmt:message key="jsp.dspace-admin.list-metadata-fields.schema"/>: </p>
<select class="form-control" name="dc_dest_schema_id">
<%
for (int i = 0; i < schemas.length; i++)
{
@@ -180,15 +171,15 @@ if (error!=null) {
<% }
}
%>
</select></td></tr>
<tr><td></td><td><p><input type="submit" name="submit_move" value="<fmt:message key="jsp.dspace-admin.list-metadata-fields.movesubmit"/>"/></p></td></tr>
</select>
<p><input class="btn btn-primary" type="submit" name="submit_move" value="<fmt:message key="jsp.dspace-admin.list-metadata-fields.movesubmit"/>"/></p>
<% } else { %>
<tr><td colspan="2">
<p><fmt:message key="jsp.dspace-admin.list-metadata-fields.moveformnote"/><br/><br/>
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.list-metadata-fields.moveformnote"/><br/><br/>
</p>
</td></tr>
<% } %>
</table>
</form>
</dspace:layout>

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

@@ -34,34 +34,28 @@
(MetadataSchema[]) request.getAttribute("schemas");
%>
<dspace:layout titlekey="jsp.dspace-admin.list-metadata-schemas.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.list-metadata-schemas.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin">
<table width="95%">
<tr>
<td align="left">
<h1><fmt:message key="jsp.dspace-admin.list-metadata-schemas.title"/></h1>
</td>
<td align="right" class="standard">
<h1><fmt:message key="jsp.dspace-admin.list-metadata-schemas.title"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#dublincore\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
</h1>
<%
String error = (String)request.getAttribute("error");
if (error!=null) {
%>
<p align="center">
<font color="red"><%=error%></font>
<p class="alert alert-danger">
<%=error%>
</p>
<% } %>
<table class="miscTable" align="center" width="500">
<table class="table" width="500">
<tr>
<th class="oddRowOddCol"><strong><fmt:message key="jsp.general.id" /></strong></th>
<th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.list-metadata-schemas.namespace"/></strong></th>
@@ -86,8 +80,8 @@ if (error!=null) {
<% if ( schemas[i].getSchemaID() != 1 ) { %>
<form method="post" action="">
<input type="hidden" name="dc_schema_id" value="<%= schemas[i].getSchemaID() %>"/>
<input type="button" name="submit_update" value="<fmt:message key="jsp.dspace-admin.general.update"/>" onclick="javascript:document.schema.namespace.value='<%= schemas[i].getNamespace() %>';document.schema.short_name.value='<%= schemas[i].getName() %>';document.schema.dc_schema_id.value='<%= schemas[i].getSchemaID() %>';return null;"/>
<input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>"/>
<input class="btn btn-primary" type="button" name="submit_update" value="<fmt:message key="jsp.dspace-admin.general.update"/>" onclick="javascript:document.schema.namespace.value='<%= schemas[i].getNamespace() %>';document.schema.short_name.value='<%= schemas[i].getName() %>';document.schema.dc_schema_id.value='<%= schemas[i].getSchemaID() %>';return null;"/>
<input class="btn btn-danger" type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>"/>
</form>
<% } %>
</td>
@@ -100,26 +94,26 @@ if (error!=null) {
<form method="post" name="schema" action="">
<input type="hidden" name="dc_schema_id" value=""/>
<table align="center" width="600">
<tr>
<td align="left" colspan="2">
<p>
<br/><fmt:message key="jsp.dspace-admin.list-metadata-schemas.instruction"/>
<br/><br/>
<p class="alert alert-info">
<fmt:message key="jsp.dspace-admin.list-metadata-schemas.instruction"/>
</p>
</td>
</tr>
<tr>
<td><p><fmt:message key="jsp.dspace-admin.list-metadata-schemas.namespace"/>:</p></td>
<td><input type="text" name="namespace" value=""/></td>
</tr>
<tr>
<td><p><fmt:message key="jsp.dspace-admin.list-metadata-schemas.name"/>:</p></td>
<td><input type="text" name="short_name" value=""/></td>
</tr>
<tr>
<td><p><input type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.general.save"/>"/></p></td>
</tr>
</table>
<div class="input-group col-md-6">
<div class="input-group-addon">
<span class="col-md-2"><fmt:message key="jsp.dspace-admin.list-metadata-schemas.namespace"/>:</span>
</div>
<input class="form-control" type="text" name="namespace" value=""/>
</div>
<div class="input-group col-md-6">
<div class="input-group-addon">
<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>
</form>
</dspace:layout>

2
dspace-jspui/src/main/webapp/dspace-admin/metadataimport-error.jsp
View File

@@ -47,7 +47,7 @@
%>
<dspace:layout titlekey="jsp.dspace-admin.metadataimport.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.metadataimport.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"

11
dspace-jspui/src/main/webapp/dspace-admin/metadataimport-showchanges.jsp
View File

@@ -36,7 +36,7 @@
boolean allow = ((Boolean)request.getAttribute("allow")).booleanValue();
%>
<dspace:layout titlekey="jsp.dspace-admin.metadataimport.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.metadataimport.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -64,7 +64,7 @@
}
%>
<table class="miscTable">
<table class="table">
<%
// Display the changes
@@ -326,17 +326,16 @@
<p align="center">
<form method="post" action="">
<input type="hidden" name="type" value="confirm" />
<input type="submit" name="submit" value="<fmt:message key="jsp.dspace-admin.metadataimport.apply"/>" />
<input class="btn btn-default" type="submit" name="submit" value="<fmt:message key="jsp.dspace-admin.metadataimport.apply"/>" />
</form>
<form method="post" action="">
<input type="hidden" name="type" value="cancel" />
<input type="submit" name="submit" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
<input class="btn btn-default" type="submit" name="submit" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</form>
</p>
<%
}
%>
</form>
</dspace:layout>

6
dspace-jspui/src/main/webapp/dspace-admin/metadataimport.jsp
View File

@@ -29,7 +29,7 @@
}
%>
<dspace:layout titlekey="jsp.dspace-admin.metadataimport.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.metadataimport.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -43,11 +43,11 @@
<%= message %>
<p align="center">
<input type="file" size="40" name="file"/>
<input class="form-control" type="file" size="40" name="file"/>
</p>
<p align="center">
<input type="submit" name="submit" value="<fmt:message key="jsp.dspace-admin.general.upload"/>" />
<input class="btn btn-default" type="submit" name="submit" value="<fmt:message key="jsp.dspace-admin.general.upload"/>" />
</p>
</form>

35
dspace-jspui/src/main/webapp/dspace-admin/news-edit.jsp
View File

@@ -37,7 +37,7 @@
request.setAttribute("LanguageSwitch", "hide");
%>
<dspace:layout titlekey="jsp.dspace-admin.news-edit.title"
<dspace:layout style="submission" titlekey="jsp.dspace-admin.news-edit.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
@@ -50,7 +50,7 @@
<form action="<%= request.getContextPath() %>/dspace-admin/news-edit" method="post">
<p>
<p class="alert alert-info">
<% if (position.contains("top"))
{ %>
<fmt:message key="jsp.dspace-admin.news-edit.text.topbox"/>
@@ -61,24 +61,17 @@
<% } %>
</p>
<%-- <p>You may format the text using HTML tags, but please note that the HTML will not be validated here.</p> --%>
<p><fmt:message key="jsp.dspace-admin.news-edit.text3"/></p>
<center>
<table>
<tr>
<%-- <td class="submitFormLabel">News:</td> --%>
<td class="submitFormLabel"><fmt:message key="jsp.dspace-admin.news-edit.news"/></td>
<td><textarea name="news" rows="10" cols="50"><%= news %></textarea></td>
</tr>
<tr>
<td colspan="2" align="center">
<input type="hidden" name="position" value='<%= position %>'/>
<%-- <input type="submit" name="submit_save" value="Save"> --%>
<input type="submit" name="submit_save" value="<fmt:message key="jsp.dspace-admin.general.save"/>" />
<%-- <input type="submit" name="cancel" value="Cancel"> --%>
<input type="submit" name="cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
<p class="alert alert-warning"><fmt:message key="jsp.dspace-admin.news-edit.text3"/></p>
<%-- <td class="submitFormLabel">News:</td> --%>
<span class="col-md-2"><fmt:message key="jsp.dspace-admin.news-edit.news"/></span>
<textarea class="form-control" name="news" rows="10" cols="50"><%= news %></textarea>
<input type="hidden" name="position" value='<%= position %>'/>
<%-- <input type="submit" name="submit_save" value="Save"> --%>
<input class="btn btn-primary" type="submit" name="submit_save" value="<fmt:message key="jsp.dspace-admin.general.save"/>" />
<%-- <input type="submit" name="cancel" value="Cancel"> --%>
<input class="btn btn-default" type="submit" name="cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</form>
</dspace:layout>

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

@@ -39,49 +39,24 @@
%>
<dspace:layout titlekey ="jsp.dspace-admin.news-main.title"
<dspace:layout style="submission" titlekey ="jsp.dspace-admin.news-main.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin"
nocache="true">
<table width="95%">
<tr>
<td align="left">
<%-- <h1>News Editor</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.news-main.heading"/></h1>
</td>
<td align="right" class="standard">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#editnews\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
<form action="<%= request.getContextPath() %>/dspace-admin/news-edit" method="post">
<table class="miscTable" align="center">
<tr>
<%-- <td class="oddRowOddCol">Top News</td> --%>
<th id="t1" class="oddRowOddCol"><fmt:message key="jsp.dspace-admin.news-main.news.top"/></th>
<td headers="t1" class="oddRowEvenCol">
<input type="hidden" name="position" value="<fmt:message key="news-top.html"/>" />
<%-- <input type="submit" name="submit_edit" value="Edit..."> --%>
<input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
</td>
</tr>
</table>
</form>
<form action="<%= request.getContextPath() %>/dspace-admin/news-edit" method="post">
<table class="miscTable" align="center">
<tr>
<%-- <td class="evenRowOddCol">Sidebar News</td> --%>
<th id="t2" class="evenRowOddCol"><fmt:message key="jsp.dspace-admin.news-main.news.sidebar"/></th>
<td headers="t2" class="evenRowEvenCol">
<input type="hidden" name="position" value="<fmt:message key="news-side.html" />" />
<%-- <input type="submit" name="submit_edit" value="Edit..."> --%>
<input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
</td>
</tr>
</table>
</form>
<%-- <h1>News Editor</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.news-main.heading"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#editnews\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</h1>
<form action="<%= request.getContextPath() %>/dspace-admin/news-edit" method="post">
<select class="form-control" name="position" size="5">
<option value="news-top.html"><fmt:message key="jsp.dspace-admin.news-main.news.top"/></option>
<option value="news-side.html"><fmt:message key="jsp.dspace-admin.news-main.news.sidebar"/></option>
</select>
<input class="btn btn-primary" type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" />
</form>
</dspace:layout>

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

@@ -37,7 +37,8 @@
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"
locbar="link"
parentlink="/dspace-admin"
@@ -47,18 +48,14 @@
<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);
// String title = (titleArray.length > 0 ? titleArray[0].value : "Untitled");
EPerson submitter = wsItem.getItem().getSubmitter();
%>
<strong><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.titleheader"/></strong>:
<br/>
<div class="row">
<label class="col-md-2"><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.titleheader"/>:</label>
<span class="col-md-3">
<%
if (titleArray.length > 0)
{
@@ -73,24 +70,32 @@
<%
}
%>
<br/><br/>
<strong><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.authorheader"/></strong>:
<br/>
</span>
</div>
<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>
<br/><br/>
<strong><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.supervisorgroupheader"/></strong>:
<br/>
</span>
</div>
<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() %>
<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 method="post" action="">
<input type="hidden" name="gID" value="<%= group.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 type="submit" name="submit_base" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>"/>
<input class="btn btn-default" type="submit" name="submit_doremove" value="<fmt:message key="jsp.dspace-admin.general.remove"/>"/>
<input class="btn btn-default" type="submit" name="submit_base" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>"/>
</form>
</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"
prefix="fmt" %>
<dspace:layout titlekey="jsp.dspace-admin.supervise-duplicate.title"
<dspace:layout
style="submission"
titlekey="jsp.dspace-admin.supervise-duplicate.title"
navbar="admin"
locbar="link"
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.Supervisor" %>
<%@ page import="org.dspace.core.Utils" %>
<%@page import="javax.servlet.jsp.jstl.fmt.LocaleSupport"%>
<%
// get objects from request
@@ -37,24 +38,26 @@
request.setAttribute("LanguageSwitch", "hide");
%>
<dspace:layout titlekey="jsp.dspace-admin.supervise-link.title"
<dspace:layout style="submission"
titlekey="jsp.dspace-admin.supervise-link.title"
navbar="admin"
locbar="link"
parentlink="/dspace-admin"
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>
<form method="post" action="">
<table>
<div class="input-group">
<%-- Select the group to supervise --%>
<tr>
<td>
<b><fmt:message key="jsp.dspace-admin.supervise-link.group"/></b>
<select name="TargetGroup">
<label class="input-group-addon"><fmt:message key="jsp.dspace-admin.supervise-link.group"/></label>
<select class="form-control" name="TargetGroup">
<%
for (int i = 0; i < groups.length; i++)
{
@@ -64,30 +67,24 @@
}
%>
</select>
<br/><br/>
</td>
</tr>
<%-- Select the defaul policy type --%>
<tr>
<td>
<b><fmt:message key="jsp.dspace-admin.supervise-link.policy"/></b>
<select name="PolicyType">
<label class="input-group-addon"><fmt:message key="jsp.dspace-admin.supervise-link.policy"/></label>
<select class="form-control" name="PolicyType">
<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_OBSERVER %>"><fmt:message key="jsp.dspace-admin.supervise-link.policyobserver"/></option>
</select>
<br/><br/>
</td>
</tr>
</div>
<%-- Select the workspace item to be supervised --%>
<tr>
<td>
<b><fmt:message key="jsp.dspace-admin.supervise-link.workspace"/></b>
<br/><br/>
<div align="left">
<table class="miscTable">
<table class="table">
<tr>
<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>
@@ -141,16 +138,10 @@
%>
</table>
</div>
<br/><br/>
</td>
</tr>
<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>
<input class="btn btn-default" type="submit" name="submit_link" value="<fmt:message key="jsp.dspace-admin.supervise-link.submit.button"/>"/>
<input class="btn btn-default" type="submit" name="submit_base" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>"/>
</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"
prefix="fmt" %>
<%@page import="javax.servlet.jsp.jstl.fmt.LocaleSupport"%>
<%@ page import="org.dspace.content.DCValue" %>
<%@ page import="org.dspace.content.Item" %>
<%@ page import="org.dspace.content.SupervisedItem" %>
@@ -33,26 +34,29 @@
request.setAttribute("LanguageSwitch", "hide");
%>
<dspace:layout titlekey="jsp.dspace-admin.supervise-list.title"
<dspace:layout
style="submission"
titlekey="jsp.dspace-admin.supervise-list.title"
navbar="admin"
locbar="link"
parentlink="/dspace-admin"
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>
<br/><br/>
<div align="center" />
<%-- form to navigate to the "add supervisory settings" page --%>
<form method="post" action="">
<input 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_add" value="<fmt:message key="jsp.dspace-admin.supervise-list.add.button"/>"/>
<input class="btn btn-default" type="submit" name="submit_base" value="<fmt:message key="jsp.dspace-admin.supervise-list.back.button"/>"/>
</form>
<table class="miscTable">
<table class="table">
<tr>
<th class="oddRowOddCol">
&nbsp;
@@ -91,7 +95,7 @@
<%-- form to navigate to the item policies --%>
<form action="<%= request.getContextPath() %>/tools/authorize" method="post">
<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>
</td>
<td class="<%= row %>RowEvenCol">
@@ -121,7 +125,7 @@
<form method="post" action="">
<input type="hidden" name="gID" value="<%= supervisors[j].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>
</td>
</tr>

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

@@ -17,13 +17,18 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"
prefix="fmt" %>
<dspace:layout titlekey="jsp.dspace-admin.supervise-main.title"
<%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
<dspace:layout style="submission"
titlekey="jsp.dspace-admin.supervise-main.title"
navbar="admin"
locbar="link"
parentlink="/dspace-admin"
parenttitlekey="jsp.administer">
<h1><fmt:message key="jsp.dspace-admin.supervise-main.heading"/></h1>
<h1><fmt:message key="jsp.dspace-admin.supervise-main.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-main.subheading"/></h3>
@@ -32,11 +37,15 @@
<div align="center" />
<%-- form to navigate to any of the three options available --%>
<form method="post" action="">
<input type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.supervise-main.add.button"/>"/>
<br/><br/>
<input type="submit" name="submit_view" value="<fmt:message key="jsp.dspace-admin.supervise-main.view.button"/>"/>
<br/><br/>
<input type="submit" name="submit_clean" value="<fmt:message key="jsp.dspace-admin.supervise-main.clean.button"/>"/>
<div class="row">
<input class="btn btn-default col-md-12" type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.supervise-main.add.button"/>"/>
</div>
<div class="row">
<input class="btn btn-default col-md-12" type="submit" name="submit_view" value="<fmt:message key="jsp.dspace-admin.supervise-main.view.button"/>"/>
</div>
<div class="row">
<input class="btn btn-default col-md-12" type="submit" name="submit_clean" value="<fmt:message key="jsp.dspace-admin.supervise-main.clean.button"/>"/>
</div>
</form>
<div align="center" />

195
dspace-jspui/src/main/webapp/dspace-admin/wizard-basicinfo.jsp
View File

@@ -29,158 +29,111 @@
<% Collection collection = (Collection) request.getAttribute("collection"); %>
<dspace:layout locbar="off"
<dspace:layout style="submission" locbar="off"
navbar="off"
titlekey="jsp.dspace-admin.wizard-basicinfo.title"
nocache="true">
<table width="95%">
<tr>
<td>
<%-- <h1>Describe the Collection</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.wizard-basicinfo.title"/></h1>
</td>
<td class="standard" align="right">
<h1><fmt:message key="jsp.dspace-admin.wizard-basicinfo.title"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#wizard_description\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
</h1>
<form action="<%= request.getContextPath() %>/tools/collection-wizard" method="post" enctype="multipart/form-data">
<table summary="Describe the Collection table">
<tr>
<%-- <td><p class="submitFormLabel">Name:</p></td> --%>
<td><p class="submitFormLabel"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.name"/></p></td>
<td><input type="text" name="name" size="50" id="tname" /></td>
</tr>
<div class="form-group">
<label for="short_description"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.name"/></label>
<%-- <td><p class="submitFormLabel">Name:</p></td> --%>
<input class="form-control" type="text" name="name" size="50" id="tname" />
</div>
<%-- Hints about table width --%>
<tr>
<td width="40%">&nbsp;</td>
<td>&nbsp;</td>
<td width="40%">&nbsp;</td>
</tr>
<tr>
<%-- <td colspan="3" class="submitFormHelp">
Shown in list on community home page
</td> --%>
<td colspan="3" class="submitFormHelp">
<div class="help-block">
<fmt:message key="jsp.dspace-admin.wizard-basicinfo.shown"/>
</td>
</tr>
<tr>
<%-- <td><p class="submitFormLabel">Short Description:</p></td> --%>
<td><p class="submitFormLabel"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.description"/></p></td>
<td><input type="text" name="short_description" size="50"/></td>
</tr>
</div>
<div class="form-group">
<%-- <td><p class="submitFormLabel">Short Description:</p></td> --%>
<label for="short_description"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.description"/></label>
<input class="form-control" type="text" name="short_description" size="50"/>
</div>
<tr><td>&nbsp;</td></tr>
<tr>
<td colspan="3" class="submitFormHelp">
<div class="help-block">
<%-- HTML, shown in center of collection home page. Be sure to enclose in &lt;P&gt; &lt;/P&gt; tags! --%>
<fmt:message key="jsp.dspace-admin.wizard-basicinfo.html1"/>
</td>
</tr>
<tr>
<%-- <td><p class="submitFormLabel">Introductory text:</p></td> --%>
<td><p class="submitFormLabel"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.intro"/></p></td>
<td><textarea name="introductory_text" rows="4" cols="50"></textarea></td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td colspan="3" class="submitFormHelp">
<%-- Plain text, shown at bottom of collection home page --%>
</div>
<div class="form-group">
<%-- <td><p class="submitFormLabel">Introductory text:</p></td> --%>
<label for="introductory_text"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.intro"/></label>
<textarea class="form-control" name="introductory_text" rows="4" cols="50"></textarea>
</div>
<div class="help-block">
<%-- Plain text, shown at bottom of collection home page --%>
<fmt:message key="jsp.dspace-admin.wizard-basicinfo.plain"/>
</td>
</tr>
<tr>
<%-- <td><p class="submitFormLabel">Copyright text:</p></td> --%>
<td><p class="submitFormLabel"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.copyright"/></p></td>
<td><textarea name="copyright_text" rows="3" cols="50"></textarea></td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td colspan="3" class="submitFormHelp">
<%-- HTML, shown on right-hand side of collection home page. Be sure to enclose in &lt;P&gt; &lt;/P&gt; tags! --%>
</div>
<div class="form-group">
<%-- <td><p class="submitFormLabel">Copyright text:</p></td> --%>
<label for="copyright_text"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.copyright"/></label>
<textarea class="form-control" name="copyright_text" rows="3" cols="50"></textarea>
</div>
<div class="help-block">
<%-- HTML, shown on right-hand side of collection home page. Be sure to enclose in &lt;P&gt; &lt;/P&gt; tags! --%>
<fmt:message key="jsp.dspace-admin.wizard-basicinfo.html2"/>
</td>
</tr>
<tr>
<%-- <td><p class="submitFormLabel">Side bar text:</p></td> --%>
<td><p class="submitFormLabel"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.side"/></p></td>
<td><textarea name="side_bar_text" rows="4" cols="50"></textarea></td>
</tr>
</div>
<div class="form-group">
<%-- <td><p class="submitFormLabel">Side bar text:</p></td> --%>
<label for="side_bar_text"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.side"/></label>
<textarea class="form-control" name="side_bar_text" rows="4" cols="50"></textarea>
</div>
<tr><td>&nbsp;</td></tr>
<tr>
<td colspan="32" class="submitFormHelp">
<div class="help-block">
<%-- Licence that submitters must grant. Leave this blank to use the default license. --%>
<fmt:message key="jsp.dspace-admin.wizard-basicinfo.license1"/>
</td>
</tr>
<tr>
</div>
<div class="form-group">
<%-- <td><p class="submitFormLabel">License:</p></td> --%>
<td><p class="submitFormLabel"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.license2"/></p></td>
<td><textarea name="license" rows="4" cols="50"></textarea></td>
</tr>
<label for="side_bar_text"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.license2"/></label>
<textarea class="form-control" name="license" rows="4" cols="50"></textarea></td>
</div>
<tr><td>&nbsp;</td></tr>
<tr>
<td colspan="3" class="submitFormHelp">
<div class="help-block">
<%-- Plain text, any provenance information about this collection. Not shown on collection pages. --%>
<fmt:message key="jsp.dspace-admin.wizard-basicinfo.plain2"/>
</div>
<div class="form-group">
<%-- <td><p class="submitFormLabel">Provenance:</p></td> --%>
<label for="provenance_description"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.provenance"/></label>
<textarea class="form-control" name="provenance_description" rows="4" cols="50"></textarea>
</div>
</td>
</tr>
<tr>
<%-- <td><p class="submitFormLabel">Provenance:</p></td> --%>
<td><p class="submitFormLabel"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.provenance"/></p></td>
<td><textarea name="provenance_description" rows="4" cols="50"></textarea></td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td colspan="3" class="submitFormHelp">
<%-- Choose a JPEG or GIF logo for the collection home page. Should be quite small. --%>
<div class="help-block">
<%-- Choose a JPEG or GIF logo for the collection home page. Should be quite small. --%>
<fmt:message key="jsp.dspace-admin.wizard-basicinfo.choose"/>
</td>
</tr>
<tr>
<%-- <td><p class="submitFormLabel">Logo:</p></td> --%>
<td><p class="submitFormLabel"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.logo"/></p></td>
<td><input type="file" size="40" name="file"/></td>
</tr>
</table>
<p>&nbsp;</p>
<%-- Hidden fields needed for servlet to know which collection and page to deal with --%>
</div>
<div class="form-group">
<%-- <td><p class="submitFormLabel">Provenance:</p></td> --%>
<label for="file"><fmt:message key="jsp.dspace-admin.wizard-basicinfo.logo"/></label>
<input class="form-control" type="file" size="40" name="file"/>
</div>
<div class="col-md-6 pull-right btn-group">
<%-- Hidden fields needed for servlet to know which collection and page to deal with --%>
<input type="hidden" name="collection_id" value="<%= ((Collection) request.getAttribute("collection")).getID() %>" />
<input type="hidden" name="stage" value="<%= CollectionWizardServlet.BASIC_INFO %>" />
<center>
<table border="0" width="80%">
<tr>
<td width="100%">&nbsp;
</td>
<td>
<%-- <input type="submit" name="submit_next" value="Next &gt;"> --%>
<input type="submit" name="submit_next" value="<fmt:message key="jsp.dspace-admin.general.next.button"/>" />
</td>
</tr>
</table>
</center>
<%-- <input type="submit" name="submit_next" value="Next &gt;"> --%>
<input class="btn btn-primary pull-right col-md-6" type="submit" name="submit_next" value="<fmt:message key="jsp.dspace-admin.general.next.button"/>" />
</div>
</form>
</dspace:layout>

106
dspace-jspui/src/main/webapp/dspace-admin/wizard-permissions.jsp
View File

@@ -37,7 +37,7 @@
boolean mitGroup = (request.getAttribute("mitgroup") != null);
%>
<dspace:layout locbar="off"
<dspace:layout style="submission" locbar="off"
navbar="off"
titlekey="jsp.dspace-admin.wizard-permissions.title"
nocache="true">
@@ -49,27 +49,33 @@
%>
<%-- <h1>Authorization to Read</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading1"/></h1>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading1"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#wizard_permissions\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<%-- <p>Who has (by default) permission to read new items submitted to this collection? --%>
<p><fmt:message key="jsp.dspace-admin.wizard-permissions.text1"/></p>
<p class="help-block"><fmt:message key="jsp.dspace-admin.wizard-permissions.text1"/></p>
<%
break;
case CollectionWizardServlet.PERM_SUBMIT:
%>
<%-- <h1>Authorization to Submit</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading2"/></h1>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading2"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#wizard_permissions\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<%-- <p>Who has permission to submit new items to this collection? --%>
<p><fmt:message key="jsp.dspace-admin.wizard-permissions.text2"/></p>
<p class="help-block"><fmt:message key="jsp.dspace-admin.wizard-permissions.text2"/></p>
<%
break;
case CollectionWizardServlet.PERM_WF1:
%>
<%-- <h1>Submission Workflow Accept/Reject Step</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading3"/></h1>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading3"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#wizard_permissions\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<%-- <p>Who is responsible for performing the <strong>accept/reject</strong> step?
They will be able to accept or reject incoming submissions. They will not be
@@ -82,19 +88,23 @@
case CollectionWizardServlet.PERM_WF2:
%>
<%-- <h1>Submission Workflow Accept/Reject/Edit Metadata Step</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading4"/></h1>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading4"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#wizard_permissions\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<%-- <p>Who is responsible for performing the <strong>accept/reject/edit metadata</strong> step?
They will be able to edit the metadata of incoming submissions, and then accept
or reject them. Only one of the group need perform the step for each submission. --%>
<p><fmt:message key="jsp.dspace-admin.wizard-permissions.text4"/></p>
<p class="help-block"><fmt:message key="jsp.dspace-admin.wizard-permissions.text4"/></p>
<%
break;
case CollectionWizardServlet.PERM_WF3:
%>
<%-- <h1>Submission Workflow Edit Metadata Step</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading5"/></h1>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading5"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#wizard_permissions\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<%-- <p>Who is responsible for performing the <strong>edit metadata</strong> step?
They will be able to edit the metadata of incoming submissions, but will not
@@ -106,7 +116,9 @@
case CollectionWizardServlet.PERM_ADMIN:
%>
<%-- <h1>Delegated Collection Administrators</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading6"/></h1>
<h1><fmt:message key="jsp.dspace-admin.wizard-permissions.heading6"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#wizard_permissions\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<%-- <p>Who are the collection administrators for this collection? They will be able to decide who can submit items
to the collection, withdraw items, edit item metadata (after submission), and add (map) existing items from
other collections to this collection (subject to authorization from that collection).</p>--%>
@@ -115,13 +127,12 @@
break;
}
%>
<div><dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#wizard_permissions\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup></div>
<%-- <p>You can change this later using the relevant sections of the DSpace admin UI.</p> --%>
<p><fmt:message key="jsp.dspace-admin.wizard-permissions.change"/></p>
<p class="alert alert-info"><fmt:message key="jsp.dspace-admin.wizard-permissions.change"/></p>
<form name="epersongroup" action="<%= request.getContextPath() %>/tools/collection-wizard" method="post">
<center>
<table>
<%
// MIT group checkbox - only if there's an MIT group and on the READ and SUBMIT pages
// (Sorry, everyone who isn't running DSpace at MIT, I know this isn't very elegant!)
@@ -130,62 +141,37 @@
(perm == CollectionWizardServlet.PERM_READ || perm == CollectionWizardServlet.PERM_SUBMIT))
{
%>
<tr>
<td></td>
<%-- <td><input type="checkbox" name="mitgroup" value="true" />&nbsp;<span class="submitFormLabel">All MIT users</span> --%>
<td><input type="checkbox" name="mitgroup" value="true"/>&nbsp;<span class="submitFormLabel"><fmt:message key="jsp.dspace-admin.wizard-permissions.mit"/></span>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<input type="checkbox" name="mitgroup" value="true"/>&nbsp;<span class="submitFormLabel"><fmt:message key="jsp.dspace-admin.wizard-permissions.mit"/></span>
<%-- <td colspan="2" class="submitFormHelp"><strong>OR</strong></td> --%>
<td colspan="2" class="submitFormHelp"><strong><fmt:message key="jsp.dspace-admin.wizard-permissions.or"/></strong></td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<strong><fmt:message key="jsp.dspace-admin.wizard-permissions.or"/></strong>
<%
}
%>
<div class="row">
<div class="col-md-6">
<label for="eperson_id"><fmt:message key="jsp.dspace-admin.wizard-permissions.click"/></label>
<dspace:selecteperson multiple="true" />
</div>
<div class="col-md-6">
<label for="eperson_id"><fmt:message key="jsp.dspace-admin.wizard-permissions.click2"/></label>
<dspace:selectgroup multiple="true" />
</div>
</div>
<br/>
<tr>
<td colspan="2">
<table align="center" width="80%">
<tr>
<td class="submitFormHelp"><fmt:message key="jsp.dspace-admin.wizard-permissions.click"/><br/>
<dspace:selecteperson multiple="true" />
</td>
<td>&nbsp;</td>
<td class="submitFormHelp"><fmt:message key="jsp.dspace-admin.wizard-permissions.click2"/><br/>
<dspace:selectgroup multiple="true" />
</td>
</tr>
</table>
</td>
</tr>
</table>
</center>
<%-- Hidden fields needed for servlet to know which collection and page to deal with --%>
<%-- Hidden fields needed for servlet to know which collection and page to deal with --%>
<input type="hidden" name="collection_id" value="<%= ((Collection) request.getAttribute("collection")).getID() %>" />
<input type="hidden" name="stage" value="<%= CollectionWizardServlet.PERMISSIONS %>" />
<input type="hidden" name="permission" value="<%= perm %>" />
<center>
<table border="0" width="80%">
<tr>
<td width="100%">&nbsp;
</td>
<td>
<%-- <input type="submit" name="submit_next" value="Next &gt;" onclick="javascript:finishEPerson();finishGroups();"> --%>
<input type="submit" name="submit_next" value="<fmt:message key="jsp.dspace-admin.general.next.button"/>" onclick="javascript:finishEPerson();finishGroups();"/>
</td>
</tr>
</table>
</center>
<%-- <input type="submit" name="submit_next" value="Next &gt;" onclick="javascript:finishEPerson();finishGroups();"> --%>
<div class="row container"><input class="btn btn-primary pull-right col-md-2" type="submit" name="submit_next" value="<fmt:message key="jsp.dspace-admin.general.next.button"/>" onclick="javascript:finishEPerson();finishGroups();"/></div>
</form>
</dspace:layout>

180
dspace-jspui/src/main/webapp/dspace-admin/wizard-questions.jsp
View File

@@ -46,163 +46,125 @@
<dspace:layout locbar="off"
<dspace:layout style="submission" locbar="off"
navbar="off"
titlekey="jsp.dspace-admin.wizard-questions.title"
nocache="true">
<%-- <h1>Describe the Collection</h1> --%>
<h1><fmt:message key="jsp.dspace-admin.wizard-questions.title"/></h1>
<h1><fmt:message key="jsp.dspace-admin.wizard-questions.title"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#createcollection\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup>
</h1>
<form action="<%= request.getContextPath() %>/tools/collection-wizard" method="post">
<%--<p>Please check the boxes next to the statements that apply to the collection. --%>
<div><fmt:message key="jsp.dspace-admin.wizard-questions.text"/>
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#createcollection\"%>"><fmt:message key="jsp.morehelp"/></dspace:popup></div>
<center>
<table class="miscTable">
<tr class="oddRowOddCol">
<td class="oddRowOddCol" align="left">
<table border="0">
<tr>
<td valign="top">
<% if(!sysadmin_button ) { %> <input type="hidden" name="public_read" value="true"/>
<input type="checkbox" name="public_read" value="true" disabled="disabled" checked="checked"/>
<div class="help-block"><fmt:message key="jsp.dspace-admin.wizard-questions.text"/></div>
<div class="input-group">
<span class="input-group-addon">
<% if(!sysadmin_button ) { %>
<input type="hidden" name="public_read" value="true"/>
<input type="checkbox" name="public_read" value="true" disabled="disabled" checked="checked"/>
<% } else { %>
<input type="checkbox" name="public_read" value="true" checked="checked"/>
<input type="checkbox" name="public_read" value="true" checked="checked"/>
<% } %>
</td>
</span>
<%-- <td class="submitFormLabel" nowrap>New items should be publicly readable</td> --%>
<td class="submitFormLabel" nowrap="nowrap">
<fmt:message key="jsp.dspace-admin.wizard-questions.check1"/>
<label class="form-control" for="public_read">
<fmt:message key="jsp.dspace-admin.wizard-questions.check1"/>
<% if(!sysadmin_button ) { %>
<fmt:message key="jsp.dspace-admin.wizard-questions.check1-disabled"/>
<% } %>
</td>
</tr>
</table>
</td>
</tr>
<tr class="evenRowOddCol">
<td class="evenRowOddCol" align="left">
<table border="0">
<tr>
<td valign="top">
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<% if(!bSubmittersButton) { %> <input type="hidden" name="submitters" value="false" />
<input type="checkbox" name="submitters" value="true" disabled="disabled"/>
<% } else { %>
<input type="checkbox" name="submitters" value="true" checked="checked"/>
<% } %>
</td>
</span>
<label class="form-control" for="submitters">
<%-- <td class="submitFormLabel" nowrap>Some users will be able to submit to this collection</td> --%>
<td class="submitFormLabel" nowrap="nowrap"><fmt:message key="jsp.dspace-admin.wizard-questions.check2"/></td>
</tr>
</table>
</td>
</tr>
<tr class="oddRowOddCol">
<td class="oddRowOddCol" align="left">
<table border="0">
<tr>
<td valign="top">
<fmt:message key="jsp.dspace-admin.wizard-questions.check2"/>
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<% if(!bWorkflowsButton) { %> <input type="hidden" name="workflow1" value="false" />
<input type="checkbox" name="workflow1" value="true" disabled="disabled"/>
<% } else { %>
<input type="checkbox" name="workflow1" value="true"/>
<% } %>
</td>
</span>
<label class="form-control" for="workflow1">
<%-- <td class="submitFormLabel" nowrap>The submission workflow will include an <em>accept/reject</em> step</td> --%>
<td class="submitFormLabel" nowrap="nowrap"><fmt:message key="jsp.dspace-admin.wizard-questions.check3"/></td>
</tr>
</table>
</td>
</tr>
<tr class="evenRowOddCol">
<td class="evenRowOddCol" align="left">
<table border="0">
<tr>
<td valign="top">
<fmt:message key="jsp.dspace-admin.wizard-questions.check3"/>
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<% if(!bWorkflowsButton) { %> <input type="hidden" name="workflow2" value="false" />
<input type="checkbox" name="workflow2" value="true" disabled="disabled"/>
<% } else { %>
<input type="checkbox" name="workflow2" value="true"/>
<% } %>
</td>
</span>
<label class="form-control" for="workflow2">
<%-- <td class="submitFormLabel" nowrap>The submission workflow will include an <em>accept/reject/edit metadata</em> step</td> --%>
<td class="submitFormLabel" nowrap="nowrap"><fmt:message key="jsp.dspace-admin.wizard-questions.check4"/></td>
</tr>
</table>
</td>
</tr>
<tr class="oddRowOddCol">
<td class="oddRowOddCol" align="left">
<table border="0">
<tr>
<td valign="top">
<fmt:message key="jsp.dspace-admin.wizard-questions.check4"/>
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<% if(!bWorkflowsButton) { %> <input type="hidden" name="workflow3" value="false" />
<input type="checkbox" name="workflow3" value="true" disabled="disabled"/>
<% } else { %>
<input type="checkbox" name="workflow3" value="true"/>
<% } %>
</td>
</span>
<label class="form-control" for="workflow3">
<%-- <td class="submitFormLabel" nowrap>The submission workflow will include an <em>edit metadata</em> step</td> --%>
<td class="submitFormLabel" nowrap="nowrap"><fmt:message key="jsp.dspace-admin.wizard-questions.check5"/></td>
</tr>
</table>
</td>
</tr>
<tr class="evenRowOddCol">
<td class="evenRowOddCol" align="left">
<table border="0">
<tr>
<td valign="top">
<fmt:message key="jsp.dspace-admin.wizard-questions.check5"/>
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<% if(!bAdminCreateGroup) { %> <input type="hidden" name="admins" value="false" />
<input type="checkbox" name="admins" value="true" disabled="disabled"/>
<% } else { %>
<input type="checkbox" name="admins" value="true"/>
<% } %>
</td>
</span>
<label class="form-control" for="admins">
<%-- <td class="submitFormLabel" nowrap>This collection will have delegated collection administrators</td> --%>
<td class="submitFormLabel" nowrap="nowrap"><fmt:message key="jsp.dspace-admin.wizard-questions.check6"/></td>
</tr>
</table>
</td>
</tr>
<tr class="oddRowOddCol">
<td class="oddRowOddCol" align="left">
<table border="0">
<tr>
<td valign="top">
<fmt:message key="jsp.dspace-admin.wizard-questions.check6"/>
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<% if(!bTemplateButton) { %> <input type="hidden" name="default.item" value="false" />
<input type="checkbox" name="default.item" value="true" disabled="disabled"/>
<% } else { %>
<input type="checkbox" name="default.item" value="true"/></td>
<input type="checkbox" name="default.item" value="true"/>
<% } %>
</span>
<label class="form-control" for="default.item">
<%-- <td class="submitFormLabel" nowrap>New submissions will have some metadata already filled out with defaults</td> --%>
<td class="submitFormLabel" nowrap="nowrap"><fmt:message key="jsp.dspace-admin.wizard-questions.check7"/></td>
</tr>
</table>
</td>
</tr>
</table>
</center>
<p>&nbsp;</p>
<fmt:message key="jsp.dspace-admin.wizard-questions.check7"/>
</label>
</div>
<%-- Hidden fields needed for servlet to know which collection and page to deal with --%>
<input type="hidden" name="collection_id" value="<%= ((Collection) request.getAttribute("collection")).getID() %>" />
<input type="hidden" name="stage" value="<%= CollectionWizardServlet.INITIAL_QUESTIONS %>" />
<center>
<table border="0" width="80%">
<tr>
<td width="100%">&nbsp;
</td>
<td>
<input type="submit" name="submit_next" value="<fmt:message key="jsp.dspace-admin.general.next.button"/>" />
</td>
</tr>
</table>
</center>
</form>
<div class="row">
<div class="col-md-6 pull-right btn-group">
<%-- Hidden fields needed for servlet to know which collection and page to deal with --%>
<input type="hidden" name="collection_id" value="<%= ((Collection) request.getAttribute("collection")).getID() %>" />
<input type="hidden" name="stage" value="<%= CollectionWizardServlet.INITIAL_QUESTIONS %>" />
<input class="btn btn-primary pull-right col-md-6" type="submit" name="submit_next" value="<fmt:message key="jsp.dspace-admin.general.next.button"/>" />
</div>
</div>
</form>
</dspace:layout>

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

@@ -30,7 +30,8 @@
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"
locbar="link"
parenttitlekey="jsp.administer"
@@ -43,36 +44,33 @@
</fmt:message></h1>
<%-- <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>
<ul>
<div class="row">
<%-- <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:message></li>
</fmt:message></span>
</div>
<div class="row">
<%-- <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:message></li>
</fmt:message></span>
</div>
<div class="row">
<%-- <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:message></li>
</ul>
</fmt:message></span>
</div>
<form method="post" action="">
<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="<fmt:message key="jsp.dspace-admin.workflow-abort-confirm.button"/>" />
</td>
<td align="right">
<input class="btn btn-default" type="submit" name="submit_abort_confirm" value="<fmt:message key="jsp.dspace-admin.workflow-abort-confirm.button"/>" />
<%-- <input type="submit" name="submit_cancel" value="Cancel"/> --%>
<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</td>
</tr>
</table>
</center>
<input class="btn btn-default" type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>" />
</form>
</dspace:layout>

18
dspace-jspui/src/main/webapp/dspace-admin/workflow-list.jsp
View File

@@ -37,25 +37,17 @@
(WorkflowItem[]) request.getAttribute("workflows");
%>
<dspace:layout titlekey="jsp.dspace-admin.workflow-list.title"
<dspace:layout style="submission"
titlekey="jsp.dspace-admin.workflow-list.title"
navbar="admin"
locbar="link"
parenttitlekey="jsp.administer"
parentlink="/dspace-admin"
nocache="true">
<table width="95%">
<tr>
<%-- <td align="left"> <h1>Currently Active Workflows</h1> --%>
<td align="left"><h1><fmt:message key="jsp.dspace-admin.workflow-list.heading"/></h1>
</td>
<td align="right" class="standard">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#workflow\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</td>
</tr>
</table>
<h1><fmt:message key="jsp.dspace-admin.workflow-list.heading"/><dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") + \"#workflow\"%>"><fmt:message key="jsp.help"/></dspace:popup></h1>
<table class="miscTable" align="center" summary="Table displaying list of currently active workflows">
<table class="table" align="center" summary="Table displaying list of currently active workflows">
<tr>
<th class="oddRowOddCol"> <strong>ID</strong></th>
<th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.workflow-list.collection"/></strong></th>
@@ -82,7 +74,7 @@
<td class="<%= row %>RowOddCol">
<form method="post" action="">
<input type="hidden" name="workflow_id" value="<%= workflows[i].getID() %>"/>
<input type="submit" name="submit_abort" value="<fmt:message key="jsp.dspace-admin.general.abort-w-confirm"/>" />
<input class="btn btn-default" type="submit" name="submit_abort" value="<fmt:message key="jsp.dspace-admin.general.abort-w-confirm"/>" />
</form>
</td>
</tr>

217
dspace-jspui/src/main/webapp/home.jsp
View File

@@ -15,6 +15,7 @@
- recent.submissions - RecetSubmissions
--%>
<%@page import="org.dspace.content.Bitstream"%>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
@@ -59,9 +60,6 @@
<dspace:layout locbar="nolink" titlekey="jsp.home.title" feedData="<%= feedData %>">
<table width="95%" align="center">
<tr align="right">
<td align="right">
<% if (supportedLocales != null && supportedLocales.length > 1)
{
%>
@@ -81,113 +79,22 @@ for (int i = supportedLocales.length-1; i >= 0; i--)
}
}
%>
</td>
</tr>
<tr>
<td class="oddRowEvenCol"><%= topNews %></td>
</tr>
</table>
<br/>
<form action="<%= request.getContextPath() %>/simple-search" method="get">
<table class="miscTable" width="95%" align="center">
<tr>
<td class="oddRowEvenCol">
<h3><fmt:message key="jsp.home.search1"/></h3>
<p><label for="tquery"><fmt:message key="jsp.home.search2"/></label></p>
<p><input type="text" name="query" size="20" id="tquery" />&nbsp;
<input type="submit" name="submit" value="<fmt:message key="jsp.general.search.button"/>" /></p>
</td>
</tr>
</table>
</form>
<%
if (communities != null && communities.length != 0)
{
%>
<br/>
<table class="miscTable" width="95%" align="center">
<tr>
<td class="oddRowEvenCol">
<h3><fmt:message key="jsp.home.com1"/></h3>
<p><fmt:message key="jsp.home.com2"/></p>
<table border="0" cellpadding="2">
<%
for (int i = 0; i < communities.length; i++)
{
%>
<tr>
<td class="standard">
<a href="<%= request.getContextPath() %>/handle/<%= communities[i].getHandle() %>"><%= communities[i].getMetadata("name") %></a>
<%
if (ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
%>
[<%= ic.getCount(communities[i]) %>]
<%
}
%>
</td>
</tr>
<%
}
%>
</table>
</td>
</tr>
</table>
<%
}
%>
<div class="jumbotron">
<%= topNews %>
</div>
<div class="row">
<%
if (submissions != null && submissions.count() > 0)
{
%>
<br/>
<table class="miscTable" width="95%" align="center">
<tr>
<td class="oddRowEvenCol">
<h3><fmt:message key="jsp.collection-home.recentsub"/></h3>
<table border="0" cellpadding="2">
<%
for (Item item : submissions.getRecentSubmissions())
{
DCValue[] dcv = item.getMetadata("dc", "title", null, Item.ANY);
String displayTitle = "Untitled";
if (dcv != null & dcv.length > 0)
{
displayTitle = dcv[0].value;
}
%>
<tr>
<td class="standard10">
<a href="<%= request.getContextPath() %>/handle/<%=item.getHandle() %>"><%= displayTitle%> </a>
</td>
</tr>
<%
}
%>
</table>
</td>
</tr>
</table>
<%
}
%>
<dspace:sidebar>
<%= sideNews %>
<%
<div class="col-md-8">
<div class="panel panel-primary">
<div id="recent-submissions-carousel" class="panel-heading carousel slide">
<h3><fmt:message key="jsp.collection-home.recentsub"/>
<%
if(feedEnabled)
{
%>
<center>
<h4><fmt:message key="jsp.home.feeds"/></h4>
<%
String[] fmts = feedData.substring(feedData.indexOf(':')+1).split(",");
String icon = null;
int width = 0;
@@ -212,11 +119,107 @@ if (submissions != null && submissions.count() > 0)
<a href="<%= request.getContextPath() %>/feed/<%= fmts[j] %>/site"><img src="<%= request.getContextPath() %>/image/<%= icon %>" alt="RSS Feed" width="<%= width %>" height="15" vspace="3" border="0" /></a>
<%
}
%>
</center>
<%
}
%>
</h3>
<!-- Wrapper for slides -->
<div class="carousel-inner">
<%
boolean first = true;
for (Item item : submissions.getRecentSubmissions())
{
DCValue[] dcv = item.getMetadata("dc", "title", null, Item.ANY);
String displayTitle = "Untitled";
if (dcv != null & dcv.length > 0)
{
displayTitle = dcv[0].value;
}
%>
<div style="padding-bottom: 50px; min-height: 200px;" class="item <%= first?"active":""%>">
<div style="padding-left: 80px; padding-right: 80px; display: inline-block;"><%= StringUtils.abbreviate(displayTitle, 400) %>
<a href="<%= request.getContextPath() %>/handle/<%=item.getHandle() %>">
<button class="btn btn-success" type="button">See</button>
</a>
</div>
</div>
<%
first = false;
}
%>
</div>
<!-- Controls -->
<a class="left carousel-control" href="#recent-submissions-carousel" data-slide="prev">
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#recent-submissions-carousel" data-slide="next">
<span class="icon-next"></span>
</a>
<ol class="carousel-indicators">
<li data-target="#recent-submissions-carousel" data-slide-to="0" class="active"></li>
<% for (int i = 1; i < submissions.count(); i++){ %>
<li data-target="#recent-submissions-carousel" data-slide-to="<%= i %>"></li>
<% } %>
</ol>
</div></div></div>
<%
}
%>
<div class="col-md-3">
<%= sideNews %>
</div>
</div>
<div class="container row">
<%
if (communities != null && communities.length != 0)
{
%>
<div class="col-md-4">
<h3><fmt:message key="jsp.home.com1"/></h3>
<p><fmt:message key="jsp.home.com2"/></p>
<div class="list-group">
<%
for (int i = 0; i < communities.length; i++)
{
%><div class="list-group-item row">
<%
Bitstream logo = communities[i].getLogo();
if (logo != null) { %>
<div class="col-md-3">
<img alt="Logo" class="img-responsive" src="<%= request.getContextPath() %>/retrieve/<%= logo.getID() %>" />
</div>
<div class="col-md-9">
<% } else { %>
<div class="col-md-12">
<% } %>
<h4 class="list-group-item-heading"><a href="<%= request.getContextPath() %>/handle/<%= communities[i].getHandle() %>"><%= communities[i].getMetadata("name") %></a></h4>
<p><%= communities[i].getMetadata("short_description") %></p>
</div>
</div>
<%
if (ConfigurationManager.getBooleanProperty("webui.strengths.show"))
{
%>
[<%= ic.getCount(communities[i]) %>]
<%
}
%>
<%
}
%>
</div>
</div>
<%
}
%>
<%
int discovery_panel_cols = 8;
int discovery_facet_cols = 4;
%>
<%@ include file="discovery/static-sidebar-facet.jsp" %>
</dspace:sidebar>
</div>
</dspace:layout>

BIN
dspace-jspui/src/main/webapp/image/dspace-logo-only.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
dspace-jspui/src/main/webapp/image/logo-cineca-small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
dspace-jspui/src/main/webapp/image/logo.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

49
dspace-jspui/src/main/webapp/layout/footer-default.jsp
View File

@@ -20,50 +20,35 @@
<%
String sidebar = (String) request.getAttribute("dspace.layout.sidebar");
int overallColSpan = 3;
if (sidebar == null)
{
overallColSpan = 2;
}
%>
<%-- End of page content --%>
<p>&nbsp;</p>
</td>
<%-- Right-hand side bar if appropriate --%>
<%
if (sidebar != null)
{
%>
<td class="sidebar">
</div>
<div class="col-md-3">
<%= sidebar %>
</td>
</div>
</div>
<%
}
%>
</tr>
</div>
</main>
<%-- Page footer --%>
<tr class="pageFooterBar">
<td colspan="<%= overallColSpan %>" class="pageFootnote">
<table class="pageFooterBar" width="100%">
<tr>
<td>
<a href="http://validator.w3.org/check?uri=referer"><img
src="<%= request.getContextPath() %>/image/valid-xhtml10.png"
alt="Valid XHTML 1.0!" height="31" width="88" /></a>
</td>
<td class="pageFootnote">
<fmt:message key="jsp.layout.footer-default.text"/>&nbsp;-
<footer class="navbar navbar-inverse navbar-bottom">
<div class="container text-muted" style="padding:5px;">
<fmt:message key="jsp.layout.footer-default.theme-by"/> <a href="http://www.cineca.it"><img
src="<%= request.getContextPath() %>/image/logo-cineca-small.png"
alt="Logo CINECA" height="45" width="42" style="border:5px solid white;"/></a>
<div class="pull-right" style="padding-top:10px;">
<p class="text-muted"><fmt:message key="jsp.layout.footer-default.text"/>&nbsp;-
<a target="_blank" href="<%= request.getContextPath() %>/feedback"><fmt:message key="jsp.layout.footer-default.feedback"/></a>
<a href="<%= request.getContextPath() %>/htmlmap"></a>
</td>
<td nowrap="nowrap" valign="middle"> <%-- nowrap, valign for broken NS 4.x --%>
</td>
</tr>
</table>
</td>
</tr>
</table>
<a href="<%= request.getContextPath() %>/htmlmap"></a></p>
</div>
</div>
</footer>
</body>
</html>

14
dspace-jspui/src/main/webapp/layout/footer-submission.jsp Normal file
View File

@@ -0,0 +1,14 @@
<%--
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/
--%>
<%--
- Footer for submission
--%>
<%@ include file="footer-default.jsp" %>

100
dspace-jspui/src/main/webapp/layout/header-default.jsp
View File

@@ -42,17 +42,18 @@
String analyticsKey = ConfigurationManager.getProperty("jspui.google.analytics.key");
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!DOCTYPE html>
<html>
<head>
<title><%= siteName %>: <%= title %></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="Generator" content="<%= generator %>" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/styles.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/print.css" media="print" type="text/css" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" href="<%= request.getContextPath() %>/css/discovery.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/static/css/jquery-ui-1.10.3.custom/redmond/jquery-ui-1.10.3.custom.min.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/static/css/jquery-ui-1.10.3.custom/redmond/jquery-ui-1.10.3.custom.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/static/css/bootstrap/bootstrap.min.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/static/css/bootstrap/bootstrap-theme.min.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/static/css/bootstrap/dspace-theme.css" type="text/css" />
<%
if (!"NONE".equals(feedRef))
{
@@ -78,13 +79,11 @@
}
%>
<script type='text/javascript' src='<%= request.getContextPath() %>/static/js/jquery/jquery-1.10.2.min.js'></script>
<script type='text/javascript' src="<%= request.getContextPath() %>/static/js/jquery/jquery-1.10.2.min.js"></script>
<script type='text/javascript' src='<%= request.getContextPath() %>/static/js/jquery/jquery-ui-1.10.3.custom.min.js'></script>
<script type='text/javascript' src='<%= request.getContextPath() %>/static/js/bootstrap/bootstrap.min.js'></script>
<script type='text/javascript' src='<%= request.getContextPath() %>/static/js/holder.js'></script>
<script type="text/javascript" src="<%= request.getContextPath() %>/utils.js"></script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/prototype.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/effects.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/builder.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/controls.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/choice-support.js"> </script>
<%--Gooogle Analytics recording.--%>
@@ -111,70 +110,61 @@
<%
}
%>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="<%= request.getContextPath() %>/static/js/html5shiv.js"></script>
<script src="<%= request.getContextPath() %>/static/js/respond.min.js"></script>
<![endif]-->
</head>
<%-- HACK: leftmargin, topmargin: for non-CSS compliant Microsoft IE browser --%>
<%-- HACK: marginwidth, marginheight: for non-CSS compliant Netscape browser --%>
<body>
<%-- DSpace top-of-page banner --%>
<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%>
<table class="pageBanner" width="100%" border="0" cellpadding="0" cellspacing="0">
<%-- DSpace logo --%>
<tr>
<td>
<a href="<%= request.getContextPath() %>/"><img src="<%= request.getContextPath() %>/image/dspace-blue.gif" alt="<fmt:message key="jsp.layout.header-default.alt"/>" width="198" height="79" border="0"/></a></td>
<td class="tagLine" width="99%"> <%-- Make as wide as possible. cellpadding repeated for broken NS 4.x --%>
<a class="tagLineText" target="_blank" href="http://www.dspace.org/"><fmt:message key="jsp.layout.header-default.about"/></a>
</td>
<td nowrap="nowrap" valign="middle">
</td>
</tr>
<tr class="stripe"> <%-- Blue stripe --%>
<td colspan="3">&nbsp;</td>
</tr>
</table>
<%-- Localization --%>
<%-- <c:if test="${param.locale != null}">--%>
<%-- <fmt:setLocale value="${param.locale}" scope="session" /> --%>
<%-- </c:if> --%>
<%-- <fmt:setBundle basename="Messages" scope="session"/> --%>
<%-- Page contents --%>
<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%>
<table class="centralPane" width="99%" border="0" cellpadding="3" cellspacing="1">
<%-- HACK: valign: for non-CSS compliant Netscape browser --%>
<tr valign="top">
<%-- Navigation bar --%>
<%
<body style="padding-top: 55px;">
<a class="sr-only" href="#content">Skip navigation</a>
<header class="navbar navbar-inverse navbar-fixed-top">
<%
if (!navbar.equals("off"))
{
%>
<td class="navigationBar">
<div class="container">
<dspace:include page="<%= navbar %>" />
</td>
</div>
<%
}
%>
<%-- Page Content --%>
<%-- HACK: width specified here for non-CSS compliant Netscape 4.x --%>
<%-- HACK: Width shouldn't really be 100%, but omitting this means --%>
<%-- navigation bar gets far too wide on certain pages --%>
<td class="pageContents" width="100%">
</header>
<main id="content" role="main" style="padding-bottom:60px;">
<div class="container banner">
<div class="row">
<div class="col-md-9 brand">
<h1>DSpace <small>JSPUI</small></h1>
<h4>DSpace preserves and enables easy and open access to all types of digital content including text, images, moving images, mpegs and data sets</h4>
<a href="http://www.dspace.org"><button class="btn btn-primary">Learn More</button></a>
</div>
<div class="col-md-3"><img class="pull-right" src="<%= request.getContextPath() %>/image/logo.gif">
</div>
</div>
</div>
<br/>
<%-- Location bar --%>
<%
if (locbar)
{
%>
<div class="container">
<dspace:include page="/layout/location-bar.jsp" />
</div>
<%
}
%>
<%-- Page contents --%>
<div class="container">
<% if (request.getAttribute("dspace.layout.sidebar") != null) { %>
<div class="row">
<div class="col-md-9">
<% } %>

158
dspace-jspui/src/main/webapp/layout/header-submission.jsp Normal file
View File

@@ -0,0 +1,158 @@
<%--
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/
--%>
<%--
- HTML header for main home page
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ page import="java.util.List"%>
<%@ page import="java.util.Enumeration"%>
<%@ page import="org.dspace.app.webui.util.JSPManager" %>
<%@ page import="org.dspace.core.ConfigurationManager" %>
<%@ page import="org.dspace.app.util.Util" %>
<%@ page import="javax.servlet.jsp.jstl.core.*" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%
String title = (String) request.getAttribute("dspace.layout.title");
String navbar = (String) request.getAttribute("dspace.layout.navbar");
boolean locbar = ((Boolean) request.getAttribute("dspace.layout.locbar")).booleanValue();
String siteName = ConfigurationManager.getProperty("dspace.name");
String feedRef = (String)request.getAttribute("dspace.layout.feedref");
boolean osLink = ConfigurationManager.getBooleanProperty("websvc.opensearch.autolink");
String osCtx = ConfigurationManager.getProperty("websvc.opensearch.svccontext");
String osName = ConfigurationManager.getProperty("websvc.opensearch.shortname");
List parts = (List)request.getAttribute("dspace.layout.linkparts");
String extraHeadData = (String)request.getAttribute("dspace.layout.head");
String extraHeadDataLast = (String)request.getAttribute("dspace.layout.head.last");
String dsVersion = Util.getSourceVersion();
String generator = dsVersion == null ? "DSpace" : "DSpace "+dsVersion;
String analyticsKey = ConfigurationManager.getProperty("jspui.google.analytics.key");
%>
<!DOCTYPE html>
<html>
<head>
<title><%= title %> | <%= siteName %></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="Generator" content="<%= generator %>" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" href="<%= request.getContextPath() %>/static/css/jquery-ui-1.10.3.custom/redmond/jquery-ui-1.10.3.custom.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/static/css/bootstrap/bootstrap.min.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/static/css/bootstrap/bootstrap-theme.min.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/static/css/bootstrap/dspace-theme.css" type="text/css" />
<%
if (!"NONE".equals(feedRef))
{
for (int i = 0; i < parts.size(); i+= 3)
{
%>
<link rel="alternate" type="application/<%= (String)parts.get(i) %>" title="<%= (String)parts.get(i+1) %>" href="<%= request.getContextPath() %>/feed/<%= (String)parts.get(i+2) %>/<%= feedRef %>"/>
<%
}
}
if (osLink)
{
%>
<link rel="search" type="application/opensearchdescription+xml" href="<%= request.getContextPath() %>/<%= osCtx %>description.xml" title="<%= osName %>"/>
<%
}
if (extraHeadData != null)
{ %>
<%= extraHeadData %>
<%
}
%>
<script type='text/javascript' src="<%= request.getContextPath() %>/static/js/jquery/jquery-1.10.2.min.js"></script>
<script type='text/javascript' src='<%= request.getContextPath() %>/static/js/jquery/jquery-ui-1.10.3.custom.min.js'></script>
<script type='text/javascript' src='<%= request.getContextPath() %>/static/js/bootstrap/bootstrap.min.js'></script>
<script type='text/javascript' src='<%= request.getContextPath() %>/static/js/holder.js'></script>
<script type="text/javascript" src="<%= request.getContextPath() %>/utils.js"></script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/choice-support.js"> </script>
<%--Gooogle Analytics recording.--%>
<%
if (analyticsKey != null && analyticsKey.length() > 0)
{
%>
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '<%= analyticsKey %>']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
<%
}
if (extraHeadDataLast != null)
{ %>
<%= extraHeadDataLast %>
<%
}
%>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="<%= request.getContextPath() %>/static/js/html5shiv.js"></script>
<script src="<%= request.getContextPath() %>/static/js/respond.min.js"></script>
<![endif]-->
</head>
<%-- HACK: leftmargin, topmargin: for non-CSS compliant Microsoft IE browser --%>
<%-- HACK: marginwidth, marginheight: for non-CSS compliant Netscape browser --%>
<body style="padding-top: 65px;">
<a class="sr-only" href="#content">Skip navigation</a>
<header class="navbar navbar-inverse navbar-fixed-top">
<%
if (!navbar.equals("off"))
{
%>
<div class="container">
<dspace:include page="<%= navbar %>" />
</div>
<%
}
%>
</header>
<main id="content" role="main" style="padding-bottom:60px;">
<%-- Location bar --%>
<%
if (locbar)
{
%>
<div class="container">
<dspace:include page="/layout/location-bar.jsp" />
</div>
<%
}
%>
<%-- Page contents --%>
<div class="container">
<% if (request.getAttribute("dspace.layout.sidebar") != null) { %>
<div class="row">
<div class="col-md-9">
<% } %>

69
dspace-jspui/src/main/webapp/layout/legacy/footer-default.jsp Normal file
View File

@@ -0,0 +1,69 @@
<%--
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/
--%>
<%--
- Footer for home page
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ page import="java.net.URLEncoder" %>
<%@ page import="org.dspace.app.webui.util.UIUtil" %>
<%
String sidebar = (String) request.getAttribute("dspace.layout.sidebar");
int overallColSpan = 3;
if (sidebar == null)
{
overallColSpan = 2;
}
%>
<%-- End of page content --%>
<p>&nbsp;</p>
</td>
<%-- Right-hand side bar if appropriate --%>
<%
if (sidebar != null)
{
%>
<td class="sidebar">
<%= sidebar %>
</td>
<%
}
%>
</tr>
<%-- Page footer --%>
<tr class="pageFooterBar">
<td colspan="<%= overallColSpan %>" class="pageFootnote">
<table class="pageFooterBar" width="100%">
<tr>
<td>
<a href="http://validator.w3.org/check?uri=referer"><img
src="<%= request.getContextPath() %>/image/valid-xhtml10.png"
alt="Valid XHTML 1.0!" height="31" width="88" /></a>
</td>
<td class="pageFootnote">
<fmt:message key="jsp.layout.footer-default.text"/>&nbsp;-
<a target="_blank" href="<%= request.getContextPath() %>/feedback"><fmt:message key="jsp.layout.footer-default.feedback"/></a>
<a href="<%= request.getContextPath() %>/htmlmap"></a>
</td>
<td nowrap="nowrap" valign="middle"> <%-- nowrap, valign for broken NS 4.x --%>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>

20
dspace-jspui/src/main/webapp/layout/legacy/footer-popup.jsp Normal file
View File

@@ -0,0 +1,20 @@
<%--
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/
--%>
<%--
- Footer for home page
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page contentType="text/html;charset=UTF-8" %>
</body>
</html>

180
dspace-jspui/src/main/webapp/layout/legacy/header-default.jsp Normal file
View File

@@ -0,0 +1,180 @@
<%--
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/
--%>
<%--
- HTML header for main home page
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ page import="java.util.List"%>
<%@ page import="java.util.Enumeration"%>
<%@ page import="org.dspace.app.webui.util.JSPManager" %>
<%@ page import="org.dspace.core.ConfigurationManager" %>
<%@ page import="org.dspace.app.util.Util" %>
<%@ page import="javax.servlet.jsp.jstl.core.*" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%
String title = (String) request.getAttribute("dspace.layout.title");
String navbar = (String) request.getAttribute("dspace.layout.navbar");
boolean locbar = ((Boolean) request.getAttribute("dspace.layout.locbar")).booleanValue();
String siteName = ConfigurationManager.getProperty("dspace.name");
String feedRef = (String)request.getAttribute("dspace.layout.feedref");
boolean osLink = ConfigurationManager.getBooleanProperty("websvc.opensearch.autolink");
String osCtx = ConfigurationManager.getProperty("websvc.opensearch.svccontext");
String osName = ConfigurationManager.getProperty("websvc.opensearch.shortname");
List parts = (List)request.getAttribute("dspace.layout.linkparts");
String extraHeadData = (String)request.getAttribute("dspace.layout.head");
String extraHeadDataLast = (String)request.getAttribute("dspace.layout.head.last");
String dsVersion = Util.getSourceVersion();
String generator = dsVersion == null ? "DSpace" : "DSpace "+dsVersion;
String analyticsKey = ConfigurationManager.getProperty("jspui.google.analytics.key");
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<title><%= siteName %>: <%= title %></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="Generator" content="<%= generator %>" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/styles.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/print.css" media="print" type="text/css" />
<link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" href="<%= request.getContextPath() %>/css/discovery.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/static/css/jquery-ui-1.10.3.custom/redmond/jquery-ui-1.10.3.custom.min.css" type="text/css" />
<%
if (!"NONE".equals(feedRef))
{
for (int i = 0; i < parts.size(); i+= 3)
{
%>
<link rel="alternate" type="application/<%= (String)parts.get(i) %>" title="<%= (String)parts.get(i+1) %>" href="<%= request.getContextPath() %>/feed/<%= (String)parts.get(i+2) %>/<%= feedRef %>"/>
<%
}
}
if (osLink)
{
%>
<link rel="search" type="application/opensearchdescription+xml" href="<%= request.getContextPath() %>/<%= osCtx %>description.xml" title="<%= osName %>"/>
<%
}
if (extraHeadData != null)
{ %>
<%= extraHeadData %>
<%
}
%>
<script type='text/javascript' src='<%= request.getContextPath() %>/static/js/jquery/jquery-1.10.2.min.js'></script>
<script type='text/javascript' src='<%= request.getContextPath() %>/static/js/jquery/jquery-ui-1.10.3.custom.min.js'></script>
<script type="text/javascript" src="<%= request.getContextPath() %>/utils.js"></script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/prototype.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/effects.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/builder.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/controls.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/choice-support.js"> </script>
<%--Gooogle Analytics recording.--%>
<%
if (analyticsKey != null && analyticsKey.length() > 0)
{
%>
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '<%= analyticsKey %>']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
<%
}
if (extraHeadDataLast != null)
{ %>
<%= extraHeadDataLast %>
<%
}
%>
</head>
<%-- HACK: leftmargin, topmargin: for non-CSS compliant Microsoft IE browser --%>
<%-- HACK: marginwidth, marginheight: for non-CSS compliant Netscape browser --%>
<body>
<%-- DSpace top-of-page banner --%>
<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%>
<table class="pageBanner" width="100%" border="0" cellpadding="0" cellspacing="0">
<%-- DSpace logo --%>
<tr>
<td>
<a href="<%= request.getContextPath() %>/"><img src="<%= request.getContextPath() %>/image/dspace-blue.gif" alt="<fmt:message key="jsp.layout.header-default.alt"/>" width="198" height="79" border="0"/></a></td>
<td class="tagLine" width="99%"> <%-- Make as wide as possible. cellpadding repeated for broken NS 4.x --%>
<a class="tagLineText" target="_blank" href="http://www.dspace.org/"><fmt:message key="jsp.layout.header-default.about"/></a>
</td>
<td nowrap="nowrap" valign="middle">
</td>
</tr>
<tr class="stripe"> <%-- Blue stripe --%>
<td colspan="3">&nbsp;</td>
</tr>
</table>
<%-- Localization --%>
<%-- <c:if test="${param.locale != null}">--%>
<%-- <fmt:setLocale value="${param.locale}" scope="session" /> --%>
<%-- </c:if> --%>
<%-- <fmt:setBundle basename="Messages" scope="session"/> --%>
<%-- Page contents --%>
<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%>
<table class="centralPane" width="99%" border="0" cellpadding="3" cellspacing="1">
<%-- HACK: valign: for non-CSS compliant Netscape browser --%>
<tr valign="top">
<%-- Navigation bar --%>
<%
if (!navbar.equals("off"))
{
%>
<td class="navigationBar">
<dspace:include page="<%= navbar %>" />
</td>
<%
}
%>
<%-- Page Content --%>
<%-- HACK: width specified here for non-CSS compliant Netscape 4.x --%>
<%-- HACK: Width shouldn't really be 100%, but omitting this means --%>
<%-- navigation bar gets far too wide on certain pages --%>
<td class="pageContents" width="100%">
<%-- Location bar --%>
<%
if (locbar)
{
%>
<dspace:include page="/layout/location-bar.jsp" />
<%
}
%>

73
dspace-jspui/src/main/webapp/layout/legacy/header-popup.jsp Normal file
View File

@@ -0,0 +1,73 @@
<%--
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/
--%>
<%--
- HTML header for main home page
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ page import="java.util.List"%>
<%@ page import="java.util.Enumeration"%>
<%@ page import="org.dspace.app.webui.util.JSPManager" %>
<%@ page import="org.dspace.core.ConfigurationManager" %>
<%@ page import="javax.servlet.jsp.jstl.core.*" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%
String title = (String) request.getAttribute("dspace.layout.title");
String navbar = (String) request.getAttribute("dspace.layout.navbar");
boolean locbar = ((Boolean) request.getAttribute("dspace.layout.locbar")).booleanValue();
String siteName = ConfigurationManager.getProperty("dspace.name");
String feedRef = (String)request.getAttribute("dspace.layout.feedref");
List parts = (List)request.getAttribute("dspace.layout.linkparts");
String extraHeadData = (String)request.getAttribute("dspace.layout.head");
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<title><%= siteName %>: <%= title %></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="Generator" content="DSpace" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/styles.css" type="text/css" />
<link rel="stylesheet" href="<%= request.getContextPath() %>/print.css" media="print" type="text/css" />
<link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon"/>
<%
if (extraHeadData != null)
{ %>
<%= extraHeadData %>
<%
}
%>
<script type="text/javascript" src="<%= request.getContextPath() %>/utils.js"></script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/prototype.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/effects.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/builder.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/scriptaculous/controls.js"> </script>
<script type="text/javascript" src="<%= request.getContextPath() %>/static/js/choice-support.js"> </script>
</head>
<%-- HACK: leftmargin, topmargin: for non-CSS compliant Microsoft IE browser --%>
<%-- HACK: marginwidth, marginheight: for non-CSS compliant Netscape browser --%>
<body>
<%-- Localization --%>
<%-- <c:if test="${param.locale != null}">--%>
<%-- <fmt:setLocale value="${param.locale}" scope="session" /> --%>
<%-- </c:if> --%>
<%-- <fmt:setBundle basename="Messages" scope="session"/> --%>
<%-- Page contents --%>

59
dspace-jspui/src/main/webapp/layout/legacy/location-bar.jsp Normal file
View File

@@ -0,0 +1,59 @@
<%--
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/
--%>
<%--
- Location bar component
-
- This component displays the "breadcrumb" style navigation aid at the top
- of most screens.
-
- Uses request attributes set in org.dspace.app.webui.jsptag.Layout, and
- hence must only be used as part of the execution of that tag. Plus,
- dspace.layout.locbar should be verified to be true before this is included.
-
- dspace.layout.parenttitles - List of titles of parent pages
- dspace.layout.parentlinks - List of URLs of parent pages, empty string
- for non-links
--%>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ page import="java.util.List" %>
<p class="locationBar">
<%
List parentTitles = (List) request.getAttribute("dspace.layout.parenttitles");
List parentLinks = (List) request.getAttribute("dspace.layout.parentlinks");
for (int i = 0; i < parentTitles.size(); i++)
{
String s = (String) parentTitles.get(i);
String u = (String) parentLinks.get(i);
// New line for each breadcrumb (no <br> needed for first)
if (i > 0)
{
%><br/><%
}
if (u.equals(""))
{
%>
<%= s %>&nbsp;&gt;
<%
}
else
{
%>
<a href="<%= request.getContextPath() %><%= u %>"><%= s %></a>&nbsp;&gt;
<%
}
}
%>
</p>

209
dspace-jspui/src/main/webapp/layout/legacy/navbar-admin.jsp Normal file
View File

@@ -0,0 +1,209 @@
<%--
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/
--%>
<%--
- Navigation bar for admin pages
--%>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ page import="java.util.LinkedList" %>
<%@ page import="java.util.List" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
<%@ page import="org.dspace.app.webui.util.UIUtil" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%
// Get the current page, minus query string
String currentPage = UIUtil.getOriginalURL(request);
int c = currentPage.indexOf( '?' );
if( c > -1 )
{
currentPage = currentPage.substring(0, c);
}
%>
<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%>
<table width="100%" border="0" cellspacing="2" cellpadding="2">
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/tools/edit-communities") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/tools/edit-communities"><fmt:message key="jsp.layout.navbar-admin.communities-collections"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/edit-epeople") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/edit-epeople"><fmt:message key="jsp.layout.navbar-admin.epeople"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/tools/group-edit") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/tools/group-edit"><fmt:message key="jsp.layout.navbar-admin.groups"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/tools/edit-item") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/tools/edit-item"><fmt:message key="jsp.layout.navbar-admin.items"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/metadata-schema-registry") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/metadata-schema-registry"><fmt:message key="jsp.layout.navbar-admin.metadataregistry"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/format-registry") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/format-registry"><fmt:message key="jsp.layout.navbar-admin.formatregistry"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/workflow") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/workflow"><fmt:message key="jsp.layout.navbar-admin.workflow"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/tools/authorize") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/tools/authorize"><fmt:message key="jsp.layout.navbar-admin.authorization"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/news-edit") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/news-edit"><fmt:message key="jsp.layout.navbar-admin.editnews"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/license-edit") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/license-edit"><fmt:message key="jsp.layout.navbar-admin.editlicense"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/supervise") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/supervise"><fmt:message key="jsp.layout.navbar-admin.supervisors"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/statistics") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/statistics"><fmt:message key="jsp.layout.navbar-admin.statistics"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/metadataimport") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/metadataimport"><fmt:message key="jsp.layout.navbar-admin.metadataimport"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/curate") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/curate"><fmt:message key="jsp.layout.navbar-admin.curate"/></a>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/withdrawn") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/withdrawn"><fmt:message key="jsp.layout.navbar-admin.withdrawn"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/privateitems") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/privateitems"><fmt:message key="jsp.layout.navbar-admin.privateitems"/></a>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/arrow.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\")%>"><fmt:message key="jsp.layout.navbar-admin.help"/></dspace:popup>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/arrow.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/logout"><fmt:message key="jsp.layout.navbar-admin.logout"/></a>
</td>
</tr>
</table>

244
dspace-jspui/src/main/webapp/layout/legacy/navbar-default.jsp Normal file
View File

@@ -0,0 +1,244 @@
<%--
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/
--%>
<%--
- Default navigation bar
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ taglib uri="/WEB-INF/dspace-tags.tld" prefix="dspace" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.List" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
<%@ page import="org.dspace.app.webui.util.UIUtil" %>
<%@ page import="org.dspace.content.Collection" %>
<%@ page import="org.dspace.content.Community" %>
<%@ page import="org.dspace.eperson.EPerson" %>
<%@ page import="org.dspace.core.ConfigurationManager" %>
<%@ page import="org.dspace.browse.BrowseIndex" %>
<%@ page import="org.dspace.browse.BrowseInfo" %>
<%@ page import="java.util.Map" %>
<%
// Is anyone logged in?
EPerson user = (EPerson) request.getAttribute("dspace.current.user");
// Is the logged in user an admin
Boolean admin = (Boolean)request.getAttribute("is.admin");
boolean isAdmin = (admin == null ? false : admin.booleanValue());
// Get the current page, minus query string
String currentPage = UIUtil.getOriginalURL(request);
int c = currentPage.indexOf( '?' );
if( c > -1 )
{
currentPage = currentPage.substring( 0, c );
}
// E-mail may have to be truncated
String navbarEmail = null;
if (user != null)
{
navbarEmail = user.getEmail();
if (navbarEmail.length() > 18)
{
navbarEmail = navbarEmail.substring(0, 17) + "...";
}
}
// get the browse indices
BrowseIndex[] bis = BrowseIndex.getBrowseIndices();
BrowseInfo binfo = (BrowseInfo) request.getAttribute("browse.info");
String browseCurrent = "";
if (binfo != null)
{
BrowseIndex bix = binfo.getBrowseIndex();
// Only highlight the current browse, only if it is a metadata index,
// or the selected sort option is the default for the index
if (bix.isMetadataIndex() || bix.getSortOption() == binfo.getSortOption())
{
if (bix.getName() != null)
browseCurrent = bix.getName();
}
}
%>
<%-- Search Box --%>
<form method="get" action="<%= request.getContextPath() %>/simple-search">
<%
if (user != null)
{
%>
<p class="loggedIn"><fmt:message key="jsp.layout.navbar-default.loggedin">
<fmt:param><%= navbarEmail %></fmt:param>
</fmt:message>
(<a href="<%= request.getContextPath() %>/logout"><fmt:message key="jsp.layout.navbar-default.logout"/></a>)</p>
<%
}
%>
<table width="100%" class="searchBox">
<tr>
<td>
<table width="100%" border="0" cellspacing="0" >
<tr>
<td class="searchBoxLabel"><label for="tequery"><fmt:message key="jsp.layout.navbar-default.search"/></label></td>
</tr>
<tr>
<td class="searchBoxLabelSmall" valign="middle" nowrap="nowrap">
<%-- <input type="text" name="query" id="tequery" size="10"/><input type=image border="0" src="<%= request.getContextPath() %>/image/search-go.gif" name="submit" alt="Go" value="Go"/> --%>
<input type="text" name="query" id="tequery" size="8"/><input type="submit" name="submit" value="<fmt:message key="jsp.layout.navbar-default.go"/>" />
<br/><a href="<%= request.getContextPath() %>/advanced-search"><fmt:message key="jsp.layout.navbar-default.advanced"/></a>
<%
if (ConfigurationManager.getBooleanProperty("webui.controlledvocabulary.enable"))
{
%>
<br/><a href="<%= request.getContextPath() %>/subject-search"><fmt:message key="jsp.layout.navbar-default.subjectsearch"/></a>
<%
}
%>
</td>
</tr>
</table>
</td>
</tr>
</table>
</form>
<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%>
<table width="100%" border="0" cellspacing="2" cellpadding="2">
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/index.jsp") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/"><fmt:message key="jsp.layout.navbar-default.home"/></a>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<td nowrap="nowrap" colspan="2" class="navigationBarSublabel"><fmt:message key="jsp.layout.navbar-default.browse"/></td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/community-list" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/community-list"><fmt:message key="jsp.layout.navbar-default.communities-collections"/></a>
</td>
</tr>
<%-- Insert the dynamic browse indices here --%>
<%
for (int i = 0; i < bis.length; i++)
{
BrowseIndex bix = bis[i];
String key = "browse.menu." + bix.getName();
%>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( browseCurrent.equals(bix.getName()) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/browse?type=<%= bix.getName() %>"><fmt:message key="<%= key %>"/></a>
</td>
</tr>
<%
}
%>
<%-- End of dynamic browse indices --%>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<td nowrap="nowrap" colspan="2" class="navigationBarSublabel"><fmt:message key="jsp.layout.navbar-default.sign"/></td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/subscribe" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/subscribe"><fmt:message key="jsp.layout.navbar-default.receive"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/mydspace" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.layout.navbar-default.users"/></a><br/>
<fmt:message key="jsp.layout.navbar-default.users-authorized" />
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/profile" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/profile"><fmt:message key="jsp.layout.navbar-default.edit"/></a>
</td>
</tr>
<%
if (isAdmin)
{
%>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/dspace-admin" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin"><fmt:message key="jsp.administer"/></a>
</td>
</tr>
<%
}
%>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/help" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\")%>"><fmt:message key="jsp.layout.navbar-default.help"/></dspace:popup>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/about" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="http://www.dspace.org/"><fmt:message key="jsp.layout.navbar-default.about"/></a>
</td>
</tr>
</table>

25
dspace-jspui/src/main/webapp/layout/location-bar.jsp
View File

@@ -25,8 +25,7 @@
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ page import="java.util.List" %>
<p class="locationBar">
<ol class="breadcrumb btn-success">
<%
List parentTitles = (List) request.getAttribute("dspace.layout.parenttitles");
List parentLinks = (List) request.getAttribute("dspace.layout.parentlinks");
@@ -36,24 +35,26 @@
String s = (String) parentTitles.get(i);
String u = (String) parentLinks.get(i);
// New line for each breadcrumb (no <br> needed for first)
if (i > 0)
{
%><br/><%
}
if (u.equals(""))
{
if (i == parentTitles.size())
{
%>
<%= s %>&nbsp;&gt;
<%
<li class="active"><%= s %></li>
<%
}
else
{
%>
<li><%= s %></li>
<% }
}
else
{
%>
<a href="<%= request.getContextPath() %><%= u %>"><%= s %></a>&nbsp;&gt;
<li><a href="<%= request.getContextPath() %><%= u %>"><%= s %></a></li>
<%
}
}
%>
</p>
</ol>

253
dspace-jspui/src/main/webapp/layout/navbar-admin.jsp
View File

@@ -18,13 +18,19 @@
<%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
<%@ page import="org.dspace.browse.BrowseInfo" %>
<%@ page import="org.dspace.sort.SortOption" %>
<%@ page import="org.dspace.app.webui.util.UIUtil" %>
<%@ page import="org.dspace.eperson.EPerson" %>
<%@page import="org.apache.commons.lang.StringUtils"%>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%
// Is anyone logged in?
EPerson user = (EPerson) request.getAttribute("dspace.current.user");
// Get the current page, minus query string
String currentPage = UIUtil.getOriginalURL(request);
int c = currentPage.indexOf( '?' );
@@ -32,178 +38,81 @@
{
currentPage = currentPage.substring(0, c);
}
// E-mail may have to be truncated
String navbarEmail = null;
if (user != null)
{
navbarEmail = user.getEmail();
}
%>
<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%>
<table width="100%" border="0" cellspacing="2" cellpadding="2">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<%= request.getContextPath() %>/"><img height="25px" src="<%= request.getContextPath() %>/image/dspace-logo-only.png" /></a>
</div>
<nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
<ul class="nav navbar-nav">
<li><a href="<%= request.getContextPath() %>/"><span class="glyphicon glyphicon-home"></span> <fmt:message key="jsp.layout.navbar-default.home"/></a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><fmt:message key="jsp.layout.navbar-admin.contents"/> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="<%= request.getContextPath() %>/tools/edit-item"><fmt:message key="jsp.layout.navbar-admin.items"/></a></li>
<li><a href="<%= request.getContextPath() %>/dspace-admin/workflow"><fmt:message key="jsp.layout.navbar-admin.workflow"/></a></li>
<li><a href="<%= request.getContextPath() %>/dspace-admin/supervise"><fmt:message key="jsp.layout.navbar-admin.supervisors"/></a></li>
<li><a href="<%= request.getContextPath() %>/dspace-admin/curate"><fmt:message key="jsp.layout.navbar-admin.curate"/></a></li>
<li><a href="<%= request.getContextPath() %>/dspace-admin/withdrawn"><fmt:message key="jsp.layout.navbar-admin.withdrawn"/></a></li>
<li><a href="<%= request.getContextPath() %>/dspace-admin/metadataimport"><fmt:message key="jsp.layout.navbar-admin.metadataimport"/></a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><fmt:message key="jsp.layout.navbar-admin.accesscontrol"/> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="<%= request.getContextPath() %>/dspace-admin/edit-epeople"><fmt:message key="jsp.layout.navbar-admin.epeople"/></a></li>
<li><a href="<%= request.getContextPath() %>/tools/group-edit"><fmt:message key="jsp.layout.navbar-admin.groups"/></a></li>
<li><a href="<%= request.getContextPath() %>/tools/authorize"><fmt:message key="jsp.layout.navbar-admin.authorization"/></a></li>
</ul>
</li>
<li><a href="<%= request.getContextPath() %>/statistics"><fmt:message key="jsp.layout.navbar-admin.statistics"/></a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><fmt:message key="jsp.layout.navbar-admin.settings"/> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="<%= request.getContextPath() %>/dspace-admin/metadata-schema-registry"><fmt:message key="jsp.layout.navbar-admin.metadataregistry"/></a></li>
<li><a href="<%= request.getContextPath() %>/dspace-admin/format-registry"><fmt:message key="jsp.layout.navbar-admin.formatregistry"/></a></li>
<li class="divider"></li>
<li><a href="<%= request.getContextPath() %>/dspace-admin/news-edit"><fmt:message key="jsp.layout.navbar-admin.editnews"/></a></li>
<li class="divider"></li>
<li><a href="<%= request.getContextPath() %>/dspace-admin/license-edit"><fmt:message key="jsp.layout.navbar-admin.editlicense"/></a></li>
</ul>
</li>
<li class="<%= ( currentPage.endsWith( "/help" ) ? "active" : "" ) %>"><dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\") %>"><fmt:message key="jsp.layout.navbar-admin.help"/></dspace:popup></li>
</ul>
<div class="nav navbar-nav navbar-right">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/tools/edit-communities") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/tools/edit-communities"><fmt:message key="jsp.layout.navbar-admin.communities-collections"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/edit-epeople") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/edit-epeople"><fmt:message key="jsp.layout.navbar-admin.epeople"/></a>
</td>
</tr>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-user"></span> <fmt:message key="jsp.layout.navbar-default.loggedin">
<fmt:param><%= StringUtils.abbreviate(navbarEmail, 20) %></fmt:param>
</fmt:message> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="<%= request.getContextPath() %>/subscribe"><fmt:message key="jsp.layout.navbar-default.receive"/></a></li>
<li><a href="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.layout.navbar-default.users"/></a></li>
<li><a href="<%= request.getContextPath() %>/profile"><fmt:message key="jsp.layout.navbar-default.edit"/></a></li>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/tools/group-edit") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/tools/group-edit"><fmt:message key="jsp.layout.navbar-admin.groups"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/tools/edit-item") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/tools/edit-item"><fmt:message key="jsp.layout.navbar-admin.items"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/metadata-schema-registry") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/metadata-schema-registry"><fmt:message key="jsp.layout.navbar-admin.metadataregistry"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/format-registry") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/format-registry"><fmt:message key="jsp.layout.navbar-admin.formatregistry"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/workflow") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/workflow"><fmt:message key="jsp.layout.navbar-admin.workflow"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/tools/authorize") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/tools/authorize"><fmt:message key="jsp.layout.navbar-admin.authorization"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/news-edit") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/news-edit"><fmt:message key="jsp.layout.navbar-admin.editnews"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/license-edit") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/license-edit"><fmt:message key="jsp.layout.navbar-admin.editlicense"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/dspace-admin/supervise") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/supervise"><fmt:message key="jsp.layout.navbar-admin.supervisors"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/statistics") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/statistics"><fmt:message key="jsp.layout.navbar-admin.statistics"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/metadataimport") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/metadataimport"><fmt:message key="jsp.layout.navbar-admin.metadataimport"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/curate") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/curate"><fmt:message key="jsp.layout.navbar-admin.curate"/></a>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/withdrawn") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/withdrawn"><fmt:message key="jsp.layout.navbar-admin.withdrawn"/></a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= (currentPage.endsWith("/privateitems") ? "arrow-highlight" : "arrow") %>.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/dspace-admin/privateitems"><fmt:message key="jsp.layout.navbar-admin.privateitems"/></a>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/arrow.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\")%>"><fmt:message key="jsp.layout.navbar-admin.help"/></dspace:popup>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/arrow.gif" width="16" height="16"/>
</td>
<td nowrap="nowrap" class="navigationBarItem">
<a href="<%= request.getContextPath() %>/logout"><fmt:message key="jsp.layout.navbar-admin.logout"/></a>
</td>
</tr>
</table>
<li><a href="<%= request.getContextPath() %>/logout"><span class="glyphicon glyphicon-log-out"></span> <fmt:message key="jsp.layout.navbar-default.logout"/></a></li>
</ul>
</li>
</ul>
</div>
</nav>

Some files were not shown because too many files have changed in this diff Show More