diff --git a/koha-tmpl/intranet-tmpl/prog/en/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl similarity index 91% rename from koha-tmpl/intranet-tmpl/prog/en/boraccount.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl index db02db9035..d3bb3f2e71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/boraccount.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl @@ -1,9 +1,13 @@ Account for , + + + +

Account for

+ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/jmemberentry.tmpl index b821465319..e5361c3cc3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/members/jmemberentry.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/jmemberentry.tmpl @@ -1,5 +1,8 @@ Add Child + + + " /> @@ -13,44 +16,62 @@ " /> " /> " /> - " /> + " />

Add Child

-
Account for
Date Description of Charges
- - - - -
Parent or Guardian
" />
" />
" />
-
- - - - - - - - - - - - - - - - - - -
Child
" name="cardnumber_child_" size="20" value="" />" value="" />
" name="firstname_child_" size="20" />
" name="surname_child_" size="20" />
" id="dateofbirth_child_" size="10" />
- " name="sex_child_" value="F" />F - " value="M" />M -
" name="school_child_" size="20" >
- +

Parent or Guardian

+

+ + " /> +

+

+ + " /> +

+

+ + " /> +

+ +

Child

+

+ + +

+

+ + " name="cardnumber_child_" size="20" value="" /> + " value="" /> +

+

+ + " name="firstname_child_" size="20" /> +

+

+ + " name="surname_child_" size="20" /> +

+

+ + " id="dateofbirth_child_" size="10" /> +

+

+ + " name="sex_child_" value="F" />F + " value="M" />M +

+

+ + " name="school_child_" size="20" /> +

+

+ + +

+ - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl index 9490e0baf4..f2f3451ca2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl @@ -1,5 +1,8 @@ Set Privileges for , + + +
" /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl index 4b52057088..a50e422598 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl @@ -1,23 +1,30 @@ Password Updated Update Password for , + + + -

Password Updated

+

Password Updated

-

Change Username and/or Password for

+

Change Username and/or Password for

You have entered a User ID that already exists. Please choose another one.

- -
New UserID:" /> - -
New Password:" />
- - +

+ + " /> + +

+

+ + " /> +

+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl index 0b15bba7c4..e78ad6b5f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl @@ -1,31 +1,33 @@ -Member Search Results +Member search result - - - - - - - - - - - - - - - - - - - - - - + + + +

Member Search Results

+ + +
Member Search Results
CardNameCatAddressOD/IssuesChargesNotes
">,
+ + + + + + + + + + + + + + + + + + + -
CardNameCatAddressOD/IssuesChargesNotes
">,
No results found
- - +

No results found

\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentry.tmpl index e2502a1129..604ca165d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentry.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentry.tmpl @@ -1,5 +1,8 @@ Edit RecordAdd New Institutional Member + + +

Add New Institutional Member @@ -12,7 +15,6 @@ -

Missing Information

The following fields have a forbidden value. Correct them and press OK again :

-
" /> @@ -50,104 +51,204 @@ - - - + + +

+ + +

+ +

+ + " /> +

- + +

+ + " /> +

+ - + +

+ + " /> +

+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
">
" class="focus">
">
">
checked="checked">F checked="checked"> M
"> ()
Addresses:
Mailing Address" class="focus"> -
" class="focus" /> -
">
- -
Street Address (if different) -" /> -
" /> -
" /> -
-
" />
" />
" />
" />

(appears in OPAC)

(appears in Circulation)

Joining date (leave blank for today): " />Joining date:
Expiry date (leave blank for auto calc): " />
- + +

+ + " /> +

+ + +

+ + checked="checked" />F checked="checked" /> M +

+ - - - - - - -
Alternate Contact
">
">
+

" /> ()

+ - - - - - -
Flags
" name="" value="1" >Yes " value="0" >No
+

Addresses:

+
+ Mailing Address +

+ + " /> +

+

+ + " /> +

+

+ + " /> +

+
- - - - - - -
Member Details
" class="focus" class="focus">
- - - -
Additional Fields
">

These fields are available for your own usage. They can be useful for statistical purposes

">
+
+ Street Address (if different) +

+ + " /> +

+

+ + " /> +

+

+ + " /> +

+
+

+ + " /> +

+

+ + " /> +

+

+ + " /> +

+

+ + " /> +

+

+

+ +

+

+ + +

+ +

+ + " /> +

+ +

+ + +

+ +

+ + " /> +

+ +

Alternate Contact

+

+ + " /> +

+

+ + " /> +

+

+ + +

+

+ + +

+ -"> - UpdateAdd This Member" /> -
+

Flags

+ +

+ + " name="" value="1" />Yes + " value="0" />No +

+ + +

Member Details

+ +

+ + +

+ +

+ + +

+

+ + +

+

+ + " /> +

+ +

Additional Fields

+

These fields are available for your own usage. They can be useful for statistical purposes

+

+ + " /> +

+

+ + " /> +

+ +" /> +UpdateAdd This Member" /> + diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl index 369970eddd..49f41cb85c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl @@ -1,8 +1,8 @@ Member Search -Member Search - - + + +

Member Search

diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl index 5997034f06..296a9e9138 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl @@ -1,100 +1,162 @@ Member Details + + +

()

- - - - - - - - - - +

Borrower Information

+

+

+

+

+

+

+

+

- - - - - - - - - - - - + +

+

+

- - - - - - - - - - - - - - - - - +

+

+

+

- - - - +

+

+ + +

+

+

+

+

+ + +

+

+ + +

+

+

+

+

+

+ + +

+

+

+

- - + +

+ - - - - + +

">

+ - -
Borrower Information
Title (borrowers.title):
First Name (borrowers.firstname):
Last Name (borrowers.lastname):
Othernames (borrowers.othernames):
Initials (borrowers.initials):
Street Address (borrowers.streetaddress):
City (borrowers.city):
Zip Code (borrowers.zipcode):
(borrowers.physstreet):
(borrowers.streetcity):
(borrowers.homezipcode):
Home Phone (borrowers.phone):
Daytime Phone (borrowers.phoneday):
Fax (borrowers.faxnumber):
E-mail Address (borrowers.emailaddress):
Date of Birth (borrowers.dateofbirth):
Sex (borrowers.sex):
Member Number (borrowers.borrowernumber):
Category (borrowers.categorycode):
Registration Date (borrowers.dateenrolled):
Expiration Date (borrowers.expiry):
Registration Branch (borrowers.branchcode):
Ethnicity (borrowers.ethnicity):
Ethnicity Notes (borrowers.ethnotes):
Sort field 1 (borrowers.sort1):
Sort field 2 (borrowers.sort2):
OPAC login (borrowers.userid):
OPAC Password (borrowers.password):
Circulation Notes (borrowers.borrowernotes) :
Patron Message (borrowers.textmessaging):
Alternate Contact Name (borrowers.contactname):
Alternate Contact Phone (borrowers.altphone):
Alternate Contact Relationship (borrowers.altrelationship):
Alternate Contact Notes (borrowers.altnotes):
Guarantees:
Guarantor:">
-

Fines & Charges

- Total Due: +

Fines & Charges

+ +

Total Due:

- No Outstanding Charges +

No Outstanding Charges

+ +

Items On Loan

" /> - @@ -107,11 +169,12 @@ - @@ -127,27 +190,30 @@ - +
Items On Loan
Title Due
- - &bib=&bi="> - - + + + + &bib=&bi="> + + ">Return
Total Replacement Cost: 
Total Replacement Cost: 

-
" />" value="y" />
+
+ " /> + + + " value="y" /> + + + +
- - - -
+

Reserves

+ - - - +
Reserves
Title Requested Remove
@@ -168,8 +234,10 @@ " />
+ + + +
- - - - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl index ee91e42253..2472e6cac4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl @@ -1,15 +1,18 @@ Pay Fines for , -
" /> + + +

Pay Fines for

+ + " /> - - - - - - + + + + + @@ -32,12 +35,10 @@ - - - - + +
Pay Fines for
Fines & ChargesDescriptionAccount TypeAmountAmount OutstandingFines & ChargesDescriptionAccount TypeAmountAmount Outstanding
Total Due
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl index b62827575e..49edee6a7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl @@ -1,4 +1,8 @@ Reading Record for + + + + +

Reading Record for

- - - - - + - class="highlight"> + + + + + class="onissue"> "> @@ -35,11 +43,10 @@ class="onissue"> class="onissue">Checked Out +
Reading Record for
+ &order=title&limit=">Title + &order=author&limit=">Author Call No. + Call No. &order=returndate DESC&limit=">Return Date
- - diff --git a/members/boraccount.pl b/members/boraccount.pl index eb37b95d11..82ac243885 100755 --- a/members/boraccount.pl +++ b/members/boraccount.pl @@ -38,7 +38,7 @@ my $theme = $input->param('theme'); # only used if allowthemeoverride is set #my %tmpldata = pathtotemplate ( template => 'boraccount.tmpl', theme => $theme ); #my $template = HTML::Template->new(filename => $tmpldata{'path'}, die_on_bad_params => 0); my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "boraccount.tmpl", + = get_template_and_user({template_name => "members/boraccount.tmpl", query => $input, type => "intranet", authnotrequired => 0, diff --git a/members/memberentry.pl b/members/memberentry.pl index 234be6b0c6..035e9aa822 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -199,9 +199,10 @@ if ($delete){ my @relshipdata; while (@relationships) { my $relship = shift @relationships; + next unless $relship; my %row = ('relationship' => $relship); if ($data->{'altrelationship'} eq $relship) { - $row{'selected'}=' selected'; + $row{'selected'}=' selected = "selected"'; } else { $row{'selected'}=''; } @@ -220,11 +221,11 @@ if ($delete){ 'name' => $flags{$key}[0], 'html' => $flags{$key}[1]); if ($data->{$key}) { - $row{'yes'}=' checked'; + $row{'yes'}=' checked="checked"'; $row{'no'}=''; } else { $row{'yes'}=''; - $row{'no'}=' checked'; + $row{'no'}=' checked="checked"'; } push(@flagdata, \%row); } diff --git a/members/moremember.pl b/members/moremember.pl index fe0aa0f4a4..d90e74ab6c 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -144,7 +144,7 @@ if (C4::Context->preference("IndependantBranches")) { $samebranch =1 if ($userenv->{flags} == 1); } -$data->{'branchcode'} = &getbranchname($data->{'branchcode'}); +$data->{'branchname'} = &getbranchdetail($data->{'branchcode'}); # Converts the categorycode to the description $data->{'categorycode'} = &getborrowercategory($data->{'categorycode'});