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

(-)a/C4/NewsChannels.pm (-2 lines)
Lines 116-123 sub get_opac_news { Link Here
116
    my $count = 0;
116
    my $count = 0;
117
    while (my $row = $sth->fetchrow_hashref) {
117
    while (my $row = $sth->fetchrow_hashref) {
118
        if ((($limit) && ($count < $limit)) || (!$limit)) {
118
        if ((($limit) && ($count < $limit)) || (!$limit)) {
119
            $row->{'newdate'} = format_date($row->{'newdate'});
120
            $row->{'expirationdate'} = format_date($row->{'expirationdate'});
121
            push @opac_news, $row;
119
            push @opac_news, $row;
122
        }
120
        }
123
        $count++;
121
        $count++;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt (-9 / +9 lines)
Lines 1-20 Link Here
1
[% USE KohaDates %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Tools &rsaquo; News</title>
3
<title>Koha &rsaquo; Tools &rsaquo; News</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'calendar.inc' %]
5
[% INCLUDE 'calendar.inc' %]
5
[% IF ( opac_news_count ) %]
6
[% IF ( opac_news_count ) %]
6
    <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />
7
    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
7
    <script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
8
    [% INCLUDE 'datatables.inc' %]
8
    [% INCLUDE 'datatables-strings.inc' %]
9
    <script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
10
    <script type="text/javascript">//<![CDATA[
9
    <script type="text/javascript">//<![CDATA[
11
    [% IF (dateformat == 'metric') %]dt_add_type_uk_date();[% END %]
12
    $(document).ready(function() {
10
    $(document).ready(function() {
13
        $("#newst").dataTable($.extend(true, {}, dataTablesDefaults, {
11
        $("#newst").dataTable($.extend(true, {}, dataTablesDefaults, {
14
            "sDom": 't',
12
            "sDom": 't',
15
            "aoColumnDefs": [
13
            "aoColumnDefs": [
16
                { "aTargets": [ 0,-1,-2 ], "bSortable": false, "bSearchable": false }
14
                { "aTargets": [ 0,-1,-2 ], "bSortable": false, "bSearchable": false }
17
            ],
15
            ],
16
            "aoColumns": [
17
                null,null,null,{ "sType": "title-string" },{ "sType": "title-string" },null,null,null
18
            ],
18
            "bPaginate": false
19
            "bPaginate": false
19
        }));
20
        }));
20
    });
21
    });
Lines 52-58 tinyMCE.init({ Link Here
52
[% INCLUDE 'cat-search.inc' %]
53
[% INCLUDE 'cat-search.inc' %]
53
54
54
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( add_form ) %]<a href="/cgi-bin/koha/tools/koha-news.pl">News</a> &rsaquo; [% IF ( id ) %]
55
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( add_form ) %]<a href="/cgi-bin/koha/tools/koha-news.pl">News</a> &rsaquo; [% IF ( id ) %]
55
Edit News Item[% ELSE %]Add News Item[% END %][% ELSE %]News[% END %]</div>
56
Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
56
57
57
[% IF ( add_form ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
58
[% IF ( add_form ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
58
   <div id="bd">
59
   <div id="bd">
Lines 165-172 Edit News Item[% ELSE %]Add News Item[% END %][% ELSE %]News[% END %]</div> Link Here
165
                             </td>
166
                             </td>
166
167
167
                            <td>[% opac_new.number %]</td>
168
                            <td>[% opac_new.number %]</td>
168
                            <td>[% opac_new.newdate %]</td>
169
                            <td><span title="[% opac_new.newdate %]">[% opac_new.newdate | $KohaDates %]</span></td>
169
                            <td>[% opac_new.expirationdate %] [% IF ( opac_new.expired ) %](<span class="expired">expired</span>)[% END %]</td>
170
                            <td><span title="[% opac_new.expirationdate %]">[% opac_new.expirationdate | $KohaDates %] [% IF ( opac_new.expired ) %](<span class="expired">expired</span>)[% END %]</span></td>
170
                            <td>[% opac_new.title %]</td>
171
                            <td>[% opac_new.title %]</td>
171
                           <td>
172
                           <td>
172
                                [% opac_new.new %]
173
                                [% opac_new.new %]
173
- 

Return to bug 11736