View | Details | Raw Unified | Return to bug 21942
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-5 / +2 lines)
Lines 155-161 div#result { margin-top: 1em; } Link Here
155
[% ELSE %]
155
[% ELSE %]
156
<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post" onsubmit="return mergeformsubmit()">
156
<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post" onsubmit="return mergeformsubmit()">
157
157
158
<div class="yui-g">
159
<div class="col-sm-6">
158
<div class="col-sm-6">
160
[% PROCESS mergesource sourcerecords=records %]
159
[% PROCESS mergesource sourcerecords=records %]
161
</div>
160
</div>
Lines 173-181 div#result { margin-top: 1em; } Link Here
173
    <input type="submit" name="merge" value="Merge" />
172
    <input type="submit" name="merge" value="Merge" />
174
    <label for="report_fields">Fields to display in report:</label>
173
    <label for="report_fields">Fields to display in report:</label>
175
    <input type="text" name="report_fields" id="report_fields" value="[% MergeReportFields | html %]" />
174
    <input type="text" name="report_fields" id="report_fields" value="[% MergeReportFields | html %]" />
176
    <span class="hint">(Example: "001,245ab,600")
175
    <span class="hint">(Example: "001,245ab,600")</span>
177
</fieldset>
176
</fieldset>
178
</div>
179
</form>
177
</form>
180
[% END %]
178
[% END %]
181
[% END %]
179
[% END %]
Lines 187-193 div#result { margin-top: 1em; } Link Here
187
[% MACRO jsinclude BLOCK %]
185
[% MACRO jsinclude BLOCK %]
188
    [% Asset.js("js/merge-record.js") | $raw %]
186
    [% Asset.js("js/merge-record.js") | $raw %]
189
    [% INCLUDE 'merge-record-strings.inc' %]
187
    [% INCLUDE 'merge-record-strings.inc' %]
190
    <script type="text/javascript">
188
    <script>
191
        [% UNLESS (result) %]
189
        [% UNLESS (result) %]
192
          [% IF (choosereference) %]
190
          [% IF (choosereference) %]
193
            function changeFramework(fw) {
191
            function changeFramework(fw) {
194
- 

Return to bug 21942