[Koha-patches] [PATCH] Fix for Bug 4859, Formatting cleanup for merge biblio record interface
Owen Leonard
oleonard at myacpl.org
Tue Jun 8 21:43:35 CEST 2010
---
.../prog/en/modules/cataloguing/merge.tmpl | 48 +++++++++++--------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tmpl
index 1898c9d..6230faa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tmpl
@@ -3,6 +3,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<style type="text/css">
div.record ul, div.record li { float:none; display:block; }
+div#result { margin-top: 1em; }
/* We use this style "against" the li ui-tabs-nav style automatically applied */
</style>
<script type="text/javascript">
@@ -17,7 +18,7 @@ div.record ul, div.record li { float:none; display:block; }
$(document).ready(function(){
// Creating tabs
- $("#tabs").tabs();
+ $("#tabs > ul").tabs();
// Getting marc structure via ajax
tagslib = [];
@@ -165,20 +166,20 @@ $(document).ready(function(){
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cataloging-search.inc" -->
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › <!-- TMPL_IF NAME="biblionumber" -->Editing <em><!-- TMPL_VAR NAME="title" escape="html" --></em> (Record Number <!-- TMPL_VAR name="biblionumber" -->)<!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></div>
<div id="doc" class="yui-t7">
<div id="bd">
<div id="yui-main">
- <div class="yui-g">
<h1>Merging records</h1>
<!-- TMPL_IF name="result" -->
<!-- TMPL_IF name="errors" -->
<!-- TMPL_LOOP name="errors" -->
- <div class="error"><!-- TMPL_VAR name="error" -->.<br />Therefore, the record to be merged has not been deleted.</div>
+ <div class="dialog alert"><!-- TMPL_VAR name="error" -->.<br />Therefore, the record to be merged has not been deleted.</div>
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
@@ -189,15 +190,17 @@ $(document).ready(function(){
<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="choosereference" -->
-<p>Please choose which record will be the reference for the merge (the record chosen as reference will be kept, and the other will be deleted) : </p>
+<p>Please choose which record will be the reference for the merge. The record chosen as reference will be kept, and the other will be deleted.</p>
<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post">
- <fieldset>
+ <fieldset class="rows">
<legend>Merge reference</legend>
- <input type="radio" value="<!-- TMPL_VAR NAME="biblio1" -->" checked="checked" id="mergereference1" name="mergereference" /><label for="mergereference1"><!-- TMPL_VAR NAME="title1" --> (<!-- TMPL_VAR NAME="biblio1" -->)</label><br />
- <input type="radio" value="<!-- TMPL_VAR NAME="biblio2" -->" id="mergereference2" name="mergereference" /><label for="mergereference2"><!-- TMPL_VAR NAME="title2" --> (<!-- TMPL_VAR NAME="biblio2" -->)</label><br />
+ <ol>
+ <li class="radio"><input type="radio" value="<!-- TMPL_VAR NAME="biblio1" -->" checked="checked" id="mergereference1" name="mergereference" /><label for="mergereference1"><!-- TMPL_VAR NAME="title1" --> (<!-- TMPL_VAR NAME="biblio1" -->)</label></li>
+ <li class="radio"><input type="radio" value="<!-- TMPL_VAR NAME="biblio2" -->" id="mergereference2" name="mergereference" /><label for="mergereference2"><!-- TMPL_VAR NAME="title2" --> (<!-- TMPL_VAR NAME="biblio2" -->)</label></li>
+</ol>
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblio1" -->" />
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblio2" -->" />
- <input type="submit" />
+ <fieldset class="action"><input type="submit" value="Next" /></fieldset>
</fieldset>
</form>
<!-- TMPL_ELSE -->
@@ -208,7 +211,9 @@ $(document).ready(function(){
<!-- TMPL_ELSE -->
<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post" onsubmit="return mergeformsubmit()">
-<div id="tabs" class="yui-u first">
+<div class="yui-g">
+<div class="yui-u first">
+<div id="tabs" class="toptabs">
<h2>Source records</h2>
<ul>
<li><a href="#tabrecord1"><!-- TMPL_VAR name="biblio1" --></a></li>
@@ -216,7 +221,7 @@ $(document).ready(function(){
</ul>
<div id="tabrecord1">
<!-- TMPL_IF name="record1" -->
- <br />
+
<div class="record">
<ul id="ulrecord1">
<!-- TMPL_LOOP NAME="record1" -->
@@ -248,11 +253,11 @@ $(document).ready(function(){
</li>
<!-- /TMPL_LOOP -->
</ul>
- </div>
- </div>
+ </div><!-- /div.record -->
+ </div><!-- /div#tabrecord1 -->
<div id="tabrecord2">
<!-- TMPL_IF name="record2" -->
- <br />
+
<div class="record">
<ul id="ulrecord2">
<!-- TMPL_LOOP NAME="record2" -->
@@ -285,18 +290,19 @@ $(document).ready(function(){
<!-- /TMPL_LOOP -->
</ul>
</div>
-
+ <!-- /div.record -->
<!-- /TMPL_IF -->
- </div>
+ </div><!-- /div#tabrecord2 -->
</div> <!-- // #tabs -->
-
-<div id="result" class="yui-u">
+</div>
+<div class="yui-u">
+<div id="result">
<h2>Destination record</h2>
- <br /><br />
+ <div style="border:1px solid #E8E8E8;padding:1em;margin-top:2em;">
<ul id="resultul">
<!-- TMPL_LOOP NAME="record1" -->
<!-- TMPL_LOOP NAME="field" --><li id="k<!-- TMPL_VAR name="key" -->"><span class="field"><!-- TMPL_VAR NAME="tag" --></span>
@@ -330,9 +336,11 @@ $(document).ready(function(){
<input type="hidden" name="biblio2" value="<!-- TMPL_VAR name="biblio2" -->" />
<input type="hidden" name="mergereference" value="<!-- TMPL_VAR name="mergereference" -->" />
-<p><input type="submit" name="merge" value="merge" /></p>
-
+</div>
</div> <!-- // #result -->
+</div> <!-- .yui-u -->
+<fieldset class="action"><input type="submit" name="merge" value="Merge" /></fieldset>
+</div>
</form>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
--
1.7.0.4
More information about the Koha-patches
mailing list