From 1a914b7202f62f840b9a3c14a6f1bf2abb2ce820 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 4 Dec 2007 15:00:05 -0600 Subject: [PATCH] Fixing some menu formatting Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 29 +++++++------ .../prog/en/includes/circ-menu.inc | 11 +++-- .../prog/en/includes/members-menu.inc | 7 +-- .../intranet-tmpl/prog/en/js/staff-global.js | 3 ++ .../prog/en/modules/circ/overdue.tmpl | 43 +------------------ .../en/modules/members/guarantor_search.tmpl | 25 ++++++----- .../en/modules/members/memberentrygen.tmpl | 2 +- members/boraccount.pl | 1 + members/moremember.pl | 1 + 9 files changed, 49 insertions(+), 73 deletions(-) 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 727e0b65a1..49748f8d2b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -469,10 +469,7 @@ div.patroninfo { } div.patroninfo h5 { - background-color : #FCFAF3; - /*border-top : 1px solid #CCCC99; - border-left : 1px solid #CCCC99;*/ - border-right : 1px solid #CCCC99; + border-right : 1px solid #000; margin-bottom : 0; padding-left : .5em; padding-top : .3em; @@ -480,11 +477,9 @@ div.patroninfo h5 { } div.patroninfo ul { - /*border : 1px solid #CCCC99;*/ - border-right : 1px solid #CCCC99; + border-right : 1px solid #000; border-bottom : 0; border-top : 0; - background-color : #FCFAF3; padding-bottom : .5em; } @@ -493,11 +488,8 @@ div.patroninfo ul li, div.patronviews ul li { } 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; + border-right : 1px solid #000; + border-top : 1px solid #000; margin-bottom : .5em; padding : .5em 0 .5em 0; } @@ -1089,4 +1081,17 @@ h1#logo a { padding:44px 0 0; text-decoration:none; width:180px; +} + +#closewindow { + margin-top : 2em; + text-align : center; +} + +#closewindow a { + font-weight : bold; +} + +.patroninfo+#menu { + margin-right : 0; } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index da05e800ca..7a605cd8fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -27,11 +27,14 @@
  • Category:
    • -
    -
    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 2614e05153..36aee33751 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc @@ -1,9 +1,10 @@ -
    Patron Details
    + \ No newline at end of file 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 9615fd9a74..9983c04dbc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js @@ -10,6 +10,9 @@ function _(s) { return s } // dummy function for gettext $('#header_search').find('div:visible').find('input').eq(0).focus(); } }); + $(".close").click(function(){ + window.close(); + }); }); 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 9885b4b6ba..d5a4e4d7b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl @@ -15,47 +15,6 @@

    Items Overdue as of

    - -
    -
    Filter on :
    - Name or cardnumber :"> - Patron category : - - - Patron flags :
    - Item type : - - - Library :
    - Show any items currently issued:checked="checked"> - - - Sort By - -
    -
    @@ -84,7 +43,7 @@
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl index 4bc73dbfef..add0071dd5 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl @@ -1,38 +1,39 @@ Koha › Guarantor Search + - -
    +
    +
    -

    Search for guarantor

    +

    Search for guarantor

    - " /> Ordered by +
    + " class="focus" /> Ordered by - +
    -

    Searched for , borrower(s) found:

    +

    Searched for , patron(s) found:

    - - + - + @@ -40,5 +41,7 @@
    CardnumberSurnameFirstnameName Date of birth Address

    ;window.opener.document.form.guarantorsearch.value='Modify Guarantor';window.opener.document.form.contactname.value='';window.opener.document.form.contactfirstname.value='';window.opener.document.form.address.value='';window.opener.document.form.city.value='';window.opener.document.form.zipcode.value='';self.close();">

    -     		;window.opener.document.form.guarantorsearch.value='Modify Guarantor';window.opener.document.form.contactname.value='';window.opener.document.form.contactfirstname.value='';window.opener.document.form.address.value='';window.opener.document.form.city.value='';window.opener.document.form.zipcode.value='';self.close();">,

    + +
    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 9e7ccc5a2d..e126b83e96 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl @@ -57,7 +57,7 @@ patron Duplicate suspected ');" >Detail Duplicate ? - &category_type=">Yes + &category_type=">Yes     No, it is not diff --git a/members/boraccount.pl b/members/boraccount.pl index 006d6b70ea..35cbbbfad1 100755 --- a/members/boraccount.pl +++ b/members/boraccount.pl @@ -103,6 +103,7 @@ $template->param( branchcode => $data->{'branchcode'}, total => sprintf("%.2f",$total), totalcredit => $totalcredit, + finesview => 1, accounts => \@accountrows ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/members/moremember.pl b/members/moremember.pl index b85a6b2a81..9eb3ffaad0 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -299,6 +299,7 @@ my $branch=C4::Context->userenv->{'branch'}; $template->param($data); $template->param( + detailview => 1, roaddetails => $roaddetails, borrowernumber => $borrowernumber, reregistration => $reregistration, -- 2.39.5