From 4692b2e8993e6677f1e7f41e84e31be927be526f Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 31 Aug 2005 16:14:03 +0000 Subject: [PATCH] refactored some of the copy details info git-svn-id: svn://svn.open-ils.org/ILS/trunk@1779 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/extras/autogen.sh | 2 +- Open-ILS/web/opac/common/js/OrgTree.js | 4 +- Open-ILS/web/opac/skin/default/css/layout.css | 4 +- Open-ILS/web/opac/skin/default/js/rdetail.js | 105 ++++++++++-------- .../web/opac/skin/default/js/search_bar.js | 2 +- 5 files changed, 65 insertions(+), 52 deletions(-) diff --git a/Open-ILS/src/extras/autogen.sh b/Open-ILS/src/extras/autogen.sh index 092befff7f..5e95c82e22 100755 --- a/Open-ILS/src/extras/autogen.sh +++ b/Open-ILS/src/extras/autogen.sh @@ -5,7 +5,7 @@ CONFIG="$1"; [ -z "$CONFIG" ] && echo "usage: $0 " && exit; -JSDIR="/openils/var/web/js/util"; +JSDIR="/openils/var/web/opac/common/js/"; echo "Updating fieldmapper"; perl fieldmapper.pl > "$JSDIR/fmall.js"; diff --git a/Open-ILS/web/opac/common/js/OrgTree.js b/Open-ILS/web/opac/common/js/OrgTree.js index 4e2e384dce..d042c3bc75 100644 --- a/Open-ILS/web/opac/common/js/OrgTree.js +++ b/Open-ILS/web/opac/common/js/OrgTree.js @@ -1,2 +1,2 @@ -var _l = [[1,1,,"PINES"],[146,3,143,"Alexander Public Library"],[64,3,62,"Alma-Bacon County Public Library"],[135,3,134,"Ambrose Public Library"],[278,3,277,"Appleby Branch Library"],[63,3,62,"Appling County Public Library"],[262,3,261,"Arlington Branch Library"],[9,2,1,"Athens Regional Library"],[10,3,9,"Athens-Clarke County Library"],[189,3,188,"Auburn Public Library"],[279,3,277,"Audio/Visual Center/TBC Library"],[288,3,277,"Augusta-Richmond County Public Library"],[255,3,254,"Baker County Library"],[193,3,188,"Banks County Public Library"],[114,3,113,"Barnesville-Lamar County Library"],[218,2,1,"Bartram Trail Regional Library"],[3,3,2,"Berlin Community Library"],[4,3,2,"Berlin Community Library"],[174,3,166,"Betty C. Hagler Public Library"],[66,3,62,"Blackshear Memorial Library"],[161,3,160,"Blackshear Place Library"],[12,3,9,"Bogart Branch Library"],[136,3,134,"Bookmbile--see Douglas-Coffee Co. Library"],[205,3,204,"Bookmbile--see Vidalia-Toombs County Library"],[11,3,9,"Bookmobile"],[24,3,23,"Bookmobile"],[167,3,166,"Bookmobile"],[65,3,62,"Bookmobile"],[272,3,269,"Bookmobile"],[280,3,277,"Bookmobile"],[219,3,218,"Bookmobile"],[71,3,70,"Bookmobile"],[149,3,148,"Bookmobile--See Clarkesville-Habersham Co."],[229,3,228,"Bookmobile--See Louisville Public Library"],[243,3,235,"Bookmobile--See Washington Memorial Library"],[181,3,180,"Bookmobile--see Gilbert H. Gragg Mem. Lib."],[5,3,2,"Bookmobile-See Moultrie-Colquitt County Lib."],[101,3,100,"Bookmobile-See Mountain Regional Lib. Sys."],[85,3,84,"Bookmoible-see Screvens County Library"],[25,3,23,"Bowman Library"],[72,3,70,"Brantley County Library"],[191,3,188,"Braselton Library"],[213,2,1,"Brooks County Library"],[214,3,213,"Brooks County Library"],[137,3,134,"Broxton Public Library"],[169,3,166,"Buchanan - Haralson County Public Library"],[281,3,277,"Burke County Library"],[93,3,92,"Butler Public Library"],[107,3,106,"Byron Public Library"],[263,3,261,"Calhoun County Library"],[73,3,70,"Camden County Public Library"],[271,3,269,"Carrie Dorsey Perry Memorial Library"],[30,3,27,"Cave Spring Branch"],[29,3,27,"Cedartown Branch"],[157,3,156,"Centerville Branch Library"],[36,3,35,"Central Library"],[74,3,70,"Charlton Public Library"],[122,2,1,"Chattooga County Library"],[123,3,122,"Chattooga County Library"],[223,2,1,"Cherokee Regional Library"],[215,2,1,"Chestatee Regional Library"],[224,3,223,"Chickamauga Public Library"],[150,3,148,"Clarkesville-Habersham County Library"],[264,3,261,"Clay County Library"],[127,2,1,"Clayton County Library System"],[129,3,127,"Clayton County Library System"],[162,3,160,"Clermont Branch Library"],[67,3,62,"Clinch County Public Library"],[269,2,1,"Coastal Plain Regional Library"],[275,3,269,"Coastal Plain Regional Library"],[147,3,143,"Cochran Public Library"],[296,3,295,"Cochran-Bleckley/Tessie W. Norris"],[284,3,277,"Columbia County Libraries/Gibbs Memorial"],[192,3,188,"Commerce Public Library"],[125,2,1,"Conyers-Rockdale Library System"],[273,3,269,"Cook County Library"],[152,3,148,"Cornelia-Habersham Library"],[248,3,235,"Crawford County Public Library"],[225,3,223,"Dade County Public Library"],[216,3,215,"Dawson County Library"],[254,2,1,"DeSoto Trail Regional Library"],[35,2,1,"Dougherty County Public Library"],[171,3,166,"Douglas County Public Library"],[138,3,134,"Douglas-Coffee County Library"],[14,3,9,"East Athens Community Center"],[277,2,1,"East Central Georgia Regional Library"],[163,3,160,"East Hall and Special Needs Library"],[236,3,235,"East Wilkinson County Library"],[48,3,41,"Eatonton-Putnam County Library"],[26,3,23,"Elbert County Library"],[23,2,1,"Elbert County Public Library"],[282,3,277,"Euchee Creek Library"],[54,3,53,"Evans County Library"],[94,3,92,"Extension Services"],[102,3,100,"Fannin County Public Library"],[115,3,113,"Fayette County Public Library"],[34,3,33,"Fitzerald-Ben Hill County Library"],[33,2,1,"Fitzgerald-Ben Hill Library"],[113,2,1,"Flint River Regional Library"],[128,3,127,"Forest Park Branch Library"],[144,3,143,"Fortson Public Library"],[59,3,53,"Franklin Memorial Library"],[283,3,277,"Friedman Branch Library"],[237,3,235,"Genealogical and Historical Department"],[182,3,180,"Gilbert H. Gragg Memorial Library"],[285,3,277,"Glascock County Library"],[210,3,204,"Glennville Public Library"],[238,3,235,"Gordon Public Library"],[42,3,41,"Greene County Library"],[95,3,92,"Greenville Area Public Library"],[117,3,113,"Griffin-Spalding County Library"],[164,3,160,"Hall County Library"],[160,2,1,"Hall County Library System"],[43,3,41,"Hancock County Library"],[286,3,277,"Harlem Branch Library"],[196,3,188,"Harold S. Swindle Public Library"],[186,2,1,"Hart County Library"],[187,3,186,"Hart County Library"],[139,3,134,"Hazlehurst-Jeff Davis Public Library"],[257,3,254,"Hdqtrs Library/Camilla"],[172,3,166,"Heard County Public Library"],[143,2,1,"Henry County Library"],[96,3,92,"Hightower Memorial Library"],[156,2,1,"Houston County Public Library"],[77,3,70,"Ida Hilton Public Library"],[239,3,235,"Ideal Public Library"],[274,3,269,"Irwin County Library"],[121,3,113,"J. Joel Edwards Public Library"],[118,3,113,"Jackson-Butts County Public Library"],[258,3,254,"Jakin Public Library"],[183,3,180,"James W. Merritt Memorial Library"],[44,3,41,"Jasper County Library"],[228,2,1,"Jefferson County Library"],[194,3,188,"Jefferson Public Library"],[86,3,84,"Jenkins County Elementary School"],[87,3,84,"Jenkins County High School"],[88,3,84,"Jenkins County Memorial Library"],[203,3,199,"Johnson County Library"],[240,3,235,"Jones County Public Library"],[130,3,127,"Jonesboro Branch Library"],[261,2,1,"Kinchafoonee Regional Library"],[265,3,261,"Kinchafoonee Regional Library"],[55,3,53,"L.C. Anderson Library"],[226,3,223,"LaFayette-Walker County Library"],[206,3,204,"Ladson Genealogical Library"],[207,3,204,"Ladson Genealogical Library"],[51,3,50,"Lake Sinclair Library"],[16,3,9,"Lavonia-Carnegie Library"],[17,3,9,"Lay Park Community Resource Ctr."],[110,2,1,"Lee County Public Library"],[111,3,110,"Lee County Public Library"],[241,3,235,"Library for the Blind & Physically Handicapped"],[287,3,277,"Lincoln County Library"],[145,3,143,"Locust Grove Public Library"],[76,3,70,"Long County Library"],[230,3,228,"Louisville Public Library"],[131,3,127,"Lovejoy Branch Library (projected)"],[256,3,254,"Lucy Maddox Memorial Library"],[217,3,215,"Lumpkin County Library"],[19,3,9,"Lyndon House Arts Ctr"],[299,3,295,"M.E. Roden Public Library"],[13,3,9,"Madison County Library"],[97,3,92,"Manchester Public Library"],[260,3,254,"Margaret Jones Public Library"],[68,3,62,"Marian Anderson Public Library"],[242,3,235,"Marshallville Public Library"],[52,3,50,"Mary Vinson Memorial Library"],[221,3,218,"Mary Willis Library"],[175,3,166,"Maude P. Ragsdale Public Library"],[290,3,277,"Maxwell Branch Library"],[195,3,188,"Maysville Public Library"],[232,3,228,"McCollum Public Library"],[235,2,1,"Middle Georgia Regional Library"],[289,3,277,"Midville Branch Library"],[184,3,180,"Miller County Public Library"],[116,3,113,"Monroe County Library"],[6,3,2,"Monroe Memorial Library"],[7,3,2,"Monroe Memorial Library"],[46,3,41,"Monroe-Walton County Library"],[244,3,235,"Montezuma Carnegie Public Library"],[209,3,204,"Montgomery County Library"],[45,3,41,"Morgan County Library"],[132,3,127,"Morrow Branch Library"],[2,2,1,"Moultrie-Colquitt County Library"],[8,3,2,"Moultrie-Colquitt County Library"],[100,2,1,"Mountain Regional Library"],[103,3,100,"Mountain Regional Library System"],[165,3,160,"Murrayville Branch Library"],[298,3,295,"Murrell Memorial Library"],[126,3,125,"Nancy Guinn Memorial Library"],[208,3,204,"Nelle Brown Memorial Library"],[173,3,166,"Neva Lomason Memorial Library"],[176,3,166,"New Georgia Public Library"],[234,3,233,"Newton County Library Headqtrs."],[233,2,1,"Newton County Library System"],[140,3,134,"Nicholls Public Library"],[159,3,156,"Nola Brantley Memorial Library"],[148,2,1,"Northeast Georgia Regional Library"],[37,3,35,"Northwest Library"],[47,3,41,"O'Kelly Memorial Library"],[295,2,1,"Ocmulgee Regional Library"],[21,3,9,"Oconee County Library"],[199,2,1,"Oconee Regional Library"],[200,3,199,"Oconee Regional Library"],[80,2,1,"Office of Public Library Services"],[18,3,9,"Oglethorpe County Library"],[245,3,235,"Oglethorpe Public Library"],[204,2,1,"Ohoopee Regional Library"],[62,2,1,"Okefenokee Regional Library System"],[28,3,27,"Outreach Collection"],[177,3,166,"Paulding County Public Library"],[108,3,106,"Peach County Law Enforcement Center"],[106,2,1,"Peach Public Libraries"],[119,3,113,"Peachtree City Library"],[141,3,134,"Pearson Public Library"],[259,3,254,"Pelham-Carnegie Library"],[56,3,53,"Pembroke Public Library"],[158,3,156,"Perry Public Library"],[188,2,1,"Piedmont Regional Library System"],[198,3,188,"Piedmont Regional Library-Headquarters"],[190,3,188,"Piedmont-Bookmobile"],[92,2,1,"Pine Mountain Regional Library"],[60,2,1,"Pine Mountain Regional Library System"],[297,3,295,"Public Service Annex"],[154,3,148,"Rabun County Library"],[266,3,261,"Randolph County Public LIbrary"],[247,3,235,"Regional Library"],[98,3,92,"Reynolds Community Library"],[57,3,53,"Richmond Hill Public Library"],[133,3,127,"Riverdale Branch Library"],[249,3,235,"Riverside Branch Library"],[31,3,27,"Rockmart Branch"],[246,3,235,"Rocky Creek Branch Library"],[90,2,1,"Roddenbery Memorial Library"],[91,3,90,"Roddenbery Memorial Library"],[32,3,27,"Rome-Floyd County Library"],[201,3,199,"Rosa M. Tarbutton Memorial Library/Washington Co."],[227,3,223,"Rossville Public Library"],[20,3,9,"Royston Branch Library"],[15,3,9,"Sandy Creek Nature Ctr"],[27,2,1,"Sara Hightower Regional Library"],[292,3,277,"Sardis Branch Library"],[134,2,1,"Satilla Regional Library"],[89,3,84,"Screven County Library"],[84,2,1,"Screven-Jenkins Regional Library"],[185,3,180,"Seminole Public Library"],[250,3,235,"Shurling Branch Library"],[112,3,110,"Smithville Library"],[291,3,277,"South Augusta Branch Library/ Diamond Lakes Branch Library"],[38,3,35,"Southside Library"],[180,2,1,"Southwest Georgia Regional Library"],[78,3,70,"St. Mary's Library"],[81,3,80,"State Library of Georgia Admin. Offices"],[83,3,80,"State Library of Georgia Collection"],[82,3,80,"State Library of Georgia Library for the Blind"],[53,2,1,"Statesboro Regional Library"],[58,3,53,"Statesboro Regional Library"],[197,3,188,"Statham Public Library"],[99,3,92,"Talbot County Library"],[222,3,218,"Taliaferro County Library"],[178,3,166,"Tallapoosa Public Library"],[39,3,35,"Tallulah Massey Library"],[211,3,204,"Tattnall County Library"],[300,3,295,"Telfair County Library"],[267,3,261,"Terrell County Public Library"],[109,3,106,"Thomas Public Library"],[220,3,218,"Thomson-McDuffie County Library"],[75,3,70,"Three Rivers Regional Library"],[70,2,1,"Three Rivers Regional Library"],[276,3,269,"Tifton-Tift County Public Library"],[155,3,148,"Toccoa-Stephens County Library"],[104,3,100,"Towns County Public Library"],[202,3,199,"Treutlen County Library"],[124,3,122,"Trion Public Library"],[251,3,235,"Twiggs County Public Library"],[50,2,1,"Twin Lakes Library"],[120,3,113,"Tyrone Public Library"],[41,2,1,"Uncle Remus Regional Library"],[105,3,100,"Union County Public Library"],[270,3,269,"Victoria Evans Memorial Library"],[212,3,204,"Vidalia-Toombs County Library"],[179,3,166,"Villa Rica Public Library"],[49,3,41,"W. H. Stanton Memorial Library"],[231,3,228,"Wadley Public Library"],[293,3,277,"Wallace Branch Library"],[294,3,277,"Warren County Library"],[168,3,166,"Warren P. Sewell Memorial Library of Bowdon"],[170,3,166,"Warren P. Sewell Memorial Library of Bremen"],[252,3,235,"Washington Memorial Library"],[69,3,62,"Waycross-Ware County Public Library"],[79,3,70,"Wayne County Library"],[268,3,261,"Webster County Public Library"],[253,3,235,"West Bibb Branch Library"],[166,2,1,"West Georgia Regional Library"],[40,3,35,"Westtown Library"],[301,3,295,"Wheeler County Library"],[302,3,295,"Wheeler County Library"],[151,3,148,"White County Library, Cleveland Branch"],[153,3,148,"White County Library, Helen Branch"],[303,3,295,"Wilcox County Public Library"],[142,3,134,"Willacoochee Public Library"],[22,3,9,"Winterville Branch Library"],[61,3,60,"Yatesville Public Library"]]; -var globalOrgTypes = JSON2js("[/*--S aout--*/[null,null,null,null,0,0,0,1,\"Consortium\",\"Everywhere\"]/*--E aout--*/,/*--S aout--*/[null,null,null,null,0,0,1,2,\"System\",\"Local Library System\",1]/*--E aout--*/,/*--S aout--*/[null,null,null,null,1,1,2,3,\"Branch\",\"This Branch\",2]/*--E aout--*/,/*--S aout--*/[null,null,null,null,1,1,3,5,\"Bookmobile\",\"Your Bookmobile\",3]/*--E aout--*/,/*--S aout--*/[null,null,null,null,1,1,3,4,\"Sub-lib\",\"This Specialized Library\",3]/*--E aout--*/]"); \ No newline at end of file +var _l = [[1,1,,"Pines"],[146,3,143,"Alexander Public Library"],[64,3,62,"Alma-Bacon County Public Library"],[135,3,134,"Ambrose Public Library"],[278,3,277,"Appleby Branch Library"],[63,3,62,"Appling County Public Library"],[262,3,261,"Arlington Branch Library"],[9,2,1,"Athens Regional Library"],[10,3,9,"Athens-Clarke County Library"],[189,3,188,"Auburn Public Library"],[279,3,277,"Audio/Visual Center/TBC Library"],[288,3,277,"Augusta-Richmond County Public Library"],[255,3,254,"Baker County Library"],[193,3,188,"Banks County Public Library"],[114,3,113,"Barnesville-Lamar County Library"],[218,2,1,"Bartram Trail Regional Library"],[3,3,2,"Berlin Community Library"],[4,3,2,"Berlin Community Library"],[174,3,166,"Betty C. Hagler Public Library"],[66,3,62,"Blackshear Memorial Library"],[161,3,160,"Blackshear Place Library"],[12,3,9,"Bogart Branch Library"],[136,3,134,"Bookmbile--see Douglas-Coffee Co. Library"],[205,3,204,"Bookmbile--see Vidalia-Toombs County Library"],[219,3,218,"Bookmobile"],[272,3,269,"Bookmobile"],[280,3,277,"Bookmobile"],[167,3,166,"Bookmobile"],[65,3,62,"Bookmobile"],[71,3,70,"Bookmobile"],[11,3,9,"Bookmobile"],[24,3,23,"Bookmobile"],[149,3,148,"Bookmobile--See Clarkesville-Habersham Co."],[229,3,228,"Bookmobile--See Louisville Public Library"],[243,3,235,"Bookmobile--See Washington Memorial Library"],[181,3,180,"Bookmobile--see Gilbert H. Gragg Mem. Lib."],[5,3,2,"Bookmobile-See Moultrie-Colquitt County Lib."],[101,3,100,"Bookmobile-See Mountain Regional Lib. Sys."],[85,3,84,"Bookmoible-see Screvens County Library"],[25,3,23,"Bowman Library"],[72,3,70,"Brantley County Library"],[191,3,188,"Braselton Library"],[213,2,1,"Brooks County Library"],[214,3,213,"Brooks County Library"],[137,3,134,"Broxton Public Library"],[169,3,166,"Buchanan - Haralson County Public Library"],[281,3,277,"Burke County Library"],[93,3,92,"Butler Public Library"],[107,3,106,"Byron Public Library"],[263,3,261,"Calhoun County Library"],[73,3,70,"Camden County Public Library"],[271,3,269,"Carrie Dorsey Perry Memorial Library"],[30,3,27,"Cave Spring Branch"],[29,3,27,"Cedartown Branch"],[157,3,156,"Centerville Branch Library"],[36,3,35,"Central Library"],[74,3,70,"Charlton Public Library"],[122,2,1,"Chattooga County Library"],[123,3,122,"Chattooga County Library"],[223,2,1,"Cherokee Regional Library"],[215,2,1,"Chestatee Regional Library"],[224,3,223,"Chickamauga Public Library"],[150,3,148,"Clarkesville-Habersham County Library"],[264,3,261,"Clay County Library"],[127,2,1,"Clayton County Library System"],[129,3,127,"Clayton County Library System"],[162,3,160,"Clermont Branch Library"],[67,3,62,"Clinch County Public Library"],[269,2,1,"Coastal Plain Regional Library"],[275,3,269,"Coastal Plain Regional Library"],[147,3,143,"Cochran Public Library"],[296,3,295,"Cochran-Bleckley/Tessie W. Norris"],[284,3,277,"Columbia County Libraries/Gibbs Memorial"],[192,3,188,"Commerce Public Library"],[125,2,1,"Conyers-Rockdale Library System"],[273,3,269,"Cook County Library"],[152,3,148,"Cornelia-Habersham Library"],[248,3,235,"Crawford County Public Library"],[225,3,223,"Dade County Public Library"],[216,3,215,"Dawson County Library"],[254,2,1,"DeSoto Trail Regional Library"],[35,2,1,"Dougherty County Public Library"],[171,3,166,"Douglas County Public Library"],[138,3,134,"Douglas-Coffee County Library"],[14,3,9,"East Athens Community Center"],[277,2,1,"East Central Georgia Regional Library"],[163,3,160,"East Hall and Special Needs Library"],[236,3,235,"East Wilkinson County Library"],[48,3,41,"Eatonton-Putnam County Library"],[26,3,23,"Elbert County Library"],[23,2,1,"Elbert County Public Library"],[282,3,277,"Euchee Creek Library"],[54,3,53,"Evans County Library"],[94,3,92,"Extension Services"],[102,3,100,"Fannin County Public Library"],[115,3,113,"Fayette County Public Library"],[34,3,33,"Fitzerald-Ben Hill County Library"],[33,2,1,"Fitzgerald-Ben Hill Library"],[113,2,1,"Flint River Regional Library"],[128,3,127,"Forest Park Branch Library"],[144,3,143,"Fortson Public Library"],[59,3,53,"Franklin Memorial Library"],[283,3,277,"Friedman Branch Library"],[237,3,235,"Genealogical and Historical Department"],[182,3,180,"Gilbert H. Gragg Memorial Library"],[285,3,277,"Glascock County Library"],[210,3,204,"Glennville Public Library"],[238,3,235,"Gordon Public Library"],[42,3,41,"Greene County Library"],[95,3,92,"Greenville Area Public Library"],[117,3,113,"Griffin-Spalding County Library"],[164,3,160,"Hall County Library"],[160,2,1,"Hall County Library System"],[43,3,41,"Hancock County Library"],[286,3,277,"Harlem Branch Library"],[196,3,188,"Harold S. Swindle Public Library"],[186,2,1,"Hart County Library"],[187,3,186,"Hart County Library"],[139,3,134,"Hazlehurst-Jeff Davis Public Library"],[257,3,254,"Hdqtrs Library/Camilla"],[172,3,166,"Heard County Public Library"],[143,2,1,"Henry County Library"],[96,3,92,"Hightower Memorial Library"],[156,2,1,"Houston County Public Library"],[77,3,70,"Ida Hilton Public Library"],[239,3,235,"Ideal Public Library"],[274,3,269,"Irwin County Library"],[121,3,113,"J. Joel Edwards Public Library"],[118,3,113,"Jackson-Butts County Public Library"],[258,3,254,"Jakin Public Library"],[183,3,180,"James W. Merritt Memorial Library"],[44,3,41,"Jasper County Library"],[228,2,1,"Jefferson County Library"],[194,3,188,"Jefferson Public Library"],[86,3,84,"Jenkins County Elementary School"],[87,3,84,"Jenkins County High School"],[88,3,84,"Jenkins County Memorial Library"],[203,3,199,"Johnson County Library"],[240,3,235,"Jones County Public Library"],[130,3,127,"Jonesboro Branch Library"],[261,2,1,"Kinchafoonee Regional Library"],[265,3,261,"Kinchafoonee Regional Library"],[55,3,53,"L.C. Anderson Library"],[226,3,223,"LaFayette-Walker County Library"],[206,3,204,"Ladson Genealogical Library"],[207,3,204,"Ladson Genealogical Library"],[51,3,50,"Lake Sinclair Library"],[16,3,9,"Lavonia-Carnegie Library"],[17,3,9,"Lay Park Community Resource Ctr."],[110,2,1,"Lee County Public Library"],[111,3,110,"Lee County Public Library"],[241,3,235,"Library for the Blind & Physically Handicapped"],[287,3,277,"Lincoln County Library"],[145,3,143,"Locust Grove Public Library"],[76,3,70,"Long County Library"],[230,3,228,"Louisville Public Library"],[131,3,127,"Lovejoy Branch Library (projected)"],[256,3,254,"Lucy Maddox Memorial Library"],[217,3,215,"Lumpkin County Library"],[19,3,9,"Lyndon House Arts Ctr"],[299,3,295,"M.E. Roden Public Library"],[13,3,9,"Madison County Library"],[97,3,92,"Manchester Public Library"],[260,3,254,"Margaret Jones Public Library"],[68,3,62,"Marian Anderson Public Library"],[242,3,235,"Marshallville Public Library"],[52,3,50,"Mary Vinson Memorial Library"],[221,3,218,"Mary Willis Library"],[175,3,166,"Maude P. Ragsdale Public Library"],[290,3,277,"Maxwell Branch Library"],[195,3,188,"Maysville Public Library"],[232,3,228,"McCollum Public Library"],[235,2,1,"Middle Georgia Regional Library"],[289,3,277,"Midville Branch Library"],[184,3,180,"Miller County Public Library"],[116,3,113,"Monroe County Library"],[6,3,2,"Monroe Memorial Library"],[7,3,2,"Monroe Memorial Library"],[46,3,41,"Monroe-Walton County Library"],[244,3,235,"Montezuma Carnegie Public Library"],[209,3,204,"Montgomery County Library"],[45,3,41,"Morgan County Library"],[132,3,127,"Morrow Branch Library"],[2,2,1,"Moultrie-Colquitt County Library"],[8,3,2,"Moultrie-Colquitt County Library"],[100,2,1,"Mountain Regional Library"],[103,3,100,"Mountain Regional Library System"],[165,3,160,"Murrayville Branch Library"],[298,3,295,"Murrell Memorial Library"],[126,3,125,"Nancy Guinn Memorial Library"],[208,3,204,"Nelle Brown Memorial Library"],[173,3,166,"Neva Lomason Memorial Library"],[176,3,166,"New Georgia Public Library"],[234,3,233,"Newton County Library Headqtrs."],[233,2,1,"Newton County Library System"],[140,3,134,"Nicholls Public Library"],[159,3,156,"Nola Brantley Memorial Library"],[148,2,1,"Northeast Georgia Regional Library"],[37,3,35,"Northwest Library"],[47,3,41,"O'Kelly Memorial Library"],[295,2,1,"Ocmulgee Regional Library"],[21,3,9,"Oconee County Library"],[199,2,1,"Oconee Regional Library"],[200,3,199,"Oconee Regional Library"],[80,2,1,"Office of Public Library Services"],[18,3,9,"Oglethorpe County Library"],[245,3,235,"Oglethorpe Public Library"],[204,2,1,"Ohoopee Regional Library"],[62,2,1,"Okefenokee Regional Library System"],[28,3,27,"Outreach Collection"],[177,3,166,"Paulding County Public Library"],[108,3,106,"Peach County Law Enforcement Center"],[106,2,1,"Peach Public Libraries"],[119,3,113,"Peachtree City Library"],[141,3,134,"Pearson Public Library"],[259,3,254,"Pelham-Carnegie Library"],[56,3,53,"Pembroke Public Library"],[158,3,156,"Perry Public Library"],[188,2,1,"Piedmont Regional Library System"],[198,3,188,"Piedmont Regional Library-Headquarters"],[190,3,188,"Piedmont-Bookmobile"],[92,2,1,"Pine Mountain Regional Library"],[60,2,1,"Pine Mountain Regional Library System"],[297,3,295,"Public Service Annex"],[154,3,148,"Rabun County Library"],[266,3,261,"Randolph County Public LIbrary"],[247,3,235,"Regional Library"],[98,3,92,"Reynolds Community Library"],[57,3,53,"Richmond Hill Public Library"],[133,3,127,"Riverdale Branch Library"],[249,3,235,"Riverside Branch Library"],[31,3,27,"Rockmart Branch"],[246,3,235,"Rocky Creek Branch Library"],[90,2,1,"Roddenbery Memorial Library"],[91,3,90,"Roddenbery Memorial Library"],[32,3,27,"Rome-Floyd County Library"],[201,3,199,"Rosa M. Tarbutton Memorial Library/Washington Co."],[227,3,223,"Rossville Public Library"],[20,3,9,"Royston Branch Library"],[15,3,9,"Sandy Creek Nature Ctr"],[27,2,1,"Sara Hightower Regional Library"],[292,3,277,"Sardis Branch Library"],[134,2,1,"Satilla Regional Library"],[89,3,84,"Screven County Library"],[84,2,1,"Screven-Jenkins Regional Library"],[185,3,180,"Seminole Public Library"],[250,3,235,"Shurling Branch Library"],[112,3,110,"Smithville Library"],[291,3,277,"South Augusta Branch Library/ Diamond Lakes Branch Library"],[38,3,35,"Southside Library"],[180,2,1,"Southwest Georgia Regional Library"],[78,3,70,"St. Mary's Library"],[81,3,80,"State Library of Georgia Admin. Offices"],[83,3,80,"State Library of Georgia Collection"],[82,3,80,"State Library of Georgia Library for the Blind"],[53,2,1,"Statesboro Regional Library"],[58,3,53,"Statesboro Regional Library"],[197,3,188,"Statham Public Library"],[99,3,92,"Talbot County Library"],[222,3,218,"Taliaferro County Library"],[178,3,166,"Tallapoosa Public Library"],[39,3,35,"Tallulah Massey Library"],[211,3,204,"Tattnall County Library"],[300,3,295,"Telfair County Library"],[267,3,261,"Terrell County Public Library"],[109,3,106,"Thomas Public Library"],[220,3,218,"Thomson-McDuffie County Library"],[70,2,1,"Three Rivers Regional Library"],[75,3,70,"Three Rivers Regional Library"],[276,3,269,"Tifton-Tift County Public Library"],[155,3,148,"Toccoa-Stephens County Library"],[104,3,100,"Towns County Public Library"],[202,3,199,"Treutlen County Library"],[124,3,122,"Trion Public Library"],[251,3,235,"Twiggs County Public Library"],[50,2,1,"Twin Lakes Library"],[120,3,113,"Tyrone Public Library"],[41,2,1,"Uncle Remus Regional Library"],[105,3,100,"Union County Public Library"],[270,3,269,"Victoria Evans Memorial Library"],[212,3,204,"Vidalia-Toombs County Library"],[179,3,166,"Villa Rica Public Library"],[49,3,41,"W. H. Stanton Memorial Library"],[231,3,228,"Wadley Public Library"],[293,3,277,"Wallace Branch Library"],[294,3,277,"Warren County Library"],[168,3,166,"Warren P. Sewell Memorial Library of Bowdon"],[170,3,166,"Warren P. Sewell Memorial Library of Bremen"],[252,3,235,"Washington Memorial Library"],[69,3,62,"Waycross-Ware County Public Library"],[79,3,70,"Wayne County Library"],[268,3,261,"Webster County Public Library"],[253,3,235,"West Bibb Branch Library"],[166,2,1,"West Georgia Regional Library"],[40,3,35,"Westtown Library"],[301,3,295,"Wheeler County Library"],[302,3,295,"Wheeler County Library"],[151,3,148,"White County Library, Cleveland Branch"],[153,3,148,"White County Library, Helen Branch"],[303,3,295,"Wilcox County Public Library"],[142,3,134,"Willacoochee Public Library"],[22,3,9,"Winterville Branch Library"],[61,3,60,"Yatesville Public Library"]]; +var globalOrgTypes = JSON2js("[/*--S aout--*/[null,null,null,null,0,0,0,1,\"Consortium\",\"Everywhere in PINES\"]/*--E aout--*/,/*--S aout--*/[null,null,null,null,0,0,1,2,\"System\",\"Local Library System\",1]/*--E aout--*/,/*--S aout--*/[null,null,null,null,1,1,2,3,\"Branch\",\"This Branch\",2]/*--E aout--*/,/*--S aout--*/[null,null,null,null,1,1,3,5,\"Bookmobile\",\"Your Bookmobile\",3]/*--E aout--*/,/*--S aout--*/[null,null,null,null,1,1,3,4,\"Sub-lib\",\"This Specialized Library\",3]/*--E aout--*/]"); \ No newline at end of file diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css index 5ab4d30308..0340bf0ff4 100644 --- a/Open-ILS/web/opac/skin/default/css/layout.css +++ b/Open-ILS/web/opac/skin/default/css/layout.css @@ -4,6 +4,8 @@ .right { position:absolute; right: 0px; } .hide_me {display:none; visibility: hidden;} +/*.vertical {writing-mode: tb-rl; filter: flipv fliph; }*/ + /* ---------------------------------------------------------------------- */ .canvas { float:right; width: 80%; text-align: left;} #loading_div { width: 100%;} @@ -71,7 +73,7 @@ /* ---------------------------------------------------------------------- */ -#rdetail_detail_main { width 100%; } +#rdetail_detail_main { width: 100%; } #rdetail_details_table { padding-top: 10px; width: 100%; padding: 30px; border-collapse: collapse;} .rdetail_header { padding: 3px; padding-left: 10px; font-weight: 600; } .rdetail_desc { padding: 2px; padding-left: 4px; padding-right: 4px;} diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js index 97ab3aa15d..e80b179112 100644 --- a/Open-ILS/web/opac/skin/default/js/rdetail.js +++ b/Open-ILS/web/opac/skin/default/js/rdetail.js @@ -1,4 +1,5 @@ /* */ + attachEvt("common", "run", rdetailDraw); attachEvt("rdetail", "recordDrawn", rdetailBuildStatusColumns); attachEvt("rdetail", "recordDrawn", rdetailBuildInfoRows); @@ -9,6 +10,7 @@ var cp_statuses = null; var copyRowParent = null; var copyRow = null; var statusRow = null; +var numStatuses = null; function rdetailDraw() { @@ -71,14 +73,13 @@ function _rdetailDraw(r) { } - function rdetailBuildInfoRows() { var req = new Request(FETCH_COPY_COUNTS_SUMMARY, record.doc_id()) req.callback(_rdetailBuildInfoRows); req.send(); } -/* pre-allocate the copy info table with all org units */ +/* pre-allocate the copy info table with all org units in correct order */ function _rdetailRows(node) { if(node) { @@ -93,10 +94,8 @@ function _rdetailRows(node) { libtd.setAttribute("style", "padding-left: " + ((findOrgDepth(node) - 1) * 9) + "px;"); if(!findOrgType(node.ou_type()).can_have_vols()) { - var c = 2; - for(x in _statusPositions) c++; - libtd.setAttribute("colspan", c ); - libtd.colSpan = c; + libtd.setAttribute("colspan", numStatuses + 2 ); + libtd.colSpan = numStatuses + 2; row.removeChild(cntd); row.removeChild(cpctd); addCSSClass(row, config.css.color_3); @@ -116,20 +115,15 @@ function _rdetailBuildInfoRows(r) { _rdetailRows(); var summary = r.getResultObject(); - var curLoc = getLocation(); - /* remove the 'now loading' thingy */ G.ui.rdetail.cp_info_loading.parentNode.removeChild( G.ui.rdetail.cp_info_loading); - var curLoc = getLocation(); - for( var i = 0; i < summary.length; i++ ) { var arr = summary[i]; - var rowNode = copyRow.cloneNode(true); - var rowNode = getId("cp_info_" + arr[0]); - + var thisOrg = findOrgUnit(arr[0]); + var rowNode = getId("cp_info_" + thisOrg.id()); if(rowNode.getAttribute("used")) { @@ -138,49 +132,49 @@ function _rdetailBuildInfoRows(r) { else rowNode = copyRowParent.appendChild(copyRow.cloneNode(true)); var n = findNodeByName( rowNode, config.names.rdetail.lib_cell ); - n.appendChild(text(findOrgUnit(arr[0]).name())); - n.setAttribute("style", "padding-left: " + ((findOrgDepth(arr[0]) - 1) * 9) + "px;"); + n.appendChild(text(thisOrg.name())); + n.setAttribute("style", "padding-left: " + ((findOrgDepth(thisOrg) - 1) * 9) + "px;"); - } else { - rowNode.setAttribute("used", "1"); - } + } else rowNode.setAttribute("used", "1"); - rowNode.setAttribute("hasinfo", "1"); - var p = getId("cp_info_" + findOrgUnit(arr[0]).parent_ou()); - if(p) p.setAttribute("hasinfo", "1"); + findNodeByName( rowNode, config.names.rdetail.cn_cell ).appendChild(text(arr[1])); - if( orgIsMine( findOrgUnit(curLoc), findOrgUnit(arr[0]) ) ) { - unHideMe(rowNode); - unHideMe(getId("cp_info_" + findOrgUnit(arr[0]).parent_ou())); - rowNode.setAttribute("local", "1"); - } + var cpc_temp = rowNode.removeChild( + findNodeByName(rowNode, config.names.rdetail.cp_count_cell)); - var cntd = findNodeByName( rowNode, config.names.rdetail.cn_cell ); - cntd.appendChild(text(arr[1])); - var cpc_temp = rowNode.removeChild(findNodeByName(rowNode, config.names.rdetail.cp_count_cell)); - - for( var j in _statusPositions ) { - var stat = _statusPositions[j]; - var val = arr[2][stat.id()]; - var nn = cpc_temp.cloneNode(true); - if(val) nn.appendChild(text(val)); - else nn.appendChild(text(0)); - rowNode.appendChild(nn); - } + rdetailApplyStatuses(rowNode, cpc_temp, arr[2]); + + var isLocal = false; + if( orgIsMine( findOrgUnit(getLocation()), thisOrg ) ) isLocal = true; + rdetailSetPath( thisOrg, isLocal ); } - /* unhide the path to me */ - var nodeTrail = orgNodeTrail(findOrgUnit(curLoc)); - for( var i = 0; i != nodeTrail.length; i++ ) { - var n = getId("cp_info_" + nodeTrail[i].id()); - if(n) { - unHideMe(n); - n.setAttribute("local", "1"); - } +} + +/* sets the path to org as 'active' and displays the + path if it's local */ +function rdetailSetPath(org, local) { + if( findOrgDepth(org) == 0 ) return; + var row = getId("cp_info_" + org.id()); + row.setAttribute("hasinfo", "1"); + if(local) { + unHideMe(row); + row.setAttribute("local", "1"); } + rdetailSetPath(findOrgUnit(org.parent_ou()), local); } +function rdetailApplyStatuses( row, template, statuses ) { + for( var j in _statusPositions ) { + var stat = _statusPositions[j]; + var val = statuses[stat.id()]; + var nn = template.cloneNode(true); + if(val) nn.appendChild(text(val)); + else nn.appendChild(text(0)); + row.appendChild(nn); + } +} /* --------------------------------------------------------------------- */ @@ -194,14 +188,31 @@ function rdetailBuildStatusColumns() { var i = 0; for( i = 0; i < cp_statuses.length; i++ ) { + var c = cp_statuses[i]; + if(c && c.holdable()) { + + var name = c.name(); _statusPositions[i] = c; var node = template.cloneNode(true); - node.appendChild(text("#" + c.name())); + var data = findNodeByName( node, config.names.rdetail.cp_status); + + data.appendChild(text(name)); + +/* + for( var x = 0; x < name.length; x++ ) { + var c = name.charAt(x); + data.appendChild(text(c)); + data.appendChild(document.createElement("br")); + } +*/ parent.appendChild(node); } } + + numStatuses = 0; + for(x in _statusPositions) numStatuses++; } function rdetailGrabCopyStatuses() { diff --git a/Open-ILS/web/opac/skin/default/js/search_bar.js b/Open-ILS/web/opac/skin/default/js/search_bar.js index 1113726bcd..f7c0d36068 100644 --- a/Open-ILS/web/opac/skin/default/js/search_bar.js +++ b/Open-ILS/web/opac/skin/default/js/search_bar.js @@ -21,7 +21,7 @@ function searchBarInit() { _fs = G.ui.searchbar.form_selector; G.ui.searchbar.text.focus(); - G.ui.searchbar.text.onkeydown = + G.ui.searchbar.text.onkeypress = function(evt) {if(userPressedEnter(evt)) searchBarSubmit();}; G.ui.searchbar.submit.onclick = searchBarSubmit; -- 2.43.2