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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt (-12 / +16 lines)
Lines 26-35 Link Here
26
        [% END %]
26
        [% END %]
27
    </div>
27
    </div>
28
28
29
    <div id="doc3" class="yui-t2">
29
<div class="main container-fluid">
30
    <div id="bd">
30
    <div class="row">
31
    <div id="yui-main">
31
        <div class="col-sm-10 col-sm-push-2">
32
    <div class="yui-b">
32
            <main>
33
33
    [% IF op == 'list' %]
34
    [% IF op == 'list' %]
34
        <div id="toolbar" class="btn-toolbar">
35
        <div id="toolbar" class="btn-toolbar">
35
            <a class="btn btn-default" id="newfields" href="?op=add_form&amp;tablename=[% tablename | uri %]"><i class="fa fa-plus"></i> Create field</a>
36
            <a class="btn btn-default" id="newfields" href="?op=add_form&amp;tablename=[% tablename | uri %]"><i class="fa fa-plus"></i> Create field</a>
Lines 65-71 Link Here
65
        <h3>Additional fields</h3>
66
        <h3>Additional fields</h3>
66
        <p>Select a table:</p>
67
        <p>Select a table:</p>
67
        [% BLOCK table_option %]
68
        [% BLOCK table_option %]
68
            <li><a href="?tablename=[% value | uri %]">[% content | html %] (<tt>[% value | html %]</tt>)</a></li>
69
            <li><a href="?tablename=[% value | uri %]">[% content | html %] (<span class="ex">[% value | html %]</span>)</a></li>
69
        [% END %]
70
        [% END %]
70
        <ul>
71
        <ul>
71
            [% IF CAN_user_acquisition_order_manage %]
72
            [% IF CAN_user_acquisition_order_manage %]
Lines 164-176 Link Here
164
        </form>
165
        </form>
165
    [% END %]
166
    [% END %]
166
167
167
    </div>
168
            </main>
168
    </div>
169
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
170
171
        <div class="col-sm-2 col-sm-pull-10">
172
            <aside>
173
                [% INCLUDE 'admin-menu.inc' %]
174
            </aside>
175
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
176
    </div> <!-- /.row -->
169
177
170
<div class="yui-b">
171
[% INCLUDE 'admin-menu.inc' %]
172
</div>
173
</div>
174
178
175
[% MACRO jsinclude BLOCK %]
179
[% MACRO jsinclude BLOCK %]
176
    [% INCLUDE "datatables.inc" %]
180
    [% INCLUDE "datatables.inc" %]
Lines 198-204 Link Here
198
                if ( $("#marcfield").length && $("select[name='authorised_value_category']").length ) {
202
                if ( $("#marcfield").length && $("select[name='authorised_value_category']").length ) {
199
                    if ( $("#marcfield").val().length > 0
203
                    if ( $("#marcfield").val().length > 0
200
                        && $("select[name='authorised_value_category']" ).val().length > 0 ) {
204
                        && $("select[name='authorised_value_category']" ).val().length > 0 ) {
201
                        alert("You cannot select an authorised value category and a marcfield");
205
                        alert(_("You cannot select an authorised value category and a marcfield") );
202
                        return false;
206
                        return false;
203
                    }
207
                    }
204
                }
208
                }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-12 / +9 lines)
Lines 57-62 Link Here
57
    <div class="row">
57
    <div class="row">
58
        <div class="col-sm-10 col-sm-push-2">
58
        <div class="col-sm-10 col-sm-push-2">
59
            <main>
59
            <main>
60
                <div class="row">
60
61
61
[% IF ( unknownbiblionumber ) %]
62
[% IF ( unknownbiblionumber ) %]
62
  <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
63
  <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
Lines 69-79 Link Here
69
    [% END %]
70
    [% END %]
70
71
71
    [% IF ( AmazonCoverImages  || LocalCoverImages || AdlibrisEnabled ) %]
72
    [% IF ( AmazonCoverImages  || LocalCoverImages || AdlibrisEnabled ) %]
72
        <div class="yui-gc">
73
        <div id="catalogue_detail_biblio" class="col-xs-9">
73
            <div id="catalogue_detail_biblio" class="yui-u first">
74
    [% ELSE %]
74
    [% ELSE %]
75
        <div class="yui-g">
75
        <div id="catalogue_detail_biblio" class="col-xs-12">
76
            <div id="catalogue_detail_biblio">
77
    [% END %]
76
    [% END %]
78
77
79
        [% XSLTBloc | $raw %]
78
        [% XSLTBloc | $raw %]
Lines 123-129 Link Here
123
        [% END %]
122
        [% END %]
124
123
125
        [% IF ( AmazonCoverImages  || LocalCoverImages || AdlibrisEnabled ) %]
124
        [% IF ( AmazonCoverImages  || LocalCoverImages || AdlibrisEnabled ) %]
126
        </div><div class="yui-u" id="bookcoverimg">
125
        </div><div class="col-xs-3" id="bookcoverimg">
127
        [% IF ( LocalCoverImages ) %]
126
        [% IF ( LocalCoverImages ) %]
128
            <div title="[% biblionumber |url %]" class="[% biblionumber | html %]" id="local-thumbnail-preview"></div>
127
            <div title="[% biblionumber |url %]" class="[% biblionumber | html %]" id="local-thumbnail-preview"></div>
129
        [% END %]
128
        [% END %]
Lines 493-499 Link Here
493
492
494
[% IF ( subscriptionsnumber ) %]
493
[% IF ( subscriptionsnumber ) %]
495
<div id="subscriptions">
494
<div id="subscriptions">
496
<div class="yui-g">
497
<div id="catalogue_detail_subscriptions">
495
<div id="catalogue_detail_subscriptions">
498
    <h2>This is a serial subscription</h2>
496
    <h2>This is a serial subscription</h2>
499
    <p> (There are [% subscriptionsnumber | html %] subscriptions associated with this title).</p> 
497
    <p> (There are [% subscriptionsnumber | html %] subscriptions associated with this title).</p> 
Lines 545-551 Link Here
545
    [% END %]
543
    [% END %]
546
</div>
544
</div>
547
</div>
545
</div>
548
</div>
549
[% END %]
546
[% END %]
550
547
551
[% IF Koha.Preference('AcquisitionDetails') %]
548
[% IF Koha.Preference('AcquisitionDetails') %]
Lines 703-719 Link Here
703
700
704
</div><!-- /bibliodetails -->
701
</div><!-- /bibliodetails -->
705
702
706
<div class="yui-g" id="export" style="margin-top: 1em;">
703
<div id="export" style="margin-top: 1em;">
707
<form method="get" action="/cgi-bin/koha/catalogue/export.pl">
704
<form method="get" action="/cgi-bin/koha/catalogue/export.pl">
708
<table>  <tr>
705
<table>  <tr>
709
      <th>Save Record</th>   </tr>
706
      <th>Save record</th>   </tr>
710
    <tr><td> Select download format:    <select name="format">
707
    <tr><td> Select download format:    <select name="format">
711
        <option value="mods">MODS (XML)</option>
708
        <option value="mods">MODS (XML)</option>
712
        <option data-toggle="modal" data-target="#exportModal_">Dublin Core</option>
709
        <option data-toggle="modal" data-target="#exportModal_">Dublin Core</option>
713
        <option value="marcxml">MARCXML</option>
710
        <option value="marcxml">MARCXML</option>
714
        <option value="marc8">MARC (non-Unicode/MARC-8)</option>
711
        <option value="marc8">MARC (non-Unicode/MARC-8)</option>
715
        <option value="utf8">MARC (Unicode/UTF-8)</option>    </select>
712
        <option value="utf8">MARC (Unicode/UTF-8)</option>    </select>
716
        <input type="submit" name="save" value="Download Record" /></td>
713
        <input type="submit" name="save" value="Download record" /></td>
717
  </tr>
714
  </tr>
718
  <tr><td>
715
  <tr><td>
719
    <input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="[% biblionumber | html %]" />
716
    <input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="[% biblionumber | html %]" />
Lines 767-776 Link Here
767
                        h = this.height;
764
                        h = this.height;
768
                        if ((w == 1) || (h == 1)) {
765
                        if ((w == 1) || (h == 1)) {
769
                            $("#amazon-bookcoverimg").remove();
766
                            $("#amazon-bookcoverimg").remove();
770
                            $(".yui-gb").attr("class","yui-g");
767
                            $("#catalogue_detail_biblio").attr("class","col-xs-12");
771
                        } else if ((this.complete != null) && (!this.complete)) {
768
                        } else if ((this.complete != null) && (!this.complete)) {
772
                            $("#amazon-bookcoverimg").remove();
769
                            $("#amazon-bookcoverimg").remove();
773
                            $(".yui-gb").attr("class","yui-g");
770
                            $("#catalogue_detail_biblio").attr("class","col-xs-12");
774
                        }
771
                        }
775
                    }
772
                    }
776
                });
773
                });
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-3 / +1 lines)
Lines 52-59 Link Here
52
    [% IF ( ONLY_ONE ) %]
52
    [% IF ( ONLY_ONE ) %]
53
        <div class="dialog message">You are only viewing one item.  <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&amp;bi=[% biblioitemnumber | uri %]#item[% itemnumber | uri %]">View All</a></div>
53
        <div class="dialog message">You are only viewing one item.  <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&amp;bi=[% biblioitemnumber | uri %]#item[% itemnumber | uri %]">View All</a></div>
54
    [% END %]
54
    [% END %]
55
55
    [% FOREACH ITEM_DAT IN ITEM_DATA %]
56
    [% FOREACH ITEM_DAT IN ITEM_DATA %]
56
    <div class="yui-g">
57
        <h3 id="item[% ITEM_DAT.itemnumber | html %]">Barcode [% ITEM_DAT.barcode | html %]  [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]</h3>
57
        <h3 id="item[% ITEM_DAT.itemnumber | html %]">Barcode [% ITEM_DAT.barcode | html %]  [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]</h3>
58
        <div class="listgroup"><h4>Item information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %]
58
        <div class="listgroup"><h4>Item information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %]
59
         [% IF ( CAN_user_editcatalogue_edit_items ) %]
59
         [% IF ( CAN_user_editcatalogue_edit_items ) %]
Lines 271-277 Link Here
271
                </li>
271
                </li>
272
            </ol>
272
            </ol>
273
            </div>
273
            </div>
274
        </div>
275
</div>
274
</div>
276
[% END %]
275
[% END %]
277
276
278
- 

Return to bug 22764