@@ -, +, @@ --- .../intranet-tmpl/prog/en/css/staff-global.css | 14 ------ .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 5 +- .../prog/en/modules/members/moremember.tt | 48 +++++++++----------- 4 files changed, 26 insertions(+), 43 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1953,20 +1953,6 @@ ul.budget_hierarchy li:last-child:after { ul.budget_hierarchy li:first-child:after { content: ""; } -#cartmenulink img { - background-image : none; - display : inline; - padding : 3px 6px 0 0; -} - -* html #cartmenulink { - border : 1px solid #336600; -} - -* html #listsmenulink { - border : 1px solid #006699; -} - #collapsedaddress { border: solid 1px #eee; margin-right: 10px; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -124,7 +124,7 @@ function CheckAttributeTypeForm(f) {
  • - Check to show this attribute in member check-out. + Check to show this attribute in patron check-out.
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -80,7 +80,7 @@ function Dopop(link) { [% END %] -[% IF ( WrongTransfer ) %]

    Please return [% title |html %] to [% TransferWaitingAt %]

    +[% IF ( WrongTransfer ) %]

    Please return [% title |html %] to [% TransferWaitingAt %] or Cancel Transfer

    [% IF ( wborcnum ) %]
    Hold for:
    • [% borsurname %], [% borfirstname %] ([% borcnum %])
    • @@ -396,7 +396,7 @@ function Dopop(link) { [% IF ( riloop ) %]

      Checked-In items

      - + [% FOREACH riloo IN riloop %] @@ -412,6 +412,7 @@ function Dopop(link) { [% riloo.itemtitle |html %] + [% ELSE %] + [% IF ( issueloo.norenew_reason_on_reserve ) %] + + [% ELSE %] + [% END %] [% END %] [% END %] @@ -511,21 +517,17 @@ function validate1(date) { [% IF ( relissuecount ) %]
      -

      Relatives issues

      Due DateTitle Author BarcodeCall NumberType PatronNote
      Due DateTitle Author BarcodeShelving LocationCall NumberType PatronNote
      [% riloo.itemauthor %] [% riloo.barcode %][% riloo.location %] [% riloo.itemcallnumber %] [% riloo.itemtype %] [% riloo.ccode %] [% IF ( riloo.duedate ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -179,7 +179,7 @@ function validate1(date) { [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %] -

      +

      [% streetnumber %] [% IF ( roaddetails ) %] [% roaddetails %], [% END %] @@ -212,7 +212,9 @@ function validate1(date) { [% END %]

    • Initials: [% initials %]
    • Date of birth:[% dateofbirth %]
    • -
    • Sex:[% sex %]
    • [% END %] +
    • Gender: + [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %] +
    • [% END %] [% IF ( printethnicityline ) %]
    • Ethnicity:[% ethnicity %]
    • Ethnicity notes: [% ethnotes %]
    • @@ -339,8 +341,8 @@ function validate1(date) { [% END %] [% IF ( sort1 ) %]
    • Sort field 1:[% lib1 %]
    • [% END %] [% IF ( sort2 ) %]
    • Sort field 2:[% lib2 %]
    • [% END %] -
    • OPAC login: [% userid %]
    • -
    • OPAC password: +
    • Username: [% userid %]
    • +
    • Password: [% IF ( password ) %] ******* [% ELSE %] @@ -390,7 +392,7 @@ function validate1(date) {
    • Checkin FailedOn Hold
      - - - - - + + @@ -544,16 +546,13 @@ function validate1(date) { [% relissueloo.itemdamaged %] [% END %] - - - - + - - - - + + + + [% END %] @@ -603,18 +602,15 @@ function validate1(date) { - + [% END %]
      Due date TitleCollectionStock numberBarcode Item Type Checked out onBorrowerCall noCall no Charge PricePatron
      [% relissueloo.title |html %][% IF ( relissueloo.author ) %], by [% relissueloo.author %][% END %] [% IF ( relissueloo.publishercode ) %]; [% relissueloo.publishercode %] [% END %] [% IF ( relissueloo.publicationyear ) %], [% relissueloo.publicationyear %][% END %][% relissueloo.collection %][% relissueloo.stocknumber %][% relissueloo.barcode %][% relissueloo.title |html %][% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] [% relissueloo.barcode %] [% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %][% END %][% END %][% relissueloo.itemtype_description %] [% relissueloo.issuedate %][% relissueloo.borrowername %][% relissueloo.itemcallnumber %][% relissueloo.charge %][% relissueloo.replacementprice %][% relissueloo.itemcallnumber %][% relissueloo.charge %][% relissueloo.replacementprice %][% relissueloo.borrowername %] ([% relissueloo.cardnumber %])
      -
      - - -
      - [% ELSE %]

      Patron has nothing checked out.

      [% END %] - +
      + + [% ELSE %]

      Patron has nothing on hold.

      [% END %]
    --