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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt (-10 lines)
Lines 168-179 Link Here
168
        You searched for [% searchfield | html %]
168
        You searched for [% searchfield | html %]
169
    [% END %]
169
    [% END %]
170
    <table id="serverst">
170
    <table id="serverst">
171
<<<<<<< f7630d746947b82b40098be4cbac266e4a494553
172
173
        <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Preselected</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>Record type</th><th>Attributes</th><th>Actions</th>
174
=======
175
        <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Preselected</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>Record type</th><th>Opac</th><th>Options</th>
171
        <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Preselected</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>Record type</th><th>Opac</th><th>Options</th>
176
>>>>>>> Bug11361 - opac z3950 search
177
        </tr></thead>
172
        </tr></thead>
178
        <tbody>
173
        <tbody>
179
        [% FOREACH loo IN loop %]
174
        [% FOREACH loo IN loop %]
Lines 186-196 Link Here
186
                <span>Authority</span>
181
                <span>Authority</span>
187
                [% END %]
182
                [% END %]
188
            </td>
183
            </td>
189
<<<<<<< f7630d746947b82b40098be4cbac266e4a494553
190
            <td>[% loo.attributes | html %]</td>
191
=======
192
            <td>[% IF loo.opac %]X[% END %]</td>
184
            <td>[% IF loo.opac %]X[% END %]</td>
193
>>>>>>> Bug11361 - opac z3950 search
194
            <td>
185
            <td>
195
                <div class="dropdown">
186
                <div class="dropdown">
196
                    <a class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" href="#">
187
                    <a class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" href="#">
197
- 

Return to bug 11361