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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-1 / +1 lines)
Lines 470-476 Link Here
470
                        </td>
470
                        </td>
471
                        <td><span title="[% batch_lis.staged_date %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 %]</span></td>
471
                        <td><span title="[% batch_lis.staged_date %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 %]</span></td>
472
                        <td>[% batch_lis.num_records %]</td>
472
                        <td>[% batch_lis.num_records %]</td>
473
                        <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]">Add orders</a></td>
473
                        <td class="actions"><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-mini"><i class="fa fa-plus"></i> Add orders</a></td>
474
                      </tr>
474
                      </tr>
475
                      [% END %]
475
                      [% END %]
476
                    </tbody>
476
                    </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt (-9 / +4 lines)
Lines 66-73 Link Here
66
         <th>Summary</th>
66
         <th>Summary</th>
67
         <th>Publisher</th>
67
         <th>Publisher</th>
68
         <th>Copyright</th>
68
         <th>Copyright</th>
69
         <th>&nbsp;</th>
69
         <th>Actions</th>
70
         <th>&nbsp;</th>
71
      </tr>
70
      </tr>
72
    </thead>
71
    </thead>
73
    <tbody>
72
    <tbody>
Lines 89-101 Link Here
89
            <td>
88
            <td>
90
                [% biblio.copyrightdate %]
89
                [% biblio.copyrightdate %]
91
            </td>
90
            </td>
92
        <td>
91
            <td class="actions">
93
        <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber %]&amp;viewas=html" class="previewMARC">View MARC</a>
92
                <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber %]&amp;viewas=html" class="previewMARC btn btn-mini"><i class="fa fa-eye"></i> View MARC</a>
94
        </td>
93
                <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;biblionumber=[% biblio.biblionumber %]" title="Order this one" class="btn btn-mini"><i class="fa fa-plus"></i> Order</a>
95
            <td>
96
            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;biblionumber=[% biblio.biblionumber %]" title="Order this one">
97
                Order
98
            </a>
99
            </td>
94
            </td>
100
        </tr>
95
        </tr>
101
      [% END %]
96
      [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-2 / +1 lines)
Lines 423-430 $(document).ready(function() Link Here
423
              <table>
423
              <table>
424
                  <thead>
424
                  <thead>
425
                      <tr>
425
                      <tr>
426
                          <th>&nbsp;</th>
426
                          <th>Actions</th>
427
                          <th>&nbsp;</th>
428
                          <th>Barcode</th>
427
                          <th>Barcode</th>
429
                          <th>Home library</th>
428
                          <th>Home library</th>
430
                          <th>Holding library</th>
429
                          <th>Holding library</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-3 / +3 lines)
Lines 94-105 Link Here
94
                                        <span title="0000-00-00"></span>
94
                                        <span title="0000-00-00"></span>
95
                                    [% END %]
95
                                    [% END %]
96
                                </td>
96
                                </td>
97
                                <td>
97
                                <td class="actions">
98
                                    [% IF (sub.alreadyOnOrder) %]
98
                                    [% IF (sub.alreadyOnOrder) %]
99
                                        Outstanding order (only one order per subscription is allowed)
99
                                        Outstanding order (only one order per subscription is allowed)
100
                                    [% ELSIF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%]
100
                                    [% ELSIF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%]
101
                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;biblionumber=[% sub.biblionumber %]&amp;subscriptionid=[% sub.subscriptionid %]" title="Order this one">
101
                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;biblionumber=[% sub.biblionumber %]&amp;subscriptionid=[% sub.subscriptionid %]" title="Order this one" class="btn btn-mini">
102
                                            Order
102
                                            <i class="fa fa-plus"></i> Order
103
                                        </a>
103
                                        </a>
104
                                    [% ELSE %]
104
                                    [% ELSE %]
105
                                        <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>
105
                                        <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-4 / +14 lines)
Lines 130-137 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
130
        <th>Author</th>
130
        <th>Author</th>
131
        <th>ISBN</th>
131
        <th>ISBN</th>
132
        <th>LCCN</th>
132
        <th>LCCN</th>
133
        <th>Preview</th>
133
        <th>&nbsp;</th>
134
		<th>&nbsp;</th>
134
        <th>&nbsp;</th>
135
    </tr></thead>
135
    </tr></thead>
136
    <tbody>[% FOREACH breeding_loo IN breeding_loop %]
136
    <tbody>[% FOREACH breeding_loo IN breeding_loop %]
137
        [% IF ( breeding_loo.breedingid ) %]
137
        [% IF ( breeding_loo.breedingid ) %]
Lines 142-149 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
142
            <td>[% breeding_loo.author %]</td>
142
            <td>[% breeding_loo.author %]</td>
143
            <td>[% breeding_loo.isbn %]</td>
143
            <td>[% breeding_loo.isbn %]</td>
144
            <td>[% breeding_loo.lccn %]</td>
144
            <td>[% breeding_loo.lccn %]</td>
145
            <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" title="MARC" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" title="Card" class="previewData">Card</a></td>
145
            <td>
146
            <td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order</a></td>
146
                <div class="dropdown">
147
                    <a class="btn btn-mini dropdown-toggle" id="z3950preview[% breeding_loo.breedingid %]" role="button" data-toggle="dropdown" href="#">
148
                        Preview <b class="caret"></b>
149
                    </a>
150
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="z3950preview[% breeding_loo.breedingid %]">
151
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC</a></li>
152
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card</a></li>
153
                    </ul>
154
                </div>
155
            </td>
156
            <td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode %]&amp;breedingid=[% breeding_loo.breedingid %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]" class="btn btn-mini"><i class="fa fa-plus"></i> Order</a></td>
147
157
148
        </tr>
158
        </tr>
149
        [% END %]
159
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-2 / +12 lines)
Lines 111-118 Link Here
111
                      [% END %]
111
                      [% END %]
112
                  </ul>
112
                  </ul>
113
            </td>
113
            </td>
114
            <td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc %]">[% END %]<b>[% reserveloo.ratiocalc %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %]
114
            <td class="actions">
115
            [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders %] pending</b>[% END %]</p>[% END %]</td>
115
                <p>
116
                    [% IF ( reserveloo.thisratio_atleast1 ) %]
117
                        [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc %] -->
118
                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc %]" class="btn btn-mini"><b><i class="fa fa-plus"></i> [% reserveloo.ratiocalc %] to order</b></a>
119
                        [% END %]
120
                        [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders %] pending</b>[% END %]
121
                    [% ELSE %]
122
                        0 to order
123
                    [% END %]
124
                </p>
125
            </td>
116
        </tr>
126
        </tr>
117
      [% END %]
127
      [% END %]
118
      </tbody>
128
      </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-mini'><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-mini'><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