From f46c789805993ae18c15012ad72145964de15c09 Mon Sep 17 00:00:00 2001 From: kados Date: Fri, 17 Mar 2006 10:49:22 +0000 Subject: [PATCH] Heavy revisions to MARC Editor ... I'll send a mail to koha-devel asap. --- acqui.simple/addbiblio.pl | 24 +- .../npl/en/acqui.simple/addbiblio.tmpl | 764 +++++++----------- 2 files changed, 298 insertions(+), 490 deletions(-) diff --git a/acqui.simple/addbiblio.pl b/acqui.simple/addbiblio.pl index f775ea14cb..8540fb782c 100755 --- a/acqui.simple/addbiblio.pl +++ b/acqui.simple/addbiblio.pl @@ -185,7 +185,7 @@ sub create_input () { $subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh,$authorised_values_sth); # it's a thesaurus / authority field } elsif ($tagslib->{$tag}->{$subfield}->{authtypecode}) { - $subfield_data{marc_value}=" {$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">..."; + $subfield_data{marc_value}=" {$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">..."; # it's a plugin field } elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) { # opening plugin. Just check wether we are on a developper computer on a production one @@ -198,18 +198,18 @@ sub create_input () { require $plugin; my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop); my ($function_name,$javascript) = plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop); - $subfield_data{marc_value}=" ... $javascript"; + $subfield_data{marc_value}=" ... $javascript"; # it's an hidden field } elsif ($tag eq '') { - $subfield_data{marc_value}=""; + $subfield_data{marc_value}=""; } elsif ($tagslib->{$tag}->{$subfield}->{'hidden'}) { - $subfield_data{marc_value}=""; + $subfield_data{marc_value}=""; # it's a standard field } else { if (length($value) >100) { - $subfield_data{marc_value}=""; + $subfield_data{marc_value}=""; } else { - $subfield_data{marc_value}=""; #" + $subfield_data{marc_value}=""; #" } } return \%subfield_data; @@ -285,6 +285,10 @@ sub build_tabs ($$$$) { $tag_data{repeatable} = $tagslib->{$tag}->{repeatable}; $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2) if ($tag>=10); $tag_data{subfield_loop} = \@subfields_data; + if ($tag<10) { + $tag_data{fixedfield} = 1; + } + push (@loop_data, \%tag_data); } # If there is more than 1 field, add an empty hidden field as separator. @@ -296,6 +300,10 @@ sub build_tabs ($$$$) { $tag_data{tag_lib} = ''; $tag_data{indicator} = ''; $tag_data{subfield_loop} = \@subfields_data; + if ($tag<10) { + $tag_data{fixedfield} = 1; + } + push (@loop_data, \%tag_data); $i++; } @@ -320,6 +328,9 @@ sub build_tabs ($$$$) { $tag_data{indicator} = $indicator; $tag_data{subfield_loop} = \@subfields_data; $tag_data{tagfirstsubfield} = $tag_data{subfield_loop}[0]; + if ($tag<10) { + $tag_data{fixedfield} = 1; + } push (@loop_data, \%tag_data); } } @@ -549,5 +560,6 @@ $template->param( intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), intranetstylesheet => C4::Context->preference("intranetstylesheet"), IntranetNav => C4::Context->preference("IntranetNav"), + advancedMARCEditor => C4::Context->preference("advancedMARCEditor"), ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl index e3c22fd383..4518b5c3cb 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl @@ -20,9 +20,9 @@ " /> " /> - + - + @@ -59,9 +59,10 @@ 9 - -
- + + +
+

Is this a duplicate of " onclick="openWindow('../MARCdetail.pl?bib=&popup=1', 'Duplicate biblio'; return false;)">?

You must either :

@@ -70,466 +71,256 @@
  • If not, click to Confirm it's not a duplicate
  • - - - -

    - "> - - - " class="flat"> - - - "> - - - - ')">+ - -

    - - - - /images/up.png" onclick="unHideSubfield('subfield')"> - -
    -

    - - - "> - " size="2" maxlength="1"> - "> - "> - "> -

    -
    - - -
    - -
    - - -

    - "> - - - " class="flat"> - - - "> - - - - ')">+ - -

    - - - - /images/up.png" onclick="unHideSubfield('subfield')"> - -
    -

    - - - "> - " size="2" maxlength="1"> - "> - "> - "> -

    -
    - - -
    - -
    - - -

    - "> - - - " class="flat"> - - - "> - - - - ')">+ - -

    - - - - /images/up.png" onclick="unHideSubfield('subfield')"> - -
    -

    - - - "> - " size="2" maxlength="1"> - "> - "> - "> -

    -
    - - -
    - -
    - - -

    - "> - - - " class="flat"> - - - "> - - - - ')">+ - -

    - - - - /images/up.png" onclick="unHideSubfield('subfield')"> - -
    -

    - - - "> - " size="2" maxlength="1"> - "> - "> - "> -

    -
    - - -
    - -
    - - -

    - "> - - - " class="flat"> - - - "> - - - - ')">+ - -

    - - - - /images/up.png" onclick="unHideSubfield('subfield')"> - -
    -

    - - - "> - " size="2" maxlength="1"> - "> - "> - "> -

    -
    - - -
    - -
    - - -

    - "> - - - " class="flat"> - - - "> - - - - ')">+ - -

    - - - - /images/up.png" onclick="unHideSubfield('subfield')"> - -
    -

    - - - "> - " size="2" maxlength="1"> - "> - "> - "> -

    -
    - - -
    - -
    - - -

    - "> - - - " class="flat"> - - - "> - - - - ')">+ - -

    - - - - /images/up.png" onclick="unHideSubfield('subfield')"> - -
    -

    - - - "> - " size="2" maxlength="1"> - "> - "> - "> -

    -
    - - -
    - -
    - - -

    - "> - - - " class="flat"> - - - "> - - - - ')">+ - -

    - - - - /images/up.png" onclick="unHideSubfield('subfield')"> - -
    -

    - - - "> - " size="2" maxlength="1"> - "> - "> - "> -

    -
    - - -
    - -
    - - -

    - "> - - - " class="flat"> - - - "> - - - - ')">+ - -

    - - - - /images/up.png" onclick="unHideSubfield('subfield')"> - -
    -

    - - - "> - " size="2" maxlength="1"> - "> - "> - "> -

    -
    - - -
    - -
    - - -

    - "> - - - " class="flat"> - - - "> - - - - ')">+ - -

    - - - - /images/up.png" onclick="unHideSubfield('subfield')"> - -
    -

    - - - "> - " size="2" maxlength="1"> - "> - "> - "> -

    -
    - - -
    - + + + +

    + "> + "> + style="display:none;" name="indicator" size="2" maxlength="2" value="" class="flat"> - + + style="display:none;" name="indicator" value=""> + + ')">+ +

    + +
    " onclick="unHideSubfield('subfield','label')">
    +')">+ +"/> +" size="2" maxlength="1"/> +"/> +"/> +"/> +
    + +
    +
    + + +

    + "> + "> + " class="flat"> - + +"> + + ')">+ +

    + +
    " onclick="unHideSubfield('subfield','label')">
    +')">+ +"/> +" size="2" maxlength="1"/> +"/> +"/> +"/> +
    + +
    +
    + + +

    + "> + "> + " class="flat"> - + +"> + + ')">+ +

    + +
    " onclick="unHideSubfield('subfield','label')">
    +')">+ +"/> +" size="2" maxlength="1"/> +"/> +"/> +"/> +
    + +
    +
    + + +

    + "> + "> + " class="flat"> - + +"> + + ')">+ +

    + +
    " onclick="unHideSubfield('subfield','label')">
    +')">+ +"/> +" size="2" maxlength="1"/> +"/> +"/> +"/> +
    + +
    +
    + + +

    + "> + "> + " class="flat"> - + +"> + + ')">+ +

    + +
    " onclick="unHideSubfield('subfield','label')">
    +')">+ +"/> +" size="2" maxlength="1"/> +"/> +"/> +"/> +
    + +
    +
    + + +

    + "> + "> + " class="flat"> - + +"> + + ')">+ +

    + +
    " onclick="unHideSubfield('subfield','label')">
    +')">+ +"/> +" size="2" maxlength="1"/> +"/> +"/> +"/> +
    + +
    +
    + + +

    + "> + "> + " class="flat"> - + +"> + + ')">+ +

    + +
    " onclick="unHideSubfield('subfield','label')">
    +')">+ +"/> +" size="2" maxlength="1"/> +"/> +"/> +"/> +
    + +
    +
    + + +

    + "> + "> + " class="flat"> - + +"> + + ')">+ +

    + +
    " onclick="unHideSubfield('subfield','label')">
    +')">+ +"/> +" size="2" maxlength="1"/> +"/> +"/> +"/> +
    + +
    +
    + + +

    + "> + "> + " class="flat"> - + +"> + + ')">+ +

    + +
    " onclick="unHideSubfield('subfield','label')">
    +')">+ +"/> +" size="2" maxlength="1"/> +"/> +"/> +"/> +
    + +
    +
    + + +

    + "> + "> + " class="flat"> - + +"> + + ')">+ +

    + +
    " onclick="unHideSubfield('subfield','label')">
    +')">+ +"/> +" size="2" maxlength="1"/> +"/> +"/> +"/> +
    + +
    "> @@ -587,6 +378,7 @@ function active(numlayer) } active(0); function Check(f) { + document.body.style.cursor ="wait"; // Scan for nonempty fields var field_is_nonempty_p = new Array(); for (i=0 ; i -- 2.39.5