From ba11e45cac241552f41cb8bb37a21d9503950ce8 Mon Sep 17 00:00:00 2001 From: tipaul Date: Wed, 24 Mar 2004 14:59:33 +0000 Subject: [PATCH] css'ing & merging members management. memberentry merges * memberentry, moremember & insertdata (form, validation & storing) * and the I series (Institution management) --- .../default/en/members/member-flags.tmpl | 43 +- .../default/en/members/member-password.tmpl | 32 +- .../default/en/members/member.tmpl | 89 ++-- .../default/en/members/memberentry.tmpl | 461 ++++++++++-------- .../default/en/members/members-home.tmpl | 44 +- .../default/en/members/moremember.tmpl | 297 ++++++----- 6 files changed, 486 insertions(+), 480 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl index a72e61c824..fcf2a6da0e 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl @@ -1,28 +1,19 @@ - -

,

-
- > - - - - - - - - - - -
FLAGS
- > - - - - -
- -

- -

- +
+
+
FLAGS for ,
+
+ > + + +

+ > + + +

+ + +
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl index 885ee3401a..8d139b87c5 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl @@ -1,23 +1,17 @@ - - - -Click here to continue to see Member Info. - - -

,

-
- > - - You have entered a UserID that already exists. Please choose another one.
- - New UserID: >
- New Password: > -

- -

- - +
+
+
,
+
+ > + + You have entered a UserID that already exists. Please choose another one.
+ + New UserID: >
+ New Password: >
+ +
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl index 2a3a5d1542..7d1bbaee9b 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl @@ -1,48 +1,49 @@ - - +
+

Member Search

-

Member Search


- -
- - -
- -You Searched for

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/images/background-mem.gif">Card/images/background-mem.gif">Surname/images/background-mem.gif">Firstname/images/background-mem.gif">Category/images/background-mem.gif">Address/images/background-mem.gif">OD/Issues/images/background-mem.gif">Charges/images/background-mem.gif">Notes
+

+
Search on
+
+ + +
+
-
- -Adult -Organisation -
+
+
You Searched for
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
CardSurnameFirstnameCategoryAddressOD/IssuesChargesNotes
+
+ + Adult + Organisation +
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl index 3993e9d224..e341cefcfa 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl @@ -1,211 +1,270 @@ - -

- Add member -

- -

- Update Member Details -

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

+ Add member +

+ +

+ Update Member Details +

+ + + +

ERROR

+
+

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

+ + Card number
+ + + Invalid cardnumber
+ + + Gender
+ + + Given Names
+ + + Surname
+ + + Postal Street Address
+ + + Postal city
+ +
+ + + + + + + + + -
+ - - - - + + + +
Member# , Card number*
/images/background-mem.gif">MEMBER PERSONAL DETAILS/images/background-mem.gif">* - checked>F - checked> M -     Date of Birth () - -
SalutationInitials Given Names* Surname* Prefered Name
- -
EthnicityEthnicity Notes   Membership Category*
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - -
Member# , Card number*
MEMBER PERSONAL DETAILS
SalutationInitials Given Names*Institution name* Surname*Prefered Name
+ + + + + + + + + + + + + + + + +
+ + checked>F + checked> M + + + + + Date of Birth () + + + + Category +
EthnicityEthnicity Notes
+ + + +  
MEMBER ADDRESS
Postal Address*Zipcode Town*Joining Branch
+ "> + + + + +
Street Address if different
+ "> + +
Phone homeFaxEmailText Messaging
Phone daytime
ALTERNATE CONTACT DETAILS
Surname*PhoneRelationship
+ - -  
/images/background-mem.gif">MEMBER ADDRESS
Postal Address*Zipcode / Town*Joining Branch
- ">
- - 		- -
Street Address if differentZipcode / Town
- ">
-
Phone homeFaxEmailText Messaging
Phone daytime
/images/background-mem.gif">ALTERNATE CONTACT DETAILS
Surname*PhoneRelationship*
- -
Notes
/images/background-mem.gif">LIBRARY USE
Notes
FLAGS
>Yes - >No -
Notes
LIBRARY USE
Notes
FLAGS
>Yes + >No +
- > - -
- +
+ > + + +
+ +
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl index 340f717a4d..2192930403 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl @@ -1,30 +1,18 @@ +
+

Members

-

Members

- - - - - -
/images/background-mem.gif"> -
-Member Search - - -

Renew Items, view add, modify and delete records, all by starting with this search. Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search

-
- -

- - - - - - - - -
/images/background-mem.gif"> - Browse Members -
-
+
+
Member Search
+
+ + +

Renew Items, view add, modify and delete records, all by starting with this search.

+

Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search

+
+
+
+
Browse Members
A || B || C || @@ -51,8 +39,6 @@ X || Y || Z - -
+

+
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl index 0941480cb8..857857a5af 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl @@ -1,44 +1,41 @@ - - - -

-

- - - - - - - - - -
/images/background-mem.gif">MEMBERSHIP RECORD
- (, )

- Card number:
- Postal Address: ,
- Home Address: ,
- Phone home:
- Phone daytime:
- Fax:
+

+

+
+
MEMBERSHIP RECORD
+ (, ) +

Card number:
+ Postal Address: ,
+ Home Address: ,
+ Phone home:
+ Phone daytime:
+ Fax:
E-mail: ">
Text messaging:

- Membership Number:
- Membership Category:
- Fee:$30/year, Paid
- Joined: , Expires:
- Joining Branch:

+ Membership Number:
+ Membership Category:
+ Fee:$30/year, Paid
+ Joined: , Expires:
+ Joining branch: +

+

Ethnicity: ,
- DoB:
- Sex:

- Alternative Contact:
- Phone:
+ DoB:
+ Sex:
+ Alternative + + Contact:
+ Phone:
- Relationship:
+ Relationship:
- Notes:

+ Notes: +

+

Guarantees:
"> -
@@ -51,9 +48,11 @@ -

- General Notes: - +

+

+ General Notes: + +

@@ -78,7 +77,7 @@

- "> + ">
@@ -89,143 +88,119 @@ >
- -
- -/images/holder.gif" width=16 height=800 align=left> - - - - - - - - - - - - - - - - - + + No debts +

-
"> View Account "> Pay Fines -

- - -
/images/background-mem.gif" colspan=2>FINES & CHARGES
Total due
No debts
+ + +
+
FINES & CHARGES
+ + Total due +
- -

-

- "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/images/background-mem.gif" colspan=6>ITEMS CURRENTLY ON ISSUE
/images/background-mem.gif">Title/images/background-mem.gif">Due/images/background-mem.gif">Itemtype/images/background-mem.gif">Charge/images/background-mem.gif">Renew
- - &bib=&bi="> - - - - - ">On Request - no renewals + +
+
ITEMS CURRENTLY ON ISSUE
+ + + "> + + + + + + + + + + + + + + + + + + + +
TitleDueItemtypeChargeRenew
+ + &bib=&bi="> + + + + + ">On Request - no renewals + + " value=y>Y + " value=n>N + + +
+ + - " value=y>Y - " value=n>N + None - -
- -
- - -

- - - - - - - - - - - - - - - - - - - - - "> - "> - - - - - - - -
/images/background-mem.gif" colspan=5>ITEMS REQUESTED
/images/background-mem.gif">Title/images/background-mem.gif">Requested/images/background-mem.gif">Remove
- "> - - - + +
+
ITEMS REQUESTED
+ + + + + + + + + + + + + + + "> + "> + + + + + + +
TitleRequestedRemove
+ "> + + + + + + +
+ + /images/cancel-requests.gif"> + +
+ + None -
- -
- - /images/cancel-requests.gif"> - -
-
-
-"> - Reading Record - + +

+