From cb39259b1a93895683291263e5d02e2392e6e7a4 Mon Sep 17 00:00:00 2001
From: oleonard
Date: Wed, 3 Aug 2005 19:30:31 +0000
Subject: [PATCH] Synching with rel_2_2.
---
admin/branches.pl | 38 ++---
.../npl/en/parameters/branches.tmpl | 136 ++++++++++++------
.../npl/en/parameters/currency.tmpl | 7 -
3 files changed, 111 insertions(+), 70 deletions(-)
diff --git a/admin/branches.pl b/admin/branches.pl
index d4e3b2ba92..1f3f2cac25 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -88,25 +88,24 @@ if ($op eq 'add') {
# If the user has pressed the "add new branch" button.
heading("Branches: Add Branch");
$template->param('heading-branches-add-branch-p' => 1);
- $template->param('use-heading-flags-p' => 1);
editbranchform();
} elsif ($op eq 'edit') {
# if the user has pressed the "edit branch settings" button.
heading("Branches: Edit Branch");
$template->param('heading-branches-edit-branch-p' => 1);
- $template->param('use-heading-flags-p' => 1);
$template->param(add => 1);
editbranchform($branchcode);
} elsif ($op eq 'add_validate') {
# confirm settings change...
my $params = $input->Vars;
unless ($params->{'branchcode'} && $params->{'branchname'}) {
- default ("Cannot change branch record: You must specify a Branchname and a Branchcode");
+ $template->param(else => 1);
+ default ("MESSAGE1");
} else {
setbranchinfo($params);
$template->param(else => 1);
- default ("Branch record changed for branch: $params->{'branchname'}");
+ default ("MESSAGE2");
}
} elsif ($op eq 'delete') {
# if the user has pressed the "delete branch" button.
@@ -123,22 +122,21 @@ if ($op eq 'add') {
# actually delete branch and return to the main screen....
deletebranch($branchcode);
$template->param(else => 1);
- default("The branch \"$branchname\" ($branchcode) has been deleted.");
+ default("MESSAGE3");
} elsif ($op eq 'editcategory') {
# If the user has pressed the "add new category" or "modify" buttons.
- heading("Branches: Edit Category");
$template->param('heading-branches-edit-category-p' => 1);
- $template->param('use-heading-flags-p' => 1);
editcatform($categorycode);
} elsif ($op eq 'addcategory_validate') {
# confirm settings change...
my $params = $input->Vars;
unless ($params->{'categorycode'} && $params->{'categoryname'}) {
- default ("Cannot change branch record: You must specify a Branchname and a Branchcode");
+ $template->param(else => 1);
+ default ("MESSAGE4");
} else {
setcategoryinfo($params);
$template->param(else => 1);
- default ("Category record changed for category $params->{'categoryname'}");
+ default ("MESSAGE5");
}
} elsif ($op eq 'delete_category') {
# if the user has pressed the "delete branch" button.
@@ -154,7 +152,7 @@ if ($op eq 'add') {
# actually delete branch and return to the main screen....
deletecategory($categorycode);
$template->param(else => 1);
- default("The category with code $categorycode has been deleted.");
+ default("MESSAGE6");
} else {
# if no operation has been set...
@@ -171,8 +169,7 @@ sub default {
my ($message) = @_;
heading("Branches");
$template->param('heading-branches-p' => 1);
- $template->param('use-heading-flags-p' => 1);
- $template->param(message => $message);
+ $template->param("$message" => 1);
$template->param(action => $script_name);
branchinfotable();
}
@@ -263,10 +260,11 @@ sub branchinfotable {
} else {
$branchinfo = getbranchinfo();
}
- my $color;
+ my $toggle;
+ my $i;
my @loop_data =();
foreach my $branch (@$branchinfo) {
- ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
+ ($i % 2) ? ($toggle = 1) : ($toggle = 0);
#
# We export the following fields to the template. These are not
# pre-composed as a single "address" field because the template
@@ -322,21 +320,27 @@ sub branchinfotable {
# Handle all other fields
$row{'branch_name'} = $branch->{'branchname'};
$row{'branch_code'} = $branch->{'branchcode'};
- $row{'color'} = $color;
+ $row{'toggle'} = $toggle;
$row{'value'} = $branch->{'branchcode'};
$row{'action'} = '/cgi-bin/koha/admin/branches.pl';
push @loop_data, { %row };
+ $i++;
}
my @branchcategories =();
my $catinfo = getcategoryinfo();
+ my $toggle;
+ my $i = 0;
foreach my $cat (@$catinfo) {
+ ($i % 2) ? ($toggle = 1) : ($toggle = 0);
push @branchcategories, {
+ toggle => $toggle,
categoryname => $cat->{'categoryname'},
categorycode => $cat->{'categorycode'},
codedescription => $cat->{'codedescription'},
};
- }
+ $i++;
+ }
$template->param(branches => \@loop_data,
branchcategories => \@branchcategories);
@@ -501,7 +505,7 @@ sub checkdatabasefor {
my $message;
if ($total) {
# FIXME: need to be replaced by an exported boolean parameter
- $message = "Branch cannot be deleted because there are $total items using that branch.";
+ $message = "MESSAGE7";
}
return $message;
}
diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/branches.tmpl
index d082f01b0f..6b03c750fd 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/branches.tmpl
@@ -8,56 +8,62 @@
-
+
+ Branches
+ Add Branch
+ Edit Branch
+ Edit Branch Category
+
+
@@ -75,10 +81,37 @@
-
-
+
+
+Branches
+Add Branch
+ Edit Branch
+Edit Branch Category
+
+
+
+ Cannot change branch record: You must specify a branch name and a branch code
+
+
+ Branch record updated
+
+
+ Branch record deleted
+
+
+ Cannot change branch category: You must specify a category name and category code
+
+
+ Branch category record udpated
+
+
+ The branch category has been deleted
+
+
+ Branch cannot be deleted because there are items using that branch
+
+
-
Name |
Code |
@@ -88,8 +121,8 @@
|
-
- |
+
|
+ |
|
@@ -137,7 +170,7 @@
|
@@ -150,8 +183,8 @@
|
-
- |
+
|
+ |
|
|
@@ -171,48 +204,59 @@
|
- Confirm delete:
+
+
+ Confirm Deletion of Category?
+ Category Code: | |
+
diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/currency.tmpl
index ada8c7fb98..a84e310213 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/currency.tmpl
@@ -152,13 +152,6 @@
Currencies Management
-
- You searched for
-
-