From e817f5d20380aac6df547b28b59107c8b361733b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 7 Sep 2007 14:04:28 -0500 Subject: [PATCH] New basic page structure implemented for circ pages: global main menu in the header, resident search box and logo, followed by breadcrumb navigation. Added circ-menu.inc for left-hand sidebar menu (needs revision), circ-search.inc which defines the resident search box for circ pages, additions to staff-global.js to handle tab-switching in search box. Signed-off-by: Chris Cormack --- .../prog/en/css/staff-global.css | 29 ++++++++++-------- .../prog/en/includes/circ-menu.inc | 12 ++++++++ .../prog/en/includes/circ-search.inc | 24 +++++++++++++++ .../intranet-tmpl/prog/en/includes/header.inc | 10 +++--- .../intranet-tmpl/prog/en/js/staff-global.js | 22 +++++++++++++ .../prog/en/modules/circ/bookcount.tmpl | 9 ++++-- .../prog/en/modules/circ/branchoverdues.tmpl | 7 +++-- .../prog/en/modules/circ/branchtransfers.tmpl | 7 +++-- .../prog/en/modules/circ/circulation.tmpl | 14 ++++++--- .../prog/en/modules/circ/overdue.tmpl | 8 +++-- .../prog/en/modules/circ/pendingreserves.tmpl | 9 +++--- .../prog/en/modules/circ/returns.tmpl | 17 +++++----- .../en/modules/circ/selectbranchprinter.tmpl | 11 ++++--- .../prog/en/modules/circ/stats.tmpl | 8 +++-- .../prog/en/modules/circ/transferstodo.tmpl | 13 ++++---- .../en/modules/circ/transferstoreceive.tmpl | 9 ++++-- .../prog/en/modules/circ/waitingreserves.tmpl | 7 +++-- .../prog/img/koha-logo-medium.gif | Bin 0 -> 2715 bytes .../intranet-tmpl/prog/img/more-arrow.gif | Bin 0 -> 65 bytes 19 files changed, 152 insertions(+), 64 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/img/koha-logo-medium.gif create mode 100644 koha-tmpl/intranet-tmpl/prog/img/more-arrow.gif diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 1218d78128..70889f73e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1,7 +1,7 @@ @import url( /intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css) all; a, a:link, a:visited, a:active { - color : #316494; + color : #0000CC; } a:hover { @@ -227,6 +227,7 @@ legend { #breadcrumbs { background-color : #F3F3F3; border-bottom : 1px solid #E8E8E8; + clear : both; font-size : 90%; padding :.2em .5em .4em .5em; } @@ -240,8 +241,13 @@ div#header_search { background-image : url("../../img/koha-logo-medium.gif"); background-position : .5em .5em; background-repeat : no-repeat; + float: left; padding-left : 14.2em; - margin: 1em .5em 1em 0; + margin: 1em 0 1.5em 0; +} + +div#header_search input { + font-size : 1.3em; } div#header_search ul.link-tabs { @@ -254,11 +260,9 @@ div#header_search ul.link-tabs li.on a, div#header_search ul.link-tabs li a, div } div#circ_search,div#catalog_search { - border-top : 1px solid #EEEEEE; - border-left : 1px solid #EEEEEE; - border-right : 1px solid #666666; - border-bottom : 1px solid #CCCCCC; - padding : .5em 2em .5em 1em; + border : 0; + border-bottom : 1px solid #FF9900; + padding : 0 0 .2em 0; } div#circ_search { @@ -272,7 +276,7 @@ div#catalog_search { /* Panel-Switch Tabs */ ul.link-tabs { list-style-type: none; - margin: 2px 0 9px 5px; + margin: 1px 0 9px 5px; padding: 0; } @@ -290,16 +294,15 @@ ul.link-tabs li a { } ul.link-tabs li.off a { - background-color: #EEEEEB; - border-top: 1px solid #DDDDDD; + background-color: #FFFFFF; + border : 0; margin-right : 1px; + text-decoration: underline; } ul.link-tabs li.off a:hover { background-color: #FFFFEC; - border-bottom: 1px solid #333333; - border-left : 1px solid #BEBF84; - border-right : 2px solid #333333; + border : 0; margin-right : 0; padding: .2em 1.2em .2em 1.2em; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc new file mode 100644 index 0000000000..5f8ffd8ef4 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -0,0 +1,12 @@ +
+
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc new file mode 100644 index 0000000000..1045d4ee05 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc @@ -0,0 +1,24 @@ + + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index aff9540707..7322227cf8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -1,14 +1,12 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js index 51b52660a1..c14aa7fb97 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js @@ -3,4 +3,26 @@ $(document).ready(function() { $(".focus").focus(); }); + + $(document).ready(function() { + $('a#showCatSearch').click(function() { + $('#catalog_search').show(); + $('#circ_search').hide(); + $('#showCircSearch').parents("li").addClass('off').removeClass('on'); + $('#showCatSearch').parents("li").addClass('on').removeClass('off'); + $('#search-form').val($('#findborrower').val()).focus(); + $('#residenttip').html("Enter search keywords:"); + return false; + }); + + $('a#showCircSearch').click(function() { + $('#circ_search').show(); + $('#catalog_search').hide(); + $('#showCatSearch').parents("li").addClass('off').removeClass('on'); + $('#showCircSearch').parents("li").addClass('on').removeClass('off'); + $('#findborrower').val($('#search-form').val()).focus(); + $('#residenttip').html("Enter patron card number or partial name:"); + return false; + }); +}); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl index 722fb5d93f..5f236d3b9d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl @@ -1,10 +1,12 @@ -Koha › Circulation Statistics for <!-- TMPL_VAR Name="title" --> +Koha › Circulation › Circulation Statistics for <!-- TMPL_VAR Name="title" --> - + + +
@@ -12,6 +14,7 @@
+

()

Barcode

@@ -44,5 +47,5 @@
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl index 56eff7111f..60409d2b1e 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl @@ -4,7 +4,9 @@ - + + +
@@ -12,6 +14,7 @@
+

Circulation: Library Overdues at

@@ -179,5 +182,5 @@
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl index ef18799009..33ab39db88 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl @@ -4,7 +4,9 @@ - + + +
@@ -12,6 +14,7 @@
+

Circulation › Transfers

@@ -176,5 +179,5 @@
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index 0c72aa14f5..3dda525ba4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -54,10 +54,14 @@ } + + - + + +
@@ -68,7 +72,7 @@

Checkouts

-

Circulation › Checkouts

+ @@ -166,7 +170,7 @@ -
+" /> -
+ --> @@ -884,5 +888,5 @@ No patron matched
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl index c6cd077fb8..5684be469c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl @@ -1,10 +1,12 @@ -Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --> +Koha › Circulation › Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --> - + + +
@@ -42,5 +44,5 @@
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl index 6ebff465be..c5891dcded 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl @@ -1,5 +1,5 @@ -Koha › Circulation › Holds +Koha › Circulation › Pending Holds /lib/calendar/calendar-system.css" /> @@ -11,10 +11,10 @@ + - - +
@@ -22,6 +22,7 @@
+

Pending holds as of


@@ -174,5 +175,5 @@ Calendar.setup(
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl index 8fad0f1eed..dfdb3f27b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl @@ -1,10 +1,13 @@ -Koha › Circulation › Returns <!-- TMPL_VAR Name="title" --> +Koha › Circulation › Check In <!-- TMPL_VAR Name="title" --> - + + + +
@@ -12,7 +15,8 @@
-

Circulation › Returns

+ +

Check In

@@ -185,9 +189,8 @@
- Enter item barcode

- +

@@ -238,7 +241,7 @@ -

Returned items

+

Checked-In items

@@ -282,5 +285,5 @@ - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl index f813f09e78..0939433fa6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl @@ -1,10 +1,12 @@ -Circulation › Set Library +Koha › Circulation › Set Library - + + +
@@ -12,7 +14,8 @@
-

Circulation › Set Library

+ +

Set Library

@@ -50,5 +53,5 @@
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl index b930e0516f..0f95aef6f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl @@ -1,10 +1,12 @@ -Statistics +Koha › Circulation › Statistics - + + +
@@ -48,5 +50,5 @@
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl index 3ef6ec68c0..05e3d5957f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl @@ -1,14 +1,12 @@ -Koha › Circulation -<!-- TMPL_IF Name="borrowernumber" --> -: Checkout to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" --> -(<!-- TMPL_VAR NAME="cardnumber" -->) -<!-- /TMPL_IF --> +Koha › Circulation › Transfers to do - + + +
@@ -16,6 +14,7 @@
+

Transfers to do

@@ -76,5 +75,5 @@
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl index 196b2c43db..1acd180a28 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl @@ -1,10 +1,12 @@ -Koha › Circulation +Koha › Circulation › Transfers to your branch - + + +
@@ -12,6 +14,7 @@
+

Transfers made TO your library on :

Your library is the destination for the following transfer(s)

@@ -79,5 +82,5 @@
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl index 5bf55cdd9b..774e57e3f6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl @@ -4,7 +4,9 @@ - + + +
@@ -12,6 +14,7 @@
+

Circulation: Library Holds

Holds for your library on :

@@ -93,5 +96,5 @@
- + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/img/koha-logo-medium.gif b/koha-tmpl/intranet-tmpl/prog/img/koha-logo-medium.gif new file mode 100644 index 0000000000000000000000000000000000000000..80c2de2288461bc95189733ce4ac4bf5592127f7 GIT binary patch literal 2715 zcmeH`|3A}-1IOR{{w4C>H~V7R-lmyv(MFBq)85-+v@{kem(U35&YgQ`eNn^MB$}k? zqiea9)YVbCgwu#_GMA+5D)m|A$~hHIr!J3tKKJ<>K0kh5KfHc?{_uJ}UXf7|;*ivD zfIwgl02US&K7RZ-KR^HB!-x0p-@kkJZf+9?7?d|F5>F(~ne*Jn^S663eXGcdzdwcuU zt5>gFxzgI&dinC@mX?<0=H`nRFJ8EC;r#jYO-)UWjg4o{oUvFe4Gj$^Po6w+;zWIY z{qf_+Yinz3YHF&hs}CPOTvb(d=+L3c%F6Qc^0KlrqtR$E7)nY?ii(PKI$c3Q!S3C= zwOZ}YojddM^YilZa&vP(|NQeEJ9gycVPs$z(7LOC*x;@bIv(u+Y%ZkdTlS zD^>&r1&Kr=p->nQ5a93c@9XO;5D55uK99$PAc(`^u-R-Di^X6t=yW=bMx#=xWHOmV zB7q=?!{M-4EE0}0{E|~|MdU!zg+-&kH%1eO2F@L?BAaN@C$%DfvspZcNgO+ zKA+l}Pu(zpyy$vGOG95dLzF#gYx(BKLlm6nkOWzT0J!RNpN7Qh48HqW{YMCfKH#W0 z?*&y?eA|9f^tOH|s&za9%-8wUL>Y0b5qL2p9-m@G64m}#l{B+ygH*!8GEw|;dg$`2 z8X6;Ipf+%$)sZ@4`)yMh_Gj(mM@G{~Nsw0YTWH?+CS;ga42|yWerzO6O#QmYODBUw z1g16&wAq8}Im?DbyS^kE1R3oFfAB{o^evNRQ}4dyKHyYlpC^47urF$%VHxU z4NaiAq5Q;CqeGG~Ix7skX(8Y z?>yAwdXUu6x5YWwi?S0{V6`X)%MJ?9P#Fe4US)feH@9bLK;bC5yc@leR@HzTB$h3p{(2c~jka z7e!YNfG(ocLJ(QO7OE3nzPKP#ZS)N4QLey$)y>@sPMHw-e+K6sIba*nOV`;KS`}Oz zdwq{Gbnn_PdBx~`Dq!0!&2yQi-uXxe-hX*@yBpY3GJJOsT`EO+dfas*4o*|{;>rZo zSiG~KntJ;7*pv)83%y^L=)dm;RB4hZKvKH6`kw@6)71;nivrZ_l`EqeTnxJv*xKiz zX;&Wn$Jp@=`+6Y*hc!3|r{ z*OGb0T<><9CDR$^sENVYwiS>PAT(tO8>on(szz`IVi?S#u0ZC+Q zEdPgSJX_<@Wu!K^K$fv&)lrk!c1P%%X(7|oO6trh(A%xId@;xsbq+Y|+;;SX#c?Hd zM|`1MTQ|zFE&8&y81Mazmy#mSg=!xsd1=MjVj5;RrVc;N%^2cH6C9A9?a0-u=u+ZC zyo=QmW*YXsR@EBufu%ZX;e>StN({pb*a{$UVcokS8)-u6XtR>^B~uG{XIC zRZ6!PMMSjV8Z-*$PF59$dg&A~>RTlkZ(;^r+D*#Uz(DQ~uAcHzz1UeA=0h1_%D=04 zS1&=EtVIh9M=sM}!9R2#j&yRkEKgDZe~LjMH|G4|)-?CB4IpI#A;CF{a~AcqMi>#$ zx0B^Q>XnqwXlRru_N1g#Vnj1Ei-aLJU_~l2}b)|T+ zDL~PtL#H`P!_W4U4(9Y;7s{`dOU%Bz6~#=aKPiL1sWUPJ#Y~0S#1A5Cd;CRykj;b+ z49Z$8wtffeOc|o)Wf1pl95}kO*ll}vM_t+ht;nM&aM`ae
Title