From ff113395ffd5d35c9c81db6b13bdd7ae3ff13387 Mon Sep 17 00:00:00 2001 From: tipaul Date: Thu, 10 Jun 2004 09:33:56 +0000 Subject: [PATCH] MARC authority management (continued) --- acqui.simple/addbiblio.pl | 6 +- .../default/en/includes/about-top.inc | 1 + .../default/en/includes/acquisitions-top.inc | 1 + .../default/en/includes/auth-bottom.inc | 23 +++++ .../default/en/includes/auth-top.inc | 96 +++++++++++++++++++ .../default/en/includes/circulation-top.inc | 1 + .../default/en/includes/common-style.css | 14 +++ .../default/en/includes/members-top.inc | 1 + .../default/en/includes/parameters-top.inc | 21 ++-- .../default/en/includes/popup-bottom.inc | 2 + .../default/en/includes/popup-top.inc | 26 +++++ 11 files changed, 179 insertions(+), 13 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc create mode 100644 koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc create mode 100644 koha-tmpl/intranet-tmpl/default/en/includes/popup-bottom.inc create mode 100644 koha-tmpl/intranet-tmpl/default/en/includes/popup-top.inc diff --git a/acqui.simple/addbiblio.pl b/acqui.simple/addbiblio.pl index f81d679f14..7758ff9cd3 100755 --- a/acqui.simple/addbiblio.pl +++ b/acqui.simple/addbiblio.pl @@ -172,8 +172,8 @@ sub create_input () { $subfield_data{kohafield}=$tagslib->{$tag}->{$subfield}->{kohafield}; if ($tagslib->{$tag}->{$subfield}->{authorised_value}) { $subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh,$authorised_values_sth); - } elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) { - $subfield_data{marc_value}=" {$tag}->{$subfield}->{thesaurus_category}&index=$i',$i)\">..."; + } elsif ($tagslib->{$tag}->{$subfield}->{authtypecode}) { + $subfield_data{marc_value}=" {$tag}->{$subfield}->{authtypecode}&index=$i',$i)\">..."; } elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) { my $plugin="../value_builder/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; require $plugin; @@ -181,7 +181,7 @@ sub create_input () { my ($function_name,$javascript) = plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop); $subfield_data{marc_value}=" ... $javascript"; } elsif ($tag eq '') { - $subfield_data{marc_value}=""; #" + $subfield_data{marc_value}=""; } else { $subfield_data{marc_value}=""; #" } diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc index 0928dae522..a0ff4736bb 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc @@ -39,6 +39,7 @@ a.about:hover { Members Acquisitions Circulation + Authorities Reports Parameters About diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc index 6e0ae243e3..0e2e8d83b7 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc @@ -38,6 +38,7 @@ a.acquisition:hover { Members Acquisitions Circulation + Authorities Reports Parameters About diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc new file mode 100644 index 0000000000..ba9bbe7417 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc @@ -0,0 +1,23 @@ +
+

 

+ + + + +
+ +Home || +Catalogue || +Members || +Acquisitions || +Circulation || +Authorities || +Reports || +Parameters || +About || +Help + +
+ + + diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc new file mode 100644 index 0000000000..b7a14de6cb --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc @@ -0,0 +1,96 @@ + + + + +KOHA: INTRANET: Authorities + + + + + + +/includes/common-style.css"> + + + + +
+ + +
+ +

Logged in as: [Log Out]

+ +

Log In to Koha

+ +TOGGLE CSS \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc index 6115eb4bc5..d9f712250a 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc @@ -51,6 +51,7 @@ a.circulation:hover { Members Acquisitions Circulation + Authorities Reports Parameters About diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css index 87a218ee30..5c43da2bc1 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css +++ b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css @@ -10,6 +10,11 @@ input { display:inline; } +ul { + margin-top:0px; + margin-bottom:0px; +} + p { margin-bottom:0px; margin-top:0px; @@ -18,6 +23,7 @@ p { padding:0px; clear:left; } + .center { text-align:center; } @@ -303,6 +309,14 @@ a.acquisition:hover { color: #000000; } +.authority { + color:#777777; + } +a.authority:hover { + background-color: #6b7cbe; + color: #000000; + } + .reports { color:#777777; } 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 57222dbbd9..aecc31ab83 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc @@ -37,6 +37,7 @@ a.members:hover { Members Acquisitions Circulation + Authorities Reports Parameters About 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 f2a9270cc1..237416f58f 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc @@ -31,16 +31,17 @@ function Help() {