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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt (-24 / +28 lines)
Lines 109-115 Link Here
109
    <div class="dialog alert">Contract has not been deleted. Maybe a basket linked to this contract exists.</div>
109
    <div class="dialog alert">Contract has not been deleted. Maybe a basket linked to this contract exists.</div>
110
[% END %]
110
[% END %]
111
111
112
                [% IF ( add_form ) %]
112
            [% IF ( add_form ) %]
113
                <div class="page-section">
113
                    <form name="Aform" action="/cgi-bin/koha/admin/aqcontract.pl" id="add_modify_contract" method="post">
114
                    <form name="Aform" action="/cgi-bin/koha/admin/aqcontract.pl" id="add_modify_contract" method="post">
114
                        <input type="hidden" name="op" value="add_validate" />
115
                        <input type="hidden" name="op" value="add_validate" />
115
                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
116
                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
Lines 150-155 Link Here
150
                            <input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&amp;contractnumber=[% contractnumber | html %]">Cancel</a>
151
                            <input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&amp;contractnumber=[% contractnumber | html %]">Cancel</a>
151
                        </fieldset>
152
                        </fieldset>
152
                    </form>
153
                    </form>
154
                </div> <!-- /.page-section -->
153
            [% END %]
155
            [% END %]
154
            [% IF ( add_validate ) %]
156
            [% IF ( add_validate ) %]
155
                <h1>Data recorded</h1>
157
                <h1>Data recorded</h1>
Lines 191-219 Link Here
191
            [% IF ( else ) %]
193
            [% IF ( else ) %]
192
                <h1>Contract(s) of [% booksellername | html %]</h1>
194
                <h1>Contract(s) of [% booksellername | html %]</h1>
193
                [% IF ( loop ) %]
195
                [% IF ( loop ) %]
194
                    <table>
196
                    <div class="page-section">
195
                        <tr>
197
                        <table>
196
                            <th scope="col">Name</th>
198
                            <tr>
197
                            <th scope="col">Description</th>
199
                                <th scope="col">Name</th>
198
                            <th scope="col">Start date</th>
200
                                <th scope="col">Description</th>
199
                            <th scope="col">End date</th>
201
                                <th scope="col">Start date</th>
200
                            <th scope="col">Actions</th>
202
                                <th scope="col">End date</th>
201
                        </tr>
203
                                <th scope="col">Actions</th>
202
                    [% FOREACH loo IN loop %]
204
                            </tr>
203
                        <tr>
205
                            [% FOREACH loo IN loop %]
204
                        <td>
206
                                <tr>
205
                            <a href="[% loo.script_name | url %]?op=add_form&amp;booksellerid=[% loo.booksellerid | uri %]&amp;contractnumber=[% loo.contractnumber | uri %]">[% loo.contractname | html %]</a>
207
                                    <td>
206
                        </td>
208
                                        <a href="[% loo.script_name | url %]?op=add_form&amp;booksellerid=[% loo.booksellerid | uri %]&amp;contractnumber=[% loo.contractnumber | uri %]">[% loo.contractname | html %]</a>
207
                        <td>[% loo.contractdescription | html %]</td>
209
                                    </td>
208
                        <td>[% loo.contractstartdate | html %]</td>
210
                                    <td>[% loo.contractdescription | html %]</td>
209
                        <td>[% loo.contractenddate | html %]</td>
211
                                    <td>[% loo.contractstartdate | html %]</td>
210
                        <td class="actions">
212
                                    <td>[% loo.contractenddate | html %]</td>
211
                            <a href="[% loo.script_name | url %]?op=add_form&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
213
                                    <td class="actions">
212
                            <a href="[% loo.script_name | url %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
214
                                        <a href="[% loo.script_name | url %]?op=add_form&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
213
                        </td>
215
                                        <a href="[% loo.script_name | url %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
214
                        </tr>
216
                                    </td>
215
                    [% END %]
217
                                </tr>
216
                </table>
218
                            [% END %]
219
                        </table>
220
                    </div> <!-- /.page-section -->
217
                [% ELSE %]
221
                [% ELSE %]
218
                    <div class="dialog message">
222
                    <div class="dialog message">
219
                        There are no contracts with this vendor.
223
                        There are no contracts with this vendor.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt (-115 / +113 lines)
Lines 48-178 Link Here
48
<input type="hidden" name="authcat" value="[% authcat | html %]" />
48
<input type="hidden" name="authcat" value="[% authcat | html %]" />
49
<!-- Budget Lines -->
49
<!-- Budget Lines -->
50
50
51
    [% IF ( budget_lines ) %]
51
    <div class="page-section">
52
52
53
        [% INCLUDE 'budgets-active-currency.inc' %]
53
        [% IF ( budget_lines ) %]
54
        [% IF ( show_actual ) %]
55
            <p><strong>Each cell contain both actual and estimated values.</strong></p>
56
        [% ELSE %]
57
            <p><strong>Cells contain estimated values only.</strong></p>
58
        [% END %]
59
60
    <p id="selections">
61
        <strong>Show/hide columns:</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall"/><label for="showall">Show all columns</label></span> <span><input type="checkbox" id="hideall"/><label for="hideall">Hide all columns</label></span>
62
        [% FOREACH authvals_ro IN authvals_row %]
63
            <span class="selected"><label><input type="checkbox" checked="checked" id="col[% authvals_ro.colnum | html %]">[% authvals_ro.code | html %]</label></span>
64
        [% END %]
65
    </p>
66
    <table id="plan">
67
    <thead>
68
    <tr>
69
    <th>Fund name</th>
70
    <th>Fund total</th>
71
54
72
    [% FOREACH authvals_ro IN authvals_row %]
55
            [% INCLUDE 'budgets-active-currency.inc' %]
73
         [% IF ( authvals_ro.display ) %]
56
            [% IF ( show_actual ) %]
74
            <th id="col[% authvals_ro.code | html %]" class="[% authvals_ro.colnum | html %]">
57
                <p><strong>Each cell contain both actual and estimated values.</strong></p>
75
        [% ELSE %]
76
            <th id="col[% authvals_ro.code | html %]" style="display:none;" class="[% authvals_ro.colnum | html %]">
77
        [% END %]
78
79
    [% authvals_ro.code | html %]</th>
80
    [% END %]
81
82
    <th class="remaining">Fund remaining</th>
83
    <th class="noExport">Actions</th>
84
    </tr>
85
    </thead>
86
87
    <tbody>
88
    [% FOREACH budget_line IN budget_lines %]
89
    <tr id="[% budget_line.budget_id | html %]">
90
        [% IF ( budget_line.budget_lock ) %]
91
            <td class="locked" title="Fund locked">
92
        [% ELSE %]
93
            <td>
94
        [% END %]
95
        <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budget_line.budget_id | uri %]&amp;budget_period_id=[% budget_period_id | uri %]">[% budget_line.budget_name | html %]</a></td>
96
        <td><span id="[% budget_line.budget_amount | html %]">[% budget_line.budget_amount | $Price %]&nbsp;</span>
97
98
99
        <!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS -->
100
        <div style="display:none;" id="budget_tot_[% budget_line.budget_id | html %]">[% budget_line.budget_amount | html %]</div></td>
101
102
        [% FOREACH line IN budget_line.lines %]
103
            [% IF ( line.display ) %]
104
                <td class="[% line.colnum | html %]">
105
            [% ELSE %]
58
            [% ELSE %]
106
                <td style="display:none;" class="[% line.colnum | html %]">
59
                <p><strong>Cells contain estimated values only.</strong></p>
60
            [% END %]
61
62
        <p id="selections">
63
            <strong>Show/hide columns:</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall"/><label for="showall">Show all columns</label></span> <span><input type="checkbox" id="hideall"/><label for="hideall">Hide all columns</label></span>
64
            [% FOREACH authvals_ro IN authvals_row %]
65
                <span class="selected"><label><input type="checkbox" checked="checked" id="col[% authvals_ro.colnum | html %]">[% authvals_ro.code | html %]</label></span>
107
            [% END %]
66
            [% END %]
108
            <table class="invis">
67
        </p>
68
        <table id="plan">
69
            <thead>
109
                <tr>
70
                <tr>
110
                    [% IF show_actual %]
71
                    <th>Fund name</th>
111
                        <td    >[% line.actual_amount | html %]</td>
72
                    <th>Fund total</th>
73
                    [% FOREACH authvals_ro IN authvals_row %]
74
                        [% IF ( authvals_ro.display ) %]
75
                            <th id="col[% authvals_ro.code | html %]" class="[% authvals_ro.colnum | html %]">
76
                        [% ELSE %]
77
                            <th id="col[% authvals_ro.code | html %]" style="display:none;" class="[% authvals_ro.colnum | html %]">
78
                        [% END %]
79
                        [% authvals_ro.code | html %]</th>
112
                    [% END %]
80
                    [% END %]
113
                <td>
81
                    <th class="remaining">Fund remaining</th>
114
82
                    <th class="noExport">Actions</th>
115
                [% IF ( line.budget_lock ) %]
83
                </tr>
116
                    [% line.estimated_amount | html %]&nbsp;
84
            </thead>
117
                    <input type="hidden" style="text-align: right;"  name="[% line.cell_name | html %]" value="[% line.estimated_amount | html %]"   />
85
118
                [% ELSE %]
86
            <tbody>
119
                    <input type="text" size="6" name="[% line.cell_name | html %]"  value="[% line.estimated_amount | html %]"  id="budget_[% line.budget_id | html %][% line.colnum | html %]" class="plan_entry plan_entry_[% line.budget_id | html %]" />
87
                [% FOREACH budget_line IN budget_lines %]
88
                    <tr id="[% budget_line.budget_id | html %]">
89
                        [% IF ( budget_line.budget_lock ) %]
90
                            <td class="locked" title="Fund locked">
91
                        [% ELSE %]
92
                            <td>
93
                        [% END %]
94
                            <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budget_line.budget_id | uri %]&amp;budget_period_id=[% budget_period_id | uri %]">[% budget_line.budget_name | html %]</a></td>
95
                        <td><span id="[% budget_line.budget_amount | html %]">[% budget_line.budget_amount | $Price %]&nbsp;</span>
96
                        <!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS -->
97
                        <div style="display:none;" id="budget_tot_[% budget_line.budget_id | html %]">[% budget_line.budget_amount | html %]</div></td>
98
99
                        [% FOREACH line IN budget_line.lines %]
100
                            [% IF ( line.display ) %]
101
                                <td class="[% line.colnum | html %]">
102
                            [% ELSE %]
103
                                <td style="display:none;" class="[% line.colnum | html %]">
104
                            [% END %]
105
                                <table class="invis">
106
                                    <tr>
107
                                        [% IF show_actual %]
108
                                            <td    >[% line.actual_amount | html %]</td>
109
                                        [% END %]
110
                                    <td>
111
112
                                        [% IF ( line.budget_lock ) %]
113
                                            [% line.estimated_amount | html %]&nbsp;
114
                                            <input type="hidden" style="text-align: right;"  name="[% line.cell_name | html %]" value="[% line.estimated_amount | html %]"   />
115
                                        [% ELSE %]
116
                                            <input type="text" size="6" name="[% line.cell_name | html %]"  value="[% line.estimated_amount | html %]"  id="budget_[% line.budget_id | html %][% line.colnum | html %]" class="plan_entry plan_entry_[% line.budget_id | html %]" />
117
                                        [% END %]
118
119
                                    </td></tr>
120
                                </table>
121
                            </td>
122
                        [% END %]
123
124
                        <td>
125
                            <table class="invis">
126
                                <tr>
127
                                    [% IF show_actual %]
128
                                        [% IF ( budget_line.act_negative ) %]
129
                                            <td style="color: red;">
130
                                        [% ELSIF ( budget_line.act_positive ) %]
131
                                            <td style="color: green;">
132
                                        [% ELSE %]
133
                                            <td>
134
                                        [% END %]
135
                                        [% budget_line.budget_act_remain | html %]
136
                                        </td>
137
                                    [% END %]
138
139
                                    [% IF ( budget_line.est_negative ) %]
140
                                        <td style="color: red;" id="budget_est_[% budget_line.budget_id | html %]">
141
                                    [% ELSIF ( budget_line.est_positive ) %]
142
                                        <td style="color: green;" id="budget_est_[% budget_line.budget_id | html %]">
143
                                    [% ELSE %]
144
                                        <td id="budget_est_[% budget_line.budget_id | html %]">
145
                                    [% END %]
146
                                        [% budget_line.budget_est_remain | $Price %]&nbsp;
147
                                    </td>
148
                                </tr>
149
                            </table>
150
                        </td>
151
152
                        <td class="actions">
153
                            [% UNLESS ( budget_line.budget_lock ) %]
154
                                <input type="button" class="auto_fill_row btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" value="Auto-fill row"/>
155
                                <input type="button" class="clear_fields btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" value="Clear">
156
                            [% ELSE %]
157
                                <div style="color:red;">not owned</div>
158
                            [% END %]
159
                        </td>
160
                    </tr>
120
                [% END %]
161
                [% END %]
121
162
            </tbody>
122
                </td></tr>
123
            </table>
124
            </td>
125
        [% END %]
126
127
        <td>
128
        <table class="invis">
129
            <tr>
130
       [% IF show_actual %]
131
            [% IF ( budget_line.act_negative ) %]
132
                <td style="color: red;">
133
            [% ELSIF ( budget_line.act_positive ) %]
134
                <td style="color: green;">
135
            [% ELSE %]
136
                <td>
137
            [% END %]
138
                    [% budget_line.budget_act_remain | html %]
139
            </td>
140
        [% END %]
141
142
        [% IF ( budget_line.est_negative ) %]
143
            <td style="color: red;" id="budget_est_[% budget_line.budget_id | html %]">
144
        [% ELSIF ( budget_line.est_positive ) %]
145
            <td style="color: green;" id="budget_est_[% budget_line.budget_id | html %]">
146
        [% ELSE %]
147
            <td id="budget_est_[% budget_line.budget_id | html %]">
148
        [% END %] 
149
                [% budget_line.budget_est_remain | $Price %]&nbsp;
150
            </td>
151
            </tr>
152
        </table>
163
        </table>
153
        </td>
154
164
155
        <td class="actions">
165
        <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
156
             [% UNLESS ( budget_line.budget_lock ) %]
166
        [% IF ( budget_period_locked ) %]
157
                    <input type="button" class="auto_fill_row btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" value="Auto-fill row"/>
167
            <!-- <input STYLE="background: gray;"   type="submit" value="Save" disabled="disabled"/> -->
158
                    <input type="button" class="clear_fields btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" value="Clear">
168
        [% ELSE %]
159
            [% ELSE %]
169
            <input type="hidden" name="op" value="save" />
160
             <div style="color:red;">not owned</div>
170
            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
161
            [% END %]
171
        [% END %]
162
        </td>
163
        </tr>
164
    [% END %]
165
    </tbody>
166
    </table>
167
168
    <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
169
    [% IF ( budget_period_locked ) %]
170
        <!-- <input STYLE="background: gray;"   type="submit" value="Save" disabled="disabled"/> -->
171
    [% ELSE %]
172
        <input type="hidden" name="op" value="save" />
173
        <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
174
    [% END %]
175
172
173
    </div> <!-- /.page-section -->
176
174
177
<div id="hide_div">
175
<div id="hide_div">
178
    [% FOREACH authvals_ro IN authvals_row %]
176
    [% FOREACH authvals_ro IN authvals_row %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt (-23 / +25 lines)
Lines 182-210 Link Here
182
    [% END %]
182
    [% END %]
183
183
184
    [% IF desks.count %]
184
    [% IF desks.count %]
185
        <table id="table_desks">
185
        <div class="page-section">
186
            <thead>
186
            <table id="table_desks">
187
                <tr>
187
                <thead>
188
                    <th>Desk ID</th>
188
                    <tr>
189
                    <th>Desk</th>
189
                        <th>Desk ID</th>
190
                    <th>Library</th>
190
                        <th>Desk</th>
191
                    <th class="NoSort noExport">Action</th>
191
                        <th>Library</th>
192
                </tr>
192
                        <th class="NoSort noExport">Action</th>
193
            </thead>
193
                    </tr>
194
            <tbody>
194
                </thead>
195
                [% FOREACH desk IN desks %]
195
                <tbody>
196
                <tr>
196
                    [% FOREACH desk IN desks %]
197
                    <td>[% desk.desk_id | html %]</td>
197
                    <tr>
198
                    <td>[% desk.desk_name | html %]</td>
198
                        <td>[% desk.desk_id | html %]</td>
199
                    <td>[% Branches.GetName( desk.branchcode ) | html %]</td>
199
                        <td>[% desk.desk_name | html %]</td>
200
                    <td class="actions">
200
                        <td>[% Branches.GetName( desk.branchcode ) | html %]</td>
201
                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/desks.pl?op=add_form&amp;desk_id=[% desk.desk_id | html %]"><i class="fa fa-pencil"></i> Edit</a>
201
                        <td class="actions">
202
                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/desks.pl?op=delete_confirm&amp;desk_id=[% desk.desk_id | html %]"><i class="fa fa-trash"></i> Delete</a>
202
                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/desks.pl?op=add_form&amp;desk_id=[% desk.desk_id | html %]"><i class="fa fa-pencil"></i> Edit</a>
203
                    </td>
203
                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/desks.pl?op=delete_confirm&amp;desk_id=[% desk.desk_id | html %]"><i class="fa fa-trash"></i> Delete</a>
204
                </tr>
204
                        </td>
205
                [% END %]
205
                    </tr>
206
            </tbody>
206
                    [% END %]
207
        </table>
207
                </tbody>
208
            </table>
209
        </div> <!-- /.page-section -->
208
    [% ELSE %]
210
    [% ELSE %]
209
        <div class="dialog message">
211
        <div class="dialog message">
210
            There are no desks defined. <a href="/cgi-bin/koha/admin/desks.pl?op=add_form">Create a new desk</a>.
212
            There are no desks defined. <a href="/cgi-bin/koha/admin/desks.pl?op=add_form">Create a new desk</a>.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt (-88 / +91 lines)
Lines 45-138 Link Here
45
      [% UNLESS ( mappings ) %]
45
      [% UNLESS ( mappings ) %]
46
        <div class="dialog alert"><p><strong>Warning:</strong> No mappings have been defined for this set</p></div>
46
        <div class="dialog alert"><p><strong>Warning:</strong> No mappings have been defined for this set</p></div>
47
      [% END %]
47
      [% END %]
48
      <form action="/cgi-bin/koha/admin/oai_set_mappings.pl" method="post" id="mappingform">
48
49
        <table id="mappings">
49
        <div class="page-section">
50
          <thead>
50
            <form action="/cgi-bin/koha/admin/oai_set_mappings.pl" method="post" id="mappingform">
51
            <tr>
51
                <table id="mappings">
52
              <th>Rule operator</th>
52
                    <thead>
53
              <th>Field</th>
53
                        <tr>
54
              <th>Subfield</th>
54
                        <th>Rule operator</th>
55
              <th>Operator</th>
55
                        <th>Field</th>
56
              <th>Value</th>
56
                        <th>Subfield</th>
57
              <th>&nbsp;</th>
57
                        <th>Operator</th>
58
              <th>&nbsp;</th>
58
                        <th>Value</th>
59
            </tr>
59
                        <th>&nbsp;</th>
60
          </thead>
60
                        <th>&nbsp;</th>
61
          <tbody>
61
                        </tr>
62
            [% IF ( mappings ) %]
62
                    </thead>
63
              [% FOREACH mapping IN mappings %]
63
                    <tbody>
64
                <tr>
64
                        [% IF ( mappings ) %]
65
                  <td>
65
                            [% FOREACH mapping IN mappings %]
66
                  <select name="rule_operator">
66
                                <tr>
67
                    [% IF (mapping.rule_operator == 'and') %]
67
                                    <td>
68
                    <option value="and" selected="selected">and</option>
68
                                    <select name="rule_operator">
69
                    [% ELSE %]
69
                                        [% IF (mapping.rule_operator == 'and') %]
70
                    <option value="and">and</option>
70
                                        <option value="and" selected="selected">and</option>
71
                    [% END %]
71
                                        [% ELSE %]
72
                    [% IF (mapping.rule_operator == 'or') %]
72
                                        <option value="and">and</option>
73
                    <option value="or" selected="selected">or</option>
73
                                        [% END %]
74
                    [% ELSE %]
74
                                        [% IF (mapping.rule_operator == 'or') %]
75
                    <option value="or">or</option>
75
                                        <option value="or" selected="selected">or</option>
76
                    [% END %]
76
                                        [% ELSE %]
77
                  </select>
77
                                        <option value="or">or</option>
78
                  </td>
78
                                        [% END %]
79
                  <td><input type="text" name="marcfield" size="3" value="[% mapping.marcfield | html %]" /></td>
79
                                    </select>
80
                  <td><input type="text" name="marcsubfield" size="1" value="[% mapping.marcsubfield | html %]" /></td>
80
                                    </td>
81
                  <td><select name=operator>
81
                                    <td><input type="text" name="marcfield" size="3" value="[% mapping.marcfield | html %]" /></td>
82
                      [% IF mapping.operator == 'equal' %]
82
                                    <td><input type="text" name="marcsubfield" size="1" value="[% mapping.marcsubfield | html %]" /></td>
83
                        <option value="equal" selected="selected">is equal to</option>
83
                                    <td><select name=operator>
84
                        <option value="notequal">not equal to</option>
84
                                        [% IF mapping.operator == 'equal' %]
85
                      [% ELSE %]
85
                                            <option value="equal" selected="selected">is equal to</option>
86
                        <option value="equal">is equal to</option>
86
                                            <option value="notequal">not equal to</option>
87
                        <option value="notequal" selected="selected">not equal to</option>
87
                                        [% ELSE %]
88
                      [% END %]
88
                                            <option value="equal">is equal to</option>
89
                      </select></td>
89
                                            <option value="notequal" selected="selected">not equal to</option>
90
                  <td><input type="text" name="marcvalue" value="[% mapping.marcvalue | html %]" /></td>
90
                                        [% END %]
91
                  <td>
91
                                        </select></td>
92
                    [% IF ( loop.last ) %]
92
                                    <td><input type="text" name="marcvalue" value="[% mapping.marcvalue | html %]" /></td>
93
                        <button type="button" id="new_rule_button" class="btn btn-default btn-xs" title="Add another condition"><i class="fa fa-plus"></i> Add</button>
93
                                    <td>
94
                    [% END %]
94
                                        [% IF ( loop.last ) %]
95
                  </td>
95
                                            <button type="button" id="new_rule_button" class="btn btn-default btn-xs" title="Add another condition"><i class="fa fa-plus"></i> Add</button>
96
                  <td><button class="btn btn-default btn-xs clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td>
96
                                        [% END %]
97
                </tr>
97
                                    </td>
98
              [% END %]
98
                                    <td><button class="btn btn-default btn-xs clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td>
99
            [% ELSE %]
99
                                </tr>
100
              <tr>
100
                            [% END %]
101
                <td>
101
                        [% ELSE %]
102
                  <select name="rule_operator">
102
                            <tr>
103
                    [% IF (mapping.rule_operator == 'and') %]
103
                                <td>
104
                    <option value="and" selected="selected">and</option>
104
                                    <select name="rule_operator">
105
                    [% ELSE %]
105
                                        [% IF (mapping.rule_operator == 'and') %]
106
                    <option value="and">and</option>
106
                                            <option value="and" selected="selected">and</option>
107
                    [% END %]
107
                                        [% ELSE %]
108
                    [% IF (mapping.rule_operator == 'or') %]
108
                                            <option value="and">and</option>
109
                    <option value="or" selected="selected">or</option>
109
                                        [% END %]
110
                    [% ELSE %]
110
                                        [% IF (mapping.rule_operator == 'or') %]
111
                    <option value="or">or</option>
111
                                            <option value="or" selected="selected">or</option>
112
                    [% END %]
112
                                        [% ELSE %]
113
                  </select>
113
                                            <option value="or">or</option>
114
                </td>
114
                                        [% END %]
115
                <td><input type="text" name="marcfield" size="3" /></td>
115
                                    </select>
116
                <td><input type="text" name="marcsubfield" size="1" /></td>
116
                                </td>
117
                <td><select name=operator>
117
                                <td><input type="text" name="marcfield" size="3" /></td>
118
                    <option value="equal">is equal to</option>
118
                                <td><input type="text" name="marcsubfield" size="1" /></td>
119
                    <option value="notequal">not equal to</option>
119
                                <td><select name=operator>
120
                    </select></td>
120
                                    <option value="equal">is equal to</option>
121
                <td><input type="text" name="marcvalue" /></td>
121
                                    <option value="notequal">not equal to</option>
122
                <td>
122
                                    </select></td>
123
                    <button type="button" id="new_rule_button" class="btn btn-default btn-xs" title="Add another condition"><i class="fa fa-plus"></i> Add</button>
123
                                <td><input type="text" name="marcvalue" /></td>
124
                </td>
124
                                <td>
125
                <td><button class="btn btn-default btn-xs clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td>
125
                                    <button type="button" id="new_rule_button" class="btn btn-default btn-xs" title="Add another condition"><i class="fa fa-plus"></i> Add</button>
126
              </tr>
126
                                </td>
127
            [% END %]
127
                                <td><button class="btn btn-default btn-xs clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td>
128
          </tbody>
128
                            </tr>
129
        </table>
129
                        [% END %]
130
        <input type="hidden" name="id" value="[% id | html %]" />
130
                    </tbody>
131
        <input type="hidden" name="op" value="save" />
131
                </table>
132
        <fieldset class="action">
132
                <input type="hidden" name="id" value="[% id | html %]" />
133
            <input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>
133
                <input type="hidden" name="op" value="save" />
134
        </fieldset>
134
                <fieldset class="action">
135
      </form>
135
                    <input type="submit" class="btn btn-primary" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>
136
                </fieldset>
137
            </form>
138
        </div> <!-- /.page-section -->
136
139
137
            </main>
140
            </main>
138
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
141
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt (-28 / +29 lines)
Lines 37-71 Link Here
37
37
38
                <h1>OverDrive library authnames</h1>
38
                <h1>OverDrive library authnames</h1>
39
39
40
                <form action="/cgi-bin/koha/admin/overdrive.pl" name="overdrive_form" method="post" class="validated">
40
                <div class="page-section">
41
                    <input type="hidden" name="op" value="update" />
41
                    <form action="/cgi-bin/koha/admin/overdrive.pl" name="overdrive_form" method="post" class="validated">
42
42
                        <input type="hidden" name="op" value="update" />
43
                    <table id="od_info">
44
                        <thead>
45
                            <tr>
46
                                <th>Library</th>
47
                                <th>Authname</th>
48
                            </tr>
49
                        </thead>
50
                        <tbody>
51
                            [% FOREACH b IN branches %]
52
                            <tr>
53
                                <td>
54
                                    [% Branches.GetName( b.branchcode ) | html %]
55
                                    <input type="hidden" name="branchcode" value="[% b.branchcode | html %]" />
56
                                </td>
57
                                <td>
58
                                    <input type="text" name="authname" value="[% b.authname | html %]" />
59
                                </td>
60
                            </tr>
61
                            [% END %]
62
                        </tbody>
63
                    </table>
64
                    <div class="action">
65
                        <input type="submit" class="btn btn-primary" value="Submit" />
66
                    </div>
67
                </form>
68
43
44
                        <table id="od_info">
45
                            <thead>
46
                                <tr>
47
                                    <th>Library</th>
48
                                    <th>Authname</th>
49
                                </tr>
50
                            </thead>
51
                            <tbody>
52
                                [% FOREACH b IN branches %]
53
                                <tr>
54
                                    <td>
55
                                        [% Branches.GetName( b.branchcode ) | html %]
56
                                        <input type="hidden" name="branchcode" value="[% b.branchcode | html %]" />
57
                                    </td>
58
                                    <td>
59
                                        <input type="text" name="authname" value="[% b.authname | html %]" />
60
                                    </td>
61
                                </tr>
62
                                [% END %]
63
                            </tbody>
64
                        </table>
65
                        <div class="action">
66
                            <input type="submit" class="btn btn-primary" value="Submit" />
67
                        </div>
68
                    </form>
69
                </div> <!-- /.page-section -->
69
            </main>
70
            </main>
70
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
71
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
71
72
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt (-27 / +27 lines)
Lines 41-76 Link Here
41
                <h1>SMS cellular providers</h1>
41
                <h1>SMS cellular providers</h1>
42
42
43
                [% IF providers.count %]
43
                [% IF providers.count %]
44
44
                    <div id="providers" class="page-section">
45
                    <table id="providerst">
45
                        <table>
46
                        <thead>
46
                            <thead>
47
                            <tr>
48
                                <th>Name</th>
49
                                <th>Domain</th>
50
                                <th title="Patrons using this provider">Patrons</th>
51
                                <th>&nbsp;</th>
52
                            </tr>
53
                        </thead>
54
55
                        <tbody>
56
                            [% FOREACH p IN providers %]
57
                                <tr>
47
                                <tr>
58
                                    <td id="name_[% p.id | html %]">[% p.name | html %]</td>
48
                                    <th>Name</th>
59
                                    <td id="domain_[% p.id | html %]">[% p.domain | html %]</td>
49
                                    <th>Domain</th>
60
                                    <td id="patrons_using_[% p.id | html %]">[% p.patrons_using | html %]</td>
50
                                    <th title="Patrons using this provider">Patrons</th>
61
                                    <td class="actions">
51
                                    <th>&nbsp;</th>
62
                                        <a class="btn btn-default btn-xs edit" href="#" id="edit_[% p.id | html %]" data-providerid="[% p.id | html %]">
63
                                            <i class="fa fa-pencil"></i> Edit
64
                                        </a>
65
                                        <a class="btn btn-default btn-xs delete" href="#" data-providerid="[% p.id | html %]" data-patrons_using="[% p.patrons_using | html %]" id="delete_[% p.id | html %]">
66
                                            <i class="fa fa-trash"></i> Delete
67
                                        </a>
68
                                    </td>
69
                                </tr>
52
                                </tr>
70
                            [% END %]
53
                            </thead>
71
                        </tbody>
72
                    </table>
73
54
55
                            <tbody>
56
                                [% FOREACH p IN providers %]
57
                                    <tr>
58
                                        <td id="name_[% p.id | html %]">[% p.name | html %]</td>
59
                                        <td id="domain_[% p.id | html %]">[% p.domain | html %]</td>
60
                                        <td id="patrons_using_[% p.id | html %]">[% p.patrons_using | html %]</td>
61
                                        <td class="actions">
62
                                            <a class="btn btn-default btn-xs edit" href="#" id="edit_[% p.id | html %]" data-providerid="[% p.id | html %]">
63
                                                <i class="fa fa-pencil"></i> Edit
64
                                            </a>
65
                                            <a class="btn btn-default btn-xs delete" href="#" data-providerid="[% p.id | html %]" data-patrons_using="[% p.patrons_using | html %]" id="delete_[% p.id | html %]">
66
                                                <i class="fa fa-trash"></i> Delete
67
                                            </a>
68
                                        </td>
69
                                    </tr>
70
                                [% END %]
71
                            </tbody>
72
                        </table>
73
                    </div> <!-- /.page-section -->
74
                [% ELSE %]
74
                [% ELSE %]
75
75
76
                    <div class="dialog message">
76
                    <div class="dialog message">
(-)a/koha-tmpl/intranet-tmpl/prog/js/sms_providers.js (-4 / +3 lines)
Lines 34-40 function add_provider(){ Link Here
34
    clear_form();
34
    clear_form();
35
    $(".dialog").hide();
35
    $(".dialog").hide();
36
    $("legend").text( __("Add an SMS cellular provider") );
36
    $("legend").text( __("Add an SMS cellular provider") );
37
    $("#toolbar,#submit_update,#providerst").hide();
37
    $("#toolbar,#submit_update,#providers").hide();
38
    $("#sms_add_form,#submit_save").show();
38
    $("#sms_add_form,#submit_save").show();
39
    $("#name").focus();
39
    $("#name").focus();
40
}
40
}
Lines 48-54 function edit_provider( id ) { Link Here
48
    $("#name").val( $("#name_" + id).text() );
48
    $("#name").val( $("#name_" + id).text() );
49
    $("#domain").val( $("#domain_" + id).text() );
49
    $("#domain").val( $("#domain_" + id).text() );
50
50
51
    $("#toolbar,#submit_save,#providerst").hide();
51
    $("#toolbar,#submit_save,#providers").hide();
52
52
53
    $("#name").focus();
53
    $("#name").focus();
54
}
54
}
Lines 58-64 function cancel_edit() { Link Here
58
    clear_form();
58
    clear_form();
59
    $(".dialog").show();
59
    $(".dialog").show();
60
    $("#sms_add_form,#submit_update").hide();
60
    $("#sms_add_form,#submit_update").hide();
61
    $("#toolbar,#submit_save,#providerst").show();
61
    $("#toolbar,#submit_save,#providers").show();
62
}
62
}
63
63
64
function delete_provider( id, users ) {
64
function delete_provider( id, users ) {
65
- 

Return to bug 32618