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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc (-3 / +3 lines)
Lines 1-11 Link Here
1
[% USE AuthorisedValues %]
1
[% USE AuthorisedValues %]
2
[% FOR field IN available %]
2
[% FOR field IN available %]
3
    <li>
3
    <li>
4
        <span class="label"> [% field.name %]: </span>
4
        <span class="label"> [% field.name | html %]: </span>
5
        [% IF field.authorised_value_category %]
5
        [% IF field.authorised_value_category %]
6
            [% AuthorisedValues.GetByCode( field.authorised_value_category, values.${field.name} ) %]
6
            [% AuthorisedValues.GetByCode( field.authorised_value_category, values.${field.name} ) | html %]
7
        [% ELSE %]
7
        [% ELSE %]
8
            [% values.${field.name} %]
8
            [% values.${field.name} | html %]
9
        [% END %]
9
        [% END %]
10
    </li>
10
    </li>
11
[% END %]
11
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc (-8 / +8 lines)
Lines 6-29 Link Here
6
[% END %]
6
[% END %]
7
        [% FOR field IN available %]
7
        [% FOR field IN available %]
8
            <li>
8
            <li>
9
                <label for="additional_field_[% field.id %]"> [% field.name %]: </label>
9
                <label for="additional_field_[% field.id | html %]"> [% field.name | html %]: </label>
10
                [% IF field.authorised_value_category %]
10
                [% IF field.authorised_value_category %]
11
                    <select name="additional_field_[% field.id %]" id="additional_field_[% field.id %]">
11
                    <select name="additional_field_[% field.id | html %]" id="additional_field_[% field.id | html %]">
12
                        <option value="">All</option>
12
                        <option value="">All</option>
13
                        [% FOREACH av IN AuthorisedValues.GetAuthValueDropbox( field.authorised_value_category ) %]
13
                        [% FOREACH av IN AuthorisedValues.GetAuthValueDropbox( field.authorised_value_category ) %]
14
                            [% IF av.authorised_value == values.${field.id} %]
14
                            [% IF av.authorised_value == values.${field.id} %]
15
                                <option value="[% av.authorised_value %]" selected="selected">[% av.lib %]</option>
15
                                <option value="[% av.authorised_value | html %]" selected="selected">[% av.lib | html %]</option>
16
                            [% ELSE %]
16
                            [% ELSE %]
17
                                <option value="[% av.authorised_value %]">[% av.lib %]</option>
17
                                <option value="[% av.authorised_value | html %]">[% av.lib | html %]</option>
18
                            [% END %]
18
                            [% END %]
19
                        [% END %]
19
                        [% END %]
20
                    </select> (Authorised values for [% field.authorised_value_category %])
20
                    </select> (Authorised values for [% field.authorised_value_category | html %])
21
                [% ELSE %]
21
                [% ELSE %]
22
                    [% IF field.marcfield %]
22
                    [% IF field.marcfield %]
23
                        <input type="text" value="[% values.${field.id} %]" id="additional_field_[% field.id %]" name="additional_field_[% field.id %]" readonly="readonly" />
23
                        <input type="text" value="[% values.${field.id} | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" readonly="readonly" />
24
                        This value will be filled with the [% field.marcfield %] subfield of the selected biblio.
24
                        This value will be filled with the [% field.marcfield | html %] subfield of the selected biblio.
25
                    [% ELSE %]
25
                    [% ELSE %]
26
                        <input type="text" value="[% values.${field.id} %]" id="additional_field_[% field.id %]" name="additional_field_[% field.id %]" />
26
                        <input type="text" value="[% values.${field.id} | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" />
27
                    [% END %]
27
                    [% END %]
28
                [% END %]
28
                [% END %]
29
            </li>
29
            </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt (-22 / +18 lines)
Lines 1-15 Link Here
1
[% USE raw %]
1
[% USE Asset %]
2
[% USE Asset %]
2
[% USE AuthorisedValues %]
3
[% USE AuthorisedValues %]
3
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Administration &rsaquo;
6
<title>Koha &rsaquo; Administration &rsaquo;
6
    [% SWITCH op %]
7
    [% SWITCH op %]
7
        [% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name %]'[% ELSE %]Add additional field[% END %]
8
        [% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name | html %]'[% ELSE %]Add additional field[% END %]
8
        [% CASE %]Manage additional fields
9
        [% CASE %]Manage additional fields
9
    [% END %]
10
    [% END %]
10
</title>
11
</title>
11
[% INCLUDE 'doc-head-close.inc' %]
12
[% INCLUDE 'doc-head-close.inc' %]
12
[% Asset.css('css/datatables.css') %]
13
[% Asset.css('css/datatables.css') | $raw %]
13
</head>
14
</head>
14
15
15
[% marcfield_tables = ['subscription'] %]
16
[% marcfield_tables = ['subscription'] %]
Lines 22-29 Link Here
22
    <div id="breadcrumbs">
23
    <div id="breadcrumbs">
23
        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
24
        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
24
        [% SWITCH op %]
25
        [% SWITCH op %]
25
            [% CASE 'add_form' %]<a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a> &rsaquo; [% IF field %]Modify field '[% field.name %]'[% ELSE %]Add field[% END %]
26
            [% CASE 'add_form' %]<a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a> &rsaquo; [% IF field %]Modify field '[% field.name | html %]'[% ELSE %]Add field[% END %]
26
            [% CASE 'list' %]<a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a> &rsaquo; Modify fields for '[% tablename %]'
27
            [% CASE 'list' %]<a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a> &rsaquo; Modify fields for '[% tablename | html %]'
27
            [% CASE %]Manage additional fields
28
            [% CASE %]Manage additional fields
28
        [% END %]
29
        [% END %]
29
    </div>
30
    </div>
Lines 34-40 Link Here
34
    <div class="yui-b">
35
    <div class="yui-b">
35
    [% IF op == 'list' %]
36
    [% IF op == 'list' %]
36
        <div id="toolbar" class="btn-toolbar">
37
        <div id="toolbar" class="btn-toolbar">
37
            <a class="btn btn-default btn-sm" id="newfields" href="?op=add_form&amp;tablename=[% tablename %]"><i class="fa fa-plus"></i> Create field</a>
38
            <a class="btn btn-default btn-sm" id="newfields" href="?op=add_form&amp;tablename=[% tablename | uri %]"><i class="fa fa-plus"></i> Create field</a>
38
        </div>
39
        </div>
39
    [% END %]
40
    [% END %]
40
41
Lines 66-79 Link Here
66
        <h3>Additional fields</h3>
67
        <h3>Additional fields</h3>
67
        <p>Select a table:</p>
68
        <p>Select a table:</p>
68
        [% BLOCK table_option %]
69
        [% BLOCK table_option %]
69
            <li><a href="?tablename=[% value %]">[% content %] (<tt>[% value %]</tt>)</a></li>
70
            <li><a href="?tablename=[% value | uri %]">[% content | html %] (<tt>[% value | html %]</tt>)</a></li>
70
        [% END %]
71
        [% END %]
71
        <ul>
72
        <ul>
72
            [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %]
73
            [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %]
73
            [% WRAPPER table_option value="subscription" %]Subscriptions[% END %]
74
            [% WRAPPER table_option value="subscription" %]Subscriptions[% END %]
74
        </ul>
75
        </ul>
75
    [% ELSIF op == 'list' %]
76
    [% ELSIF op == 'list' %]
76
        <h3>Additional fields for '[% tablename %]'</h3>
77
        <h3>Additional fields for '[% tablename | html %]'</h3>
77
        [% IF fields %]
78
        [% IF fields %]
78
            <table id="fieldst">
79
            <table id="fieldst">
79
                <thead>
80
                <thead>
Lines 90-106 Link Here
90
                <tbody>
91
                <tbody>
91
                    [% FOR field IN fields %]
92
                    [% FOR field IN fields %]
92
                        <tr>
93
                        <tr>
93
                            <td>[% field.name %]</td>
94
                            <td>[% field.name | html %]</td>
94
                            <td>[% field.authorised_value_category %]</td>
95
                            <td>[% field.authorised_value_category | html %]</td>
95
                            [% IF show_marcfield %]
96
                            [% IF show_marcfield %]
96
                                <td>[% field.marcfield %]</td>
97
                                <td>[% field.marcfield | html %]</td>
97
                            [% END %]
98
                            [% END %]
98
                            <td>
99
                            <td>
99
                                [% IF field.searchable %]Yes[% ELSE %]No[% END %]
100
                                [% IF field.searchable %]Yes[% ELSE %]No[% END %]
100
                            </td>
101
                            </td>
101
                            <td class="actions">
102
                            <td class="actions">
102
                                <a class="btn btn-default btn-xs" href="?op=add_form&amp;field_id=[% field.id %]"><i class="fa fa-pencil"></i> Edit</a>
103
                                <a class="btn btn-default btn-xs" href="?op=add_form&amp;field_id=[% field.id | html %]"><i class="fa fa-pencil"></i> Edit</a>
103
                                <a class="confirmdelete btn btn-default btn-xs" href="?op=delete&amp;field_id=[% field.id %]&amp;tablename=[% tablename %]"><i class="fa fa-trash"></i> Delete</a>
104
                                <a class="confirmdelete btn btn-default btn-xs" href="?op=delete&amp;field_id=[% field.id | uri %]&amp;tablename=[% tablename | uri %]"><i class="fa fa-trash"></i> Delete</a>
104
                            </td>
105
                            </td>
105
                        </tr>
106
                        </tr>
106
                    [% END %]
107
                    [% END %]
Lines 127-143 Link Here
127
                        <label for="av">Authorised value category: </label>
128
                        <label for="av">Authorised value category: </label>
128
                        <select name="authorised_value_category">
129
                        <select name="authorised_value_category">
129
                            <option value="">None</option>
130
                            <option value="">None</option>
130
                            [% PROCESS options_for_authorised_value_categories
131
                            [% PROCESS options_for_authorised_value_categories authorised_value_categories = AuthorisedValues.GetCategories({selected => field.authorised_value_category}) %]
131
                                authorised_value_categories = AuthorisedValues.GetCategories({
132
                                    selected => field.authorised_value_category
133
                                })
134
                            %]
135
                        </select>
132
                        </select>
136
                    </li>
133
                    </li>
137
                    [% IF show_marcfield %]
134
                    [% IF show_marcfield %]
138
                        <li>
135
                        <li>
139
                            <label for="marcfield">MARC field: </label>
136
                            <label for="marcfield">MARC field: </label>
140
                            <input type="text" name="marcfield" id="marcfield" value="[% field.marcfield %]" />
137
                            <input type="text" name="marcfield" id="marcfield" value="[% field.marcfield | html %]" />
141
                        </li>
138
                        </li>
142
                    [% END %]
139
                    [% END %]
143
                    <li>
140
                    <li>
Lines 152-163 Link Here
152
            </fieldset>
149
            </fieldset>
153
            <fieldset class="action">
150
            <fieldset class="action">
154
                [% IF field %]
151
                [% IF field %]
155
                    <input type="hidden" name="field_id" value="[% field.id %]" />
152
                    <input type="hidden" name="field_id" value="[% field.id | html %]" />
156
                [% END %]
153
                [% END %]
157
                <input type="hidden" name="tablename" value="[% tablename %]" />
154
                <input type="hidden" name="tablename" value="[% tablename | html %]" />
158
                <input type="hidden" name="op" value="add" />
155
                <input type="hidden" name="op" value="add" />
159
                <input type="submit" value="Save" />
156
                <input type="submit" value="Save" />
160
                <a href="?tablename=[% tablename %]" class="cancel">Cancel</a>
157
                <a href="?tablename=[% tablename | uri %]" class="cancel">Cancel</a>
161
            </fieldset>
158
            </fieldset>
162
        </form>
159
        </form>
163
    [% END %]
160
    [% END %]
164
- 

Return to bug 15774