From 401dce8971b6094088116414b828ef7509501429 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 27 Sep 2007 14:58:31 -0500 Subject: [PATCH] Various random noodlings: - Visual changes to circ, detail, request, and member pages. Fixed checkouts/reserves tabs on circulation.tmpl. Moved new form-layout CSS into staff-global.css and generalized it for wider use. Refined patron details sidebar for use on circulation.tmpl Signed-off-by: Chris Cormack --- C4/Members.pm | 6 +- .../prog/en/css/staff-global.css | 266 ++++++++++++++---- .../prog/en/includes/cat-menu.inc | 7 + .../prog/en/includes/circ-menu.inc | 4 +- .../jquery/plugins/jquery.checkboxes.pack.js | 13 + .../modules/authorities/authorities-home.tmpl | 2 +- .../prog/en/modules/catalogue/detail.tmpl | 4 +- .../prog/en/modules/circ/circulation.tmpl | 63 ++--- .../en/modules/members/member-password.tmpl | 27 +- .../en/modules/members/memberentrygen.tmpl | 94 +------ .../prog/en/modules/members/moremember.tmpl | 8 +- .../prog/en/modules/reserve/request.tmpl | 120 ++++---- .../en/modules/virtualshelves/shelves.tmpl | 62 ++-- reserve/request.pl | 2 + 14 files changed, 408 insertions(+), 270 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.checkboxes.pack.js diff --git a/C4/Members.pm b/C4/Members.pm index e7a39be7c5..c27d73fd2c 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -597,11 +597,11 @@ sub ModMember { $sth->execute; } else { - + ( $data{'password'} = md5_base64( $data{'password'} ) ) + if ( $data{'password'} ne '' ); foreach (keys %data) {push @parameters,"$_ = ".$dbh->quote($data{$_}) if ($_ ne "borrowernumber" and $hashborrowerfields{$_} and $data{$_})} ; - ( $data{'password'} = md5_base64( $data{'password'} ) ) - if ( $data{'password'} ne '' ); + $query = "UPDATE borrowers SET ".join (",",@parameters)." WHERE borrowernumber=$data{'borrowernumber'}"; # warn "$query"; $sth = $dbh->prepare($query); 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 67514be032..c1474ea86c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -210,12 +210,12 @@ span.problem { fieldset { border : 2px solid #EEEEEE; - margin : 1em; + margin : 1em 1em 1em 0; padding : 1em; } legend { - font-size : 138.5%; + font-size : 123.1%; font-weight : bold; margin : 0 0 0 -1em; padding : 0; @@ -264,47 +264,9 @@ div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div padding : 0 0 .2em 0; } -/* Panel-Switch Tabs */ -ul.link-tabs { - list-style-type: none; - margin: 1px 0 9px 5px; - padding: 0; -} - -ul.link-tabs li { - display: inline; - padding: 0px; -} - -ul.link-tabs li a { - border-bottom: 1px solid #333333; - border-left : 1px solid #DDDDDD; - border-right : 1px solid #666666; - padding: .2em 1.2em .2em 1.2em; - text-decoration: none; -} - -ul.link-tabs li.off a { - background-color: #FFFFFF; - border : 0; - margin-right : 1px; - text-decoration: underline; -} - -ul.link-tabs li.off a:hover { - background-color: #FFFFEC; - border : 0; - margin-right : 0; - padding: .2em 1.2em .2em 1.2em; -} - -ul.link-tabs li.on a { - background-color: #FFFFCC; - border-top: 1px solid #FFFFCC; - border-right: 1px solid #FF9900; - border-bottom: 1px solid #FF9900; - border-left: 1px solid #FFCC66; - font-weight : bold; +div#reserves,div#checkouts { + border : 1px solid #E8E8E8; + padding : 1em; } div#header_search .tip { @@ -481,29 +443,43 @@ div.message { } div.patroninfo { - margin-bottom : .5em; margin-top : -.5em; } div.patroninfo h5 { - background-color : #F5F0CC; - border-top : 1px solid #CCCC99; - border-left : 1px solid #CCCC99; + background-color : #FCFAF3; + /*border-top : 1px solid #CCCC99; + border-left : 1px solid #CCCC99;*/ border-right : 1px solid #CCCC99; margin-bottom : 0; + padding-left : .5em; + padding-top : .3em; padding-bottom : .5em; } div.patroninfo ul { - border : 1px solid #CCCC99; + /*border : 1px solid #CCCC99;*/ + border-right : 1px solid #CCCC99; + border-bottom : 0; border-top : 0; - background-color : #F5F0CC; + background-color : #FCFAF3; + padding-bottom : .5em; } -div.patroninfo ul li { +div.patroninfo ul li, div.patronviews ul li { list-style-type : none; } +div.patronviews { + background-color : #FDFCF7; + /*border-left : 1px solid #CCCC99; + border-bottom : 1px solid #CCCC99;*/ + border-right : 1px solid #CCCC99; + border-top : 1px solid #CCCC99; + margin-bottom : .5em; + padding : .5em 0 .5em 0; +} + a.member-edit { float : right; background-color : #DBECC8; @@ -511,4 +487,192 @@ a.member-edit { padding : .3em; text-align : right; text-decoration : none; -} \ No newline at end of file +} + +fieldset.brief { + border : 1px solid #E8E8E8; +} + +fieldset.brief label { + display : block; + font-weight : bold; + padding : .3em 0; +} + +fieldset.brief div.hint { + color : #999999; + font-size : 80%; + margin-bottom : .4em; +} + +fieldset.rows { +border-width : 1px; +border-bottom : 1px solid black; +float : left; +font-size : 90%; +clear : left; +margin: .9em 0 0 0; +padding: 0; +width: 100%; +} + +fieldset.rows legend { + margin-left: 1em; + font-weight: bold; + font-size : 110%; +} + +fieldset.rows label, fieldset.rows span.label { + float: left; + font-weight : bold; + width: 12em; + margin-right: 1em; + text-align: right; +} + +fieldset.rows.left label, fieldset.rows.left span.label { + width : 8em; + text-align : left; +} + +fieldset.rows ol { +padding: 1em 1em 0 1em; +list-style-type: none; +} + +fieldset.rows li { +float : left; +clear : left; +padding-bottom: 1em; +list-style-type: none; +width: 100%; +} + +fieldset.rows.left li { + padding-bottom : .4em; +} + +fieldset.rows ol.radio label { + width : auto; + float : none; + margin-right : 0; +} + +fieldset.rows ol.radio label.radio { + float : left; + width : 12em; + margin-right : 1em; +} + +fieldset.rows table { + clear : both; + margin-left : 1em; +} + +fieldset.rows td label { + float : none; + font-weight : normal; + width : auto; +} + +fieldset.action { + clear : both; + float : none; + border : none; + margin : 0; + padding : 1em 0 .3em 0; + width : auto; +} + +fieldset.rows fieldset.action { + padding : 0 0 1em 1em; +} + +.tabs-nav li { + list-style : none; +} + +.tabs-nav a, .tabs-nav a span { + background : none; + padding: .2em .5em .25em .5em; +} + +.tabs-nav a { + z-index : auto; +} + +.tabs-nav .tabs-selected a { + background-color : #FFFFCC; + border-top: 1px solid #FFFFCC; + border-right: 1px solid #FF9900; + border-bottom: 1px solid #FF9900; + border-left: 1px solid #FFCC66; + font-weight : bold; + text-align : center; + text-decoration : none; + top : -1px; +} + +.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { + background-position : inherit; + outline: 0; /* prevent dotted border in Firefox */ +} +.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active { + background-position: inherit; +} + +.tabs-nav .tabs-selected a:hover { + color : #0000CC; +} + +.tabs-nav li.tabs-selected { + background-color : #FFFFCC; +} + +.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { + background : none; + outline: 0; /* prevent dotted border in Firefox */ +} + +.tabs-container { + border-top: 0; + padding : inherit; + background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */ +} +.tabs-loading em { + padding: inherit; + background: none; +} + +#patronlists .tabs-nav a { + top: 0; + } + +#patronlists .tabs-nav li { + margin-right : .5em; +} + +#patronlists .tabs-nav li a { + background-color : #F3F3F3; + border-top : 1px solid #E8E8E8; + border-left : 1px solid #E8E8E8; + border-right : 1px solid #E8E8E8; + border-bottom : 0; + text-align : center; + text-decoration : none; +} + +#patronlists .tabs-nav li.tabs-selected { + background-color : #FFF; +} + +#patronlists .tabs-nav li.tabs-selected a { + background-color : #FFF; + border-top : 1px solid #E8E8E8; + border-left : 1px solid #E8E8E8; + border-right : 1px solid #E8E8E8; + border-bottom : 1px solid #FFF; + margin-bottom : -5px; + text-align : center; +} + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc index 73bb1c18ba..9419ea2e45 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc @@ -1,3 +1,10 @@ + +
+
+ +
+ + +
+
-

+

@@ -600,9 +600,9 @@ No patron matched " /> -
+
-
+ @@ -611,33 +611,32 @@ No patron matched
+
-

+&print=page'); return false;">Print Page / &print=slip'); return false;">Print Slip -

+

--> " /> " /> " /> - - - +
@@ -646,10 +645,8 @@ No patron matched - - - - + + @@ -658,8 +655,8 @@ No patron matched
Title Due date Barcode Renew?
Today checkouts
&type=intra"> -
- - + , by + - 		@@ -682,15 +679,6 @@ No patron matched - - - - - - - - - @@ -727,19 +715,24 @@ No patron matched
TitleDue dateItemtypeCall noBarcodeRenew?
- +
+ + +

Patron has nothing checked out.

+ - +
+ - + @@ -782,8 +775,10 @@ No patron matched
Reserve dateHold date Barcode Title Author
-
- + +

Patron has no pending holds.

+ + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl index 0e0841d82d..2bcd2b1c66 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl @@ -6,13 +6,14 @@ - +
+

Password Updated

@@ -20,22 +21,22 @@
-

Change Username and/or Password for

-

You have entered a User ID that already exists. Please choose another one.

+

You have entered a User ID that already exists. Please choose another one.

-

- - " /> - " /> -

-

- - " /> -

-

+ +
Change Username and/or Password for +
    +
  1. + " />" />
    2. +
  2. +
    Koha cannot display existing passwords. Below is a randomly generated suggestion
    + " />
    3. +
+
+
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 ad8fb7594d..0da8fd34a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl @@ -6,70 +6,6 @@ patron - - @@ -89,13 +25,13 @@ patron

- Add Organisation Adult Child Professional -patron + Add organisation adult child professional +patron

- Modify Organisation Adult Child Professional -patron + Modify organisation adult child professional +patron

@@ -154,7 +90,7 @@ patron
-
+
Organisation Patron identity
  1. @@ -246,7 +182,7 @@ patron

-
+
Main address
  1. @@ -317,7 +253,7 @@ patron
-
+
Contact

    Borrower

    @@ -405,7 +341,7 @@ patron
    -
    +
    Alternate address
    1. @@ -438,7 +374,7 @@ patron
    -
    +
    Organisations
    1. @@ -463,7 +399,7 @@ patron
      -
      +
      Library Management
      -
      +
      Library set-up
      1. @@ -578,7 +514,7 @@ patron
      -
      +
      OPAC login
      1. @@ -609,7 +545,7 @@ patron
      -
      +
      Patron Account Flags
        @@ -638,9 +574,9 @@ patron
        - + - +
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index 790f6d1bf3..ced75f8a9a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -158,16 +158,16 @@ function confirm_reregistration() {
      1. Registration branch:
        2. -
      2. Sort field 1:
        3. -
      3. Sort field 2:
        4. +
      4. Sort field 1:
        5. +
      5. Sort field 2:
      6. OPAC login:
      7. OPAC password: *******
      8. OPAC password: ">Undefined
        9. -
      9. Circulation notes:
        10. -
      10. Message to Patron:
        11. +
      11. Circulation notes:
        12. +
      12. Message to Patron:
        13. &step=3">Edit
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl index 79bf39f038..7abd82ade6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl @@ -1,7 +1,7 @@ -Koha › Circulation +Koha › Circulation › Holds › Place a hold on <!-- TMPL_VAR NAME="title" --> - @@ -55,7 +56,7 @@ if (alreadyreserved > "0"){ - +
      @@ -73,20 +74,16 @@ if (alreadyreserved > "0"){
      -

      Holds

      - -

      Biblio informations

      -

      ">

      -

      +

      Place a hold on ">

      -

      Add reserve

      -
      " method="post" onsubmit="request.pl" name="getborrower"> + " method="post" name="getborrower"> +
      + Select Patron -

      - - (type card number or part of a name) -

      + +
      (type card number or part of a name)
      + " /> @@ -94,11 +91,12 @@ if (alreadyreserved > "0"){ " /> +

      - + Too many holds Currently, this patron has too many holds.

      @@ -106,29 +104,30 @@ if (alreadyreserved > "0"){

      - + Expired account This patron's account has expired

      - - The borrower isn't in is own library + Branch Mismatch + The patron isn't in his own library

      - + Operation Failed This patron already has a hold on this item

      -
      No patron with this name, Please, try an other
      +

      Patron not found: Name or barcode not found. Please try an other

      -

      Reserve properties

      +
      + Hold details
      " /> @@ -136,29 +135,29 @@ if (alreadyreserved > "0"){ " /> " /> -

      +

      1. Patron: - - (card number: ) + "> () Not defined yet -

        -

        - - -

        -

        - - -

        -

        - +

        2. +
      2. + Priority: + +
        3. +
      3. + + +
        4. +
      4. + -

        +
        5. -

        -

        +
      5. Item type:
        6. +
      6. Publication year:
        7. +
      @@ -189,14 +188,14 @@ if (alreadyreserved > "0"){ - + - Item reserved on + Item on hold since @@ -215,20 +214,20 @@ if (alreadyreserved > "0"){ @@ -236,24 +235,26 @@ if (alreadyreserved > "0"){
      - Can't be cancelled, when item on transfert + Can't be cancelled, when item on transfer &CancelBorrowerNumber=&CancelItemnumber=" onclick="if (window.confirm('You will delete a reserve, are you sure ?')) {return true;} - else {return false;}">Cancel A reserve + else {return false;}">Cancel A reserve Item reserved for :
      expected at :       - + - No reserves + No holds
      -

      - If no item is available, reserve next returning item - +

      +

      " /> " /> -
      +
      - + -
      +
      +
    + -

    Existing reserves

    " action="modrequest.pl" method="post"> +
    +Existing holds @@ -261,7 +262,7 @@ if (alreadyreserved > "0"){ - + @@ -280,7 +281,7 @@ if (alreadyreserved > "0"){ @@ -331,12 +332,9 @@ if (alreadyreserved > "0"){ - - - -
    PriorityNotes Date Pick up locationInformationsDetails
    - " >, + " >
    - -
    +
+
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl index 06777517d7..5b35a1384b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -1,9 +1,27 @@ Koha › <!-- TMPL_IF NAME="viewshelf" -->Virtual Shelves › Contents of <!-- TMPL_VAR NAME="shelfname" --><!-- TMPL_ELSE -->Virtual Shelves<!-- /TMPL_IF --> - +