Bugzilla – Attachment 814 Details for
Bug 2713
Opac detail content overlaps when right column extends too far
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
additional edits
0006-Bug-2713-Make-Marc-ISBD-View-match-Normal-template.patch (text/plain), 13.28 KB, created by
Chris Cormack
on 2009-08-26 22:20:00 UTC
(
hide
)
Description:
additional edits
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2009-08-26 22:20:00 UTC
Size:
13.28 KB
patch
obsolete
>From 386d4dcc18d7c3dff5561d88f25abcf5ca9ea4fd Mon Sep 17 00:00:00 2001 >From: Nicole Engard <nengard@gmail.com> >Date: Wed, 26 Aug 2009 13:54:40 -0400 >Subject: [PATCH] Bug 2713 Make Marc & ISBD View match Normal template >Content-Type: text/plain; charset="utf-8" > >--- > .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl | 141 ++------------------ > .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl | 96 +++++++++----- > 2 files changed, 74 insertions(+), 163 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl >index d320f0b..21ed412 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl >@@ -17,18 +17,19 @@ > <!-- /TMPL_IF --> > </head> > <body> >-<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF --> >- <div id="bd" class="columnfix"> >-<!-- TMPL_INCLUDE name="masthead.inc" --> > >- <div id="yui-main"> >- <div class="yui-b"> >- <div class="yui-ge"> >+<div id="doc3" class="yui-t7"> >+ <div id="bd"> >+<!--TMPL_INCLUDE NAME="masthead.inc" --> >+ >+ >+ <div id="yui-main"> >+ <div class="yui-b"><div id="opac-detail" class="yui-ge"> > <div class="yui-u first"> >- <div class="container"> >- >+ <div class="container"> >+ <div id="catalogue_detail_biblio"> > >- <h1 style="float:left;margin:0 1em 1em 0;">ISBD</h1> <div id="views"> >+ <h1 style="float:left;margin:0 1em 1em 0;">ISBD View</h1> <div id="views"> > <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a></span> <!-- TMPL_IF NAME="XSLTDetailsDisplay" --> > <span class="view"><a id="MARCviewPop" href="/cgi-bin/koha/opac-showmarc.pl?id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">MARC View</a></span> > <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Expanded MARC View</a></span> >@@ -38,120 +39,6 @@ > </div> > <div id="isbdcontents"><!-- TMPL_VAR name="ISBD" --></div> > >- <div id="bibliodescriptions" class="toptabs"> >- <ul> >- <!-- TMPL_IF name="subscriptionsnumber" --><li> >- <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#opac-isbd-subscriptions">Subscriptions</a> >- </li><!-- /TMPL_IF --> >- <!-- TMPL_IF NAME="reviewson" --><li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#comments">Comments</a></li><!-- /TMPL_IF --> >- <!-- TMPL_IF NAME="OPACAmazonEnabled" --><li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#opac-isbd-amazonreviews">Amazon Reviews</a></li><!-- /TMPL_IF --> >- </ul> >- >- <div id="opac-isbd-subscriptions"> <!-- TMPL_IF name="subscriptionsnumber" --> >- <h2> >- We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscription(s) associated with this title. >- </h2> >- <!-- TMPL_LOOP Name="subscriptions" --> >- <h3>At library: <!-- TMPL_VAR name="branchcode" --> <!-- TMPL_VAR name="notes" --></h3> >- <p>Below is a list of the <!-- TMPL_VAR NAME="opacdisplaycount" --> latest issues :</p> >- <!-- TMPL_IF name="subscriptionnotes"--> >- <p><!--TMPL_VAR Name="subscriptionnotes"--> </p> >- <!-- /TMPL_IF --> >- <!--TMPL_IF Name="latestserials"--> >- <table> >- <tr><th>Issue number</th><th>Date</th><th>Status</th></tr> >- <!--TMPL_LOOP Name="latestserials"--> >- <tr> >- <td> <!--TMPL_VAR Name="serialseq"--> >- </td> >- <td> <!--TMPL_VAR Name="planneddate"--> >- </td> >- <td> <!--TMPL_IF Name="status1"-->Pending >- <!--TMPL_ELSE --> >- <!-- TMPL_IF Name="status2"-->Arrived >- <!--TMPL_ELSE --> >- <!-- TMPL_IF Name="status3"-->Late >- <!--TMPL_ELSE --> >- <!-- TMPL_IF Name="status4"-->Missing >- <!--TMPL_ELSE --> >- <!-- TMPL_IF Name="status5"-->Not Issued >- <!--/TMPL_IF--> >- <!--/TMPL_IF--> >- <!--/TMPL_IF--> >- <!--/TMPL_IF--> >- <!--/TMPL_IF--> >- </td> >- </tr> >- <!--/TMPL_LOOP --> >- </table> >- <!-- /TMPL_IF --> >- <!-- /TMPL_LOOP --> >- <p><a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Click here</a> for more information on subscription(s) history</p> >- <!-- /TMPL_IF --></div> >- >- <!-- TMPL_IF NAME="reviewson" --> >- <div id="comments"> >- <!-- TMPL_IF NAME="reviews" --> >- <!--TMPL_LOOP NAME="reviews"--> >- <h5> >- Comment by >- <!--TMPL_VAR NAME="title"--> >- <!--TMPL_VAR NAME="firstname"--> >- <!--TMPL_VAR NAME="surname"--> >- </h5> >- <small> >- <!--TMPL_VAR NAME="datereviewed"--> >- </small> >- <p> >- <!--TMPL_VAR NAME="review" ESCAPE="HTML"--> >- </p> >- <!--/TMPL_LOOP--> >- <!-- TMPL_ELSE --> >- <p>There are no comments for this item.</p> >- <!-- /TMPL_IF --> >- >- <!-- TMPL_IF NAME="loggedinusername" --> >- <p> <a href="javascript:Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->');"> >- Post or edit your comments on this item. >- </a></p> >- <!-- TMPL_ELSE --> >- <p><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to post a comment.</p> >- <!-- /TMPL_IF --> >- </div> >- >- <!-- /TMPL_IF --> >- >- <!-- TMPL_IF NAME="OPACAmazonEnabled" --> >- <!-- Amazon Reviews --> >- <div id="opac-isbd-amazonreviews"> >- >- <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --> >- <!-- TMPL_IF NAME="normalized_isbn" --> >- <h4><a href="http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&asin=<!-- TMPL_VAR NAME="normalized_isbn" -->&store=books">Add your own review</a></h4> >- <!-- /TMPL_IF --> >- <!-- /TMPL_LOOP --><br/> >- >- <!-- TMPL_IF NAME="rating" --> >- <h4>Rating (from Amazon.com):</h4> >- <div id="starMT"><div id="starFull" style="width:<!-- TMPL_VAR NAME="rating" -->px"></div></div> >- >- <!-- TMPL_LOOP NAME="AMAZONREVIEWS" --> >- <div class="content_set"> >- <!-- TMPL_IF NAME="summary" --> >- <h4 class="underline"> <!-- TMPL_VAR NAME="summary" --></h4> >- <!-- /TMPL_IF --> >- <!-- TMPL_IF NAME="comment" --> >- <p><!-- TMPL_VAR NAME="comment" --> >- </p><!-- /TMPL_IF --> >- </div> >- <!-- /TMPL_LOOP --> >- <!-- TMPL_ELSE --> >- >- <p> Sorry, there are no reviews available for this title. </p> >- >- <!-- /TMPL_IF --> >- </div> <!-- itemReviews --> >- <!-- /TMPL_IF--> > </div> > </div> > </div> >@@ -189,6 +76,7 @@ > Add to Your Cart > </a></li><!-- /TMPL_IF --> > </ul> >+ > <div id="export"> > <form method="get" action="/cgi-bin/koha/opac-export.pl"> > <label for="format">Save Record:</label> >@@ -205,11 +93,6 @@ > </div> > > </div> >-</div><!-- TMPL_IF NAME="OpacNav" --> >-<div class="yui-b"> >-<div class="container"> >-<!--TMPL_INCLUDE NAME="navigation.inc" --> >-</div> >-</div><!-- /TMPL_IF --> > </div> >+ > <!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl >index 63501ae..735cdc9 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl >@@ -10,36 +10,18 @@ > <!-- /TMPL_IF --> > </head> > <body> >-<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF --> >+ >+<div id="doc3" class="yui-t7"> > <div id="bd"> >-<!-- TMPL_INCLUDE name="masthead.inc" --> >- >- <div id="yui-main"> >- <div class="yui-b"> >-<div class="container"><div class="yui-g"> >-<div id="toolbar"> >-<ul> >- <!-- TMPL_UNLESS NAME="norequests" --> >- <!-- TMPL_IF NAME="opacuserlogin" --> >- <!-- TMPL_IF NAME="RequestOnOpac" --> >- <!-- TMPL_IF NAME="AllowOnShelfHolds" --> >- <li><a class="link reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li> >- <!-- TMPL_ELSE --> >- <!-- TMPL_IF NAME="ItemsIssued" --> >- <li><a class="link reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li> >- <!-- /TMPL_IF --> >- <!-- /TMPL_IF --> >- <!-- /TMPL_IF --> >- <!-- /TMPL_IF --> >- <!-- /TMPL_UNLESS --> >- <li><a class="link print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li> >- <!-- TMPL_IF name="virtualshelves" --><!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><li><a class="link addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Save to Your Lists</a></li><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --> >- <!-- TMPL_IF NAME="opacbookbag" --><li><a class="link addtocart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to Your Cart</a></li><!-- /TMPL_IF --> >-</ul> >-</div> >-</div> >+<!--TMPL_INCLUDE NAME="masthead.inc" --> >+ >+ >+ <div id="yui-main"> >+ <div class="yui-b"><div id="opac-detail" class="yui-ge"> >+ <div class="yui-u first"> >+ <div class="container"> >+ <div id="catalogue_detail_biblio"> > >- <div class="yui-g" style="margin-top : 1em;"> > <h1 style="float:left;margin: 0 1em 1em 0;">MARC View</h1> > <div id="views"> > <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a></span> >@@ -172,15 +154,61 @@ > </table><!-- TMPL_ELSE --> > <p>No copies available.</p> > <!-- /TMPL_IF --> >+ </div> >+ </div> >+ </div> >+ <div class="yui-u"> >+ <div class="container"> >+<ul id="action"> >+ >+<!-- TMPL_UNLESS NAME="norequests" --> >+ <!-- TMPL_UNLESS name="bi_notforloan" --> >+ <!-- TMPL_IF NAME="opacuserlogin" --> >+ <!-- TMPL_IF NAME="RequestOnOpac" --> >+ <!-- TMPL_IF NAME="AllowOnShelfHolds" --> >+ <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li> >+ <!-- TMPL_ELSE --> >+ <!-- TMPL_IF NAME="ItemsIssued" --> >+ <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li> >+ <!-- /TMPL_IF --> >+ <!-- /TMPL_IF --> >+ >+ <!-- /TMPL_IF --> >+ <!-- /TMPL_IF --> >+ <!-- /TMPL_UNLESS --> >+<!-- /TMPL_UNLESS --> >+ <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;"> >+ Print >+ </a></li> >+<!-- TMPL_IF name="virtualshelves" --> >+ <!-- TMPL_IF NAME="opacuserlogin" --> <!-- TMPL_IF NAME="loggedinusername" --> >+ <li><a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;"> >+ Save to Your Lists >+ </a></li> >+ <!-- /TMPL_IF --><!-- /TMPL_IF --> >+<!-- /TMPL_IF --> >+ <!-- TMPL_IF NAME="opacbookbag" --><li><a class="addtocart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;"> >+ Add to Your Cart >+ </a></li><!-- /TMPL_IF --> >+</ul> >+ >+ <div id="export"> >+ <form method="get" action="/cgi-bin/koha/opac-export.pl"> >+ <label for="format">Save Record:</label> >+ <select name="format" id="format"> >+ <option value="">-- Choose Format --</option> >+ <option value="mods">MODS (XML)</option> >+ <option value="dc">Dublin Core (XML)</option> >+ <option value="marcxml">MARCXML</option> >+ <option value="marc8">MARC (non-Unicode/MARC-8)</option> >+ <option value="utf8">MARC (Unicode/UTF-8)</option> </select><input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> >+<input type="submit" name="save" value="Go" /></form></div> > </div> > </div> > </div> >+ > </div> >-<!-- TMPL_IF NAME="OpacNav" --> >-<div class="yui-b"> >-<div class="container"> >-<!--TMPL_INCLUDE NAME="navigation.inc" --> >-</div> >-</div><!-- /TMPL_IF --> > </div> >+ > <!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >+ >-- >1.5.6.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 2713
:
812
|
813
| 814