From ac24e6ac79551cfd9802910dc60526ed7d61e977 Mon Sep 17 00:00:00 2001 From: Robert Tansley Date: Wed, 23 Oct 2002 15:42:48 +0000 Subject: [PATCH] Updated look and feel of the site to match updated template. git-svn-id: http://scm.dspace.org/svn/repo/trunk@461 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- dspace/config/dspace.cfg | 2 +- dspace/jsp/components/news.jsp | 26 +-- dspace/jsp/home.jsp | 123 ++++++------ dspace/jsp/image/dome-bluewhite-smaller.gif | Bin 0 -> 2749 bytes dspace/jsp/image/dspace-blue.gif | Bin 0 -> 4969 bytes dspace/jsp/image/hp-mit.gif | Bin 0 -> 2353 bytes dspace/jsp/image/hp.gif | Bin 0 -> 870 bytes dspace/jsp/image/stripe.gif | Bin 0 -> 1019 bytes dspace/jsp/index.jsp | 5 + dspace/jsp/layout/footer-default.jsp | 31 +-- dspace/jsp/layout/footer-home.jsp | 14 +- dspace/jsp/layout/header-default.jsp | 49 ++--- dspace/jsp/layout/header-home.jsp | 50 ++--- dspace/jsp/layout/location-bar.jsp | 52 +---- dspace/jsp/layout/navbar-default.jsp | 88 +++++---- dspace/jsp/styles.css.jsp | 186 ++++++++++-------- dspace/jsp/submit/cancel.jsp | 3 +- dspace/jsp/submit/cancelled-removed.jsp | 2 +- dspace/jsp/submit/change-file-description.jsp | 3 +- dspace/jsp/submit/choose-file.jsp | 3 +- dspace/jsp/submit/complete.jsp | 3 +- dspace/jsp/submit/edit-metadata-1.jsp | 3 +- dspace/jsp/submit/edit-metadata-2.jsp | 3 +- dspace/jsp/submit/get-file-format.jsp | 3 +- dspace/jsp/submit/initial-questions.jsp | 3 +- dspace/jsp/submit/review.jsp | 3 +- dspace/jsp/submit/saved.jsp | 3 +- dspace/jsp/submit/select-collection.jsp | 3 +- dspace/jsp/submit/show-license.jsp | 3 +- dspace/jsp/submit/show-uploaded-file.jsp | 3 +- dspace/jsp/submit/upload-error.jsp | 3 +- dspace/jsp/submit/upload-file-list.jsp | 3 +- dspace/jsp/submit/verify-prune.jsp | 3 +- .../dspace/app/webui/jsptag/LayoutTag.java | 4 - 34 files changed, 322 insertions(+), 358 deletions(-) create mode 100644 dspace/jsp/image/dome-bluewhite-smaller.gif create mode 100644 dspace/jsp/image/dspace-blue.gif create mode 100644 dspace/jsp/image/hp-mit.gif create mode 100644 dspace/jsp/image/hp.gif create mode 100644 dspace/jsp/image/stripe.gif 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 0000000000000000000000000000000000000000..513dc3d40f6779d814770cf74828762dc5bbc1a8 GIT binary patch literal 2749 zcmV;u3PSZqNk%w1VOjtt0QUd@qPWQA?C`|W+=8C7zRuZEc9hcI<@Wgc+~w=e+TvJ! znY6{yd6=)MzRUn5RII?wm9M~LiK7cUW-3{IBUE`YU4V3!t@!!-6iae)kg4$W_UZ2O zbdjl~y2*{Ey8ZtCJ!y*j{QZupym5}E{Qmye;phM|Ue@5|d6unQft)&IhQQF;8$@mN z_xZBL(fIoNKyHrI-sPgU#vM_1Rd|+Fe3%_ndD!CU6-I8x)ZJ~3rje?=05xDKR(da5 ze%|Kn04-WtfSaAN!vHW{c$BR2_V|6BvX`*I06JyR+2IaAYG{d~g`l+yK4_AxzEgRY zn6bjzJEe>+h_-%w~q51vzEw@bmyUV>4ibZIG$R)!wne&Q5riVTYkb zagfZ|;QajkfuOYnKx#&AjeMA{06k`Vny{+8%d*4J89!-Uewys^^+Rxvowdce$kd3V zw<1z^06%Ep=j|Lxa7lENz0B86b(BJBiU2BD9Y}99VuX~dy_~bd{Qdq~e3-e*)|9Qk z98Gk@(Asj9tZR;@&e`G1*Wd;`X28zb04`f0Omj?lm3x+~pSH&UCstU1n-N8BZHc28 zPI`Np6l}g`d#dI>%GTdYca%G4h;o#x9ZYh(%hwP= zYq!YM02N3uVuS!TVFf;DU4)+R^Y-lU^Xl;P05@V7NO0rp?`Vspkfyq1gq{vYZho7w z!_nNh%GF|sq60T#05M*7ldBm_a|JhIH)VzfIAat;YXUQ0?(+4axW@oAU*PENY>%i+ zc$V??_cLUMPkNW(>F)6J_Q=%Tpt8dPHDLfXVF*KP2t;gbi=>&Zz!F1jN^+5irMbJy z)=qPhOm&k#W``C@a0D}705f0W=2b9 zvmr#uqeu-N0M#H(w@Z5*FakHJf)7!lvfg3Eg$uH;$haJ;aVM0cJ6kGHP{k|i5JKCi zEI^R7uE-xuChQslF4mSM>N?(VlSLVz4<7)DJp3Vq8#h%1tgy$Sh7={dhFoi7WrN+% z8XolXwQEkMLE5T(K>Fdui=;13tYM;n1ri?&PK^0n@&~P2hXzF_B7w#wKBy2u8dlWNLP0Iy0fi>*A+*{+E&Q;+8D>zR1S~`J zXM!}U7!zQC;Gn3=i#+h~qBPR*03d+87^4b*H)1h^6yy}M!UnHpI8qCROd$yj6lmcR zBa95egBDt(Qwatjv_TI&G?W7g9AJhSCL~AHLIXX4&{F{hm0Y5V7T^p41Q2@|vq}YT zM4(0$MjE7vHGNf2#qnS5(y3egn`Nk1s#D3EB}-;L?YW} zafvj|)MW!5bbzD6c&EVsf(9K!sPm6HLm-ij4SPuQHxgEpJ&prJ6yyRwa{R*p7Km)C z!8Uq$mek#JsN#cX#i;T(FDU$jLg6B?0?a*SAdwCT72NXABY^}pC;T(Q5X+~&IuFqQ zqsjDd5R`r71XWl*15Fqp#t7`d{LeY&aDy_0(1Cwcp#zk-MLmijkOaixBpygaBDz4S zEIc3sBUppBhyegftOIT~Ktr1pu`>mj;BP}n9pRoQ5JXH51_Vil_6l+W34q}rX=uU| z?9c>8NWcjHSVS=Yn4yAp=;8!DFo7aSq<{&9K@}Mg1~`f_feQ3a6BRH)6LtZP0?_3c zdH_Nbz##!BgfI*<00J#SAO%=dq6{f)o+{dxfEUVdh6E`=6K+TbAWQ-PmT&7n7}};zy=!_!vd_>Lm2+Bi%M7k zaJppSKk7*Ty*mQ)AHpPN8is*~fxLqevk<^8rXY|5NQ@vexF$1z&;WrD!<+wj05ASP zkUTVj6M>jVE(DSUE7$-WM%V!mD3A+2{_%w&4DBBm{pJo#(1C^A;0Iq�_%s3sVrGZs0S45#C_}TS#FD zSJ;OZWa>O#_S2Vm^yx7FF^W_W0(T*OhA*^XYz%&$Of*r_%MEP_p3;Fz1~LFXRKf%$KEf_|F^+!#V8!bbt^9z{2OU(S8t(7|)re_?$9lk; z07AflH#YE$XuP%qjF^BGx{!&z3>Lk+-NN;_;eY~YVi9I&hd)|jhG2*Q0Syoa1>k`L zAa3}9fRcL~6R9VRe`8Tcb!UFZfMRA4B11Oxy( Dx6IBS literal 0 HcmV?d00001 diff --git a/dspace/jsp/image/dspace-blue.gif b/dspace/jsp/image/dspace-blue.gif new file mode 100644 index 0000000000000000000000000000000000000000..644d23176db7978c954cdc15432d762d0cb00842 GIT binary patch literal 4969 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 literal 0 HcmV?d00001 diff --git a/dspace/jsp/image/hp-mit.gif b/dspace/jsp/image/hp-mit.gif new file mode 100644 index 0000000000000000000000000000000000000000..01d7e0c0839bb15806b0f2a3f3f2f3e4eefb94d7 GIT binary patch literal 2353 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 literal 0 HcmV?d00001 diff --git a/dspace/jsp/image/stripe.gif b/dspace/jsp/image/stripe.gif new file mode 100644 index 0000000000000000000000000000000000000000..b06b894b70e446c1494d769db744c4db9cf39efd GIT binary patch literal 1019 zcmcgr%S)AU5S^%n*2Z#UpwfdjVie5Aa1%)7y;s9cNu*H-Q`jc3pj8PHg)Ul1kHJR| zv&YQ zFuE!BM5vjVu^Gi$WU8iO%BB=7P!u&06E>kBgA&hzy>t1D4dHjas-P|7zuq?i;P*A;49>U1&Tr}1Rvov3;-{*!)U05 zmGA>JF%3Jw34);ztN{knm;^2Gz+zwnn&L#!jWTis;bJfn`mh!mQ#_9FHMw^blM{x` z$yK5^F*;mNyo=GqjyOW1Fpv_`ag&5c04LCR4!9D`gC?xX+#be5#K(V*gMWAJAX=m9 z*c<-@6@91X;_~|O=byWZN~>BH#$U|cFFBmn=}CzFO=( zl6u>+I5}K+a=b0ypUS>o>Z|G4Uf152%g;`B?XF1QJd_`*@2zUhf7nV5HVvf*(o>_W z1E;d>8~Lg0O>ZvGbysB0Z>?spt&FzTuD<(`yRo_NXeRf5W43W^d!vvWJ2%t0b5CV; z$=J`i2c;K(7p5mR=c|e{gAEr(eifebv3oX?y*m1+uBURKDZ8~YQhVpp(x+PuU&q^; V&o<6}lyB1=cONg!=GHr@_8;sZzoq~H literal 0 HcmV?d00001 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);