changes in HTML/CSS & link to ISBD view

diff --git a/koha-tmpl/opac-tmpl/css/en/includes/marc-editor.css b/koha-tmpl/opac-tmpl/css/en/includes/marc-editor.css
new file mode 100644 (file)
index 0000000..ceab35c
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/includes/marc-editor.css
@@ -0,0 +1,28 @@
+div.tabs {
+       width:10px;
+       position:absolute;
+       margin-left:50px;
+       margin-top:120px;
+}
+
+div.tabs a {
+       display:block;
+       font-size: small;
+       border: thin solid black;
+       margin-right: 2px;
+       padding: 10px 10px;
+       -moz-border-radius: 5px 0px 0px 5px;
+}
+
+div.tab {
+       background-color: #ACE6E6;
+       display: block;
+       visibility:hidden;
+       position:absolute;
+       margin-left:72px;
+       margin-top:121px;
+       margin-right:10%;
+}
+td {
+       border:0px;
+}

diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac.css b/koha-tmpl/opac-tmpl/css/en/includes/opac.css
index 8a18eb9..2a1533f 100644 (file)
--- a/koha-tmpl/opac-tmpl/css/en/includes/opac.css
+++ b/koha-tmpl/opac-tmpl/css/en/includes/opac.css
@@ -66,7 +66,7 @@ h1 {
        font-weight:bold;
        font-size: 150%;
        text-align:center;
-       vertical-align:top;
+/*     vertical-align:top; */
        padding: 2px;
        border: 4px inset #FF6600;
        width:75%;
@@ -118,6 +118,7 @@ th {
 td {
        font-size:10pt;
        border-left:1px solid #000000;
+       vertical-align:top;
 }
 
 /* hilighted cell */
@@ -125,6 +126,7 @@ td.hilighted {
        font-size:10pt;
        border-left:1px solid #000000;
        background-color:#ffffcc;
+       vertical-align:top;
 }
 
 /* FORMS */
@@ -169,12 +171,31 @@ input:hover {
        background-color:#FF6600;
 }
 
+textarea {
+       border:0px;
+       border-bottom:1px solid #000000;
+       background-color:#009999;
+}
+
+textarea:hover {
+       border:0px;
+       border-bottom:1px solid #000000;
+       background-color:#FF6600;
+}
+
 select {
-       background-color: #ACE6E6;
-       text-decoration:none;
-       color:#000000;
+       border:0px;
+       border-bottom:1px solid #000000;
+       background-color:#009999;
+}
+
+select:hover {
+       border:0px;
+       border-bottom:1px solid #000000;
+       background-color:#FF6600;
 }
 
+
 /* span classes */
 /* used to show small 1,2,3, to reach other pages when too much results */
 .smallnumber {
@@ -273,12 +294,21 @@ select {
        margin-bottom:10px;
        -moz-border-radius: 6px;
 }
+
 #menuline {
+/*     width:100%;
+       vertical-align:top;*/
+       float:left;
+/*     position:relative;*/
+       display:block;
+}
+
+#bibliomenu {
+       position: relative;
+       float:left;
+       display:block;
+       margin-left:10%;
        width:100%;
-       height:200%;
-       vertical-align:top;
-       float:none;
-       position:relative;
 }
 
 /* a little spacer. should not be used */

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl
new file mode 100644 (file)
index 0000000..51023ea
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl
@@ -0,0 +1,24 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+<div id="bibliomenu">
+       <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+               Normal
+       </a>
+       <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
+               MARC
+       </a>
+       <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
+               Print
+       </a>
+       <!-- TMPL_UNLESS NAME="norequests" -->
+               <a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
+                       Request
+               </a>
+       <!-- /TMPL_UNLESS -->
+</div>
+
+<div id="mainbloc">
+       <p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
+</div>
+</body>
+</html>

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl
index 4e2041a..c2700d1 100644 (file)
--- a/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl
@@ -1,9 +1,12 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
-<div class="tabbed">
+<div id="bibliomenu">
        <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
                Normal
        </a>
+       <a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+               ISBD
+       </a>
        <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
                Print
        </a>

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
index a00903d..afcdcd8 100644 (file)
--- a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
@@ -1,14 +1,28 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+
+<div id="bibliomenu">
+       <a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+               ISBD
+       </a>
+       <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
+               MARC
+       </a>
+       <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
+               Print
+       </a>
+       <!-- TMPL_UNLESS NAME="norequests" -->
+               <a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
+                       Request
+               </a>
+       <!-- /TMPL_UNLESS -->
+</div>
+
 <div id="mainbloc">
        <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
        <h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
 
        <p>
-       <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">MARC</a>
-       <!-- TMPL_UNLESS NAME="norequests" -->
-               <a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">Request</a>
-       </p>
-       <!-- /TMPL_UNLESS -->
        <div id="bibliobloc">
        <table cellspacing="0">
                <!-- BIBLIO RECORD TABLE -->

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
index 394d8b0..6985a2e 100644 (file)
--- a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
@@ -47,10 +47,14 @@
                        <tr>
                                <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
                                        <p>
-                                               <b><a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
-                                               - <!-- TMPL_VAR NAME="author" -->
-                                               / <!-- TMPL_VAR name="publishercode" -->
-                                               : <!-- TMPL_VAR name="pages" -->
+                                               <p><!-- TMPL_VAR NAME="author" --></p>
+                                               <p>
+                                                       <b><a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
+                                               <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
                                        </p>
                                </td>
                                <td align="center" <!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>

diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
new file mode 100755 (executable)
index 0000000..4bea4e6
--- /dev/null
+++ b/opac/opac-ISBDdetail.pl
@@ -0,0 +1,103 @@
+#!/usr/bin/perl
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+=head1 NAME
+
+MARCdetail.pl : script to show a biblio in MARC format
+
+=head1 SYNOPSIS
+
+
+=head1 DESCRIPTION
+
+This script needs a biblionumber in bib parameter (bibnumber
+from koha style DB.  Automaticaly maps to marc biblionumber).
+
+It shows the biblio in a (nice) MARC format depending on MARC
+parameters tables.
+
+The template is in <templates_dir>/catalogue/MARCdetail.tmpl.
+this template must be divided into 11 "tabs".
+
+The first 10 tabs present the biblio, the 11th one presents
+the items attached to the biblio
+
+=head1 FUNCTIONS
+
+=over 2
+
+=cut
+
+
+use strict;
+require Exporter;
+use C4::Auth;
+use C4::Context;
+use C4::Output;
+use C4::Interface::CGI::Output;
+use CGI;
+use C4::Search;
+use MARC::Record;
+use C4::Biblio;
+use C4::Catalogue;
+use HTML::Template;
+
+my $query=new CGI;
+
+my $dbh=C4::Context->dbh;
+
+my $biblionumber=$query->param('bib');
+my $bibid = $query->param('bibid');
+$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
+$biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
+my $itemtype = &MARCfind_itemtype($dbh,$bibid);
+my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
+
+my $record =MARCgetbiblio($dbh,$bibid);
+# open template
+my ($template, $loggedinuser, $cookie)
+               = get_template_and_user({template_name => "opac-ISBDdetail.tmpl",
+                            query => $query,
+                            type => "opac",
+                            authnotrequired => 1,
+                            debug => 1,
+                            });
+
+my $ISBD = C4::Context->preference('ISBD');
+warn "ISBD : $ISBD";
+my @fields = $record->fields();
+foreach my $field (@fields) {
+       my $tag = $field->tag();
+       if ($tag<10) {
+       } else {
+               my @subf = $field->subfields;
+               for my $i (0..$#subf) {
+                       my $subfieldcode = $subf[$i][0];
+                       my $subfieldvalue = $subf[$i][1];
+                       my $tagsubf = $tag.$subfieldcode;
+                       $ISBD =~ s/\[(.?.?.?)$tagsubf(.*?)]/$1$subfieldvalue\[$1$tagsubf$2]$2$3/g;
+               }
+       }
+}
+$ISBD =~ s/\[(.*?)]//g;
+$ISBD =~ s/\n/<br>/g;
+$template->param(ISBD => $ISBD);
+
+output_html_with_http_headers $query, $cookie, $template->output;
+

diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index 9ef66b2..49b29f0 100755 (executable)
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -173,10 +173,6 @@ foreach my $subfield_code (keys(%witness)) {
        push(@header_value_loop, \%header_value);
 }
 
-my $ISBD = C4::Context->preference('ISBD');
-warn "ISBD : $ISBD";
-# build ISBD from MARC::Record
-
 $template->param(item_loop => \@item_value_loop,
                                                item_header_loop => \@header_value_loop,
                                                biblionumber => $biblionumber,