diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg index a2a41e250c..d9bef70ccc 100644 --- a/dspace/config/dspace.cfg +++ b/dspace/config/dspace.cfg @@ -18,7 +18,7 @@ dspace.url = https://localhost dspace.hostname = localhost # Name of the site -dspace.name = DSpace @ MIT +dspace.name = DSpace at MIT ##### Destinations for configuration files for other tools ##### diff --git a/dspace/jsp/components/news.jsp b/dspace/jsp/components/news.jsp index 4a606b639c..92f8a6eb7f 100644 --- a/dspace/jsp/components/news.jsp +++ b/dspace/jsp/components/news.jsp @@ -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. --%> - - - - - - - -
- Launching -
-

DSpace launches
- April 2002

-
- -

New Collections:

-

- LIDS Technical Reports -

-

- MIT Press Out of Print Books -

+

DSpace is Live

+

Welcome to our digital repository of MIT research!

+

More news...

diff --git a/dspace/jsp/home.jsp b/dspace/jsp/home.jsp index 1ebeab455a..e68a7563f3 100644 --- a/dspace/jsp/home.jsp +++ b/dspace/jsp/home.jsp @@ -44,79 +44,68 @@ <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> +<%@ page import="org.dspace.content.Community" %> <%@ page import="org.dspace.core.ConfigurationManager" %> +<% + Community[] communities = (Community[]) request.getAttribute("communities"); +%> + -

<%= ConfigurationManager.getProperty("dspace.name") %> Home

- -
- - - - - - - - - - - - +
- - - - - -

What can you find in DSpace?

More Information   
- - - - - -
-
    -
  • Articles
    • -
  • Technical Reports
    • -
  • Working Papers
    • -
- 		-
    -
  • Datasets
    • -
  • Images
    • -
  • Videos....and more
    • -
-
-
-

Search

-

Enter some text in the box below to search DSpace.

-

 

- 		-

Submit

-

Submit your digital content to DSpace! To - start the submission process, select the button below.

-

Start Submitting

-

Authorized Users Only

-
-

Browse

-

You can also browse a DSpace index:

- - 		-

My DSpace

-

You can visit "My DSpace" to resume half-finished - submissions and check on the progress of previous submissions.

-

Visit My DSpace

-

Authorized Users Only

-
+ + + +
+ +
+ +
+ + + + + + +
+

Search

+

Enter some text in the box below to search DSpace.

+
<%-- HACK for Netscape 4.xx, "align=center" doesn't seem to work--%> +

 

+
+
+
+ + + + +
+

Communities in DSpace

+

Select a community to browse its collections.

+ +<% + for (int i = 0; i < communities.length; i++) + { +%> + + +<% + } +%> +
+ <%= communities[i].getMetadata("name") %> +
+
- - + <%-- non-break spaces to make sidebar a reasonable width--%> +

What can you find in DSpace?

+

MIT Research in digital form, including preprints, technical reports, working papers, conference papers, images, and more.

+ +
+

Is this all of MIT's research?

+

No. DSpace is limited to digital research products. For items in print, go to Barton: MIT Libraries' catalog. DSpace is young and growing rapidly. Check back often.

 diff --git a/dspace/jsp/image/dome-bluewhite-smaller.gif b/dspace/jsp/image/dome-bluewhite-smaller.gif new file mode 100644 index 0000000000..513dc3d40f Binary files /dev/null and b/dspace/jsp/image/dome-bluewhite-smaller.gif differ diff --git a/dspace/jsp/image/dspace-blue.gif b/dspace/jsp/image/dspace-blue.gif new file mode 100644 index 0000000000..644d23176d Binary files /dev/null and b/dspace/jsp/image/dspace-blue.gif differ diff --git a/dspace/jsp/image/hp-mit.gif b/dspace/jsp/image/hp-mit.gif new file mode 100644 index 0000000000..01d7e0c083 Binary files /dev/null and b/dspace/jsp/image/hp-mit.gif differ diff --git a/dspace/jsp/image/hp.gif b/dspace/jsp/image/hp.gif new file mode 100644 index 0000000000..edcabdfbfe Binary files /dev/null and b/dspace/jsp/image/hp.gif differ diff --git a/dspace/jsp/image/stripe.gif b/dspace/jsp/image/stripe.gif new file mode 100644 index 0000000000..b06b894b70 Binary files /dev/null and b/dspace/jsp/image/stripe.gif differ diff --git a/dspace/jsp/index.jsp b/dspace/jsp/index.jsp index de4e59b01c..80d58a76ef 100644 --- a/dspace/jsp/index.jsp +++ b/dspace/jsp/index.jsp @@ -58,6 +58,7 @@ <%@ page import="org.dspace.app.webui.util.JSPManager" %> <%@ 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.LogManager" %> @@ -69,6 +70,10 @@ // Obtain a context so that the location bar can display log in status context = UIUtil.obtainContext(request); + // Home page shows community list + Community[] communities = Community.findAll(context); + request.setAttribute("communities", communities); + // Show home page JSP JSPManager.showJSP(request, response, "/home.jsp"); } diff --git a/dspace/jsp/layout/footer-default.jsp b/dspace/jsp/layout/footer-default.jsp index 5bcdae922f..a70c75fb5b 100644 --- a/dspace/jsp/layout/footer-default.jsp +++ b/dspace/jsp/layout/footer-default.jsp @@ -1,5 +1,5 @@ <%-- - -- footer-default.jsp + -- footer-home.jsp -- -- Version: $Revision$ -- @@ -39,7 +39,7 @@ --%> <%-- - - Footer for default style of page + - Footer for home page --%> <%@ page import="java.net.URLEncoder" %> @@ -47,17 +47,10 @@ <% String sidebar = (String) request.getAttribute("dspace.layout.sidebar"); - String navbar = (String) request.getAttribute("dspace.layout.navbar"); - int overallColSpan = 1; - - if (sidebar != null) + int overallColSpan = 3; + if (sidebar == null) { - overallColSpan++; - } - - if (!navbar.equals("off")) - { - overallColSpan++; + overallColSpan = 2; } %> <%-- End of page content --%> @@ -84,8 +77,18 @@ %> class="pageFootnote"> - Copyright © 2002 MIT and Hewlett-Packard - - Feedback + + + + + + +
invent @ MIT: The HP-MIT Alliance + Copyright © 2002 MIT and Hewlett-Packard - + Feedback + <%-- nowrap, valign for broken NS 4.x --%> +    Hewlett Packard    +
diff --git a/dspace/jsp/layout/footer-home.jsp b/dspace/jsp/layout/footer-home.jsp index be5ad2f842..a70c75fb5b 100644 --- a/dspace/jsp/layout/footer-home.jsp +++ b/dspace/jsp/layout/footer-home.jsp @@ -77,8 +77,18 @@ %> class="pageFootnote"> - Copyright © 2002 MIT and Hewlett-Packard - - Feedback + + + + + + +
invent @ MIT: The HP-MIT Alliance + Copyright © 2002 MIT and Hewlett-Packard - + Feedback + <%-- nowrap, valign for broken NS 4.x --%> +    Hewlett Packard    +
diff --git a/dspace/jsp/layout/header-default.jsp b/dspace/jsp/layout/header-default.jsp index 2d9006c539..a5375be51a 100644 --- a/dspace/jsp/layout/header-default.jsp +++ b/dspace/jsp/layout/header-default.jsp @@ -1,5 +1,5 @@ <%-- - - header-default.jsp + - header-home.jsp - - 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" %> <%@ page import="java.util.List"%> +<%@ page import="org.dspace.app.webui.util.JSPManager" %> <%@ page import="org.dspace.core.ConfigurationManager" %> <% @@ -68,38 +69,28 @@ <%-- HACK: marginwidth, marginheight: for non-CSS compliant Netscape browser --%> - <%-- DSpace top-of-page banner --%> - <%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> - - <%-- DSpace logo and star background --%> - - <%-- HACK: background: for non-CSS compliant Netscape 4.x browser --%> + <%-- DSpace logo --%> - + + - - - <%-- Location bar --%> -<% - if (locbar) - { -%> - - - + <%-- Blue stripe --%> + +
- DSpace + + DSpace <%-- Make as wide as possible. cellpadding repeated for broken NS 4.x --%> + About DSpace + +    MIT Libraries   
 
-<% - } -%> <%-- Page contents --%> - + <%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> @@ -124,3 +115,13 @@ <%-- navigation bar gets far too wide on certain pages --%> <%-- Navigation bar --%> +<% + if (!navbar.equals("off")) + { +%> - +<% + } +%> <%-- Page Content --%> <%-- HACK: width specified here for non-CSS compliant Netscape 4.x --%> @@ -119,3 +115,13 @@ <%-- navigation bar gets far too wide on certain pages --%> +

diff --git a/dspace/jsp/layout/navbar-default.jsp b/dspace/jsp/layout/navbar-default.jsp index 59ff31db61..818df164ae 100644 --- a/dspace/jsp/layout/navbar-default.jsp +++ b/dspace/jsp/layout/navbar-default.jsp @@ -49,10 +49,11 @@ <%@ 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" %> <% // 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 String currentPage = UIUtil.getOriginalURL(request); @@ -66,6 +67,15 @@ <%-- Search Box --%> +<% + if (user != null) + { +%> +

Logged in as <%= user.getEmail() %> + (Logout)

+<% + } +%>
+ <%-- Location bar --%> +<% + if (locbar) + { +%> + +<% + } +%> + diff --git a/dspace/jsp/layout/header-home.jsp b/dspace/jsp/layout/header-home.jsp index 6ad7327d86..a5375be51a 100644 --- a/dspace/jsp/layout/header-home.jsp +++ b/dspace/jsp/layout/header-home.jsp @@ -69,35 +69,25 @@ <%-- HACK: marginwidth, marginheight: for non-CSS compliant Netscape browser --%> - <%-- DSpace top-of-page banner --%> - <%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> - - <%-- DSpace logo and star background --%> - - <%-- HACK: background: for non-CSS compliant Netscape 4.x browser --%> + <%-- DSpace logo --%> - + + - - - <%-- Location bar --%> -<% - if (locbar) - { -%> - - - + <%-- Blue stripe --%> + +
- DSpace + + DSpace <%-- Make as wide as possible. cellpadding repeated for broken NS 4.x --%> + About DSpace + +    MIT Libraries   
 
-<% - } -%> <%-- Page contents --%> @@ -108,10 +98,16 @@
+ <%-- Location bar --%> +<% + if (locbar) + { +%> + +<% + } +%> + diff --git a/dspace/jsp/layout/location-bar.jsp b/dspace/jsp/layout/location-bar.jsp index 7157ec95bc..7119e5479f 100644 --- a/dspace/jsp/layout/location-bar.jsp +++ b/dspace/jsp/layout/location-bar.jsp @@ -42,7 +42,7 @@ - Location bar component - - 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 - 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.parentlinks - List of URLs of parent pages, empty string - for non-links - - dspace.current.user - Current EPerson user, or null --%> <%@ page import="java.util.List" %> -<%@ page import="org.dspace.app.webui.util.UIUtil" %> -<%@ page import="org.dspace.eperson.EPerson" %> - - +

<% List parentTitles = (List) request.getAttribute("dspace.layout.parenttitles"); 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. --%> -

 - - - - - -<% - if (eperson != null) - { -%> -<%-- HACK:  's are a workaround for Netscape 4.x, which doesn't honour - -- "white-space: nowrap" CSS property --%> - -<% - } -%> - -
    -<% 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); - if (i != 0) + // New line for each breadcrumb (no
needed for first) + if (i > 0) { - // Not the first element, so need a preceding chevron -%>><% +%>
<% } if (u.equals("")) { %> - <%= s %> +<%= s %> > <% } else { %> - <%= s %> +<%= s %> > <% } - } +} %> - 		    - Logged in as <%= eperson.getEmail() %>    -
-
@@ -88,6 +98,19 @@ <%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> + + + + + + + + + @@ -97,7 +120,7 @@ .gif" width="16" height="16"> @@ -133,15 +156,24 @@ - + + + + + + @@ -154,47 +186,10 @@ - - - - - -<% - // If logged in - if( loggedIn ) - { -%> - - - - - - -<% - } -%> - - - - - - + + + + +
+ .gif" width="16" height="16"> + + Home +
 
Browse
- Communities/
Collections + Communities
& Collections
MembersSign on to:
- .gif" width="16" height="16"> + .gif" width="16" height="16"> - Submit + Receive email
updates +
+ .gif" width="16" height="16"> + + My DSpace
authorized users
- .gif" width="16" height="16"> - - My DSpace -
 
- .gif" width="16" height="16"> - - Log Out -
- .gif" width="16" height="16"> - - About -
.gif" width="16" height="16"> @@ -204,4 +199,13 @@
+ .gif" width="16" height="16"> + + About DSpace +
diff --git a/dspace/jsp/styles.css.jsp b/dspace/jsp/styles.css.jsp index 9575428be8..9fd06127be 100644 --- a/dspace/jsp/styles.css.jsp +++ b/dspace/jsp/styles.css.jsp @@ -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-style: normal; - color: black; - background: black; + color: #000000; + background: #bbbbbb; margin: 0; padding: 0 } +<%-- Note: Font information must be repeated for broken Netscape 4.xx --%> H1 { margin-left: 10px; margin-right: 10px; - font-size: 18pt; + font-size: 16pt; + font-weight: bold; font-style: normal; - color: #006699 } + font-family: "verdana", "Arial", "Helvetica", sans-serif; + color: #336699 } H2 { margin-left: 10px; margin-right: 10px; - font-size: 16pt; + font-size: 14pt; font-style: normal; - color: #006699 } + font-family: "verdana", "Arial", "Helvetica", sans-serif; + color: #336699 } H3 { margin-left: 10px; margin-right: 10px; font-size: 12pt; font-weight: bold; + font-family: "verdana", "Arial", "Helvetica", sans-serif; color: black } p { margin-left: 10px; margin-right: 10px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; - font-size: 12pt } + font-family: "verdana", "Arial", "Helvetica", sans-serif; + font-size: 10pt } -UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; - font-size: 12pt } +UL { font-family: "verdana", "Arial", "Helvetica", sans-serif; + font-size: 10pt } <%-- This class is here so the standard style from "P" above can be applied --%. <%-- to anything else. --%> .standard { margin-left: 10px; margin-right: 10px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; - font-size: 12pt } + font-family: "verdana", "Arial", "Helvetica", sans-serif; + font-size: 10pt } .pageBanner { width: 100%; border: 0; - margin: 1px; - padding: 0 } + margin: 0; + background: #ffffff; + color: #000000; + padding: 0; + vertical-align: middle } -.logoBar { background: black url(<%= imageUrl %>star-background.jpg) repeat-x; - vertical-align: top } +.tagLine { vertical-align: bottom; + padding: 10px; + border: 0; + margin: 0; + background: #ffffff; + color: #ff6600 } -.locationBar { background: #A7AABB; - color: #252645; - vertical-align: middle; - height: 32px; - margin-left: 10px } +.tagLineText { background: #ffffff; + color: #ff6600; + font-size: 10pt; + font-weight: bold; + border: 0; + margin: 0 } -.locationBarCell { background: #A7AABB; - color: #252645; - font-size: 10pt; - font-family: "Tahoma", "Arial", "Helvetica", sans-serif; - font-weight: bold; - vertical-align: middle; - text-align: left; - height: 1.0em; - text-decoration: none } +.stripe { background: #336699 url(<%= imageUrl %>stripe.gif) repeat-x; + vertical-align: top; + border: 0; + padding: 0; + margin: 0; + color: #ffffff } -.loggedInCell { background: #A7AABB; - color: #882222; - font-size: 10pt; - font-family: "Tahoma", "Arial", "Helvetica", sans-serif; - font-weight: bold; - vertical-align: middle; - text-align: right; - height: 1.0em; - text-decoration: none; - margin-right: 10px; - white-space: nowrap } +.locationBar { font-size: 10pt; + font-family: "verdana", "Arial", "Helvetica", sans-serif; + text-align: left } .centralPane { margin: 1px; 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% --%> <%-- as a hint, and just make it as wide as it can without impinging --%> <%-- 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; color: black; vertical-align: top; @@ -179,7 +181,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; margin: 2px; border: 0 } -.navigationBar { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.navigationBar { font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt; font-style: normal; font-weight: bold; @@ -187,8 +189,8 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; text-decoration: none; background: white } -.navigationBarSublabel{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; - font-size: 10pt; +.navigationBarSublabel{ font-family: "verdana", "Arial", "Helvetica", sans-serif; + font-size: 12pt; font-style: normal; font-weight: bold; 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, --%> <%-- 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-style: normal; - font-weight: bold; + font-weight: normal; color: #252645; + background: #ffffff; text-decoration: none; vertical-align: middle; 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%; border: 0; margin: 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-style: normal; - font-weight: bold; + font-weight: normal; + background: #ffffff; color: #252645; text-decoration: none; - text-align: center; - vertical-align: top; + text-align: left; + vertical-align: middle; margin-left: 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-weight: bold } .communityDescription { margin-left: 20px; margin-right: 10px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; + font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt; font-weight: normal; 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-weight: normal } .collectionDescription { margin-left: 20px; margin-right: 10px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; + font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt; font-weight: normal; list-style-type: none } .miscListItem { margin-left: 20px; margin-right: 10px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; + font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; list-style-type: none } @@ -260,27 +274,29 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; margin-right: 20px; text-align: center; font-style: italic; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; + font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt; list-style-type: none } -.browseBarLabel { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.browseBarLabel { font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt; font-style: normal; font-weight: bold; - color: black; + color: #000000; + background: #ffffff; vertical-align: middle; text-decoration: none } -.browseBar { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.browseBar { font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: bold; + background: #ffffff; color: #252645; vertical-align: middle; text-decoration: none } -.itemListCellOdd { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.itemListCellOdd { font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: normal; @@ -290,7 +306,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; background: #ffffff } -.itemListCellEven { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.itemListCellEven { font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: normal; @@ -299,7 +315,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; text-decoration: none; background: #eeeeee } -.itemListCellHilight { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.itemListCellHilight { font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: normal; @@ -310,32 +326,32 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; .topNavLink { margin-left: 10px; margin-right: 10px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; + font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt; text-align: center } .submitFormLabel { margin-left: 10px; margin-right: 10px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; + font-family: "verdana", "Arial", "Helvetica", sans-serif; font-weight: bold; font-size: 10pt; text-align: right } .submitFormHelp { margin-left: 10px; margin-right: 10px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; - font-size: 10pt; + font-family: "verdana", "Arial", "Helvetica", sans-serif; + font-size: 8pt; text-align: center } .uploadHelp { margin-left: 20px; margin-right: 20px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; + font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt; text-align: left } .submitFormDateLabel { margin-left: 10px; margin-right: 10px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; + font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt; font-style: italic; text-align: center } @@ -349,7 +365,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; .submitProgressButton{ border: 0 } -.miscTable { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.miscTable { font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: 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-style: normal; font-weight: normal; @@ -381,7 +397,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; background: #ffffff; <%= padding %> } -.evenRowOddCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.evenRowOddCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: normal; @@ -391,7 +407,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; background: #eeeeee; <%= padding %> } -.oddRowEvenCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.oddRowEvenCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: normal; @@ -401,7 +417,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; background: #eeeeee; <%= padding %> } -.evenRowEvenCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.evenRowEvenCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: normal; @@ -411,7 +427,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; background: #dddddd; <%= padding %> } -.highlightRowOddCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.highlightRowOddCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: normal; @@ -421,7 +437,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; background: #ccccee; <%= padding %> } -.highlightRowEvenCol{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.highlightRowEvenCol{ font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: normal; @@ -435,7 +451,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; border: 0; color: #000000 } -.metadataFieldLabel{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.metadataFieldLabel{ font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: bold; @@ -446,7 +462,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; white-space: nowrap; <%= padding %> } -.metadataFieldValue{ font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.metadataFieldValue{ font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 12pt; font-style: normal; font-weight: normal; @@ -458,10 +474,10 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; .recentItem { margin-left: 10px; margin-right: 10px; - font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; + font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt } -.searchBox { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.searchBox { font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt; font-style: normal; font-weight: bold; @@ -473,7 +489,7 @@ UL { font-family: "Trebuchet ms", "Arial", "Helvetica", sans-serif; border: 0; margin: 0 } -.searchBoxLabel { font-family: "Tahoma", "Arial", "Helvetica", sans-serif; +.searchBoxLabel { font-family: "verdana", "Arial", "Helvetica", sans-serif; font-size: 10pt; font-style: normal; font-weight: bold; diff --git a/dspace/jsp/submit/cancel.jsp b/dspace/jsp/submit/cancel.jsp index f603edda24..18d3a1719f 100644 --- a/dspace/jsp/submit/cancel.jsp +++ b/dspace/jsp/submit/cancel.jsp @@ -69,8 +69,7 @@ if (displayStep==null) displayStep = step; %> - + diff --git a/dspace/jsp/submit/cancelled-removed.jsp b/dspace/jsp/submit/cancelled-removed.jsp index 6fea8cd265..278f8d23d6 100644 --- a/dspace/jsp/submit/cancelled-removed.jsp +++ b/dspace/jsp/submit/cancelled-removed.jsp @@ -45,7 +45,7 @@ <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - +

Submission Cancelled

diff --git a/dspace/jsp/submit/change-file-description.jsp b/dspace/jsp/submit/change-file-description.jsp index 0536112429..e2609166b4 100644 --- a/dspace/jsp/submit/change-file-description.jsp +++ b/dspace/jsp/submit/change-file-description.jsp @@ -57,8 +57,7 @@ (SubmissionInfo) request.getAttribute("submission.info"); %> - + diff --git a/dspace/jsp/submit/choose-file.jsp b/dspace/jsp/submit/choose-file.jsp index f30a1e55a6..8dca652118 100644 --- a/dspace/jsp/submit/choose-file.jsp +++ b/dspace/jsp/submit/choose-file.jsp @@ -55,8 +55,7 @@ (SubmissionInfo) request.getAttribute("submission.info"); %> - + diff --git a/dspace/jsp/submit/complete.jsp b/dspace/jsp/submit/complete.jsp index a25daa7968..37d6ec21a2 100644 --- a/dspace/jsp/submit/complete.jsp +++ b/dspace/jsp/submit/complete.jsp @@ -46,8 +46,7 @@ <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - + diff --git a/dspace/jsp/submit/edit-metadata-1.jsp b/dspace/jsp/submit/edit-metadata-1.jsp index b764aa2b23..92d56eb9de 100644 --- a/dspace/jsp/submit/edit-metadata-1.jsp +++ b/dspace/jsp/submit/edit-metadata-1.jsp @@ -71,8 +71,7 @@ final int formWidth = 50; %> - + diff --git a/dspace/jsp/submit/edit-metadata-2.jsp b/dspace/jsp/submit/edit-metadata-2.jsp index 0a2d435cb1..5becab3e15 100644 --- a/dspace/jsp/submit/edit-metadata-2.jsp +++ b/dspace/jsp/submit/edit-metadata-2.jsp @@ -62,8 +62,7 @@ final int subjectWidth = 15; %> - + diff --git a/dspace/jsp/submit/get-file-format.jsp b/dspace/jsp/submit/get-file-format.jsp index e76c6e4f0c..bba9424cc0 100644 --- a/dspace/jsp/submit/get-file-format.jsp +++ b/dspace/jsp/submit/get-file-format.jsp @@ -69,8 +69,7 @@ Item item = si.submission.getItem(); %> - + diff --git a/dspace/jsp/submit/initial-questions.jsp b/dspace/jsp/submit/initial-questions.jsp index 406575c483..ae15a3cf64 100644 --- a/dspace/jsp/submit/initial-questions.jsp +++ b/dspace/jsp/submit/initial-questions.jsp @@ -55,8 +55,7 @@ (SubmissionInfo) request.getAttribute("submission.info"); %> - + diff --git a/dspace/jsp/submit/review.jsp b/dspace/jsp/submit/review.jsp index 1100f14e07..1a297d123d 100644 --- a/dspace/jsp/submit/review.jsp +++ b/dspace/jsp/submit/review.jsp @@ -75,8 +75,7 @@ identifierQualNames.put( "other", "Other" ); %> - + diff --git a/dspace/jsp/submit/saved.jsp b/dspace/jsp/submit/saved.jsp index 7b1992848f..6122ce9be2 100644 --- a/dspace/jsp/submit/saved.jsp +++ b/dspace/jsp/submit/saved.jsp @@ -45,8 +45,7 @@ <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - +

Submission Saved

diff --git a/dspace/jsp/submit/select-collection.jsp b/dspace/jsp/submit/select-collection.jsp index 64e79fa1c2..cf4d8b6825 100644 --- a/dspace/jsp/submit/select-collection.jsp +++ b/dspace/jsp/submit/select-collection.jsp @@ -55,8 +55,7 @@ (Collection[]) request.getAttribute("collections"); %> - + diff --git a/dspace/jsp/submit/show-license.jsp b/dspace/jsp/submit/show-license.jsp index c87b797347..b060081d33 100644 --- a/dspace/jsp/submit/show-license.jsp +++ b/dspace/jsp/submit/show-license.jsp @@ -58,8 +58,7 @@ String license = (String) request.getAttribute("license"); %> - + diff --git a/dspace/jsp/submit/show-uploaded-file.jsp b/dspace/jsp/submit/show-uploaded-file.jsp index 3432305aca..71a45e2e83 100644 --- a/dspace/jsp/submit/show-uploaded-file.jsp +++ b/dspace/jsp/submit/show-uploaded-file.jsp @@ -71,8 +71,7 @@ BitstreamFormat format = bitstream.getFormat(); %> - + diff --git a/dspace/jsp/submit/upload-error.jsp b/dspace/jsp/submit/upload-error.jsp index 722cc281e2..8d4cea95cc 100644 --- a/dspace/jsp/submit/upload-error.jsp +++ b/dspace/jsp/submit/upload-error.jsp @@ -58,8 +58,7 @@ (SubmissionInfo) request.getAttribute("submission.info"); %> - + diff --git a/dspace/jsp/submit/upload-file-list.jsp b/dspace/jsp/submit/upload-file-list.jsp index 9bd24a8f4d..7dd954cfc1 100644 --- a/dspace/jsp/submit/upload-file-list.jsp +++ b/dspace/jsp/submit/upload-file-list.jsp @@ -67,8 +67,7 @@ boolean showChecksums = ((Boolean) request.getAttribute("show.checksums")).booleanValue(); %> - + diff --git a/dspace/jsp/submit/verify-prune.jsp b/dspace/jsp/submit/verify-prune.jsp index a7deaab22a..9b6fc45064 100644 --- a/dspace/jsp/submit/verify-prune.jsp +++ b/dspace/jsp/submit/verify-prune.jsp @@ -70,8 +70,7 @@ String buttonPressed = (String) request.getAttribute("button.pressed"); %> - +

Submit: Caution

diff --git a/dspace/src/org/dspace/app/webui/jsptag/LayoutTag.java b/dspace/src/org/dspace/app/webui/jsptag/LayoutTag.java index 20a96fab1b..cc4a253f35 100644 --- a/dspace/src/org/dspace/app/webui/jsptag/LayoutTag.java +++ b/dspace/src/org/dspace/app/webui/jsptag/LayoutTag.java @@ -206,10 +206,6 @@ public class LayoutTag extends TagSupport } request.setAttribute("dspace.layout.locbar", new Boolean(true)); - - // Add current page title - parents.add(title); - parentLinks.add(""); } request.setAttribute("dspace.layout.parenttitles", parents);