diff --git a/koha-tmpl/intranet-tmpl/default/en/about.tmpl b/koha-tmpl/intranet-tmpl/default/en/about.tmpl index 4254e5d390..3d1b849836 100644 --- a/koha-tmpl/intranet-tmpl/default/en/about.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/about.tmpl @@ -73,7 +73,7 @@

Translation

-

Pascale Nalon (ENSMP) and Jean Yves Lemaire (Saint Germain sur Morin)

+

Pascale Nalon (ENSMP) and Jean Yves Lemaire (Chatel Saint Germain)

Ambrose Li

Andres Tarallo

Giuseppe Angilella

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl index c37377ceb8..08ac0aae2a 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl @@ -30,7 +30,7 @@ Surname
- + Postal Street Address
@@ -42,9 +42,10 @@ "> "> - "> + "> "> "> + " /> @@ -152,7 +153,7 @@ Joining Branch - "> + "> "> @@ -171,7 +172,7 @@   - "> + "> "> @@ -244,7 +245,6 @@ Circulation note (appears during issue/return) - FLAGS @@ -254,7 +254,6 @@ - The 2 following fields are available for your own usage. They can be useful for stat purposes diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl index 4c810ef9fd..e0ce4fc769 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl @@ -15,7 +15,8 @@


- , Expires:
+ ,
+

@@ -25,7 +26,6 @@

- Alternative

@@ -66,7 +66,7 @@ " class="button">Modify - " class="button">Modify + " class="button">Modify Delete " class="button">Issue books @@ -172,13 +172,13 @@ - - +

+ () &bib=&bi="> - +

- +

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl index 55a11d2b66..870cc7c818 100644 --- a/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl @@ -4,31 +4,27 @@

Reports

- - - - - - - - -
-

-

-

Top Lists

-

on issues

- -
-

-

-

-

Stat wizard on

-

Acquisitions

-

Borrowers

-

Catalogue

-

Issues

-
-

-		 +
+

Stat wizards

+ +
+

Other stats

on catalogue

@@ -45,26 +41,6 @@
  • Average loan time
    • -    		 -

    -

    -

    -
    -

    data exports

    -
  • Borrowers
    • -
  • Circulation
    • -
  • Acquisitions
    • -
  • Issues
    • -
    -
    diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl index e76b9961ec..e5148ede93 100644 --- a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl @@ -13,6 +13,7 @@ + @@ -32,6 +33,9 @@ ;

    + @@ -55,7 +59,7 @@
    SummaryItem type Item Count Location   class="hilighted"> +

    +     		class="hilighted"> class="hilighted"> - ">Request +

    ">Request

    Not Reservable

    diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl index 08f01c2e44..b433ae1002 100644 --- a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl @@ -152,6 +152,10 @@ +

    diff --git a/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl b/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl index 76864f1be6..6968002757 100644 --- a/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl @@ -1,45 +1,58 @@ - - - "> - -Z3950 Search Results
    - - - - - -
    Biblios found
    - - - - - - - - - - - - "> - - - - - - - - + + + + "> -
    TitleAuthorISBNcoming from  
    - )">Import this biblio
    Nothing found
    -

    Still requests to go

    -
    - + /includes/common-style.css"> + + + +
    +

    Z3950 Search Results

    + + + + + + + + + + + + + "> + + + + + + + +
    TitleAuthorISBNcoming from  
    )">Import this biblio
    + +

    Nothing found

    + +

    Still requests to go

    + +
    diff --git a/koha-tmpl/opac-tmpl/css/en/includes/basket.js b/koha-tmpl/opac-tmpl/css/en/includes/basket.js index 4126ddd205..5c8c1591f7 100644 --- a/koha-tmpl/opac-tmpl/css/en/includes/basket.js +++ b/koha-tmpl/opac-tmpl/css/en/includes/basket.js @@ -295,14 +295,6 @@ function delBasket() { function quit() { - if (document.myform.records.value) { - var rep = false; - rep = confirm(MSG_CONFIRM_DEL_RECORDS); - if (rep) { - delSelRecords(); - } - } - updateBasket(arrayRecords.length-1,top.opener.document); window.close(); } @@ -313,7 +305,7 @@ function sendBasket() { var loc = CGIBIN + "opac-sendbasket.pl?" + strCookie; - var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=400,top=50,left=100"; + var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=600,top=50,left=100"; var win_form = open(loc,"win_form",optWin); } diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc b/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc index 6a735ab36a..dec5aa94e8 100644 --- a/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc +++ b/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc @@ -5,7 +5,11 @@ OPAC Basket - /includes/opac.css"> + + " /> + + /includes/opac.css" /> +