From 0e91f6ae0ff6b7b6bdbfb1f5270896d9a7f1bd87 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Tue, 17 Nov 2009 17:05:20 +0100 Subject: [PATCH] reindenting and removing tmpl_if in doc-head-close --- acqui/basketgroup.pl | 4 +- .../prog/en/includes/doc-head-close.inc | 89 ++++--- .../intranet-tmpl/prog/en/includes/header.inc | 40 +-- .../prog/en/modules/intranet-main.tmpl | 6 +- .../prog/en/modules/tags/tags.tmpl | 244 +++++++++--------- 5 files changed, 203 insertions(+), 180 deletions(-) diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl index 10eb565c7f..7e407b3aa2 100755 --- a/acqui/basketgroup.pl +++ b/acqui/basketgroup.pl @@ -291,8 +291,8 @@ if ( $op eq "add" ) { # determine default billing and delivery places depending on librarian homebranch and existing basketgroup data my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) ); - my $billingplace = $billingplace || $borrower->{'branchcode'}; - my $deliveryplace = $deliveryplace || $borrower->{'branchcode'}; + $billingplace = $billingplace || $borrower->{'branchcode'}; + $deliveryplace = $deliveryplace || $borrower->{'branchcode'}; my $branches = GetBranches; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 8811f97ce5..e6da4260c0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -7,15 +7,23 @@ /css/staff-global.css" /> -/" /> + + + /" /> + + -/css/modules/" /> -/css/pages/" /> + + /css/modules/" /> + + + /css/pages/" /> + - -/" /> - + + /" /> + @@ -25,24 +33,28 @@ - - + + + - + - + - - - + + + + + + /css/login.css" /> -/css/login.css" /> -/css/wizard.css" /> + + /css/wizard.css" /> @@ -53,33 +65,38 @@ - + + + - + + + - - + var MSG_RECORD_IN_BASKET = _("This item is already in your cart"); + var MSG_RECORD_ADDED = _("This item has been added to your cart"); + var MSG_NRECORDS_ADDED = _(" item(s) added to your cart"); + var MSG_NRECORDS_IN_BASKET = _("already in your cart"); + var MSG_NO_RECORD_SELECTED = _("No item was selected"); + var MSG_NO_RECORD_ADDED = _("No item was added to your cart"); + var MSG_CONFIRM_DEL_BASKET = _("Are you sure you want to empty your cart?"); + var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?"); + var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be reserved."); + + //]]> + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 24b5d84939..42f8c23eb5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -15,6 +15,7 @@
  • Lists
  • Cataloging
    • +
  • Acquisitions
    • @@ -22,7 +23,6 @@
  • Serials
    • -
  • Reports
    • @@ -37,34 +37,34 @@ - -
  • Cart
    • - + +
  • Cart
    • +
    - - - + + + - - - - (Set) - - - (Set) - + + + + (Set) + + + (Set) + | - - - - (Log Out) | + + + + (Log Out) | - You are not logged in | + You are not logged in | [ ? ]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl index 07159e1442..ce69c63286 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl @@ -59,10 +59,10 @@ + + +

    Serials

    Acquisitions

    Reports

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/tags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/tags.tmpl index 8681a8aa12..d2ba19f919 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/tags.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/tags.tmpl @@ -1,51 +1,52 @@ -Koha Online Catalog › Tags + +Koha Online Catalog › Tags @@ -55,94 +56,99 @@
    -
    -
    - - -
    There was a problem with this operation: - Sorry, tags are not enabled on this system. - ERROR: illegal parameter - ERROR: You must log in to complete that action. - ERROR: You cannot delete the tag . -
    Note: you can only delete your own tags. - Note: your tag contained markup code that was removed. -
    The tag was added as "". - Note: your tag was entirely markup code. It was NOT added. -
    Please try again with plain text. - Unrecognized error. - -
    - - -

    All Tags

    - -
    -
    Show up to " /> - tags from other users. - - - - - - Log in to see your own saved tags. - - ">Show my tags - &hidemytags=1">Hide my tags - -
    -
    - - -
    - - " title=""> - &q="> - - - - -
    - - - -
    tagtags successfully added.
    - - -
    tagtags successfully deleted.
    - - +
    +
    + + +
    There was a problem with this operation: + Sorry, tags are not enabled on this system. + ERROR: illegal parameter + ERROR: You must log in to complete that action. + ERROR: You cannot delete the tag . +
    Note: you can only delete your own tags. + Note: your tag contained markup code that was removed. +
    The tag was added as "". + Note: your tag was entirely markup code. It was NOT added. +
    Please try again with plain text. + Unrecognized error. + +
    + + +

    All Tags

    + +
    +
    Show up to " /> + tags from other users. + + + + + + Log in to see your own saved tags. + + + ">Show my tags + + &hidemytags=1">Hide my tags + + +
    +
    + + +
    + + " title=""> + &q="> + + + + +
    + + + +
    tagtags successfully added.
    + + +
    tagtags successfully deleted.
    + + - - -
    -

    My Tags

    - - - - - - - - - - -
    TermTitleDate AddedDelete
    &q="> - - "> - " value="Delete" />
    -
    - - + + +
    +

    My Tags

    + + + + + + + + + + + + +
    TermTitleDate AddedDelete
    &q="> + + "> + " value="Delete" />
    +
    + +
    -
    - - -
    +
    + + +
    -- 2.39.5