Permalink
Browse files

Merge branch 'Bug3496' into ptfs-master

  • Loading branch information...
2 parents 73d6e48 + 46f33b9 commit 385bf3d20a5cf87a74437e06e77109d81d315286 J. David Bavousett committed Apr 27, 2010
Showing with 9 additions and 4 deletions.
  1. +7 −2 circ/circulation.pl
  2. +2 −2 koha-tmpl/intranet-tmpl/prog/en/css/login.css
View
@@ -316,8 +316,13 @@
CanBookBeIssued( $borrower, $barcode, $datedue , $inprocess );
my $blocker = $invalidduedate ? 1 : 0;
- delete $question->{'DEBT'} if ($circ_session->{'debt_confirmed'} || $circ_session->{'charges_overridden'});
- granular_overrides($circ_session, $error, $question);
+ if ($circ_session->{'debt_confirmed'} || $circ_session->{'charges_overridden'}) {
+ delete $question->{'DEBT'};
+ delete $error->{'DEBT'};
+ }
+ if (C4::Context->preference('GranularPermissions')){
+ granular_overrides($template, $error, $question);
+ }
foreach my $impossible ( keys %$error ) {
$template->param(
@@ -28,7 +28,7 @@ body.login-area {
padding: 0;
}
-#login-area input:focus, textarea:focus, label:focus {
+#login-area input:focus, #login-area textarea:focus, $login-area label:focus {
background: #fff;
border: 1px solid #686868;
}
@@ -132,7 +132,7 @@ body.login-area {
text-align: right;
}
-#login-area textarea, input, select {
+#login-area textarea, #login-area input, #login-area select {
background: #f4f4f4;
border: 1px solid #b2b2b2;
color: #000;

0 comments on commit 385bf3d

Please sign in to comment.