From 0db9056904e1bfcb158a323c22f4eb8a2aed7f28 Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Fri, 1 Jun 2012 08:10:21 +0100 Subject: [PATCH] Bug 8176 [SIGNED-OFF] Assign an intial value to $sqlwhere warnings in log because of undefined value in string concatenation variable should be initialized to empty string rather than left undefined Signed-off-by: Jonathan Druart Removes a warning in logs Signed-off-by: Paul Poulain --- C4/Serials.pm | 2 +- .../intranet-tmpl/prog/en/css/staff-global.css | 12 +++++++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 34 ++++++++++++++++--- 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index 20ad706..af5c833 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -566,7 +566,7 @@ sub GetSubscriptions { LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber ); my @bind_params; - my $sqlwhere; + my $sqlwhere = q{}; if ($biblionumber) { $sqlwhere = " WHERE biblio.biblionumber=?"; push @bind_params, $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 e591a73..d2c4884 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -2210,20 +2210,24 @@ div.pager img {+/* jQuery UI Autocomplete */ vertical-align : middle; } + div.pager img.last { padding-right: 5px; } + div.pager input.pagedisplay { border : 0; background-color : transparent; font-weight: bold; text-align : center; } + a.localimage img { border : 1px solid #0000CC; margin : 0 .5em; padding : .3em; } + div.pager p { margin: 0; } @@ -2274,3 +2278,11 @@ ul.ui-autocomplete { .ui-autocomplete-loading { background: #FFF url("../../img/loading-small.gif") right center no-repeat; } + +div.ohloh-table table, td, tr { + margin: 100 left; + text-align: left; + border: 0px solid white; + border-left: 30px solid white; + border-collapse:collapse; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index f4f0def..8a5fa25 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -30,6 +30,7 @@
  • Licenses
  • Translations
  • Koha Timeline
  • +
  • Koha Statistics
  • @@ -124,14 +125,14 @@
  • Richard Anderson
  • Nahuel Angelinetti
  • Nuño López Ansótegui
  • -
  • Tomás Cohen Arazi
  • +
  • Tomás Cohen Arazi
  • Andrew Arensburger (the small and great C4::Context module)
  • Alex Arnaud
  • Joe Atzberger
  • Larry Baerveldt
  • Al Banks
  • Daniel Banzli
  • -
  • Greg Barniskis
  • +
  • Greg Barniskis
  • Benedykt P. Barszcz (Polish for 2.0)
  • D Ruth Bavousett
  • John Beppu
  • @@ -232,8 +233,8 @@
  • Andrew Moore
  • Sharon Moreland
  • Nicolas Morin
  • -
  • Mike Mylonas
  • -
  • Joy Nelson
  • +
  • Mike Mylonas
  • +
  • Joy Nelson
  • Chris Nighswonger
  • Albert Oller
  • Eric Olsen
  • @@ -292,6 +293,7 @@

    Contributing companies and institutions

      +<<<<<<< HEAD
    • BibLibre, France
    • Bibliotheksservice-Zentrum Baden-Württemberg (BSZ), Germany
    • ByWater Solutions, USA
    • @@ -442,6 +444,26 @@
    - - +
    +

    Koha Ohloh Stats

    + +
    + + + + + + + + +
    + +
    + +
    +
    + +

    +
    [% INCLUDE 'intranet-bottom.inc' %] -- 1.7.2.5