From e905da9945b9a0273911654c8a12e6dd3796dfea Mon Sep 17 00:00:00 2001 From: tipaul Date: Thu, 4 Aug 2005 14:02:52 +0000 Subject: [PATCH] synch'ing 2.2 and head --- .../default/en/includes/marc-editor.css | 4 +- .../default/en/includes/marc-top.inc | 27 +- .../default/en/includes/members-top.inc | 24 +- .../default/en/includes/menus.inc | 152 +++++++++ .../default/en/includes/parameters-top.inc | 28 +- .../default/en/includes/reports-top.inc | 25 +- .../members/member-quicksearch-results.tmpl | 5 +- .../default/en/parameters/branches.tmpl | 28 +- .../default/en/parameters/currency.tmpl | 9 - .../en/parameters/marctagstructure.tmpl | 14 +- .../en/parameters/systempreferences.tmpl | 97 +++--- .../en/value_builder/marc21_leader.tmpl | 321 ++++++++++++++++++ .../en/value_builder/unimarc_leader.tmpl | 241 +++++++++++++ 13 files changed, 823 insertions(+), 152 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/default/en/includes/menus.inc create mode 100644 koha-tmpl/intranet-tmpl/default/en/value_builder/marc21_leader.tmpl create mode 100644 koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_leader.tmpl diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css b/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css index 9174b95f0c..c0f42c95ff 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css +++ b/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css @@ -43,9 +43,8 @@ div.tab { .MARCtag { /* style for tag definition (700 - Statement of responsability) */ font-weight:bold; color:#ad11ad; - background-color:FFFFFF; + background-color:#E8E0F1; background-image:url(''); - border-bottom: thin solid #ad11ad; margin-right:30%; } @@ -54,4 +53,5 @@ div.tab { width: 12em; margin-left:30px; display:inline; + color:#000000; } diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc index 3dac788b16..608c64d47d 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc @@ -39,29 +39,10 @@ a.catalogue:hover { - - - - + -

Logged in as: [Log Out]

+

Logged in as: [Log Out]

-

Log In to Koha

+

Log In to Koha

+ diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc index 22fdf6ee8b..f11668d956 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc @@ -29,27 +29,9 @@ a.members:hover { - - - + -

Logged in as: [Log Out]

+

Logged in as: [Log Out]

-

Log In to Koha

+

Log In to Koha

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/default/en/includes/menus.inc new file mode 100644 index 0000000000..7fcc2b5160 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/includes/menus.inc @@ -0,0 +1,152 @@ + + + + +
+ Main page + History search +
+ + +
+ Search + Add biblio +
+ Subscriptions + Late issues +
+ Virtual shelves +
+ +
+ Issues + Returns + Branch transfers +
+ +
+ Search + Add member + Add organisation +
+ +
+ Authorities +
+ +
+ Acquisitions + Borrowers + Catalogue + Circulation +
+ Most issuing Borrowers + Most issued items +
+ Borrowers without issues + Items not issued + Inventory/Stocktaking + Catalogue by itemtype + Till Reconciliation (yesterday) + Till Reconciliation (today) + Overdue items + Issues by borrower category + Average loan time +
+ +
+ + Library branches + + + Book funds + Currencies + Item types +
+ Borrower categories + Issuing rules +
+ Authorised values + + + + Thesaurus Structure + Biblio framework (MARC structure) + Links Koha - MARC DB + MARC Check +
+ Printers + + + + Stop words + + + + Z39.50 Servers + System preferences + + + +
+ MARC biblio export + Upload MARC records in reservoir + Generate barcodes + Letters + + +
+ + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc index 7b090f4825..c726d1e0b5 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc @@ -12,14 +12,12 @@ background-color: #86c268; color: #FFFFFF; text-decoration: normal; - font-weight: bold; background-image:none; } a.parameters:hover { background-color: #86c268; color: #FFFFFF; text-decoration: normal; - font-weight: bold; } @@ -30,28 +28,10 @@ function Help() { newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes'); } - - - + + -

Logged in as: [Log Out]

+

Logged in as: [Log Out]

-

Log In to Koha

+

Log In to Koha

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc index 1bd6fa51af..a620c711f4 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc @@ -16,39 +16,20 @@ function Help() { background-color: #6b7cbe; color:#FFFFFF; text-decoration: normal; - font-weight: bold; background-image:none; } a.reports:hover { background-color: #6b7cbe; color: #FFFFFF; text-decoration: normal; - font-weight: bold; } - - - - + -

Logged in as: [Log Out]

+

Logged in as: [Log Out]

-

Log In to Koha

+

Log In to Koha

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl index f0cdb4af18..8a81090ddd 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl @@ -4,7 +4,7 @@

Member Search

-

records match you search. +

members were found.

@@ -20,7 +20,8 @@ - + diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl index 7a3d38475c..a1f9539884 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl @@ -3,12 +3,10 @@

- Branches Branches: Add Branch Branches: Edit Branch Branches: Edit Category -

" name="Aform" method="post"> @@ -86,15 +84,35 @@

- Branches Branches: Add Branch Branches: Edit Branch Branches: Edit Category -

- + + + NEW Cannot change branch record: You must specify a Branchname and a Branchcode + + + NEW Branch record changed + + + NEW Branch record deleted + + + NEW Cannot change branch record: You must specify a Branchname and a Branchcode + + + NEW Category record changed + + + NEW The category has been deleted + + + Branch cannot be deleted because there are items using that branch + +
','request','member'); return false;" />
 +
','request','member'); return false;" />
 ">
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl index 87eeaff784..77b4fa51a5 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl @@ -149,15 +149,6 @@

Currencies admin

- " method="post"> - "> - - - - - You searched for - -
Currency diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl index 774589809a..895682124c 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl @@ -65,7 +65,12 @@
" name="Aform" method="post"> "> -

+

" size="80" maxlength="100">

" size="80" maxlength="100">

@@ -124,8 +129,11 @@ "> -

- Display only used Tags/Subfields checked OnChange="javascript:document.f.submit()"> +

+ Display only used Tags/Subfields + + Display only used Tags/Subfields +

NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script. diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl index fdd7d169ed..c7e532fd3a 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl @@ -139,64 +139,79 @@
- - Admin - - Admin - + + Admin + + + Admin + + - - Acquisitions - - Acquisitions - + + Acquisitions + + + Acquisitions + + - - Authorities - - Authorities - + + Authorities + + + Authorities + + - - Catalogue - - Catalogue - + + Catalogue + + + Catalogue + + - - Circulation - - Circulation - + + Circulation + + + Circulation + + - - Members - - Members - + + Members + + + Members + + - - OPAC - - OPAC - + + OPAC + + + OPAC + + - - Others - - Others - + + Others + + + Others + +
- diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/marc21_leader.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/marc21_leader.tmpl new file mode 100644 index 0000000000..02b4799c4c --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/marc21_leader.tmpl @@ -0,0 +1,321 @@ + + +Leader builder + + + +
Variable
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
1-4 Record size(auto-filled)
5- Record status + +
6- Type of record + +
7- Bibliographic level + +
8- Hierarchic level + +
9- Encoding + +
10-16 indicator/subfields/size(auto-filled)
17- Encoding + +
18 - Descriptive cataloging form + +
19 - Linked record requirement + +
20-24 entry map & lengths(auto-filled)
+ + + + diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_leader.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_leader.tmpl new file mode 100644 index 0000000000..0176f992f8 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_leader.tmpl @@ -0,0 +1,241 @@ + + +Construction du leader + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
1-4 Taille(auto-calculé)
5- Etat de la notice + +
6- Type de document + +
7- Type de la notice + +
8- Niveau hiérarchique + +
9-16 indicator/subfields/size(auto-filled)
17- Niveau de catalogage + +
18 - Descriptive cataloging form + +
19-24 entry map & lengths(auto-filled)
+
+ + + -- 2.39.5