From 5f6120785cd555b1fa2ed52a6e9d0cff74b9bc2d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 25 Jan 2008 15:04:19 -0600 Subject: [PATCH] Beginning some design changes to the OPAC: put login info at the top, move cart and list buttons alongside main search form. Putting alternate search methods below the search form. These changes will eliminate the left-hand column from most OPAC screens. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 90 +++++++----------- .../opac-tmpl/prog/en/includes/masthead.inc | 48 +++++----- .../opac-tmpl/prog/en/includes/navigation.inc | 21 +--- .../opac-tmpl/prog/images/menu-background.gif | Bin 776 -> 3048 bytes 4 files changed, 57 insertions(+), 102 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index c77e47d593..d6e62e4159 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -356,14 +356,8 @@ a .term { } #members { - font-size : .75em; - font-weight : bold; + font-size : 85%; padding : 4px 0 4px 0; - background-image : url(../../images/member-menu-background.gif); - background-repeat : repeat-x; - border-top : 1px solid #9999CC; - border-bottom : 1px solid #9999CC; - background-color : #AFBCCF; color : #000066; } @@ -371,36 +365,22 @@ a .term { text-decoration : none; } -#members a.card { - background-image : url(../../images/card.gif); - background-position : left; - background-repeat : no-repeat; - display : block; - padding-left : 39px; -} - #members a.logout { + color : #cc3333; font-weight : bold; padding : 0 .3em 0 .3em; text-decoration : none; } -#members a.logout:link, #members a.logout:visited, #members a.logout:hover, #members a.logout:active { - background-image : url(../../images/member-menu-background-logout.gif); - background-repeat : repeat-x; - color : #000000; -} - -#members a:hover.logout { - background-image : url(../../images/member-menu-background-logout-hover.gif); - background-repeat : repeat-x; - color : #000000; +#members li:first-child { + border-right : 1px solid black; } #members li { display : inline; list-style : none; margin : 0; + padding : 0 .5em; } #members ul { @@ -409,32 +389,6 @@ a .term { text-align : right; } -#members ul li a:link, #members ul li a:visited, #members span.members { - background-image : url(../../images/member-menu-background-link.gif); - background-repeat : repeat-x; - border-left : 1px solid #9999CC; - color : #006699; -} - -#members ul li a:link, #members ul li a:visited, #members ul li a:hover, #members ul li a:active, #members span.members { - padding : 4px; -} - -#members ul li a:hover { -} - -#members ul li a:hover, #members ul li a:active { - background-image : url(../../images/member-menu-background-hover.gif); - background-repeat : repeat-x; -} - -#members ul li:last-child { -} - -#members ul li:last-child a { - border-right : 1px solid #9999CC; -} - #opac-main-search { background-image : url( ../../images/menu-background.gif); background-repeat : repeat-x; @@ -740,14 +694,23 @@ a.reserve { line-height : 2em; } -#corner a.cart { - background-image : url(../../images/cart-small.gif); - background-position: left; - background-repeat : no-repeat; - padding: 0 15px; +#opac-main-search a.cart { + background : #FFC url(../../images/cart-small.gif) 7px center no-repeat; + border : 1px solid white; + color : #6699cc; + padding : 5px; + padding-left : 25px; text-decoration: none; } +#opac-main-search a.lists { + background : #FFC; + border : 1px solid white; + color : #6699cc; + padding : 5px; + text-decoration: none; +} + .pages { line-height : 1.8em; text-align: center; @@ -980,7 +943,7 @@ margin-top : .4em; #fluid-content-1 { margin : .3em -1px 0 2%; display: inline /* fix IE6 */; -line-height : 40px; +line-height : 15px; } .clearfix:after { @@ -1026,4 +989,17 @@ div.message { background : white url("../../images/message-bg.gif") repeat-x left 0; border : 1px solid #bcbcbc; width : 55%; +} + +#moresearches { + color : #000099; + font-size : 90%; + line-height : 110%; + margin : .6em 0 .3em 2%; +} + +#moresearches a:link, #moresearches a:visited { + color : #e5ebff; + font-weight : normal; + text-decoration : none; } \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index d8432a9b8b..cc7d29df95 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -1,33 +1,10 @@ -
- - -
Book Bag
+
-
@@ -57,7 +34,26 @@ - Advanced Search + + Book Bag + + Lists + + +
  • Lists + <-- ! FIXME: Owen, you can take it from here! Make it "barshelves" for proof/demo. --> + + +
    • + + +
    diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc index 6a287edbed..1b9a69ad6f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc @@ -1,23 +1,6 @@ +
    \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/images/menu-background.gif b/koha-tmpl/opac-tmpl/prog/images/menu-background.gif index c99af9fea2ae5f4033057116c92ccf177d44ec85..7d0743f8a1fb1f036cf6c7451dd535a457dab4c7 100644 GIT binary patch literal 3048 zcmVE{tl)>O;d-IgbDPk6qSt4S#f-A%i?QT=q}hh8;BlDF zh_B*wo6w4}=giNS1?$ytH9 zS%SJ%eYJ6!&TEp%XpqNYiNIHXw|1V>jk4xoh`?lw!i1~dY?R7^sNIaS<#(Udb)C{! zfVhFD+-;T0gsR_ak;r(U)N7K+ex=!puj7KL+9*k#fh-wim~Nnjl+($=vsogX_CizpwwH0yJ?Zfi?HN~uj5^XylRrj zd7sr*f3{$Wzg2#>d!g2iv*n1b;d-LiYm>@*q1SVp(T%d@iLT;mlgMU`#CV_8d7so) zezsPAw^x6-cAU~wezu3K;c1e{S%JEawB~i2(PoduT7tV;gS%UUx?+jISb(`%fw)|S zy=#-mex}-Jk;izR)NPc?ZIsJ)ozY~B!)1)ba+=P1pw@Aj&u^H`YLdr)r`n3IZfIoi`WAP^uH=&8A47LXCPeONbCzZiZMYgGLCYGPZ^dyI?C;uL~Ar&64$Mh-hll zvdyBFt6aD=^6J&gmd1j-e*t^Vn}tSUy^Ox#`@(qd7aCud=zYv6?_(N_Dog6ML=p{2 znTL7q75Ot}8a5b9PHnlDjU}%;4~x8H$*|P0YcF9``?U=ll3>$lz{5s^-wj~@UcRKk zap%A7H8|n>_X*cm|%noCYWG_5k6QU5fltSL4!oB zA|i(-mU!X-5q3xc1?t>z0|i8MB4a13+&I7uBHB3Pix76wNr)84_~ML6%4lSfNLpcq zkxI(wWGzrUS;Lf8Kmi3YTV`414O!N5B@|*pQ9}(?nyDq4R-8%9nOUA$r95VyX{Vid zoVf=cd)BaLpJ(RjCz>_zxyPACkiw@Ccr=O!DWv$qC!dN+ny90ANZP0ojDmqjDx5MJ zsu5s-;Y6rl7;$PUpQ>s^5vIcbS_G+1IAN-(s-EghDy2FBYbwr|>Wr^N)LO)`#cEK5 z2DUPLtP{)wzW*lKX?ves6+Ew)8O5J9!dYCFUb8Wb4oQF@{UQj# z2r3{67)&4rF<3zhCP4uT7{eGaD8gWj;TId89)7^ZF8;t2 zUgY8yx5&jGfaY#kt00@(qgf}Fxf)z{x2ok`-BqSgKAYd|*kgQ}UBdJMGieV9+M5QS` z=}CWh5+0{GWhz&RN->;*3SywbEvdjuG5GS7yu@WLeYuEO?s5^7pad7Fkj!vUf|ubi zfB~4vjAR-hnasE*C78iXYjS}L1_0+bDG^R-av_=D1gA2u5KeMlL78XZf;6IV1!K;mC`3URNI-%?qkx1nEcBrLM1n9L8U=@*A)!bpLqf~I z(K4_>p&I3AMv>r-jc!z| z4py-vaO`47@C`u-0uq7%gdl(+0!WD9vLXmAXfZ1SU~m=^m=%Nw08xxX0OGZ`IK(07 z@!CWGY@;54h;1>pafnT9qPM**#wGx<2|dgr6MBG!9+0btTV&$7=$M5bl51Q&JfpeK z$OJ54F$;F+0}F@%FBZl-UPOeq8{_Q#PcZei5<}aM>s+p9cXckQ#|7mqxb*`-~f(yoPc@gSjY32M*7r;8zxOTNH z-XM!!zk%1i_B9E9z3X7_8rZ*n0~yvp25VG<4A5pa8LGkTHAs8e&87yn*FX(xui+Jh z2=^-nkpXf;;}sb|Hz6{x2578d-5DUnAmAPDL3E)GgQ!CnvY~H#+dBhY064z8K=6WR zgWLkIL>CxPhdNY(0hOo&1F*qx1~9x56o+`jBkpjCD}n(Z*ugSB{sBdNU>P6906EB0 zj&h5K+~g)N`3`2Di<#T}=8Cwv&TDS-Tqt4}yHJKGMBxJ;?4an%*o6<0;RB@)o#{Tv z1<{q^gLWi?=sqY!(Y4-;qWhp3T+h1Jz3u}P6k_Z}-@pd`adx)*;2&x)gxXQ?kGIzy z?q|>YKiIzazWe>}fDgRj2T%CI8~*T!PrTw6&-lhW{_&8HyyPcO`N~`V@|e%O<~Psz q&U^mzpbx$1M^F0FoBs5uPrd3_&-&K8{`Ihrz3gXC``Z5_AOJfS7U$gn literal 776 zcmV+j1NZz#Nk%w1VI2TV0M!5hRDHFNwdhrTwpxO^Ym>=jjKgY@$b_oihppj&r`vj= z)_I`SZk5Yyl*(O(y@{~ni?Zchg}i2t#ao2CXOG5Zjl^k@$9JC7ex=!UoY7Z+xPz+R zj401AdQZXkdcxgFqM{< zn3IYhsHv(qC9STnu(7fw2er1hxVgFq8@;~2z`?>BEyc#i$jQnr zGtJJ=(9zN}3Dwru*xA|%AKl*H;NjvQ80F^Y=;`VhGVSi~@bU68CiV9B`1$%K3jO~7 z00RnCu%Mv9g9sBUT(F{{!-o(fN?dWFqQ#3CGitoRqNB%;AVZ2|k)fo?lPFWF%pjtr z%a<@?$`nDPrp=o;bLymVqNmUQpFo2OJ%OUA(W6L{Dn${asne%Wqe_jzpsLlYShH$n z(4ec=uVBN9Z9t%`*|TWVswH5ct=qS7(BTKGOpt9x5m@{iGkfO8a&!9t#PJyGe>C>oFtHx2Iwd>cgW6Q45p|