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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-1 / +3 lines)
Lines 413-419 Link Here
413
                        </td>
413
                        </td>
414
                        <td><span title="[% batch_lis.staged_date | html %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 | html %]</span></td>
414
                        <td><span title="[% batch_lis.staged_date | html %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 | html %]</span></td>
415
                        <td>[% batch_lis.num_records | html %]</td>
415
                        <td>[% batch_lis.num_records | html %]</td>
416
                        <td><a href="[% batch_lis.scriptname | html %]?import_batch_id=[% batch_lis.import_batch_id | html %]&amp;basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]">Add orders</a></td>
416
                        <td class="actions">
417
                            <a href="[% batch_lis.scriptname | html %]?import_batch_id=[% batch_lis.import_batch_id | html %]&amp;basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a>
418
                        </td>
417
                      </tr>
419
                      </tr>
418
                      [% END %]
420
                      [% END %]
419
                    </tbody>
421
                    </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt (-9 / +4 lines)
Lines 43-50 Link Here
43
         <th>Summary</th>
43
         <th>Summary</th>
44
         <th>Publisher</th>
44
         <th>Publisher</th>
45
         <th>Copyright</th>
45
         <th>Copyright</th>
46
         <th>&nbsp;</th>
46
         <th>Actions</th>
47
         <th>&nbsp;</th>
48
      </tr>
47
      </tr>
49
    </thead>
48
    </thead>
50
    <tbody>
49
    <tbody>
Lines 67-79 Link Here
67
            <td>
66
            <td>
68
                [% biblio.copyrightdate | html %]
67
                [% biblio.copyrightdate | html %]
69
            </td>
68
            </td>
70
        <td>
69
            <td class="actions">
71
        <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | html %]&amp;viewas=html" class="btn btn-default btn-xs previewMARC">View MARC</a>
70
                <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | html %]&amp;viewas=html" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> View MARC</a>
72
        </td>
71
                <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;biblionumber=[% biblio.biblionumber | html %]" title="Order this one" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
73
            <td>
74
            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;biblionumber=[% biblio.biblionumber | html %]" class="btn btn-default btn-xs" title="Order this one">
75
                Place order
76
            </a>
77
            </td>
72
            </td>
78
        </tr>
73
        </tr>
79
      [% END %]
74
      [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-2 / +1 lines)
Lines 256-263 Link Here
256
              <table>
256
              <table>
257
                  <thead>
257
                  <thead>
258
                      <tr>
258
                      <tr>
259
                          <th>&nbsp;</th>
259
                          <th>Actions</th>
260
                          <th>&nbsp;</th>
261
                          <th>Barcode</th>
260
                          <th>Barcode</th>
262
                          <th>Home library</th>
261
                          <th>Home library</th>
263
                          <th>Holding library</th>
262
                          <th>Holding library</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-3 / +4 lines)
Lines 68-79 Link Here
68
                                        <span title="0000-00-00"></span>
68
                                        <span title="0000-00-00"></span>
69
                                    [% END %]
69
                                    [% END %]
70
                                </td>
70
                                </td>
71
                                <td>
71
                                <td class="actions">
72
                                    [% IF (sub.alreadyOnOrder) %]
72
                                    [% IF (sub.alreadyOnOrder) %]
73
                                        Outstanding order
73
                                        Outstanding order
74
                                    [% END %]
74
                                    [% END %]
75
                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%]
75
                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
76
                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one">
76
                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
77
                                            <i class="fa fa-plus"></i> Order
77
                                            Place order
78
                                            Place order
78
                                        </a>
79
                                        </a>
79
                                    [% ELSE %]
80
                                    [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-11 / +19 lines)
Lines 100-129 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
100
100
101
    [% IF ( breeding_loop ) %]
101
    [% IF ( breeding_loop ) %]
102
    <table id="resultst">
102
    <table id="resultst">
103
<thead>    <tr>
103
    <thead><tr>
104
        <th>Server</th>
104
        <th>Server</th>
105
        <th>Title</th>
105
        <th>Title</th>
106
        <th>Author</th>
106
        <th>Author</th>
107
        <th>ISBN</th>
107
        <th>ISBN</th>
108
        <th>LCCN</th>
108
        <th>LCCN</th>
109
        [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
109
        [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' ) %]
110
        <th>Additional fields</th>
110
            <th>Additional fields</th>
111
        [% END %]
111
        [% END %]
112
        <th>Preview</th>
112
        <th>Preview</th>
113
		<th>&nbsp;</th>
113
        <th>&nbsp;</th>
114
    </tr></thead>
114
    </tr></thead>
115
    <tbody>[% FOREACH breeding_loo IN breeding_loop %]
115
    <tbody>[% FOREACH breeding_loo IN breeding_loop %]
116
        [% IF ( breeding_loo.breedingid ) %]
116
        [% IF ( breeding_loo.breedingid ) %]
117
117
118
        <tr>
118
        <tr>
119
            <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri  %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Place order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
119
            <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
120
            <td>[% breeding_loo.title | html %]</td>
120
            <td>[% breeding_loo.title | html %]</td>
121
            <td>[% breeding_loo.author | html %]</td>
121
            <td>[% breeding_loo.author | html %]</td>
122
            <td>[% breeding_loo.isbn | html %]</td>
122
            <td>[% breeding_loo.isbn | html %]</td>
123
            <td>[% breeding_loo.lccn | html %]</td>
123
            <td>[% breeding_loo.lccn | html %]</td>
124
            [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
124
            [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
125
            <td>
125
            <td>
126
               <dl>
126
                <dl>
127
                  [% FOREACH addnumberfield IN breeding_loo.addnumberfields %]
127
                  [% FOREACH addnumberfield IN breeding_loo.addnumberfields %]
128
                    [% FOREACH string IN breeding_loo.$addnumberfield %]
128
                    [% FOREACH string IN breeding_loo.$addnumberfield %]
129
                        <dt>[% addnumberfield | html %]:</dt>
129
                        <dt>[% addnumberfield | html %]:</dt>
Lines 132-141 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
132
                  [% END %]
132
                  [% END %]
133
               </dl>
133
               </dl>
134
            </td>
134
            </td>
135
            [% END %]
135
            <td>
136
            <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" title="MARC" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" title="Card" class="previewData">Card</a></td>
136
                <div class="dropdown">
137
            <td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Place order</a></td>
137
                    <a class="btn btn-default btn-xs dropdown-toggle" id="z3950preview[% breeding_loo.breedingid | html %]" role="button" data-toggle="dropdown" href="#">
138
138
                        Preview <b class="caret"></b>
139
                    </a>
140
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="z3950preview[% breeding_loo.breedingid | html %]">
141
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC</a></li>
142
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card</a></li>
143
                    </ul>
144
                </div>
145
            </td>
146
            <td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a></td>
139
        </tr>
147
        </tr>
140
        [% END %]
148
        [% END %]
141
    [% END %]</tbody>
149
    [% END %]</tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-2 / +12 lines)
Lines 92-99 Link Here
92
                      [% END %]
92
                      [% END %]
93
                  </ul>
93
                  </ul>
94
            </td>
94
            </td>
95
            <td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc | html %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | html %]&amp;booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc | html %]">[% END %]<b>[% reserveloo.ratiocalc | html %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %]
95
            <td class="actions">
96
            [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders | html %] pending</b>[% END %]</p>[% END %]</td>
96
                <p>
97
                    [% IF ( reserveloo.thisratio_atleast1 ) %]
98
                        [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc | html %] -->
99
                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | html %]&amp;booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc | html %]" class="btn btn-default btn-xs"><b><i class="fa fa-plus"></i> [% reserveloo.ratiocalc | html %] to order</b></a>
100
                        [% END %]
101
                        [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders | html %] pending</b>[% END %]
102
                    [% ELSE %]
103
                        0 to order
104
                    [% END %]
105
                </p>
106
            </td>
97
        </tr>
107
        </tr>
98
      [% END %]
108
      [% END %]
99
      </tbody>
109
      </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/js/additem.js (-5 / +3 lines)
Lines 87-99 function constructTrNode(index, unique_item_fields) { Link Here
87
        'stocknumber', 'ccode', 'itype', 'materials', 'itemnotes'];
87
        'stocknumber', 'ccode', 'itype', 'materials', 'itemnotes'];
88
88
89
    var result = "<tr idblock='" + index + "'>";
89
    var result = "<tr idblock='" + index + "'>";
90
    var edit_link = "<a href='#itemfieldset' style='text-decoration:none' onclick='showItem(\"" + index + "\");'>"
90
    var edit_link = "<a href='#itemfieldset' style='text-decoration:none' onclick='showItem(\"" + index + "\");' class='btn btn-default btn-xs'><i class='fa fa-pencil'></i> "
91
        + (window.MSG_ADDITEM_JS_EDIT || "Edit") + "</a>";
91
        + (window.MSG_ADDITEM_JS_EDIT || "Edit") + "</a>";
92
    var del_link = "<a style='cursor:pointer' "
92
    var del_link = "<a style='cursor:pointer' "
93
        + "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");'>"
93
        + "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");' class='btn btn-default btn-xs'><i class='fa fa-trash'></i> "
94
        + (window.MSG_ADDITEM_JS_DELETE || "Delete") + "</a>";
94
        + (window.MSG_ADDITEM_JS_DELETE || "Delete") + "</a>";
95
    result += "<td>" + edit_link + "</td>";
95
    result += "<td class='actions'>" + edit_link + " " + del_link + "</td>";
96
    result += "<td>" + del_link + "</td>";
97
    for(i in fields) {
96
    for(i in fields) {
98
        var field = fields[i];
97
        var field = fields[i];
99
        var field_elt = $("#" + index)
98
        var field_elt = $("#" + index)
100
- 

Return to bug 16939