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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt (-5 / +5 lines)
Lines 158-168 tinyMCE.init({ Link Here
158
                </select>
158
                </select>
159
            </li>
159
            </li>
160
            <li>
160
            <li>
161
                <label for="branch">Library: </label>
161
                <label for="branch">Library:</label>
162
                <select id="branch" name="branch">
162
                <select id="branch" name="branch">
163
                    [% IF ( data.branchcode == "" ) %]<option value="" selected="selected">All libraries</option>[% ELSE %]<option value="">All libraries</option>[% END %]
163
                    [% IF ( data.branchcode.branchcode == "" ) %]<option value="" selected="selected">All libraries</option>[% ELSE %]<option value="">All libraries</option>[% END %]
164
                    [% FOREACH branch IN branch_list %]
164
                    [% FOREACH branch IN branch_list %]
165
                        [% IF ( branch.branchcode == data.branchcode ) %]<option value="[% branch.branchcode %]" selected="selected">[% branch.branchname %]</option>[% ELSE %]<option value="[% branch.branchcode %]">[% branch.branchname %]</option>[% END %]
165
                        [% IF ( branch.branchcode == data.branchcode.branchcode ) %]<option value="[% branch.branchcode %]" selected="selected">[% branch.branchname %]</option>[% ELSE %]<option value="[% branch.branchcode %]">[% branch.branchname %]</option>[% END %]
166
                    [% END %]
166
                    [% END %]
167
                </select>
167
                </select>
168
            </li>
168
            </li>
Lines 219-230 tinyMCE.init({ Link Here
219
                [% IF ( disp == "2" ) %]<option value="2" selected="selected">OPAC</option>[% ELSE %]<option value="2">OPAC</option>[% END %]
219
                [% IF ( disp == "2" ) %]<option value="2" selected="selected">OPAC</option>[% ELSE %]<option value="2">OPAC</option>[% END %]
220
            </select>
220
            </select>
221
221
222
            <label for="branch">Library: </label>
222
            <label for="branch">Library:</label>
223
            <select id="branch" name="branch">
223
            <select id="branch" name="branch">
224
                [% IF ( branch == "" ) %]<option value="" selected="selected">All libraries</option>[% ELSE %]<option value="">All libraries</option>[% END %]
224
                [% IF ( branch == "" ) %]<option value="" selected="selected">All libraries</option>[% ELSE %]<option value="">All libraries</option>[% END %]
225
                [% FOREACH br IN branch_list %]
225
                [% FOREACH br IN branch_list %]
226
                    [% IF ( br.branchcode == branch ) %]
226
                    [% IF ( br.branchcode == branch ) %]
227
                        <option value="[% br.branchcode %]" selected="selected">[% br.branchname %]</option>
227
                          <option value="[% br.branchcode %]" selected="selected">[% br.branchname %]</option>
228
                    [% ELSE %]
228
                    [% ELSE %]
229
                        <option value="[% br.branchcode %]">[% br.branchname %]</option>
229
                        <option value="[% br.branchcode %]">[% br.branchname %]</option>
230
                    [% END %]
230
                    [% END %]
(-)a/opac/opac-cmspages.pl (-2 / +1 lines)
Lines 47-53 my ( $theme, $news_lang, $availablethemes ) = C4::Templates::themelanguage( Link Here
47
my ( $page_list, $parent_list, $page_data ) = Koha::CmsPages->list( $id );
47
my ( $page_list, $parent_list, $page_data ) = Koha::CmsPages->list( $id );
48
48
49
my $links = Koha::CmsPages->search( {}, { order_by => 'sortorder' } );
49
my $links = Koha::CmsPages->search( {}, { order_by => 'sortorder' } );
50
my $cms_data = Koha::CmsPages->page( $id );
50
my $cms_data = Koha::CmsPages->find( $id );
51
$template->param(
51
$template->param(
52
    links       => $links,
52
    links       => $links,
53
    cms_page    => $cms_data,
53
    cms_page    => $cms_data,
54
- 

Return to bug 15326