From c16539a291c27c733ecacc18ac99820edbbde269 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 21 Nov 2007 07:35:11 -0600 Subject: [PATCH] Bugfixing interface issues. Also enabling contextual menu highlighting for catalogue detail pages. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- C4/Auth.pm | 1 + catalogue/ISBDdetail.pl | 1 + catalogue/MARCdetail.pl | 1 + catalogue/detail.pl | 1 + catalogue/issuehistory.pl | 3 +- catalogue/moredetail.pl | 1 + .../prog/en/css/staff-global.css | 18 +++- .../prog/en/includes/biblio-view-menu.inc | 20 ++-- .../prog/en/includes/circ-toolbar.inc | 4 +- .../intranet-tmpl/prog/en/includes/header.inc | 2 +- .../prog/en/includes/members-menu.inc | 1 + .../prog/en/includes/members-toolbar.inc | 4 +- .../intranet-tmpl/prog/en/modules/auth.tmpl | 8 +- .../prog/en/modules/catalogue/detail.tmpl | 12 +-- .../en/modules/catalogue/issuehistory.tmpl | 2 +- .../prog/en/modules/catalogue/moredetail.tmpl | 1 - .../en/modules/cataloguing/addbiblio.tmpl | 5 +- .../prog/en/modules/cataloguing/additem.tmpl | 1 + .../en/modules/circ/circulation-home.tmpl | 4 +- .../prog/en/modules/circ/circulation.tmpl | 4 +- .../en/modules/members/memberentrygen.tmpl | 102 ++++++++++++------ .../prog/img/side-tab-gradient-hover.gif | Bin 0 -> 92 bytes .../prog/img/side-tab-gradient.gif | Bin 0 -> 92 bytes members/memberentry.pl | 6 +- 24 files changed, 127 insertions(+), 75 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient-hover.gif create mode 100644 koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient.gif diff --git a/C4/Auth.pm b/C4/Auth.pm index e3226f8700..156ca9727c 100755 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -735,6 +735,7 @@ sub checkauth { intranetuserjs => C4::Context->preference("intranetuserjs"), TemplateEncoding => C4::Context->preference("TemplateEncoding"), IndependantBranches => C4::Context->preference("IndependantBranches"), + AutoLocation => C4::Context->preference("AutoLocation"), ); $template->param( loginprompt => 1 ) unless $info{'nopermission'}; diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl index 04c9e38f8f..4b70d0f91f 100755 --- a/catalogue/ISBDdetail.pl +++ b/catalogue/ISBDdetail.pl @@ -160,6 +160,7 @@ if ($subscriptionsnumber) { $template->param ( ISBD => $res, biblionumber => $biblionumber, + isbdview => 1, ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl index 9271a52f98..c44a0423a8 100755 --- a/catalogue/MARCdetail.pl +++ b/catalogue/MARCdetail.pl @@ -309,6 +309,7 @@ $template->param ( biblionumber => $biblionumber, popup => $popup, hide_marc => C4::Context->preference('hide_marc'), + marcview => 1, ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/catalogue/detail.pl b/catalogue/detail.pl index f0815b5206..82ee42905e 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -98,6 +98,7 @@ foreach ( keys %{$dat} ) { $template->param( ITEM_RESULTS => \@items, biblionumber => $biblionumber, + detailview => 1, subscriptions => \@subs, subscriptionsnumber => $subscriptionsnumber, subscriptiontitle => $dat->{title}, diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl index 2db1735574..2f0825a2ae 100755 --- a/catalogue/issuehistory.pl +++ b/catalogue/issuehistory.pl @@ -71,7 +71,8 @@ foreach (@$issues){ } $template->param( total => scalar @$issues, - issues => $issues + issues => $issues, + issuehistoryview => 1, ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index c3b61dea15..c9cd8475c3 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -96,6 +96,7 @@ foreach my $item (@$items){ $template->param(count => $data->{'count'}); $template->param(BIBITEM_DATA => \@results); $template->param(ITEM_DATA => $items); +$template->param(moredetailview => 1); $template->param(loggedinuser => $loggedinuser); $template->param(biblionumber => $biblionumber); 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 afad011ab7..b363adc057 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -260,7 +260,11 @@ legend { border-bottom : 1px solid #E8E8E8; clear : both; font-size : 90%; - padding :.2em .5em .4em .5em; + padding :.2em .5em .4em 10px; +} + +#header+#breadcrumbs { + margin-top : 1em; } #commonsearch { @@ -996,8 +1000,11 @@ div.first fieldset { } .required { - background-color:red; - color:white; + color : #C00; +} + +span.required { + font-style : italic; } .term { @@ -1014,7 +1021,7 @@ div#menu { div#menu li a { text-decoration: none; display: block; - background-color: #EEE; + background : #EEE url(../../img/side-tab-gradient.gif) repeat-y top right; border: 1px solid #000; font-size: 111%; margin: .5em 0; @@ -1023,7 +1030,7 @@ div#menu li a { } div#menu li a:hover { - background-color: #F0F0CC; + background : #E8F0F6 url(../../img/side-tab-gradient-hover.gif) repeat-y top right; } div#menu li.active a:hover { @@ -1037,6 +1044,7 @@ div#menu li.active a:hover { #menu ul li.active a { background-color: #FFF; + background-image : none; border-right: 0; font-weight: bold; } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc index b3f1a1efa8..ab428287ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc @@ -1,14 +1,20 @@ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc index 78baad8e76..8bd2988e3d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc @@ -40,7 +40,7 @@ function confirm_reregistration() { var moremenu = [ { text: "Renew Patron", onclick: { fn: confirm_reregistration } }, - { text: "Set Permissions", url: "/cgi-bin/koha/members/member-flags.pl?member="}, + { text: "Set Permissions", url: "/cgi-bin/koha/members/member-flags.pl?member=",disabled: true, }, { text: "Delete", onclick: { fn: confirm_deletion } }, ] @@ -61,7 +61,7 @@ function confirm_reregistration() { }); new YAHOO.widget.Button("checkout"); - new YAHOO.widget.Button("addchild"); + new YAHOO.widget.Button("addchild"); new YAHOO.widget.Button("editpatron"); new YAHOO.widget.Button("addnote"); new YAHOO.widget.Button("changepassword"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 5dadd7798a..383c703c5e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -19,4 +19,4 @@ -
(Set) | (Log Out) | You are not logged in | [ ? ]
+
(Set) | (Log Out) | You are not logged in | [ ? ]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc index fd84f0eb81..2614e05153 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc @@ -6,3 +6,4 @@
  • ">Reading Record
  • ">Modification Log
    • + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 97349101a6..d5473d13b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -40,7 +40,7 @@ function confirm_reregistration() { var moremenu = [ { text: "Renew Patron", onclick: { fn: confirm_reregistration } }, - { text: "Set Permissions", url: "/cgi-bin/koha/members/member-flags.pl?member="}, + { text: "Set Permissions", url: "/cgi-bin/koha/members/member-flags.pl?member=",disabled: true, }, { text: "Delete", onclick: { fn: confirm_deletion } }, ] @@ -61,7 +61,7 @@ function confirm_reregistration() { }); new YAHOO.widget.Button("checkout"); - new YAHOO.widget.Button("addchild"); + new YAHOO.widget.Button("addchild"); new YAHOO.widget.Button("editpatron"); new YAHOO.widget.Button("addnote"); new YAHOO.widget.Button("changepassword"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl index c314a04343..a08c91f4b3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl @@ -42,15 +42,15 @@

    - -

    -

    - +

    +

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl index f0e2f88860..951b79752c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -30,7 +30,7 @@ ] , - , + , , /

    @@ -47,19 +47,16 @@ - - -
  • Illustrator:
  • Published by: "> - () , + () ,
  • Description: - + ,
    • @@ -109,9 +106,6 @@
  • Notes:
    • - -
  • Alternate title:
    • -
  • Classification:
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl index 71b7ed2611..248320cc50 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl @@ -99,7 +99,7 @@
    - +
    \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl index 46197e8b86..b5609f59c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl @@ -134,7 +134,6 @@ NAME="biblionumber"-->&itemnumber=">Modif
    -
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl index 02884ff7b6..f9dc4d7ebf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -42,7 +42,7 @@ function Dopop(link,i) { function PopupZ3950() { var strQuery = AreZ3950MandoriesOk(); if(strQuery){ - window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=&frameworkcode="+strQuery,"z3950search",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes'); + window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=&frameworkcode="+strQuery,"z3950search",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes,resize=yes'); } else { var strAlert = _("To perform a z39.50 search, you must enter at least one of the following: \n\n ISBN\n ISSN\n Title\n Author\n"); alert(strAlert); @@ -427,6 +427,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ? +
    @@ -434,6 +435,8 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
    + +

    Edit MARC Record Number Add MARC Record

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl index e51ddd2227..7b39619493 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl @@ -130,6 +130,7 @@ function CreateKey(){ +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl index 3a92eed9e2..bd8b310970 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl @@ -20,9 +20,7 @@
  • Check Out
  • Check In
  • Transfer
    • - -
  • Set library
    • - +
  • Set library
    • 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 3841bd6267..d0cb1305e5 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -146,8 +146,8 @@ No patron matched
    - -
    Checking out to ()
    + +
    Enter item barcode:
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl index cb4969af23..db2c271023 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl @@ -1,8 +1,8 @@ Koha › Patrons › <!-- TMPL_IF NAME="opadd" --> Add<!--TMPL_IF Name="I"--> Organisation <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professional <!--/TMPL_IF --> -patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- TMPL_ELSE -->Modify<!--TMPL_IF Name="I"--> Organisation <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professional <!--/TMPL_IF --> -patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /TMPL_IF --> +patron , Modify Organisation Adult Child Professional +patron , @@ -16,8 +16,8 @@ patron Organisation Adult Child Professional patron -"> › Modify Organisation Adult Child Professional -patron
    +"> › Modify Organisation Adult Child Professional +patron
    @@ -102,6 +102,7 @@ patron Title: + Required
  • @@ -116,6 +117,7 @@ patron " /> + Required
  • @@ -125,6 +127,7 @@ patron Firstname: " /> + Required
  • @@ -144,6 +147,7 @@ patron } ); + Required
  • @@ -153,6 +157,7 @@ patron Initials: " /> + Required
  • @@ -162,6 +167,7 @@ patron Other name: " /> +Required
    • @@ -200,6 +206,7 @@ patron Street number: " /> +Required
  • @@ -210,6 +217,7 @@ patron Street type: + Required
  • @@ -220,6 +228,7 @@ patron Address: " /> + Required
  • @@ -229,17 +238,9 @@ patron Address 2: " /> -
    • -
  • - -
    • - + Required + +
  • + Required
  • @@ -258,7 +260,19 @@ patron City: " /> + Required
    • +
  • + +
    • +
    @@ -272,14 +286,17 @@ patron - " /> + " /> + Required +
  • + " /> + Required
  • @@ -290,6 +307,7 @@ patron Phone (home): " /> + Required
  • @@ -297,8 +315,9 @@ patron + Phone (work): " /> + Required
  • @@ -308,6 +327,7 @@ patron Phone (cell): " /> + Required
  • @@ -316,7 +336,8 @@ patron - " /> + " /> + Required
  • @@ -324,8 +345,9 @@ patron - " /> + E-mail (work): + " /> + Required
  • @@ -335,6 +357,7 @@ patron Fax: " /> + Required
    • @@ -354,15 +377,7 @@ patron Address: " /> - -
  • - -
  • @@ -372,6 +387,17 @@ patron City: " /> + Required +
    • +
  • + +
    • @@ -387,6 +413,7 @@ patron Organisation(s): + Required @@ -404,7 +431,8 @@ patron - " /> + " /> + Required
  • + Required
  • @@ -434,6 +463,7 @@ patron " /> + Required
  • @@ -447,6 +477,7 @@ patron " /> + Required
    • @@ -471,6 +502,7 @@ patron } ); + Required
  • @@ -490,6 +522,7 @@ patron } ); + Required
  • @@ -499,6 +532,7 @@ patron OPAC note: + Required
  • @@ -508,6 +542,7 @@ patron Library note: + Required
    • @@ -521,6 +556,7 @@ patron OPAC Login: " /> + Required
  • @@ -538,6 +574,7 @@ patron + Required
    • @@ -574,6 +611,7 @@ patron + Cancel diff --git a/koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient-hover.gif b/koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient-hover.gif new file mode 100644 index 0000000000000000000000000000000000000000..9fcdc96598c37f44e362daa191df3afb2a8d3c7b GIT binary patch literal 92 zcmZ?wbhEHb=sn33fe#H{mdLCo8uGj-QXv&DIdPkX$4;+0iZi=+>)h>7N8um%A7aU}8p literal 0 HcmV?d00001 diff --git a/koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient.gif b/koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient.gif new file mode 100644 index 0000000000000000000000000000000000000000..af3addbcdaef7bbd180682f490dedb1fa96e0da2 GIT binary patch literal 92 zcmZ?wbhEHb=sn2}|u!m9IZLCo8uGj-QXv&DIdPkX$4;+0iZi=+>)h>7N8um%7F^(68D literal 0 HcmV?d00001 diff --git a/members/memberentry.pl b/members/memberentry.pl index f3fbd97aa6..b21dbbfed9 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -454,12 +454,10 @@ if ($data{'dateenrolled'} eq ''){ $data{'dateenrolled'}=$today; } -$data{'surname'}=uc($data{'surname'}); -$data{'firstname'}=ucfirst(lc $data{'firstname'}); +$data{'surname'}=uc($data{'surname'}) if C4::Context->preference('uppercasesurnames'); $data{'dateenrolled'}=format_date($data{'dateenrolled'}); $data{'dateexpiry'}=format_date($data{'dateexpiry'}); -$data{'contactname'}=uc($data{'contactname'}); -$data{'contactfirstname'}= ucfirst( lc $data{'contactfirstname'}); +$data{'contactname'}=uc($data{'contactname'}) if C4::Context->preference('uppercasesurnames'); $data{'dateofbirth'} = format_date($data{'dateofbirth'}); $template->param( "showguarantor" => 1) if ($category_type!~/A|I/);# associate with step to know where u are -- 2.39.5