hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated look and feel of the site to match updated template.

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/trunk@461 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Robert Tansley
2002-10-23 15:42:48 +00:00
parent 44551f1069
commit ac24e6ac79
34 changed files with 322 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace/config/dspace.cfg
View File

@@ -18,7 +18,7 @@ dspace.url = https://localhost
dspace.hostname = localhost dspace.hostname = localhost
# Name of the site # Name of the site
dspace.name = DSpace @ MIT dspace.name = DSpace at MIT
##### Destinations for configuration files for other tools ##### ##### Destinations for configuration files for other tools #####

26
dspace/jsp/components/news.jsp
View File

@@ -39,26 +39,8 @@
--%> --%>
<%-- <%--
- DSpace News. This appears on the right-hand side of the front page. - DSpace News. This appears near the top of the home page.
--%> --%>
<table border=0 cellpadding=5 cellspacing=0> <H3>DSpace is Live</H3>
<tr> <P>Welcome to our digital repository of MIT research!</P>
<td align=center> <P><A HREF="http://dspace.org/news/dspace-news.html">More news...</A></P>
<img alt="Launching" src="<%= request.getContextPath() %>/image/flying-man.jpg" width="105" height="70" />
</td>
</tr>
<tr>
<td align=center nowrap>
<P><em>DSpace launches</em><br />
<strong>April 2002</strong></P>
</td>
</tr>
</table>
<H3>New&nbsp;Collections:</H3>
<P class="recentItem">
<a href="<%= request.getContextPath() %>/communities/1/collections/100/">LIDS Technical Reports</a>
</P>
<P class="recentItem">
<a href="<%= request.getContextPath() %>/communities/3/collections/5/">MIT Press Out of Print Books</a>
</P>

109
dspace/jsp/home.jsp
View File

@@ -44,79 +44,68 @@
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@ page import="org.dspace.content.Community" %>
<%@ page import="org.dspace.core.ConfigurationManager" %> <%@ page import="org.dspace.core.ConfigurationManager" %>
<%
Community[] communities = (Community[]) request.getAttribute("communities");
%>
<dspace:layout style="home" locbar="nolink" title="Home"> <dspace:layout style="home" locbar="nolink" title="Home">
<h1><%= ConfigurationManager.getProperty("dspace.name") %> Home</h1> <table class="miscTable" width="95%" align="center">
<tr>
<td class="oddRowEvenCol">
<dspace:include page="/components/news.jsp" />
</td>
</tr>
</table>
<br>
<form action="<%= request.getContextPath() %>/simple-search" method=GET> <form action="<%= request.getContextPath() %>/simple-search" method=GET>
<table border=0 cellpadding=4 cellspacing=8> <table class="miscTable" width="95%" align="center">
<tr> <tr>
<td colspan=2 bgcolor="#e0e0e0"> <td class="oddRowEvenCol">
<table width=100% border=0 cellpadding=6> <H3>Search</H3>
<tr> <P align="center">Enter some text in the box below to search DSpace.</P>
<td valign=middle><h2>What can you find in DSpace?</h2></td> <center><%-- HACK for Netscape 4.xx, "align=center" doesn't seem to work--%>
<td valign=middle align=right class="standard"><a href="http://www.dspace.org/">More&nbsp;Information</a>&nbsp;&nbsp;&nbsp;</td>
</tr>
</table>
<table width=100%>
<tr>
<td width="50%">
<UL>
<li>Articles</li>
<li>Technical Reports</li>
<li>Working Papers</li>
</ul>
</td>
<td width="50%">
<ul>
<li>Datasets</li>
<li>Images</li>
<li>Videos....and more</li>
</ul>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td width="50%" align=center bgcolor="#e0e0e0" valign=top>
<H2>Search</H2>
<P class="submitFormHelp">Enter some text in the box below to search DSpace.</P>
<P><input type=text name=query size=20>&nbsp;<input type=submit name=submit value="Go"></P> <P><input type=text name=query size=20>&nbsp;<input type=submit name=submit value="Go"></P>
</td> </center>
<td width="50%" align=center bgcolor="#e0e0e0" valign=top>
<H2>Submit</H2>
<P class="submitFormHelp">Submit your digital content to DSpace! To
start the submission process, select the button below.</P>
<P align=center><A HREF="<%= request.getContextPath() %>/submit">Start Submitting</A></P>
<P class="submitFormHelp"><strong>Authorized Users Only</strong></P>
</td>
</tr>
<tr>
<td bgcolor="#e0e0e0" valign=top>
<H2 align=center>Browse</H2>
<P class="submitFormHelp">You can also browse a DSpace index:</P>
<UL>
<LI><A HREF="<%= request.getContextPath() %>/community-list">Communities and collections</A></LI>
<LI><A HREF="<%= request.getContextPath() %>/browse-title">Titles</A></LI>
<LI><A HREF="<%= request.getContextPath() %>/browse-author">Authors</A></LI>
<LI><A HREF="<%= request.getContextPath() %>/browse-date">Dates</A></LI>
</UL>
</td>
<td align=center bgcolor="#e0e0e0" valign=top>
<H2>My DSpace</H2>
<P class="submitFormHelp">You can visit "My DSpace" to resume half-finished
submissions and check on the progress of previous submissions.</P>
<P align=center><A HREF="<%= request.getContextPath() %>/mydspace">Visit My DSpace</A></P>
<P class="submitFormHelp"><strong>Authorized Users Only</strong></P>
</td> </td>
</tr> </tr>
</table> </table>
</form> </form>
<table class="miscTable" width="95%" align="center">
<tr>
<td class="oddRowEvenCol">
<H3>Communities in DSpace</H3>
<P align="center">Select a community to browse its collections.</P>
<table border=0 cellpadding=2>
<%
for (int i = 0; i < communities.length; i++)
{
%> <tr>
<td class="standard">
<A HREF="<%= request.getContextPath() %>/communities/<%= communities[i].getID() %>/"><%= communities[i].getMetadata("name") %></A>
</td>
</tr>
<%
}
%>
</table>
</td>
</tr>
</table>
<dspace:sidebar> <dspace:sidebar>
<dspace:include page="/components/news.jsp" /> <%-- non-break spaces to make sidebar a reasonable width--%>
<H2>What&nbsp;can&nbsp;you find&nbsp;in&nbsp;DSpace?</H2>
<P><strong>MIT</strong> Research in digital form, including preprints, technical reports, working papers, conference papers, images, and more.</P>
<br>
<H2>Is this all of MIT's&nbsp;research?</H2>
<P>No. DSpace is limited to digital research products. For items in print, go to <A HREF="http://libraries.mit.edu/barton">Barton: MIT Libraries' catalog</a>. DSpace is young and growing rapidly. Check back often.</P>
</dspace:sidebar> </dspace:sidebar>
</dspace:layout> </dspace:layout>

BIN
dspace/jsp/image/dome-bluewhite-smaller.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
dspace/jsp/image/dspace-blue.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
dspace/jsp/image/hp-mit.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
dspace/jsp/image/hp.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 870 B

BIN
dspace/jsp/image/stripe.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1019 B

5
dspace/jsp/index.jsp
View File

@@ -58,6 +58,7 @@
<%@ page import="org.dspace.app.webui.util.JSPManager" %> <%@ page import="org.dspace.app.webui.util.JSPManager" %>
<%@ page import="org.dspace.app.webui.util.UIUtil" %> <%@ page import="org.dspace.app.webui.util.UIUtil" %>
<%@ page import="org.dspace.content.Community" %>
<%@ page import="org.dspace.core.Context" %> <%@ page import="org.dspace.core.Context" %>
<%@ page import="org.dspace.core.LogManager" %> <%@ page import="org.dspace.core.LogManager" %>
@@ -69,6 +70,10 @@
// Obtain a context so that the location bar can display log in status // Obtain a context so that the location bar can display log in status
context = UIUtil.obtainContext(request); context = UIUtil.obtainContext(request);
// Home page shows community list
Community[] communities = Community.findAll(context);
request.setAttribute("communities", communities);
// Show home page JSP // Show home page JSP
JSPManager.showJSP(request, response, "/home.jsp"); JSPManager.showJSP(request, response, "/home.jsp");
} }

27
dspace/jsp/layout/footer-default.jsp
View File

@@ -1,5 +1,5 @@
<%-- <%--
-- footer-default.jsp -- footer-home.jsp
-- --
-- Version: $Revision$ -- Version: $Revision$
-- --
@@ -39,7 +39,7 @@
--%> --%>
<%-- <%--
- Footer for default style of page - Footer for home page
--%> --%>
<%@ page import="java.net.URLEncoder" %> <%@ page import="java.net.URLEncoder" %>
@@ -47,17 +47,10 @@
<% <%
String sidebar = (String) request.getAttribute("dspace.layout.sidebar"); String sidebar = (String) request.getAttribute("dspace.layout.sidebar");
String navbar = (String) request.getAttribute("dspace.layout.navbar"); int overallColSpan = 3;
int overallColSpan = 1; if (sidebar == null)
if (sidebar != null)
{ {
overallColSpan++; overallColSpan = 2;
}
if (!navbar.equals("off"))
{
overallColSpan++;
} }
%> %>
<%-- End of page content --%> <%-- End of page content --%>
@@ -84,9 +77,19 @@
%> %>
<tr class="pageFooterBar"> <tr class="pageFooterBar">
<td colspan=<%= overallColSpan %> class="pageFootnote"> <td colspan=<%= overallColSpan %> class="pageFootnote">
<table class="pageFooterBar" width="100%">
<tr>
<td><A target=_blank HREF="http://www.hp.com/"><img src="<%= request.getContextPath() %>/image/hp-mit.gif" alt="invent @ MIT: The HP-MIT Alliance" border=0></A></td>
<td class="pageFootnote">
Copyright&nbsp;&copy;&nbsp;2002&nbsp;<a target=_blank href="http://web.mit.edu/">MIT</a>&nbsp;and&nbsp;<a target=_blank href="http://www.hp.com/">Hewlett-Packard</a>&nbsp;- Copyright&nbsp;&copy;&nbsp;2002&nbsp;<a target=_blank href="http://web.mit.edu/">MIT</a>&nbsp;and&nbsp;<a target=_blank href="http://www.hp.com/">Hewlett-Packard</a>&nbsp;-
<a target=_blank href="<%= request.getContextPath() %>/feedback?fromPage=<%= fromPage %>">Feedback</a> <a target=_blank href="<%= request.getContextPath() %>/feedback?fromPage=<%= fromPage %>">Feedback</a>
</td> </td>
<td nowrap valign=middle> <%-- nowrap, valign for broken NS 4.x --%>
&nbsp;&nbsp;&nbsp;<A HREF="http://www.hp.com/"><img src="<%= request.getContextPath() %>/image/hp.gif" border=0 alt="Hewlett Packard"></A>&nbsp;&nbsp;&nbsp;
</td>
</tr>
</table>
</td>
</tr> </tr>
</table> </table>
</body> </body>

10
dspace/jsp/layout/footer-home.jsp
View File

@@ -77,9 +77,19 @@
%> %>
<tr class="pageFooterBar"> <tr class="pageFooterBar">
<td colspan=<%= overallColSpan %> class="pageFootnote"> <td colspan=<%= overallColSpan %> class="pageFootnote">
<table class="pageFooterBar" width="100%">
<tr>
<td><A target=_blank HREF="http://www.hp.com/"><img src="<%= request.getContextPath() %>/image/hp-mit.gif" alt="invent @ MIT: The HP-MIT Alliance" border=0></A></td>
<td class="pageFootnote">
Copyright&nbsp;&copy;&nbsp;2002&nbsp;<a target=_blank href="http://web.mit.edu/">MIT</a>&nbsp;and&nbsp;<a target=_blank href="http://www.hp.com/">Hewlett-Packard</a>&nbsp;- Copyright&nbsp;&copy;&nbsp;2002&nbsp;<a target=_blank href="http://web.mit.edu/">MIT</a>&nbsp;and&nbsp;<a target=_blank href="http://www.hp.com/">Hewlett-Packard</a>&nbsp;-
<a target=_blank href="<%= request.getContextPath() %>/feedback?fromPage=<%= fromPage %>">Feedback</a> <a target=_blank href="<%= request.getContextPath() %>/feedback?fromPage=<%= fromPage %>">Feedback</a>
</td> </td>
<td nowrap valign=middle> <%-- nowrap, valign for broken NS 4.x --%>
&nbsp;&nbsp;&nbsp;<A HREF="http://www.hp.com/"><img src="<%= request.getContextPath() %>/image/hp.gif" border=0 alt="Hewlett Packard"></A>&nbsp;&nbsp;&nbsp;
</td>
</tr>
</table>
</td>
</tr> </tr>
</table> </table>
</body> </body>

47
dspace/jsp/layout/header-default.jsp
View File

@@ -1,5 +1,5 @@
<%-- <%--
- header-default.jsp - header-home.jsp
- -
- Version: $Revision$ - Version: $Revision$
- -
@@ -39,12 +39,13 @@
--%> --%>
<%-- <%--
- HTML header for most UI pages - HTML header for main home page
--%> --%>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@ page import="java.util.List"%> <%@ page import="java.util.List"%>
<%@ page import="org.dspace.app.webui.util.JSPManager" %>
<%@ page import="org.dspace.core.ConfigurationManager" %> <%@ page import="org.dspace.core.ConfigurationManager" %>
<% <%
@@ -68,35 +69,25 @@
<%-- HACK: marginwidth, marginheight: for non-CSS compliant Netscape browser --%> <%-- HACK: marginwidth, marginheight: for non-CSS compliant Netscape browser --%>
<body leftmargin=0 topmargin=0 marginwidth=0 marginheight=0> <body leftmargin=0 topmargin=0 marginwidth=0 marginheight=0>
<%-- DSpace top-of-page banner --%> <%-- DSpace top-of-page banner --%>
<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> <%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%>
<table class="pageBanner" width="100%" border=0 cellpadding=0 cellspacing=0> <table class="pageBanner" width="100%" border=0 cellpadding=0 cellspacing=0>
<%-- DSpace logo --%>
<%-- DSpace logo and star background --%>
<%-- HACK: background: for non-CSS compliant Netscape 4.x browser --%>
<tr> <tr>
<td class="logoBar" background="<%= request.getContextPath() %>/images/star-background.jpg"> <td>
<img src="<%= request.getContextPath() %>/image/banner-small.jpg" width="288" height="49" alt="DSpace"> <A HREF="<%= request.getContextPath() %>/"><img src="<%= request.getContextPath() %>/image/dspace-blue.gif" alt="DSpace" width=198 height=79 border=0></A></td>
<td class="tagLine" width="99%" cellpadding=10> <%-- Make as wide as possible. cellpadding repeated for broken NS 4.x --%>
<A class="tagLineText" target=_blank href="http://www.dspace.org/">About DSpace</A>
</td>
<td nowrap valign=middle>
&nbsp;&nbsp;&nbsp;<A HREF="http://libraries.mit.edu/"><img src="<%= request.getContextPath() %>/image/dome-bluewhite-smaller.gif" border=0 alt="MIT Libraries"></A>&nbsp;&nbsp;&nbsp;
</td> </td>
</tr> </tr>
<tr class="stripe"> <%-- Blue stripe --%>
<td colspan=3>&nbsp;</td>
<%-- Location bar --%> </td>
<%
if (locbar)
{
%>
<tr>
<dspace:include page="/layout/location-bar.jsp" />
</tr>
</table> </table>
<%
}
%>
<%-- Page contents --%> <%-- Page contents --%>
@@ -124,3 +115,13 @@
<%-- navigation bar gets far too wide on certain pages --%> <%-- navigation bar gets far too wide on certain pages --%>
<td class="pageContents" width="100%"> <td class="pageContents" width="100%">
<%-- Location bar --%>
<%
if (locbar)
{
%>
<dspace:include page="/layout/location-bar.jsp" />
<%
}
%>

50
dspace/jsp/layout/header-home.jsp
View File

@@ -69,35 +69,25 @@
<%-- HACK: marginwidth, marginheight: for non-CSS compliant Netscape browser --%> <%-- HACK: marginwidth, marginheight: for non-CSS compliant Netscape browser --%>
<body leftmargin=0 topmargin=0 marginwidth=0 marginheight=0> <body leftmargin=0 topmargin=0 marginwidth=0 marginheight=0>
<%-- DSpace top-of-page banner --%> <%-- DSpace top-of-page banner --%>
<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> <%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%>
<table class="pageBanner" width="100%" border=0 cellpadding=0 cellspacing=0> <table class="pageBanner" width="100%" border=0 cellpadding=0 cellspacing=0>
<%-- DSpace logo --%>
<%-- DSpace logo and star background --%>
<%-- HACK: background: for non-CSS compliant Netscape 4.x browser --%>
<tr> <tr>
<td class="logoBar" background="<%= request.getContextPath() %>/images/star-background.jpg"> <td>
<img src="<%= request.getContextPath() %>/image/banner-large.jpg" width="576" height="98" alt="DSpace"> <A HREF="<%= request.getContextPath() %>/"><img src="<%= request.getContextPath() %>/image/dspace-blue.gif" alt="DSpace" width=198 height=79 border=0></A></td>
<td class="tagLine" width="99%" cellpadding=10> <%-- Make as wide as possible. cellpadding repeated for broken NS 4.x --%>
<A class="tagLineText" target=_blank href="http://www.dspace.org/">About DSpace</A>
</td>
<td nowrap valign=middle>
&nbsp;&nbsp;&nbsp;<A HREF="http://libraries.mit.edu/"><img src="<%= request.getContextPath() %>/image/dome-bluewhite-smaller.gif" border=0 alt="MIT Libraries"></A>&nbsp;&nbsp;&nbsp;
</td> </td>
</tr> </tr>
<tr class="stripe"> <%-- Blue stripe --%>
<td colspan=3>&nbsp;</td>
<%-- Location bar --%> </td>
<%
if (locbar)
{
%>
<tr>
<dspace:include page="/layout/location-bar.jsp" />
</tr>
</table> </table>
<%
}
%>
<%-- Page contents --%> <%-- Page contents --%>
@@ -108,10 +98,16 @@
<tr valign=top> <tr valign=top>
<%-- Navigation bar --%> <%-- Navigation bar --%>
<%
if (!navbar.equals("off"))
{
%>
<td class="navigationBar"> <td class="navigationBar">
<dspace:include page="<%= navbar %>" /> <dspace:include page="<%= navbar %>" />
</td> </td>
<%
}
%>
<%-- Page Content --%> <%-- Page Content --%>
<%-- HACK: width specified here for non-CSS compliant Netscape 4.x --%> <%-- HACK: width specified here for non-CSS compliant Netscape 4.x --%>
@@ -119,3 +115,13 @@
<%-- navigation bar gets far too wide on certain pages --%> <%-- navigation bar gets far too wide on certain pages --%>
<td class="pageContents" width="100%"> <td class="pageContents" width="100%">
<%-- Location bar --%>
<%
if (locbar)
{
%>
<dspace:include page="/layout/location-bar.jsp" />
<%
}
%>

50
dspace/jsp/layout/location-bar.jsp
View File

@@ -42,7 +42,7 @@
- Location bar component - Location bar component
- -
- This component displays the "breadcrumb" style navigation aid at the top - This component displays the "breadcrumb" style navigation aid at the top
- of most screens. Also indicates whether or not the user is logged in. - of most screens.
- -
- Uses request attributes set in org.dspace.app.webui.jsptag.Layout, and - 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, - hence must only be used as part of the execution of that tag. Plus,
@@ -51,70 +51,38 @@
- dspace.layout.parenttitles - List of titles of parent pages - dspace.layout.parenttitles - List of titles of parent pages
- dspace.layout.parentlinks - List of URLs of parent pages, empty string - dspace.layout.parentlinks - List of URLs of parent pages, empty string
- for non-links - for non-links
- dspace.current.user - Current EPerson user, or null
--%> --%>
<%@ page import="java.util.List" %> <%@ page import="java.util.List" %>
<%@ page import="org.dspace.app.webui.util.UIUtil" %> <P class="locationBar">
<%@ page import="org.dspace.eperson.EPerson" %>
<% <%
List parentTitles = (List) request.getAttribute("dspace.layout.parenttitles"); List parentTitles = (List) request.getAttribute("dspace.layout.parenttitles");
List parentLinks = (List) request.getAttribute("dspace.layout.parentlinks"); List parentLinks = (List) request.getAttribute("dspace.layout.parentlinks");
EPerson eperson = (EPerson) request.getAttribute("dspace.current.user");
%>
<%-- HACK: Have to put some non-break spaces because "margin-left" CSS
- property is poorly supported
- HACK: height=32 inserted for Netscape 4.x which doesn't recognise
- the "height: 2.0em" CSS property. --%>
<td height=32 class="locationBar">
<table width=100% border=0 cellpadding=0 cellspacing=0>
<tr>
<td class="locationBarCell">&nbsp;&nbsp;&nbsp;</td>
<td class="locationBarCell" width="100%">
<%
for (int i = 0; i < parentTitles.size(); i++) for (int i = 0; i < parentTitles.size(); i++)
{ {
String s = UIUtil.nonBreakSpace((String) parentTitles.get(i)); String s = (String) parentTitles.get(i);
String u = (String) parentLinks.get(i); String u = (String) parentLinks.get(i);
if (i != 0) // New line for each breadcrumb (no <br> needed for first)
if (i > 0)
{ {
// Not the first element, so need a preceding chevron %><br><%
%>&gt;<%
} }
if (u.equals("")) if (u.equals(""))
{ {
%> %>
<%= s %> <%= s %>&nbsp;&gt;
<% <%
} }
else else
{ {
%> %>
<A HREF="<%= request.getContextPath() %><%= u %>"><%= s %></A> <A HREF="<%= request.getContextPath() %><%= u %>"><%= s %></A>&nbsp;&gt;
<% <%
} }
} }
%> %>
</td> </P>
<td class="locationBarCell">&nbsp;&nbsp;&nbsp;</td>
<%
if (eperson != null)
{
%>
<%-- HACK: &nbsp's are a workaround for Netscape 4.x, which doesn't honour
-- "white-space: nowrap" CSS property --%>
<td class="loggedInCell">
Logged&nbsp;in&nbsp;as&nbsp;<%= eperson.getEmail() %>&nbsp;&nbsp;&nbsp;
</td>
<%
}
%>
</tr>
</table>
</td>

88
dspace/jsp/layout/navbar-default.jsp
View File

@@ -49,10 +49,11 @@
<%@ page import="org.dspace.app.webui.util.UIUtil" %> <%@ page import="org.dspace.app.webui.util.UIUtil" %>
<%@ page import="org.dspace.content.Collection" %> <%@ page import="org.dspace.content.Collection" %>
<%@ page import="org.dspace.content.Community" %> <%@ page import="org.dspace.content.Community" %>
<%@ page import="org.dspace.eperson.EPerson" %>
<% <%
// Is anyone logged in? // Is anyone logged in?
boolean loggedIn = (request.getAttribute("dspace.current.user") != null); EPerson user = (EPerson) request.getAttribute("dspace.current.user");
// Get the current page, minus query string // Get the current page, minus query string
String currentPage = UIUtil.getOriginalURL(request); String currentPage = UIUtil.getOriginalURL(request);
@@ -66,6 +67,15 @@
<%-- Search Box --%> <%-- Search Box --%>
<form method=GET action="<%= request.getContextPath() %>/simple-search"> <form method=GET action="<%= request.getContextPath() %>/simple-search">
<%
if (user != null)
{
%>
<P class="loggedIn">Logged&nbsp;in&nbsp;as <%= user.getEmail() %>
(<A HREF="<%= request.getContextPath() %>/logout">Logout</A>)</P>
<%
}
%>
<table width="100%" class="searchBox"> <table width="100%" class="searchBox">
<tr> <tr>
<td> <td>
@@ -88,6 +98,19 @@
<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> <%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%>
<table width="100%" border="0" cellspacing="2" cellpadding="2"> <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 class="navigationBarItem">
<a href="<%= request.getContextPath() %>/">Home</a>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr> <tr>
<td nowrap colspan="2" class="navigationBarSublabel">Browse</td> <td nowrap colspan="2" class="navigationBarSublabel">Browse</td>
</tr> </tr>
@@ -97,7 +120,7 @@
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.equals( "/community-list" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"> <img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.equals( "/community-list" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16">
</td> </td>
<td nowrap class="navigationBarItem"> <td nowrap class="navigationBarItem">
<a href="<%= request.getContextPath() %>/community-list">Communities/<br />Collections</a> <a href="<%= request.getContextPath() %>/community-list">Communities<br />&amp;&nbsp;Collections</a>
</td> </td>
</tr> </tr>
@@ -133,15 +156,24 @@
</tr> </tr>
<tr> <tr>
<td nowrap colspan="2" class="navigationBarSublabel">Members</td> <td nowrap colspan="2" class="navigationBarSublabel">Sign on to:</td>
</tr> </tr>
<tr class="navigationBarItem"> <tr class="navigationBarItem">
<td> <td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/submit" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"> <img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/subscribe" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16">
</td> </td>
<td nowrap class="navigationBarItem"> <td nowrap class="navigationBarItem">
<a href="<%= request.getContextPath() %>/submit">Submit</a> <a href="<%= request.getContextPath() %>/subscribe">Receive email<br>updates</a>
</td>
</tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.equals( "/mydspace" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16">
</td>
<td nowrap class="navigationBarItem">
<a href="<%= request.getContextPath() %>/mydspace">My DSpace</a><br><small>authorized users</small>
</td> </td>
</tr> </tr>
@@ -154,47 +186,10 @@
</td> </td>
</tr> </tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.equals( "/mydspace" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16">
</td>
<td nowrap class="navigationBarItem">
<a href="<%= request.getContextPath() %>/mydspace">My DSpace</a>
</td>
</tr>
<tr> <tr>
<td colspan="2">&nbsp;</td> <td colspan="2">&nbsp;</td>
</tr> </tr>
<%
// If logged in
if( loggedIn )
{
%>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.equals( "/logout" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16">
</td>
<td nowrap class="navigationBarItem">
<a href="<%= request.getContextPath() %>/logout">Log Out</a>
</td>
</tr>
<%
}
%>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.equals( "/about" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16">
</td>
<td nowrap class="navigationBarItem">
<a href="http://www.dspace.org/">About</a>
</td>
</tr>
<tr class="navigationBarItem"> <tr class="navigationBarItem">
<td> <td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.equals( "/help" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"> <img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.equals( "/help" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16">
@@ -204,4 +199,13 @@
</td> </td>
</tr> </tr>
<tr class="navigationBarItem">
<td>
<img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.equals( "/about" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16">
</td>
<td nowrap class="navigationBarItem">
<a href="http://www.dspace.org/">About DSpace</a>
</td>
</tr>
</table> </table>

184
dspace/jsp/styles.css.jsp
View File

@@ -77,85 +77,87 @@
} }
%> %>
A { color: #003366 } A { color: #336699 }
BODY { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; BODY { font-family: "verdana", Arial, Helvetica, sans-serif;
font-size: 10pt; font-size: 10pt;
font-style: normal; font-style: normal;
color: black; color: #000000;
background: black; background: #bbbbbb;
margin: 0; margin: 0;
padding: 0 } padding: 0 }
<%-- Note: Font information must be repeated for broken Netscape 4.xx --%>
H1 { margin-left: 10px; H1 { margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-size: 18pt; font-size: 16pt;
font-weight: bold;
font-style: normal; font-style: normal;
color: #006699 } font-family: "verdana", "Arial", "Helvetica", sans-serif;
color: #336699 }
H2 { margin-left: 10px; H2 { margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-size: 16pt; font-size: 14pt;
font-style: normal; font-style: normal;
color: #006699 } font-family: "verdana", "Arial", "Helvetica", sans-serif;
color: #336699 }
H3 { margin-left: 10px; H3 { margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-size: 12pt; font-size: 12pt;
font-weight: bold; font-weight: bold;
font-family: "verdana", "Arial", "Helvetica", sans-serif;
color: black } color: black }
p { margin-left: 10px; p { margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt } font-size: 10pt }
UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; UL { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt } font-size: 10pt }
<%-- This class is here so the standard style from "P" above can be applied --%. <%-- This class is here so the standard style from "P" above can be applied --%.
<%-- to anything else. --%> <%-- to anything else. --%>
.standard { margin-left: 10px; .standard { margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt } font-size: 10pt }
.pageBanner { width: 100%; .pageBanner { width: 100%;
border: 0; border: 0;
margin: 1px; margin: 0;
padding: 0 } background: #ffffff;
color: #000000;
padding: 0;
vertical-align: middle }
.logoBar { background: black url(<%= imageUrl %>star-background.jpg) repeat-x; .tagLine { vertical-align: bottom;
vertical-align: top } padding: 10px;
border: 0;
margin: 0;
background: #ffffff;
color: #ff6600 }
.locationBar { background: #A7AABB; .tagLineText { background: #ffffff;
color: #252645; color: #ff6600;
vertical-align: middle;
height: 32px;
margin-left: 10px }
.locationBarCell { background: #A7AABB;
color: #252645;
font-size: 10pt; font-size: 10pt;
font-family: "Tahoma", "Arial", "Helvetica", sans-serif;
font-weight: bold; font-weight: bold;
vertical-align: middle; border: 0;
text-align: left; margin: 0 }
height: 1.0em;
text-decoration: none }
.loggedInCell { background: #A7AABB; .stripe { background: #336699 url(<%= imageUrl %>stripe.gif) repeat-x;
color: #882222; vertical-align: top;
font-size: 10pt; border: 0;
font-family: "Tahoma", "Arial", "Helvetica", sans-serif; padding: 0;
font-weight: bold; margin: 0;
vertical-align: middle; color: #ffffff }
text-align: right;
height: 1.0em; .locationBar { font-size: 10pt;
text-decoration: none; font-family: "verdana", "Arial", "Helvetica", sans-serif;
margin-right: 10px; text-align: left }
white-space: nowrap }
.centralPane { margin: 1px; .centralPane { margin: 1px;
vertical-align: top; vertical-align: top;
@@ -168,7 +170,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
<%-- a width of 0%, but in practice browsers will only take this 100% --%> <%-- a width of 0%, but in practice browsers will only take this 100% --%>
<%-- as a hint, and just make it as wide as it can without impinging --%> <%-- as a hint, and just make it as wide as it can without impinging --%>
<%-- the other cells. This, fortunately, is precisely what we want. --%> <%-- the other cells. This, fortunately, is precisely what we want. --%>
.pageContents { FONT-FAMILY: "Trebuchet MS", Arial, Helvetica, sans-serif; .pageContents { FONT-FAMILY: "verdana", Arial, Helvetica, sans-serif;
background: white; background: white;
color: black; color: black;
vertical-align: top; vertical-align: top;
@@ -179,7 +181,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
margin: 2px; margin: 2px;
border: 0 } border: 0 }
.navigationBar { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .navigationBar { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
@@ -187,8 +189,8 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
text-decoration: none; text-decoration: none;
background: white } background: white }
.navigationBarSublabel{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .navigationBarSublabel{ font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
color: black; color: black;
@@ -200,59 +202,71 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
<%-- should be inherited from the parent, but isn't in Netscape 4.x, --%> <%-- should be inherited from the parent, but isn't in Netscape 4.x, --%>
<%-- IE or Opera. (Only Mozilla functions correctly.) --%> <%-- IE or Opera. (Only Mozilla functions correctly.) --%>
.navigationBarItem { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .navigationBarItem { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: normal;
color: #252645; color: #252645;
background: #ffffff;
text-decoration: none; text-decoration: none;
vertical-align: middle; vertical-align: middle;
white-space: nowrap } white-space: nowrap }
.loggedIn { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 8pt;
font-style: normal;
font-weight: normal;
color: #882222;
background: #ffffff }
.pageFooterBar { width: 100%; .pageFooterBar { width: 100%;
border: 0; border: 0;
margin: 0; margin: 0;
padding: 0; padding: 0;
background: white } background: #ffffff;
color: #000000;
vertical-align: middle }
.pageFootnote { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .pageFootnote { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: normal;
background: #ffffff;
color: #252645; color: #252645;
text-decoration: none; text-decoration: none;
text-align: center; text-align: left;
vertical-align: top; vertical-align: middle;
margin-left: 10px; margin-left: 10px;
margin-right: 10px } margin-right: 10px }
.sidebar { background: white } .sidebar { background: #ffffff;
color: #000000 }
.communityLink { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; .communityLink { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 14pt; font-size: 14pt;
font-weight: bold } font-weight: bold }
.communityDescription { margin-left: 20px; .communityDescription { margin-left: 20px;
margin-right: 10px; margin-right: 10px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
font-weight: normal; font-weight: normal;
list-style-type: none } list-style-type: none }
.collectionListItem { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; .collectionListItem { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-weight: normal } font-weight: normal }
.collectionDescription { margin-left: 20px; .collectionDescription { margin-left: 20px;
margin-right: 10px; margin-right: 10px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
font-weight: normal; font-weight: normal;
list-style-type: none } list-style-type: none }
.miscListItem { margin-left: 20px; .miscListItem { margin-left: 20px;
margin-right: 10px; margin-right: 10px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
list-style-type: none } list-style-type: none }
@@ -260,27 +274,29 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
margin-right: 20px; margin-right: 20px;
text-align: center; text-align: center;
font-style: italic; font-style: italic;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
list-style-type: none } list-style-type: none }
.browseBarLabel { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .browseBarLabel { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
color: black; color: #000000;
background: #ffffff;
vertical-align: middle; vertical-align: middle;
text-decoration: none } text-decoration: none }
.browseBar { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .browseBar { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
background: #ffffff;
color: #252645; color: #252645;
vertical-align: middle; vertical-align: middle;
text-decoration: none } text-decoration: none }
.itemListCellOdd { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .itemListCellOdd { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -290,7 +306,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
background: #ffffff } background: #ffffff }
.itemListCellEven { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .itemListCellEven { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -299,7 +315,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
text-decoration: none; text-decoration: none;
background: #eeeeee } background: #eeeeee }
.itemListCellHilight { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .itemListCellHilight { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -310,32 +326,32 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
.topNavLink { margin-left: 10px; .topNavLink { margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
text-align: center } text-align: center }
.submitFormLabel { margin-left: 10px; .submitFormLabel { margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-weight: bold; font-weight: bold;
font-size: 10pt; font-size: 10pt;
text-align: right } text-align: right }
.submitFormHelp { margin-left: 10px; .submitFormHelp { margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 8pt;
text-align: center } text-align: center }
.uploadHelp { margin-left: 20px; .uploadHelp { margin-left: 20px;
margin-right: 20px; margin-right: 20px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
text-align: left } text-align: left }
.submitFormDateLabel { margin-left: 10px; .submitFormDateLabel { margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
font-style: italic; font-style: italic;
text-align: center } text-align: center }
@@ -349,7 +365,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
.submitProgressButton{ border: 0 } .submitProgressButton{ border: 0 }
.miscTable { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .miscTable { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -371,7 +387,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
%> %>
.oddRowOddCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .oddRowOddCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -381,7 +397,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
background: #ffffff; background: #ffffff;
<%= padding %> } <%= padding %> }
.evenRowOddCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .evenRowOddCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -391,7 +407,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
background: #eeeeee; background: #eeeeee;
<%= padding %> } <%= padding %> }
.oddRowEvenCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .oddRowEvenCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -401,7 +417,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
background: #eeeeee; background: #eeeeee;
<%= padding %> } <%= padding %> }
.evenRowEvenCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .evenRowEvenCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -411,7 +427,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
background: #dddddd; background: #dddddd;
<%= padding %> } <%= padding %> }
.highlightRowOddCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .highlightRowOddCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -421,7 +437,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
background: #ccccee; background: #ccccee;
<%= padding %> } <%= padding %> }
.highlightRowEvenCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .highlightRowEvenCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -435,7 +451,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
border: 0; border: 0;
color: #000000 } color: #000000 }
.metadataFieldLabel{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .metadataFieldLabel{ font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
@@ -446,7 +462,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
white-space: nowrap; white-space: nowrap;
<%= padding %> } <%= padding %> }
.metadataFieldValue{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .metadataFieldValue{ font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 12pt; font-size: 12pt;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@@ -458,10 +474,10 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
.recentItem { margin-left: 10px; .recentItem { margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt } font-size: 10pt }
.searchBox { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .searchBox { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;
@@ -473,7 +489,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif;
border: 0; border: 0;
margin: 0 } margin: 0 }
.searchBoxLabel { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; .searchBoxLabel { font-family: "verdana", "Arial", "Helvetica", sans-serif;
font-size: 10pt; font-size: 10pt;
font-style: normal; font-style: normal;
font-weight: bold; font-weight: bold;

3
dspace/jsp/submit/cancel.jsp
View File

@@ -69,8 +69,7 @@
if (displayStep==null) displayStep = step; if (displayStep==null) displayStep = step;
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Cancel or Save Submission">
title="Cancel or Save Submission">
<form action="<%= request.getContextPath() %>/submit" method=post> <form action="<%= request.getContextPath() %>/submit" method=post>

2
dspace/jsp/submit/cancelled-removed.jsp
View File

@@ -45,7 +45,7 @@
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<dspace:layout locbar="nolink" parenttitle="Submit" title="Submission Cancelled"> <dspace:layout locbar="off" title="Submission Cancelled">
<H1>Submission Cancelled</H1> <H1>Submission Cancelled</H1>

3
dspace/jsp/submit/change-file-description.jsp
View File

@@ -57,8 +57,7 @@
(SubmissionInfo) request.getAttribute("submission.info"); (SubmissionInfo) request.getAttribute("submission.info");
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Change File Description">
title="Change File Description">
<form action="<%= request.getContextPath() %>/submit" method=post> <form action="<%= request.getContextPath() %>/submit" method=post>

3
dspace/jsp/submit/choose-file.jsp
View File

@@ -55,8 +55,7 @@
(SubmissionInfo) request.getAttribute("submission.info"); (SubmissionInfo) request.getAttribute("submission.info");
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Upload a File">
title="Upload a File">
<form method=post action="<%= request.getContextPath() %>/submit" enctype="multipart/form-data"> <form method=post action="<%= request.getContextPath() %>/submit" enctype="multipart/form-data">

3
dspace/jsp/submit/complete.jsp
View File

@@ -46,8 +46,7 @@
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Submission Complete!">
title="Submission Complete!">
<jsp:include page="/submit/progressbar.jsp"> <jsp:include page="/submit/progressbar.jsp">
<jsp:param name="current_stage" value="<%= SubmitServlet.SUBMISSION_COMPLETE %>"/> <jsp:param name="current_stage" value="<%= SubmitServlet.SUBMISSION_COMPLETE %>"/>

3
dspace/jsp/submit/edit-metadata-1.jsp
View File

@@ -71,8 +71,7 @@
final int formWidth = 50; final int formWidth = 50;
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Describe Your Item">
title="Describe Your Item">
<form action="<%= request.getContextPath() %>/submit#field" method=post> <form action="<%= request.getContextPath() %>/submit#field" method=post>

3
dspace/jsp/submit/edit-metadata-2.jsp
View File

@@ -62,8 +62,7 @@
final int subjectWidth = 15; final int subjectWidth = 15;
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Describe Your Item">
title="Describe Your Item">
<form action="<%= request.getContextPath() %>/submit#field" method=post> <form action="<%= request.getContextPath() %>/submit#field" method=post>

3
dspace/jsp/submit/get-file-format.jsp
View File

@@ -69,8 +69,7 @@
Item item = si.submission.getItem(); Item item = si.submission.getItem();
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Select File Format">
title="Select File Format">
<form action="<%= request.getContextPath() %>/submit" method=post> <form action="<%= request.getContextPath() %>/submit" method=post>

3
dspace/jsp/submit/initial-questions.jsp
View File

@@ -55,8 +55,7 @@
(SubmissionInfo) request.getAttribute("submission.info"); (SubmissionInfo) request.getAttribute("submission.info");
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Describe Your Item">
title="Describe Your Item">
<form action="<%= request.getContextPath() %>/submit" method=post> <form action="<%= request.getContextPath() %>/submit" method=post>

3
dspace/jsp/submit/review.jsp
View File

@@ -75,8 +75,7 @@
identifierQualNames.put( "other", "Other" ); identifierQualNames.put( "other", "Other" );
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Verify Submission">
title="Verify Submission">
<form action="<%= request.getContextPath() %>/submit" method=post> <form action="<%= request.getContextPath() %>/submit" method=post>
<jsp:include page="/submit/progressbar.jsp"> <jsp:include page="/submit/progressbar.jsp">

3
dspace/jsp/submit/saved.jsp
View File

@@ -45,8 +45,7 @@
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Submission Saved">
title="Submission Saved">
<H1>Submission Saved</H1> <H1>Submission Saved</H1>

3
dspace/jsp/submit/select-collection.jsp
View File

@@ -55,8 +55,7 @@
(Collection[]) request.getAttribute("collections"); (Collection[]) request.getAttribute("collections");
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Select Collection to Submit to">
title="Select Collection to Submit to">
<jsp:include page="/submit/progressbar.jsp"> <jsp:include page="/submit/progressbar.jsp">
<jsp:param name="current_stage" value="<%= SubmitServlet.SELECT_COLLECTION %>"/> <jsp:param name="current_stage" value="<%= SubmitServlet.SELECT_COLLECTION %>"/>

3
dspace/jsp/submit/show-license.jsp
View File

@@ -58,8 +58,7 @@
String license = (String) request.getAttribute("license"); String license = (String) request.getAttribute("license");
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="DSpace Distribution License">
title="DSpace Distribution License">
<form action="<%= request.getContextPath() %>/submit" method=post> <form action="<%= request.getContextPath() %>/submit" method=post>

3
dspace/jsp/submit/show-uploaded-file.jsp
View File

@@ -71,8 +71,7 @@
BitstreamFormat format = bitstream.getFormat(); BitstreamFormat format = bitstream.getFormat();
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Uploaded File">
title="Uploaded File">
<form action="<%= request.getContextPath() %>/submit" method=post> <form action="<%= request.getContextPath() %>/submit" method=post>

3
dspace/jsp/submit/upload-error.jsp
View File

@@ -58,8 +58,7 @@
(SubmissionInfo) request.getAttribute("submission.info"); (SubmissionInfo) request.getAttribute("submission.info");
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Error Uploading File">
title="Error Uploading File">
<form action="<%= request.getContextPath() %>/submit" method=post> <form action="<%= request.getContextPath() %>/submit" method=post>

3
dspace/jsp/submit/upload-file-list.jsp
View File

@@ -67,8 +67,7 @@
boolean showChecksums = ((Boolean) request.getAttribute("show.checksums")).booleanValue(); boolean showChecksums = ((Boolean) request.getAttribute("show.checksums")).booleanValue();
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Uploaded Files">
title="Uploaded Files">
<form action="<%= request.getContextPath() %>/submit" method=post> <form action="<%= request.getContextPath() %>/submit" method=post>

3
dspace/jsp/submit/verify-prune.jsp
View File

@@ -70,8 +70,7 @@
String buttonPressed = (String) request.getAttribute("button.pressed"); String buttonPressed = (String) request.getAttribute("button.pressed");
%> %>
<dspace:layout locbar="nolink" navbar="off" parenttitle="Submit" <dspace:layout locbar="off" navbar="off" title="Answers to Initial Questions Changed">
title="Answers to Initial Questions Changed">
<H1>Submit: Caution</H1> <H1>Submit: Caution</H1>

4
dspace/src/org/dspace/app/webui/jsptag/LayoutTag.java
View File

@@ -206,10 +206,6 @@ public class LayoutTag extends TagSupport
} }
request.setAttribute("dspace.layout.locbar", new Boolean(true)); request.setAttribute("dspace.layout.locbar", new Boolean(true));
// Add current page title
parents.add(title);
parentLinks.add("");
} }
request.setAttribute("dspace.layout.parenttitles", parents); request.setAttribute("dspace.layout.parenttitles", parents);