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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt (-24 / +55 lines)
Lines 61-83 Edit News Item[% ELSE %]Add News Item[% END %][% ELSE %]News[% END %]</div> Link Here
61
61
62
[% UNLESS ( add_form ) %]
62
[% UNLESS ( add_form ) %]
63
<div id="toolbar" class="btn-toolbar">
63
<div id="toolbar" class="btn-toolbar">
64
    <a class="btn btn-small" id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form"><i class="icon-plus"></i> New entry</a>
64
    <a class="btn btn-small" id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&lang=[% lang %]"><i class="icon-plus"></i> New entry</a>
65
</div>
65
</div>
66
[% END %]
66
[% END %]
67
67
68
[% IF ( add_form ) %]
68
[% IF ( add_form ) %]
69
    [% IF ( op == 'add' ) %][% default_lang = lang %]
70
    [% ELSE %][% default_lang = new_detail.lang %]
71
    [% END %]
69
        <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
72
        <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
70
            <input type="hidden" name="op" value="[% op %]" />
73
            <input type="hidden" name="op" value="[% op %]" />
71
            <input type="hidden" name="id" value="[% id %]" />
74
            <input type="hidden" name="id" value="[% id %]" />
72
			<fieldset class="rows">
75
			<fieldset class="rows">
73
            <legend>OPAC and Koha news</legend>
76
            <legend>OPAC and Koha news</legend>
74
           <ol> <li>
77
           <ol> <li>
75
            <label for="lang">Display location</label>
78
            <label for="lang">([% new_detail.lang %])([% lang %])Display location</label>
76
            <select id="lang" name="lang">
79
            <select id="lang" name="lang">
77
                <option value="koha">Librarian interface</option>
80
                [% IF ( default_lang == "" ) %]
78
                [% IF ( slip ) %]<option value="slip" selected="selected">Slip</option>[% ELSE %]<option value="slip">Slip</option>[% END %]
81
                <option value=""     selected>All</option>
82
                [% ELSE %]
83
                <option value=""             >All</option>
84
                [% END %]
85
                [% IF ( default_lang == "koha" ) %]
86
                <option value="koha" selected>Librarian interface</option>
87
                [% ELSE %]
88
                <option value="koha"         >Librarian interface</option>
89
                [% END %]
90
                [% IF ( default_lang == "slip" ) %]
91
                <option value="slip" selected>Slip</option>
92
                [% ELSE %]
93
                <option value="slip"         >Slip</option>
94
                [% END %]
79
                [% FOREACH lang_lis IN lang_list %]
95
                [% FOREACH lang_lis IN lang_list %]
80
                    [% IF ( lang_lis.selected ) %]<option value="[% lang_lis.language %]" selected="selected">OPAC ([% lang_lis.language %])</option>[% ELSE %]<option value="[% lang_lis.language %]">OPAC ([% lang_lis.language %])</option>[% END %]
96
                [% IF ( lang_lis.language == default_lang ) %]
97
                    <option value="[% lang_lis.language %]" selected>OPAC ([% lang_lis.language %])</option>
98
                [% ELSE %]
99
                    <option value="[% lang_lis.language %]"         >OPAC ([% lang_lis.language %])</option>
100
                [% END %]
81
                [% END %]
101
                [% END %]
82
            </select>
102
            </select>
83
            </li>
103
            </li>
Lines 115-131 Edit News Item[% ELSE %]Add News Item[% END %][% ELSE %]News[% END %]</div> Link Here
115
        <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
135
        <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
116
            <label for="lang">Display location:</label>
136
            <label for="lang">Display location:</label>
117
            <select name="lang" id="lang">
137
            <select name="lang" id="lang">
118
            <option value="">All</option>
138
            [% IF ( lang == "" ) %]
119
            <option value="koha">Librarian interface</option>
139
            <option value=""     selected>All</option>
120
	    <option value="slip">Slip</option>
140
            [% ELSE %]
141
            <option value=""             >All</option>
142
            [% END %]
143
            [% IF ( lang == "koha" ) %]
144
            <option value="koha" selected>Librarian interface</option>
145
            [% ELSE %]
146
            <option value="koha"         >Librarian interface</option>
147
            [% END %]
148
            [% IF ( lang == "slip" ) %]
149
	    <option value="slip" selected>Slip</option>
150
            [% ELSE %]
151
	    <option value="slip"         >Slip</option>
152
            [% END %]
121
                [% FOREACH lang_lis IN lang_list %]
153
                [% FOREACH lang_lis IN lang_list %]
122
                    [% IF ( lang_lis.selected ) %]
154
                [% IF ( lang_lis.language == lang ) %]
123
                        <option value="[% lang_lis.language %]" selected="selected">
155
                    <option value="[% lang_lis.language %]" selected>OPAC ([% lang_lis.language %])</option>
124
                    [% ELSE %]
156
                [% ELSE %]
125
                        <option value="[% lang_lis.language %]">
157
                    <option value="[% lang_lis.language %]">OPAC ([% lang_lis.language %])</option>
126
                    [% END %]
158
                [% END %]
127
                        OPAC ([% lang_lis.language %])
128
                    </option>
129
                [% END %]
159
                [% END %]
130
            </select>
160
            </select>
131
            <input type="submit" class="button" value="Filter" />
161
            <input type="submit" class="button" value="Filter" />
Lines 153-167 Edit News Item[% ELSE %]Add News Item[% END %][% ELSE %]News[% END %]</div> Link Here
153
                            <td>
183
                            <td>
154
                                <input type="checkbox" name="ids" value="[% opac_new.idnew %]" />
184
                                <input type="checkbox" name="ids" value="[% opac_new.idnew %]" />
155
                            </td>
185
                            </td>
156
                            <td>[% IF ( opac_new.lang == 'koha' ) %]
186
                            <td>[% SWITCH opac_new.lang %]
157
			            Librarian interface
187
			        [%   CASE "koha" %]
158
                                 [% ELSE %]
188
                                    Librarian interface
159
                                    [% IF ( opac_new.lang == 'slip' ) %]
189
			        [%   CASE "slip" %]
160
				        Slip
190
				    Slip
161
                                    [% ELSE %]
191
			        [%   CASE "" %]
162
                                        OPAC
192
                                    All
163
				    [% END %]
193
			        [%   CASE %]
164
				 [% END %]
194
                                    OPAC ([% opac_new.lang %])
195
				[% END %]
165
                             </td>
196
                             </td>
166
197
167
                            <td>[% opac_new.number %]</td>
198
                            <td>[% opac_new.number %]</td>
(-)a/tools/koha-news.pl (-1 / +2 lines)
Lines 7-12 Link Here
7
# Casta�eda, Carlos Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina
7
# Casta�eda, Carlos Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina
8
# Modified to include news to KOHA intranet - tgarip@neu.edu.tr NEU library -Cyprus
8
# Modified to include news to KOHA intranet - tgarip@neu.edu.tr NEU library -Cyprus
9
# Copyright 2000-2002 Katipo Communications
9
# Copyright 2000-2002 Katipo Communications
10
# Copyright (C) 2013    Mark Tompsett
10
#
11
#
11
# Koha is free software; you can redistribute it and/or modify it
12
# Koha is free software; you can redistribute it and/or modify it
12
# under the terms of the GNU General Public License as published by
13
# under the terms of the GNU General Public License as published by
Lines 118-121 else { Link Here
118
		);
119
		);
119
    $template->param( $lang => 1 ) if $lang;
120
    $template->param( $lang => 1 ) if $lang;
120
}
121
}
122
$template->param( lang => $lang );
121
output_html_with_http_headers $cgi, $cookie, $template->output;
123
output_html_with_http_headers $cgi, $cookie, $template->output;
122
- 

Return to bug 7567