Attachment #122878 for bug #24387

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




    ($table eq 'aqorders'     )    ? "SELECT * FROM $table WHERE    ordernumber = ?"                                  :
    ($table eq 'aqbasket'     )    ? "SELECT * FROM $table WHERE       basketno = ?"                                  :
    ($table eq 'illrequests'  )    ? "SELECT * FROM $table WHERE  illrequest_id = ?"                                  :
    ($table eq 'opac_news'    )    ? "SELECT * FROM $table WHERE          idnew = ?"                                  :
    ($table eq 'article_requests') ? "SELECT * FROM $table WHERE             id = ?"                                  :
    ($table eq 'borrower_modifications') ? "SELECT * FROM $table WHERE verification_token = ?" :
    ($table eq 'subscription') ? "SELECT * FROM $table WHERE subscriptionid = ?" :
    ($table eq 'serial') ? "SELECT * FROM $table WHERE serialid = ?" :
    ($table eq 'problem_reports') ? "SELECT * FROM $table WHERE reportid = ?" :
    ($table eq 'additional_contents' || $table eq 'opac_news') ? "SELECT * FROM additional_contents WHERE idnew = ?" :
    undef ;
    unless ($query) {
        warn "ERROR: No _parseletter_sth query for table '$table'";

            plural   => 'items',
            pk       => 'itemnumber',
        },
        additional_contents => {
            module   => 'Koha::AdditionalContents',
            singular => 'additional_content',
            plural   => 'additional_contents',
            pk       => 'idnew',
        },
        opac_news => {
            module   => 'Koha::AdditionalContents',
            singular => 'news',
            plural   => 'news',
            pk       => 'idnew',

Lines 33-39 use Koha::Database; Link Here

(-)a/C4/Members.pm (-7 / +12 lines)
33	use Koha::DateUtils qw( dt_from_string output_pref );	33	use Koha::DateUtils qw( dt_from_string output_pref );
34	use Koha::Database;	34	use Koha::Database;
35	use Koha::Holds;	35	use Koha::Holds;
36	use Koha::News;	36	use Koha::AdditionalContents;
37	use Koha::Patrons;	37	use Koha::Patrons;
38	use Koha::Patron::Categories;	38	use Koha::Patron::Categories;
39		39
Lines 490-496 sub GetBorrowersToExpunge { Link Here
490	</overdue>	490	</overdue>
491		491
492	<news>	492	<news>
493	<<opac_news.*>>	493	<<additional_contents.*>>
494	</news>	494	</news>
495		495
496	ISSUEQSLIP:	496	ISSUEQSLIP:
Lines 582-591 sub IssueSlip { Link Here
582	issues => $all,	582	issues => $all,
583	};	583	};
584	}	584	}
585	my $news = Koha::News->search_for_display({	585	my $news = Koha::AdditionalContents->search_for_display(
586	location => 'slip',	586	{
		587	category => 'news',
		588	location => 'slip',
		589	lang => $patron->lang,
587	library_id => $branch,	590	library_id => $branch,
588	});	591	}
		592	);
589	my @news;	593	my @news;
590	while ( my $n = $news->next ) {	594	while ( my $n = $news->next ) {
591	my $all = $n->unblessed_all_relateds;	595	my $all = $n->unblessed_all_relateds;
Lines 597-603 sub IssueSlip { Link Here
597	$all->{timestamp} = $published_on_dt;	601	$all->{timestamp} = $published_on_dt;
598		602
599	push @news, {	603	push @news, {
600	opac_news => $all,	604	additional_contents => $all,
601	};	605	};
602	}	606	}
603	$letter_code = 'ISSUESLIP';	607	$letter_code = 'ISSUESLIP';
Lines 609-615 sub IssueSlip { Link Here
609	%loops = (	613	%loops = (
610	issues => [ map { $_->{issues}{itemnumber} } @checkouts ],	614	issues => [ map { $_->{issues}{itemnumber} } @checkouts ],
611	overdues => [ map { $_->{issues}{itemnumber} } @overdues ],	615	overdues => [ map { $_->{issues}{itemnumber} } @overdues ],
612	opac_news => [ map { $_->{opac_news}{idnew} } @news ],	616	opac_news => [ map { $_->{additional_contents}{idnew} } @news ],
		617	additional_contents => [ map { $_->{additional_contents}{idnew} } @news ],
613	);	618	);
614	}	619	}
615		620




package Koha::AdditionalContent;

# Copyright ByWater Solutions 2015
#


=head1 NAME

Koha::AdditionalContent - Koha Additional content object class

Koha::NewsItem represents a single piece of news from the opac_news table

=head1 API



=head3 author

    $additional_content->author;

Return the Koha::Patron object for the patron who authored this additional content

=cut



=head3 is_expired

my $is_expired = $additional_content->is_expired;

Returns 1 if the additional content is expired or 0;

=cut



=head3 library

my $library = $additional_content->library;

Returns Koha::Library object or undef


=cut

sub _type {
    return 'AdditionalContent';
}

=head1 AUTHOR




package Koha::AdditionalContents;

# Copyright ByWater Solutions 2015
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use Koha::Database;
use Koha::Exceptions;
use Koha::AdditionalContent;

use base qw(Koha::Objects);

=head1 NAME

Koha::AdditionalContents - Koha Additional content object set class

=head1 API

=head2 Class Methods

=cut

=head3 search_for_display

my $contents = Koha::AdditionalContents->search_for_display({
    category => 'news', # news or html_customizations
    location => 'slip',
    lang => 'es-ES',
    library_id => $branchcode
})

Return Koha::AdditionalContents set for display to user

You can limit the results by location, language and library by optional params

library_id should be valid branchcode of defined library

location is one of this:
- slip - for ISSUESLIP notice
- staff_only - for intranet
- opac_only - for OPAC
- staff_and_opac - for intranet and online catalogue
- OpacNavRight - Right column in the online catalogue
- opacheader
- OpacCustomSearch
- OpacMainUserBlock
- opaccredits
- OpacLoginInstructions
- OpacSuggestionInstructions
- ArticleRequestsDisclaimerText

=cut

sub search_for_display {
    my ( $self, $params ) = @_;

    my $search_params;
    $search_params->{location} = $params->{location};
    $search_params->{branchcode} = [ $params->{library_id}, undef ] if $params->{library_id};
    $search_params->{published_on} = { '<=' => \'NOW()' };
    $search_params->{-or} = [ expirationdate => { '>=' => \'NOW()' },
                              expirationdate => undef ];

    if ( $params->{lang} ) {
        # FIXME I am failing to translate the following query
        # SELECT   a1.category,   a1.code,   COALESCE(a2.title, a1.title)
        # FROM additional_contents a1
        # LEFT JOIN additional_contents a2 on a1.code=a2.code AND a2.lang="es-ES"
        # WHERE a1.lang = 'default';

        # So we are retrieving the code with a translated content, then the other ones
        my $translated_contents =
          $self->SUPER::search( { %$search_params, lang => $params->{lang} } );
        my $default_contents = $self->SUPER::search(
            {
                %$search_params,
                lang => 'default',
                code =>
                  { '-not_in' => [ $translated_contents->get_column('code') ] }
            }
        );

        return $self->SUPER::search(
            {
                idnew => [
                    $translated_contents->get_column('idnew'),
                    $default_contents->get_column('idnew')
                ]
            },
            { order_by => 'number' }
        );
    }

    return $self->SUPER::search({%$search_params, lang => 'default'}, { order_by => 'number'});
}

=head3 _type

=cut

sub _type {
    return 'AdditionalContent';
}

=head3 object_class

=cut

sub object_class {
    return 'Koha::AdditionalContent';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;

Lines 215-221 our $mapping = { Link Here

(-)a/Koha/Manual.pm (-1 / +1 lines)
215	'tools/holidays' => '/tools.html#calendar',	215	'tools/holidays' => '/tools.html#calendar',
216	'tools/import_borrowers' => '/tools.html#patron-import',	216	'tools/import_borrowers' => '/tools.html#patron-import',
217	'tools/inventory' => '/tools.html#inventory-stocktaking',	217	'tools/inventory' => '/tools.html#inventory-stocktaking',
218	'tools/koha-news' => '/tools.html#news',	218	'tools/additional-contents' => '/tools.html#news', # FIXME Needs a change to the manual
219	'tools/letter' => '/tools.html#notices-slips',	219	'tools/letter' => '/tools.html#notices-slips',
220	'tools/manage-marc-import' => '/tools.html#staged-marc-record-management',	220	'tools/manage-marc-import' => '/tools.html#staged-marc-record-management',
221	'tools/marc_modification_templates' => '/tools.html#marc-modification-templates',	221	'tools/marc_modification_templates' => '/tools.html#marc-modification-templates',




package Koha::News;

# Copyright ByWater Solutions 2015
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;


use Koha::Database;
use Koha::Exceptions;
use Koha::NewsItem;

use base qw(Koha::Objects);

=head1 NAME

Koha::News - Koha News object set class

=head1 API

=head2 Class Methods

=cut

=head3 search_for_display

my $news = Koha::News->search_for_display({
    location => 'slip',
    lang => 'en',
    library_id => $branchcode
})

Return Koha::News set for display to user

You can limit the results by location, language and library by optional params

library_id should be valid branchcode of defined library

type is one of this:
- slip - for ISSUESLIP notice
- koha - for intranet
- opac - for online catalogue
- OpacNavRight - Right column in the online catalogue
- OpacLoginInstructions
- OpacMainUserBlock
- OpacCustomSearch
- opacheader
- opaccredits

lang is language code - it is used only when type is opac or any of OPAC locations

=cut

sub search_for_display {
    my ( $self, $params ) = @_;

    my $search_params;
    if ($params->{location} ) {
        if ( $params->{location} eq 'slip' || $params->{location} eq 'koha') {
            $search_params->{lang} = [ $params->{location}, '' ];
        } elsif ( $params->{location} eq 'opac' && $params->{lang} ) {
            $search_params->{lang} = [ $params->{lang}, '' ];
        } elsif ( $params->{lang} ) {
            $search_params->{lang} = $params->{location} . '_' . $params->{lang};
        } else {
            Koha::Exceptions::BadParameter->throw("The location ($params->{location}) and lang ($params->{lang}) parameters combination is not valid");
        }
    }

    $search_params->{branchcode} = [ $params->{library_id}, undef ] if $params->{library_id};
    $search_params->{published_on} = { '<=' => \'NOW()' };
    $search_params->{-or} = [ expirationdate => { '>=' => \'NOW()' },
                              expirationdate => undef ];

    return $self->SUPER::search($search_params, { order_by => 'number' });
}

=head3 _type

=cut

sub _type {
    return 'OpacNews';
}

=head3 object_class

=cut

sub object_class {
    return 'Koha::NewsItem';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Template::Plugin::AdditionalContents;

# Copyright ByWater Solutions 2012
# Copyright BibLibre 2014


use C4::Koha;
use C4::Context;
use Koha::AdditionalContents;

sub get {
    my ( $self, $params ) = @_;

    my $category   = $params->{category};
    my $location   = $params->{location};
    my $blocktitle = $params->{blocktitle};
    my $lang       = $params->{lang} || 'default';
    my $library    = $params->{library};

    my $content = Koha::AdditionalContents->search_for_display(
        {
            category   => $category,
            location   => $location,
            lang       => $lang,
            library_id => $library,
        }
    );

    if ( $content->count ) {
        return {
            content    => $content,
            location   => $location,
            blocktitle => $blocktitle
        };
    } else {
        return;
    }
}



=head1 NAME

Koha::Template::Plugin::AdditionalContents - TT Plugin for displaying additional contents

=head1 SYNOPSIS

[% USE AdditionalContents %]

[% AdditionalContents.get() %]

=head1 ROUTINES

=head2 get

In a template, you can get the all categories with
the following TT code: [% AdditionalContents.get() %]

=head1 AUTHOR





$DBversion = 'XXX'; # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {

    if( TableExists('opac_news') ) {
        $dbh->do(q|
            ALTER TABLE opac_news RENAME additional_contents
        |);
    }

    if ( foreign_key_exists('additional_contents', 'opac_news_branchcode_ibfk') ) {

        $dbh->do(q|
            ALTER TABLE additional_contents
            DROP KEY borrowernumber_fk,
            DROP KEY opac_news_branchcode_ibfk,
            DROP FOREIGN KEY borrowernumber_fk,
            DROP FOREIGN KEY opac_news_branchcode_ibfk
        |);

        $dbh->do(q|
            ALTER TABLE additional_contents
            ADD CONSTRAINT  additional_contents_borrowernumber_fk
                FOREIGN KEY (borrowernumber)
                REFERENCES borrowers (borrowernumber) ON DELETE SET NULL ON UPDATE CASCADE
        |);

        $dbh->do(q|
            ALTER TABLE additional_contents
            ADD CONSTRAINT  additional_contents_branchcode_ibfk
                FOREIGN KEY (branchcode)
                REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE
        |);
    }

    $dbh->do(q|
        UPDATE letter
        SET content = REGEXP_REPLACE(content, '<<\\\\s*opac_news\.', '<<additional_contents.')
    |);
    $dbh->do(q|
        UPDATE letter
        SET content = REGEXP_REPLACE(content, '\\\\[%\\\\s*opac_news\.', '[% additional_contents.')
    |);

    $dbh->do(q|
        UPDATE systempreferences
        SET variable="AdditionalContentsEditor"
        WHERE variable="NewsToolEditor"
    |);

    $dbh->do(q|
        UPDATE permissions
        SET code="edit_additional_contents"
        WHERE code="edit_news"
    |);

    unless ( column_exists('additional_contents', 'category' ) ) {
        $dbh->do(q|
            ALTER TABLE additional_contents
            ADD COLUMN `category` VARCHAR(20) NOT NULL COMMENT 'category for the additional content'
            AFTER `idnew`
        |);
    }
    unless ( column_exists('additional_contents', 'location' ) ) {
        $dbh->do(q|
            ALTER TABLE additional_contents
            ADD COLUMN `location` VARCHAR(255) NOT NULL COMMENT 'location of the additional content'
            AFTER `category`
        |);
    }

    unless ( column_exists('additional_contents', 'code' ) ) {
        $dbh->do(q|
            ALTER TABLE additional_contents
            ADD COLUMN `code` VARCHAR(100) NOT NULL COMMENT 'code to group content per lang'
            AFTER `category`
        |);
    }

    my $contents = $dbh->selectall_arrayref(q|SELECT * FROM additional_contents|, { Slice => {} });
    for my $c ( @$contents ) {
        my ( $category, $location, $new_lang );
        if ( $c->{lang} eq '' ) {
            $category = 'news';
            $location = 'staff_and_opac';
            $new_lang = 'default';
        } elsif ( $c->{lang} eq 'koha' ) {
            $category = 'news';
            $location = 'staff_only';
            $new_lang = 'default';
        } elsif ( $c->{lang} eq 'slip' ) {
            $category = 'news';
            $location = 'slip';
            $new_lang = 'default';
        } elsif ( $c->{lang} =~ m|_| ) {
            ( $location, $new_lang ) = split '_', $c->{lang};
            $category = 'html_customizations'
        } else {
            $category = 'news';
            $location = 'opac_only';
            $new_lang = $c->{lang};
        }

        die "There is something wrong here, we didn't find a valid category for idnew=" . $c->{idnew} unless $category;

        # Now this is getting weird
        # We are adding an extra news with the same code when the lang is not "default" (/"en")

        $new_lang = "default" if $new_lang eq 'en'; # Assume that "en" is "default"

        my $sth_update = $dbh->prepare(q|
            UPDATE additional_contents
            SET category=?, location=?, lang=?
            WHERE idnew=?
        |);

        my $parent_idnew;
        if ( $new_lang ne 'default' ) {
            $dbh->do(q|
                INSERT INTO additional_contents(category, code, location, branchcode, title, content, lang, published_on, updated_on, expirationdate, number, borrowernumber)
                VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
            |, undef, $category, 'tmp_code', $location, $c->{branchcode}, $c->{title}, $c->{content}, 'default', $c->{published_on}, $c->{updated_on}, $c->{expirationdate}, $c->{number}, $c->{borrowernumber});

            $parent_idnew = $dbh->last_insert_id(undef, undef, 'additional_contents', undef);
        }
        $sth_update->execute($category, $location, $new_lang, $c->{idnew});

        my $idnew = $parent_idnew || $c->{idnew};
        my $code = ( grep {$_ eq $location} qw( staff_and_opac staff_only opac_only slip ) ) ? "${location}_$idnew" : "News_$idnew";
        $dbh->do(q|UPDATE additional_contents SET code=? WHERE idnew = ?|, undef, $code, $idnew) if $parent_idnew;
        $dbh->do(q|UPDATE additional_contents SET code=? WHERE idnew = ?|, undef, $code, $idnew);
    }

    $dbh->do(q|
        ALTER TABLE additional_contents
        ADD UNIQUE KEY additional_contents_uniq (`category`,`code`,`branchcode`,`lang`)
    |);

    NewVersion( $DBversion, 24387, "Rename opac_news with additional_contents");
}

Lines 528-536 tables: Link Here

(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (-3 / +3 lines)
528	- "<h4 style=\"text-align: center; font-style:italic;\">News</h4>"	528	- "<h4 style=\"text-align: center; font-style:italic;\">News</h4>"
529	- "<news>"	529	- "<news>"
530	- "<div class=\"newsitem\">"	530	- "<div class=\"newsitem\">"
531	- "<h5 style=\"margin-bottom: 1px; margin-top: 1px\"><b><<opac_news.title>></b></h5>"	531	- "<h5 style=\"margin-bottom: 1px; margin-top: 1px\"><b><<additional_contents.title>></b></h5>"
532	- "<p style=\"margin-bottom: 1px; margin-top: 1px\"><<opac_news.content>></p>"	532	- "<p style=\"margin-bottom: 1px; margin-top: 1px\"><<additional_contents.content>></p>"
533	- "<p class=\"newsfooter\" style=\"font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px\">Posted on <<opac_news.published_on>></p>"	533	- "<p class=\"newsfooter\" style=\"font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px\">Posted on <<additional_contents.published_on>></p>"
534	- "<hr />"	534	- "<hr />"
535	- "</div>"	535	- "</div>"
536	- "</news>"	536	- "</news>"

Lines 21-27 description: Link Here

(-)a/installer/data/mysql/en/optional/sample_news.yml (-1 / +1 lines)
21	- "Sample news items"	21	- "Sample news items"
22		22
23	tables:	23	tables:
24	- opac_news:	24	- additional_contents:
25	translatable: [ title, content ]	25	translatable: [ title, content ]
26	multiline: [ content ]	26	multiline: [ content ]
27	rows:	27	rows:

(-)a/installer/data/mysql/fr-CA/facultatif/sample_news.sql (-1 / +1 lines)

Line 1 Link Here

INSERT INTO `opac_news` (`title`, `content`, `lang`, `published_on`, `expirationdate`, `number`) VALUES ('Bienvenue dans Koha !','Bienvenue dans Koha, la toute nouvelle version du système intégré de gestion de bibliothèque (SIGB) open source de référence. Développé initialement en Nouvelle Zélande et déployé pour la première fois en janvier 2000, Koha est un projet international soutenu par des sociétés de services en logiciels libres et par des bibliothécaires du monde entier.','koha','2008-01-14 03:25:58','2099-01-10',1),('Et maintenant ?','Félicitations ! vous avez désormais une version opérationnelle de Koha. Et maintenant, que faire ?\r\n<ul>\r\n<li><a href=\"http://koha-community.org/documentation/\">lisez la documentation de Koha ;</a></li>\r\n<li><a href=\"http://wiki.koha-community.org\">lisez et participez au Wiki de Koha ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">abonnez-vous aux listes de discussion ;</a></li>\r\n<li><a href=\"http://bugs.koha-community.org\">signalez des bugs ;</a></li>\r\n<li><a href=\"https://wiki.koha-community.org/wiki/Version_Control_Using_Git\">proposez des correctifs et des  améliorations ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">discutez avec les utilisateurs et les développeurs de Koha.</a></li>\r\n</ul>\r\n','koha','2008-01-14 03:34:45','2099-01-10',2);

INSERT INTO `additional_contents` (`title`, `content`, `lang`, `published_on`, `expirationdate`, `number`) VALUES ('Bienvenue dans Koha !','Bienvenue dans Koha, la toute nouvelle version du système intégré de gestion de bibliothèque (SIGB) open source de référence. Développé initialement en Nouvelle Zélande et déployé pour la première fois en janvier 2000, Koha est un projet international soutenu par des sociétés de services en logiciels libres et par des bibliothécaires du monde entier.','koha','2008-01-14 03:25:58','2099-01-10',1),('Et maintenant ?','Félicitations ! vous avez désormais une version opérationnelle de Koha. Et maintenant, que faire ?\r\n<ul>\r\n<li><a href=\"http://koha-community.org/documentation/\">lisez la documentation de Koha ;</a></li>\r\n<li><a href=\"http://wiki.koha-community.org\">lisez et participez au Wiki de Koha ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">abonnez-vous aux listes de discussion ;</a></li>\r\n<li><a href=\"http://bugs.koha-community.org\">signalez des bugs ;</a></li>\r\n<li><a href=\"https://wiki.koha-community.org/wiki/Version_Control_Using_Git\">proposez des correctifs et des  améliorations ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">discutez avec les utilisateurs et les développeurs de Koha.</a></li>\r\n</ul>\r\n','koha','2008-01-14 03:34:45','2099-01-10',2);

Lines 4-10 INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, m Link Here

(-)a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql (-1 / +1 lines)
4	('circulation','DUE','','Document à rendre aujourd\'hui',0,'Document à rendre aujourd\'hui','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nLe prêt de ce document arrive à expiration aujourd\'hui.\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nMerci de nous le retourner.\r\n\r\n<<branches.branchname>>','email'),	4	('circulation','DUE','','Document à rendre aujourd\'hui',0,'Document à rendre aujourd\'hui','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nLe prêt de ce document arrive à expiration aujourd\'hui.\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nMerci de nous le retourner.\r\n\r\n<<branches.branchname>>','email'),
5	('circulation','DUEDGST','','Document à rendre aujourd\'hui (Résumé)',0,'Document à rendre aujourd\'hui','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous avez <<count>> document(s) dont le prêt arrive à expiration.\r\n\r\nMerci de nous le(s) retourner rapidement.\r\n\r\n<<branches.branchname>>','email'),	5	('circulation','DUEDGST','','Document à rendre aujourd\'hui (Résumé)',0,'Document à rendre aujourd\'hui','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous avez <<count>> document(s) dont le prêt arrive à expiration.\r\n\r\nMerci de nous le(s) retourner rapidement.\r\n\r\n<<branches.branchname>>','email'),
6	('circulation','ISSUEQSLIP','','Ticket rapide de prêts',1,'Ticket rapide de prêts','<h3><<branches.branchname>></h3>\r\nEmprunté par <<borrowers.firstname>> <<borrowers.surname>> <br />\r\n(<<borrowers.cardnumber>>) <br />\r\n\r\n<<today>><br />\r\n\r\n<h4>Emprunté(s) aujourd\'hui</h4>\r\n<checkedout>\r\n<p>\r\n<<biblio.title>><br />\r\nCode-barres : <<items.barcode>><br />\r\nDate de retour : <<issues.date_due>><br />\r\n</p>\r\n</checkedout>','email'),	6	('circulation','ISSUEQSLIP','','Ticket rapide de prêts',1,'Ticket rapide de prêts','<h3><<branches.branchname>></h3>\r\nEmprunté par <<borrowers.firstname>> <<borrowers.surname>> <br />\r\n(<<borrowers.cardnumber>>) <br />\r\n\r\n<<today>><br />\r\n\r\n<h4>Emprunté(s) aujourd\'hui</h4>\r\n<checkedout>\r\n<p>\r\n<<biblio.title>><br />\r\nCode-barres : <<items.barcode>><br />\r\nDate de retour : <<issues.date_due>><br />\r\n</p>\r\n</checkedout>','email'),
7	('circulation','ISSUESLIP','','Ticket de prêts',1,'Ticket de prêts','<h3><<branches.branchname>></h3>\r\nEmprunté par <<borrowers.firstname>> <<borrowers.surname>> <br />\r\n(<<borrowers.cardnumber>>) <br />\r\n\r\n<<today>><br />\r\n\r\n<h4>Emprunté(s) aujourd\'hui</h4>\r\n<checkedout>\r\n<p>\r\n<<biblio.title>> <br />\r\nCode-barres : <<items.barcode>><br />\r\nDate de retour : <<issues.date_due>><br />\r\n</p>\r\n</checkedout>\r\n\r\n<h4>Retards</h4>\r\n<overdue>\r\n<p>\r\n<<biblio.title>> <br />\r\nCode-barres : <<items.barcode>><br />\r\nDate de retour : <<issues.date_due>><br />\r\n</p>\r\n</overdue>\r\n\r\n<hr>\r\n\r\n<h4 style=\"text-align: center; font-style:italic;\">Nouvelles</h4>\r\n<news>\r\n<div class=\"newsitem\">\r\n<h5 style=\"margin-bottom: 1px; margin-top: 1px\"><b><<opac_news.title>></b></h5>\r\n<p style=\"margin-bottom: 1px; margin-top: 1px\"><<opac_news.content>></p>\r\n<p class=\"newsfooter\" style=\"font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px\">Publiée le <<opac_news.published_on>></p>\r\n<hr />\r\n</div>\r\n</news>','email'),	7	('circulation','ISSUESLIP','','Ticket de prêts',1,'Ticket de prêts','<h3><<branches.branchname>></h3>\r\nEmprunté par <<borrowers.firstname>> <<borrowers.surname>> <br />\r\n(<<borrowers.cardnumber>>) <br />\r\n\r\n<<today>><br />\r\n\r\n<h4>Emprunté(s) aujourd\'hui</h4>\r\n<checkedout>\r\n<p>\r\n<<biblio.title>> <br />\r\nCode-barres : <<items.barcode>><br />\r\nDate de retour : <<issues.date_due>><br />\r\n</p>\r\n</checkedout>\r\n\r\n<h4>Retards</h4>\r\n<overdue>\r\n<p>\r\n<<biblio.title>> <br />\r\nCode-barres : <<items.barcode>><br />\r\nDate de retour : <<issues.date_due>><br />\r\n</p>\r\n</overdue>\r\n\r\n<hr>\r\n\r\n<h4 style=\"text-align: center; font-style:italic;\">Nouvelles</h4>\r\n<news>\r\n<div class=\"newsitem\">\r\n<h5 style=\"margin-bottom: 1px; margin-top: 1px\"><b><<additional_contents.title>></b></h5>\r\n<p style=\"margin-bottom: 1px; margin-top: 1px\"><<additional_contents.content>></p>\r\n<p class=\"newsfooter\" style=\"font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px\">Publiée le <<additional_contents.published_on>></p>\r\n<hr />\r\n</div>\r\n</news>','email'),
8	('circulation','ODUE','','Document(s) en retard',0,'Document(s) en retard','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nSelon nos informations, vous avez au moins un document en retard. Merci de retourner ou renouveller ce ou ces documents dans votre bibliothèque le plus rapidement possible.\r\n\r\n<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>> <<branches.branchaddress3>>\r\nTél : <<branches.branchphone>>\r\nFax : <<branches.branchfax>>\r\nCourriel : <<branches.branchemail>>\r\n\r\nSi vous avez le mot de passe de votre compte lecteur, vous pouvez renouveler directement en ligne. Sinon, merci de nous contacter.\r\n\r\nLe ou les documents suivants sont en retard :\r\n\r\n<item>\"<<biblio.title>>\" par <<biblio.author>>, <<items.itemcallnumber>>, code-barres : <<items.barcode>> Amende : <<items.fine>></item>\r\n\r\nMerci de votre attention.\r\n\r\n<<branches.branchname>>','email'),	8	('circulation','ODUE','','Document(s) en retard',0,'Document(s) en retard','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nSelon nos informations, vous avez au moins un document en retard. Merci de retourner ou renouveller ce ou ces documents dans votre bibliothèque le plus rapidement possible.\r\n\r\n<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>> <<branches.branchaddress3>>\r\nTél : <<branches.branchphone>>\r\nFax : <<branches.branchfax>>\r\nCourriel : <<branches.branchemail>>\r\n\r\nSi vous avez le mot de passe de votre compte lecteur, vous pouvez renouveler directement en ligne. Sinon, merci de nous contacter.\r\n\r\nLe ou les documents suivants sont en retard :\r\n\r\n<item>\"<<biblio.title>>\" par <<biblio.author>>, <<items.itemcallnumber>>, code-barres : <<items.barcode>> Amende : <<items.fine>></item>\r\n\r\nMerci de votre attention.\r\n\r\n<<branches.branchname>>','email'),
9	('circulation','PREDUE','','Document à rendre bientôt',0,'Document à rendre bientôt','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nNous souhaitons vous informer que le prêt de ce document arrive bientôt à expiration :\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),	9	('circulation','PREDUE','','Document à rendre bientôt',0,'Document à rendre bientôt','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nNous souhaitons vous informer que le prêt de ce document arrive bientôt à expiration :\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
10	('circulation','PREDUEDGST','','Document à rendre bientôt (Résumé)',0,'Document(s) à rendre bientôt','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous avez <<count>> document(s) dont le prêt arrive bientôt à expiration.\r\n\r\n<<branches.branchname>>','email'),	10	('circulation','PREDUEDGST','','Document à rendre bientôt (Résumé)',0,'Document(s) à rendre bientôt','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous avez <<count>> document(s) dont le prêt arrive bientôt à expiration.\r\n\r\n<<branches.branchname>>','email'),

Lines 98-106 Retour le : <<issues.date_due>><br /> Link Here

(-)a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql (-3 / +3 lines)
98	<h4 style="text-align: center; font-style:italic;">Nouvelles</h4>	98	<h4 style="text-align: center; font-style:italic;">Nouvelles</h4>
99	<news>	99	<news>
100	<div class="newsitem">	100	<div class="newsitem">
101	<h5 style="margin-bottom: 1px; margin-top: 1px"><b><<opac_news.title>></b></h5>	101	<h5 style="margin-bottom: 1px; margin-top: 1px"><b><<additional_contents.title>></b></h5>
102	<p style="margin-bottom: 1px; margin-top: 1px"><<opac_news.content>></p>	102	<p style="margin-bottom: 1px; margin-top: 1px"><<additional_contents.content>></p>
103	<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on <<opac_news.published_on>></p>	103	<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on <<additional_contents.published_on>></p>
104	<hr />	104	<hr />
105	</div>	105	</div>
106	</news>', 1),	106	</news>', 1),

(-)a/installer/data/mysql/fr-FR/2-Optionel/sample_news.sql (-1 / +1 lines)

Line 1 Link Here

INSERT INTO `opac_news` (`title`, `content`, `lang`, `published_on`, `expirationdate`, `number`) VALUES ('Bienvenue dans Koha !','Bienvenue dans Koha, la toute nouvelle version du système intégré de gestion de bibliothèque (SIGB) open source de référence. Développé initialement en Nouvelle Zélande et déployé pour la première fois en janvier 2000, Koha est un projet international soutenu par des sociétés de services en logiciels libres et par des bibliothécaires du monde entier.','koha','2008-01-14 03:25:58','2099-01-10',1),('Et maintenant ?','Félicitations ! vous avez désormais une version opérationnelle de Koha. Et maintenant, que faire ?\r\n<ul>\r\n<li><a href=\"http://koha-community.org/documentation/\">lisez la documentation de Koha ;</a></li>\r\n<li><a href=\"http://wiki.koha-community.org\">lisez et participez au Wiki de Koha ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">abonnez-vous aux listes de discussion ;</a></li>\r\n<li><a href=\"http://bugs.koha-community.org\">signalez des bugs ;</a></li>\r\n<li><a href=\"https://wiki.koha-community.org/wiki/Version_Control_Using_Git\">proposez des correctifs et des  améliorations ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">discutez avec les utilisateurs et les développeurs de Koha.</a></li>\r\n</ul>\r\n','koha','2008-01-14 03:34:45','2099-01-10',2);

INSERT INTO `additional_contents` (`title`, `content`, `lang`, `published_on`, `expirationdate`, `number`) VALUES ('Bienvenue dans Koha !','Bienvenue dans Koha, la toute nouvelle version du système intégré de gestion de bibliothèque (SIGB) open source de référence. Développé initialement en Nouvelle Zélande et déployé pour la première fois en janvier 2000, Koha est un projet international soutenu par des sociétés de services en logiciels libres et par des bibliothécaires du monde entier.','koha','2008-01-14 03:25:58','2099-01-10',1),('Et maintenant ?','Félicitations ! vous avez désormais une version opérationnelle de Koha. Et maintenant, que faire ?\r\n<ul>\r\n<li><a href=\"http://koha-community.org/documentation/\">lisez la documentation de Koha ;</a></li>\r\n<li><a href=\"http://wiki.koha-community.org\">lisez et participez au Wiki de Koha ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">abonnez-vous aux listes de discussion ;</a></li>\r\n<li><a href=\"http://bugs.koha-community.org\">signalez des bugs ;</a></li>\r\n<li><a href=\"https://wiki.koha-community.org/wiki/Version_Control_Using_Git\">proposez des correctifs et des  améliorations ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">discutez avec les utilisateurs et les développeurs de Koha.</a></li>\r\n</ul>\r\n','koha','2008-01-14 03:34:45','2099-01-10',2);




/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `additional_contents`
--

DROP TABLE IF EXISTS `additional_contents`;
/*!40101 SET @saved_cs_client     = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `additional_contents` (
  `idnew` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'unique identifier for the additional content',
  `category` varchar(20) NOT NULL COMMENT 'category for the additional content',
  `code` varchar(20) NOT NULL COMMENT 'code to group content per lang',
  `location` varchar(255) NOT NULL COMMENT 'location of the additional content',
  `branchcode` varchar(10) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'branch code users to create branch specific additional content, NULL is every branch.',
  `title` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'title of the additional content',
  `content` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'the body of your additional content',
  `lang` varchar(25) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'location for the additional content(koha is the staff interface, slip is the circulation receipt and language codes are for the opac)',
  `published_on` date DEFAULT NULL COMMENT 'publication date',
  `updated_on` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() COMMENT 'last modification',
  `expirationdate` date DEFAULT NULL COMMENT 'date the additional content is set to expire or no longer be visible',
  `number` int(11) DEFAULT NULL COMMENT 'the order in which this additional content appears in that specific location',
  `borrowernumber` int(11) DEFAULT NULL COMMENT 'The user who created the additional content',
  PRIMARY KEY (`idnew`),
  UNIQUE KEY `additional_contents_uniq` (`category`,`code`,`branchcode`,`lang`),
  KEY `additional_contents_borrowernumber_fk` (`borrowernumber`),
  KEY `additional_contents_branchcode_ibfk` (`branchcode`),
  CONSTRAINT `borrowernumber_fk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE,
  CONSTRAINT `additional_contents_branchcode_ibfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;


Lines 74-80 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/mandatory/userpermissions.sql (-1 / +1 lines)
74	(11, 'merge_invoices', 'Merge invoices'),	74	(11, 'merge_invoices', 'Merge invoices'),
75	(11, 'delete_baskets', 'Delete baskets'),	75	(11, 'delete_baskets', 'Delete baskets'),
76	(12, 'suggestions_manage', 'Manage purchase suggestions'),	76	(12, 'suggestions_manage', 'Manage purchase suggestions'),
77	(13, 'edit_news', 'Write news for the OPAC and staff interfaces'),	77	(13, 'edit_additional_contents', 'Write additional contents for the OPAC and staff interfaces (news and HTML customizations)'),
78	(13, 'label_creator', 'Create printable labels and barcodes from catalog and patron data'),	78	(13, 'label_creator', 'Create printable labels and barcodes from catalog and patron data'),
79	(13, 'edit_calendar', 'Define days when the library is closed'),	79	(13, 'edit_calendar', 'Define days when the library is closed'),
80	(13, 'moderate_comments', 'Moderate patron comments'),	80	(13, 'moderate_comments', 'Moderate patron comments'),

Lines 118-126 Innleveringsfrist: <<issues.date_due>><br /> Link Here

(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql (-3 / +3 lines)
118	<h4 style="text-align: center; font-style:italic;">Nyheter</h4>	118	<h4 style="text-align: center; font-style:italic;">Nyheter</h4>
119	<news>	119	<news>
120	<div class="newsitem">	120	<div class="newsitem">
121	<h5 style="margin-bottom: 1px; margin-top: 1px"><b><<opac_news.title>></b></h5>	121	<h5 style="margin-bottom: 1px; margin-top: 1px"><b><<additional_contents.title>></b></h5>
122	<p style="margin-bottom: 1px; margin-top: 1px"><<opac_news.content>></p>	122	<p style="margin-bottom: 1px; margin-top: 1px"><<additional_contents.content>></p>
123	<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Publisert <<opac_news.published_on>></p>	123	<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Publisert <<additional_contents.published_on>></p>
124	<hr />	124	<hr />
125	</div>	125	</div>
126	</news>', 1),	126	</news>', 1),

Lines 1-2 Link Here

(-)a/installer/data/mysql/nb-NO/2-Valgfritt/sample_news.sql (-1 / +1 lines)
1	INSERT INTO `opac_news` (`title`, `content`, `lang`, `published_on`, `expirationdate`, `number`) VALUES ('Velkommen til Koha!','Velkommen til Koha. Koha er et biblioteksystem rikt på funksjoner. Koha ble opprinnelig utviklet i New Zealand av Katipo Communications Ltd og først tatt i bruk i januar 2000 av Horowhenua Library Trust. I dag vedlikeholdes Koha av et verdensomspennende fellesskap av bibliotek og leverandører.','koha',DATE_SUB(NOW(), INTERVAL 1 DAY),'2099-01-10',1),	1	INSERT INTO `additional_contents` (`title`, `content`, `lang`, `published_on`, `expirationdate`, `number`) VALUES ('Velkommen til Koha!','Velkommen til Koha. Koha er et biblioteksystem rikt på funksjoner. Koha ble opprinnelig utviklet i New Zealand av Katipo Communications Ltd og først tatt i bruk i januar 2000 av Horowhenua Library Trust. I dag vedlikeholdes Koha av et verdensomspennende fellesskap av bibliotek og leverandører.','koha',DATE_SUB(NOW(), INTERVAL 1 DAY),'2099-01-10',1),
2	('Hva nå?','Hva kan du gjøre nå som du har installert Koha? Her er noen forslag:\r\n<ul>\r\n<li><a href=\"http://koha-community.org/documentation/\">Les dokumentasjon</a></li>\r\n<li><a href=\"http://wiki.koha-community.org\">Les eller bidra til Koha sin wiki</a></li>\r\n<li><a href=\"http://koha-community.org/get-involved/\">Les og delta i diskusjoner</a></li>\r\n<li><a href=\"http://bugs.koha-community.org\">Meld fra om feil og mangler</a></li>\r\n<li><a href=\"http://wiki.koha-community.org/wiki/Version_Control_Using_Git\">Send inn feilrettinger med Git (versjonskontrollsystem)</a></li>\r\n<li><a href=\"http://koha-community.org/get-involved/irc/\">Chat med Koha-brukere og -utviklere</a></li>\r\n</ul>\r\n','koha',DATE_SUB(NOW(), INTERVAL 1 DAY),'2099-01-10',2);	2	('Hva nå?','Hva kan du gjøre nå som du har installert Koha? Her er noen forslag:\r\n<ul>\r\n<li><a href=\"http://koha-community.org/documentation/\">Les dokumentasjon</a></li>\r\n<li><a href=\"http://wiki.koha-community.org\">Les eller bidra til Koha sin wiki</a></li>\r\n<li><a href=\"http://koha-community.org/get-involved/\">Les og delta i diskusjoner</a></li>\r\n<li><a href=\"http://bugs.koha-community.org\">Meld fra om feil og mangler</a></li>\r\n<li><a href=\"http://wiki.koha-community.org/wiki/Version_Control_Using_Git\">Send inn feilrettinger med Git (versjonskontrollsystem)</a></li>\r\n<li><a href=\"http://koha-community.org/get-involved/irc/\">Chat med Koha-brukere og -utviklere</a></li>\r\n</ul>\r\n','koha',DATE_SUB(NOW(), INTERVAL 1 DAY),'2099-01-10',2);

Lines 445-453 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (-3 / +3 lines)
445	Define days when the library is closed	445	Define days when the library is closed
446	</span>	446	</span>
447	<span class="permissioncode">([% name \| html %])</span>	447	<span class="permissioncode">([% name \| html %])</span>
448	[%- CASE 'edit_news' -%]	448	[%- CASE 'edit_additional_contents' -%]
449	<span class="sub_permission edit_news_subpermission">	449	<span class="sub_permission edit_additional_contents_subpermission">
450	Write news for the OPAC and staff interfaces	450	Write additional contents for the OPAC and staff interfaces (news and HTML customizations)
451	</span>	451	</span>
452	<span class="permissioncode">([% name \| html %])</span>	452	<span class="permissioncode">([% name \| html %])</span>
453	[%- CASE 'edit_notice_status_triggers' -%]	453	[%- CASE 'edit_notice_status_triggers' -%]




    [% END %]
</ul>
[% END %]
[% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents  || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool )  || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %]
<h5>Additional tools</h5>
<ul>
    [% IF ( CAN_user_tools_edit_calendar ) %]

    [% IF ( CAN_user_tools_view_system_logs ) %]
	<li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li>
    [% END %]
    [% IF ( CAN_user_tools_edit_additional_contents ) %]
    <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a></li>
    <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a></li>
    [% END %]
    [% IF ( CAN_user_tools_schedule_tasks ) %]
	<li><a href="/cgi-bin/koha/tools/scheduler.pl">Task scheduler</a></li>

Lines 38-45 Tools: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref (-2 / +2 lines)
38	both: "both OPAC and staff interface"	38	both: "both OPAC and staff interface"
39	- "."	39	- "."
40	-	40	-
41	- By default edit news items with	41	- By default edit additional contents and news items with
42	- pref: NewsToolEditor	42	- pref: AdditionalContentsEditor
43	choices:	43	choices:
44	tinymce: "a WYSIWYG editor (TinyMCE)"	44	tinymce: "a WYSIWYG editor (TinyMCE)"
45	codemirror: "a text editor (CodeMirror)"	45	codemirror: "a text editor (CodeMirror)"




                                <div class="newsbody">[% koha_new.content | $raw %]</div>
                                <p class="newsfooter"> Posted on [% koha_new.published_on | $KohaDates %][% IF( show_author && koha_new.author ) %] by <span class="newsauthor">[% INCLUDE 'patron-title.inc' patron=koha_new.author %]<br />[% END %]
                                    [% IF ( CAN_user_tools ) %]
                                        <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% koha_new.idnew | uri %]">Edit</a>
                                         | <a class="news_delete" href="/cgi-bin/koha/tools/additional-contents.pl?op=del&amp;ids=[% koha_new.idnew | html %]">Delete</a>
                                         | <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form">New</a>
                                    [% END %]
                                </p>
                            </div>
                        [% END %]
                    </div><!-- /additional-contents -->
                [% END %]
                [% IF ( daily_quote ) %]
                    <div id="area-news">




[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Additional contents &rsaquo; Tools &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
[% UNLESS ( wysiwyg ) %]
    [% Asset.css("lib/codemirror/codemirror.css") | $raw %]
    [% Asset.css("lib/codemirror/lint.min.css") | $raw %]
    <style>
        .CodeMirror {
            resize: vertical;
            z-index: 0;
        }
    </style>
[% END %]
</head>

<body id="tools_additional-contents" class="tools">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>
        <li>
            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
        </li>
        <li>
            <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
        </li>

        [% IF op == 'add_form' %]
            <li>
                <a href="/cgi-bin/koha/tools/additional-contents.pl">Additional contents</a>
            </li>
            <li>
                <a href="#" aria-current="page">
                    [% IF additional_content.idnew %]
                        Modify additional content
                    [% ELSE %]
                        Add additional content
                    [% END %]
                </a>
            </li>
        [% ELSE %]
            <li>
                <a href="#" aria-current="page">
                    Additional contents
                    ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])
                </a>
            </li>
        [% END %]
    </ol>
</nav>

[% IF op == 'add_form' %]
<div class="main container-fluid">
    <div class="row">
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
[% ELSE %]
<div class="main container-fluid">
    <div class="row">
        <div class="col-sm-10 col-sm-push-2">
[% END %]

<main>

    [% FOR m IN messages %]
        <div class="dialog [% m.type | html %]">
            [% SWITCH m.code %]
            [% CASE 'error_on_update' %]
                An error occurred when updating this content. Perhaps it already exists.
            [% CASE 'error_on_insert' %]
                An error occurred when adding this content. Check the logs
            [% CASE 'error_on_delete' %]
                An error occurred when deleting this content. Check the logs.
            [% CASE 'success_on_update' %]
                Content updated successfully.
            [% CASE 'success_on_insert' %]
                Content added successfully.
            [% CASE 'success_on_delete' %]
                Content deleted successfully.
            [% CASE %]
                [% m.code | html %]
            [% END %]
        </div>
    [% END %]

    [% IF op == 'add_form' %]
        [% PROCESS add_form %]
    [% ELSE %]
        [% PROCESS list %]
    [% END %]

</main>

        [% IF op != 'add_form' %]
            </div> <!-- /.col-sm-10.col-sm-push-2 -->

            <div class="col-sm-2 col-sm-pull-10">
                <aside>

                    <div id="news-filter">
                        <form action="/cgi-bin/koha/tools/additional-contents.pl" method="get">
                            <h4>Filter</h4>
                            <fieldset class="brief">
                                <ol>
                                    <li>
                                        <label for="news_keyword">Keyword:</label>
                                        <input type="text" name="news_keyword" id="news_keyword" />
                                    </li>
                                    <li>
                                        <label for="news_display_location">Display location:</label>
                                        <select name="news_display_location" id="news_display_location">
                                            <option value="">All</option>
                                            [% PROCESS locations_options category => category %]
                                        </select>
                                    </li>
                                    <li>
                                        <label for="news_library">Library: </label>
                                        <select id="news_library" name="news_library">
                                            <option value=""></option>
                                            <option value="">All libraries</option>
                                            [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %]
                                        </select>
                                    </li>
                                    <li>
                                        <label>
                                            <input type="checkbox" name="show_expired" id="show_expired" /> Show expired
                                        </label>
                                    </li>
                                </ol>
                            </fieldset>
                        </form>
                    </div>

                    [% INCLUDE 'tools-menu.inc' %]
                </aside>
            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
        [% END %]
    </div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->

[% BLOCK add_form %]
    [% IF additional_content %]
        <h1>Modify an additional content</h1>
    [% ELSE %]
        <h1>New additional content ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])</h1>
    [% END %]

    <div id="toolbar" class="btn-toolbar">
        <div class="btn-group">
            <button class="btn btn-default" id="submit_form"><i class="fa fa-save"></i> Save</button>
        </div>
        <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/additional-contents.pl"><i class="fa fa-remove"></i> Cancel</a>
    </div>

    <form id="add_additional_content" method="post" action="/cgi-bin/koha/tools/additional-contents.pl" class="validate">
        <input type="hidden" name="op" value="add_validate" />
        <input type="hidden" name="id" value="[% additional_content.idnew | html %]" />
        <input type="hidden" name="category" value="[% category | html %]" />
        <fieldset class="rows">
            <ol>
                <li>
                    [% IF additional_content %]
                        <span class="label">Code:</span> [% additional_content.code | html %]
                        <input type="hidden" id="code" name="code" value="[% additional_content.code | html %]" />
                    [% ELSE %]
                        <label for="code" class="required">Code:</label>
                        <input type="text" id="code" name="code" size="20" maxlength="20" value="" required="required"/>
                        <span class="required">Required</span>
                    [% END %]
                </li>
                <li>
                    <label for="location">Display location:</label>
                    <select id="location" name="location">
                        [% PROCESS locations_options location => additional_content.location %]
                    </select>
                </li>
                <li>
                    <label for="branchcode">Library: </label>
                    <select id="branchcode" name="branchcode">
                        [% IF additional_content.branchcode == '' %]
                            <option value="" selected="selected">All libraries</option>
                        [% ELSE %]
                            <option value="">All libraries</option>
                        [% END %]
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => additional_content.branchcode, unfiltered => 1, ) %]
                    </select>
                </li>
                [% UNLESS languages.size %]
                    <li>
                        <label for="title" class="required">Title: </label>
                        <input id="title" size="30" type="text" name="title" value="[% additional_content.title | html %]" required="required" class="required" /> <span class="required">Required</span>
                    </li>
                [% END %]
                <li>
                    <label for="from">Publication date: </label>
                    <input id="from" type="text" name="published_on" size="15" value="[% additional_content.published_on | html %]" class="datepickerfrom" />
                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                </li>
                <li>
                    <label for="to">Expiration date: </label>
                    <input id="to" type="text" name="expirationdate" size="15" value="[% additional_content.expirationdate | html %]" class="datepickerto" />
                    <div class="hint">
                        [% INCLUDE 'date-format.inc' %]
                        [% IF category == 'news' %]
                            <br>News will still be accessible by direct URL if expired.
                        [% END %]
                    </div>
                </li>
                <li>
                    <label for="number">Appear in position: </label>
                    [% IF ( additional_content.number ) %]
                        <input id="number" size="3" name="number" type="text" value="[% additional_content.number | html %]" />
                    [% ELSE %]
                        <input id="number" size="3" name="number" type="text" />
                    [% END %]
                </li>
            </ol>
        </fieldset>

        [% IF languages.size %]
            <div style="clear:both"></div>
            <div id="tabs">
                <ul>
                    [% FOR language IN languages %]
                        [% IF language.lang == 'default' %]
                            <li><a href="#lang_default">Default</a></li>
                        [% ELSE %]
                            <li><a href="#lang_[% language.lang | uri %]">[% language.description %]</a></li>
                        [% END %]
                    [% END %]
                </ul>

                [% FOR language IN languages %]
                    <div id="lang_[% language.lang | uri %]" class="lang" data-lang="[% language.description | html %]">
                        <div style="clear:both;">

                            <fieldset>[%# FIXME We should remove list-style:none; and use class="rows" here but it does not work. Owen please help! %]
                                <ol>
                                    <li style="list-style: none;">
                                        <label for="title_[% language.lang | html %]">Title: </label>
                                        <input id="title_[% language.lang| html %]" size="30" type="text" name="title" value="[% translated_contents.item(language.lang).title | html %]"></span>
                                    </li>
                                    <li style="list-style: none;">
                                        <label for="content_[% language.lang | html %]">Content: </label>
                                        <textarea name="content" id="content_[% language.lang | html %]"  cols="75" rows="10">[% translated_contents.item(language.lang).content | html %]</textarea>
                                        <input type="hidden" name="lang" value="[% language.lang %]" />
                                    </li>
                                </ol>
                            </fieldset>
                        </div>
                    </div>
                [% END %]
            </div>
        [% ELSE %]
            <div id="lang_default">
                <div style="clear:both;">
                    <textarea name="content" id="content_default"  cols="75" rows="10">[% additional_content.content | html %]</textarea>
                </div>
            </div>
        [% END %]
    </form>
[% END %]

[% BLOCK list %]

    <div id="toolbar" class="btn-toolbar">
        <a class="btn btn-default" id="newentry" href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&category=[% category | html %]"><i class="fa fa-plus"></i> New entry</a>
    </div>

    <h2>Additional contents ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])</h2>
    [% IF category == 'news' %]
        See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a>
    [% ELSE %]
        See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a>
    [% END %]

    [% IF additional_contents.count %]
        <form id="del_form" method="post" action="/cgi-bin/koha/tools/additional-contents.pl">
            <table id="table_additional_contents">
                <thead>
                    <tr>
                        <th class="NoSort">&nbsp;</th>
                        <th>Location</th>
                        <th>Library</th>
                        <th>Number</th>
                        <th>Publication date</th>
                        <th>Expiration date</th>
                        <th class="anti-the">Title</th>
                        <th>Author</th>
                        <th class="anti-the">News</th>
                        <th class="NoSort noExport">Actions</th>
                    </tr>
                </thead>
                <tbody>
                    [% FOREACH c IN additional_contents%]
                        [% IF ( c.is_expired ) %]<tr class="expired">[% ELSE %]<tr>[% END %]
                        <td>
                            <input type="checkbox" name="ids" value="[% c.idnew | html %]" />
                        </td>
                        <td>
                            [% IF c.category == 'news' %]
                                [% IF c.location == 'staff_and_opac' %]All
                                [% ELSIF c.location == 'staff_only' %]Librarian interface
                                [% ELSIF c.location == 'opac_only' %]OPAC
                                [% ELSIF c.location == 'slip' %]Slip
                                [% ELSE %]Unknown ('[% location %]')
                                [% END %]
                            [% ELSE %]
                                [% c.location %]
                            [% END %]
                        </td>
                        <td>
                            [% IF ( c.branchcode == "" ) -%]
                            All libraries
                            [% ELSE %][% c.library.branchname | html %]
                            [% END %]
                        </td>
                        <td>[% c.number | html %]</td>
                        <td data-order="[% c.published_on | html %]">[% c.published_on | $KohaDates %]</td>
                        <td data-order="[% c.expirationdate | html %]">[% c.expirationdate | $KohaDates %] [% IF ( c.is_expired ) %](<span class="expired">expired</span>)[% END %]</td>
                        <td>[% c.title | html %]</td>
                        <td>[% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %]</td>
                        <td>
                            <div class="btn-group">
                                <a class="preview_news btn btn-default btn-xs" data-number="[% loop.count | html %]"><i class="fa fa-eye" aria-hidden="true"></i> Preview content</a>
                            </div>
                            <div id="contentModal[% loop.count | html %]" class="modal" tabindex="-1" role="dialog" data-number="[% loop.count | html %]">
                                <div class="modal-dialog" role="document">
                                    <div class="modal-content modal-lg">
                                        <div class="modal-header">
                                            <h5 class="modal-title">Preview of: "[% c.title | html %]"</h5>
                                        </div>
                                    <div class="modal-body">
                                        [% c.content | $raw %]
                                    </div>
                                    <div class="modal-footer">
                                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                                    </div>
                                </div>
                            </div>
                        </td>
                        <td class="actions">
                            [% IF ( wysiwyg ) %]
                                [% SET editmode = "wysiwyg" %]
                            [% ELSE %]
                                [% SET editmode = "text" %]
                            [% END %]
                            <div class="btn-group dropup">
                                <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.idnew | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs"> <i class="fa fa-pencil"></i> Edit</a><button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
                                    <span class="caret"></span>
                                </button>
                                <ul class="dropdown-menu pull-right">
                                    <li>
                                        [% IF ( wysiwyg ) %]
                                            <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.idnew | uri %]&editmode=text"><i class="fa fa-pencil"></i> Edit with text editor</a>
                                        [% ELSE %]
                                            <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.idnew | uri %]&editmode=wysiwyg"><i class="fa fa-pencil"></i> Edit with WYSIWYG editor</a>
                                        [% END %]
                                    </li>
                                </ul>
                            </div>
                            <div class="btn-group">
                                <a href="/cgi-bin/koha/tools/additional-contents.pl?op=del&amp;ids=[% c.idnew | uri %]" class="delete_news btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
                            </div>
                        </td>
                    </tr>
                    [% END %]
                </tbody>
            </table>
            <input type="hidden" name="op" value="del" />
            <fieldset class="action"><input type="submit" class="button" value="Delete selected" /></fieldset>
        </form>
    [% ELSE %]
        <div class="dialog message">There are no additional contents.</div>
    [% END %]
[% END %]

[% BLOCK locations_options %]
    [% IF category == 'news' %]
        [% IF location == "staff_and_opac" %]
            <option value="staff_and_opac" selected="selected">Librarian and OPAC interfaces</option>
        [% ELSE %]
            <option value="staff_and_opac">Librarian and OPAC interfaces</option>
        [% END %]

        [% IF location == "staff_only" %]
            <option value="staff_only" selected="selected">Librarian interface</option>
        [% ELSE %]
            <option value="staff_only">Librarian interface</option>
        [% END %]

        [% IF location == "opac_only" %]
            <option value="opac_only" selected="selected">OPAC</option>
        [% ELSE %]
            <option value="opac_only">OPAC</option>
        [% END %]

        [% IF location == "slip" %]
            <option value="slip" selected="selected">Slip</option>
        [% ELSE %]
            <option value="slip">Slip</option>
        [% END %]
    [% ELSE %]
        [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText' ] %]
            [% IF l == location %]
                <option value="[% l | html %]" selected="selected">[% l | html %]</option>
            [% ELSE %]
                <option value="[% l | html %]">[% l | html %]</option>
            [% END %]
        [% END %]
    [% END %]
[% END %]

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'calendar.inc' %]
    [% Asset.js("js/tools-menu.js") | $raw %]
    [% Asset.js("lib/hc-sticky.js") | $raw %]
    [% IF additional_contents.count %]
        [% INCLUDE 'datatables.inc' %]
        <script>
            $('.preview_news').click( function() {
                modalNumber = $(this).attr('data-number');
                $('.modal[data-number="'+modalNumber+'"]').modal('show');
            })
            function Checkbox(){
                var form = document.getElementById('del_form');
                var inputs = form.getElementsByTagName('input');
                var checked = false;
                for (var i=0; i<inputs.length; i++) {
                    if (inputs[i].type == 'checkbox' && inputs[i].name == 'ids') {
                        checked = inputs[i].checked;
                        if (checked) return true;
                    }
                }
            }

            function filterDataTable( table, column, term ){
                if( column ){
                    table.column( column ).search( term ).draw();
                } else {
                    table.search( term ).draw();
                }
                clearFilter( term );
            }

            function clearFilter( term ){
                if( term == "" ){
                    $(".dt_button_clear_filter").addClass("disabled");
                } else {
                    $(".dt_button_clear_filter").removeClass("disabled");
                }
            }

            /* Custom table search configuration: If a table row
               has an "expired" class, hide it UNLESS the
               show_expired checkbox is checked */
            $.fn.dataTable.ext.search.push(
                function( settings, searchData, index, rowData, counter ) {
                    var row = $(settings.aoData[index].nTr);
                    if( row.hasClass("expired") && !$("#show_expired").prop("checked") ){
                        return false;
                    } else {
                        return true;
                    }
                }
            );

            $(document).ready(function() {

                var table = $("#table_additional_contents").DataTable($.extend(true, {}, dataTablesDefaults, {
                    "order": [[ 4, "desc" ]],
                    "aoColumnDefs": [
                        { "sortable": false, "searchable": false, 'targets': [ 'NoSort' ] },
                        { "type": "anti-the", "targets": [ "anti-the" ] }
                    ],
                    "sPaginationType": "full_numbers"
                }));

                $(".delete_news").on("click", function(){
                    return confirmDelete( _("Are you sure you want to delete this news item? This cannot be undone.") );
                });

                $("#del_form").on("submit",function(){
                    if ( Checkbox() ) {
                        return confirmDelete( _("Are you sure you want to delete the selected news?") );
                    } else {
                        alert(_("Please select a news item to delete."));
                        return false;
                    }
                });

                $("#show_expired").on("change", function(){
                    /* redraw the DataTable according to the custom search function */
                    table.draw();
                });

                table.on( 'search.dt', function () {
                    var term = table.search();
                    $("#news_keyword").val( term );
                });

                $("#news_keyword").on("keyup", function(){
                    var term = $(this).val();
                    filterDataTable( table, null, term );
                });

                $("#news_display_location").on("change", function(){
                    var term = $(this).val();
                    filterDataTable( table, 1, term );
                });

                $("#news_library").on("change", function(){
                    // Table must be filtered by the <option>'s text, not its value
                    var opt = $(this).find("option:selected").text();
                    filterDataTable( table, 2, opt );
                });

                $(".dt_button_clear_filter").on("click", function(){
                    table.search('').columns().search('').draw();
                    $("#news-filter select").each(function(){
                        $(this).val("");
                    });
                });
            });
        </script>
    [% ELSE %]
        <script>
            $(document).ready(function() {
                $("#tabs").tabs();
                $("#add_additional_content").validate({
                    submitHandler: function(form){
                        if ( ! $("#title_default").val().length > 0 ) {
                            alert(__("Please specify a title for 'Default'"));
                            return false;
                        }

                        form.submit();
                    }
                });

                $("#submit_form").on("click",function(){
                    $("#add_additional_content").submit();
                });

                Sticky = $("#toolbar");
                Sticky.hcSticky({
                    stickTo: ".main",
                    stickyClass: "floating"
                });

            });
        </script>
    [% END %]
    [% UNLESS ( wysiwyg ) %]
        [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %]
        [% Asset.js( "lib/codemirror/xml.min.js" ) | $raw %]
        [% Asset.js( "lib/codemirror/lint.min.js" ) | $raw %]
        [% Asset.js( "lib/linters/htmlhint.min.js" ) | $raw %]
        [% Asset.js( "lib/codemirror/html-lint.min.js" ) | $raw %]
        <script>
            var editor = CodeMirror.fromTextArea(document.getElementById('content'), {
                lineNumbers: true,
                lineWrapping: true,
                lint: true,
                mode: "text/html",
                gutters: ["CodeMirror-lint-markers"],
                viewportMargin: Infinity,
            });
        </script>
    [% ELSE %]
        [% Asset.js("lib/tiny_mce/tinymce.min.js") | $raw %]
        [% INCLUDE 'str/tinymce_i18n.inc' %]
        <script>
            tinyMCE.init({
                verify_html: false,
                force_br_newlines : false,
                force_p_newlines : false,
                forced_root_block : '',
                branding : false,
                relative_urls : false,
                content_css : "[% interface | html %]/[% theme | html %]/css/tinymce.css",
                menubar : "file edit view insert format tools table",
                mode : "specific_textareas",
                plugins : "autoresize table hr link image charmap lists code emoticons",
                extended_valid_elements:"style,link[href|rel]",
                custom_elements:"style,link,~link",
                toolbar : [
                    "formatselect | bold italic | cut copy paste | alignleft aligncenter alignright | outdent indent | image link unlink anchor cleanup hr",
                    "table | bullist numlist | undo redo | removeformat | emoticons charmap | forecolor backcolor | code visualaid help"
                ],
            });
        </script>
    [% END # /UNLESS wysiwyg %]
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]




[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>News &rsaquo; Tools &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
[% UNLESS ( wysiwyg ) %]
    [% Asset.css("lib/codemirror/codemirror.css") | $raw %]
    [% Asset.css("lib/codemirror/lint.min.css") | $raw %]
    <style>
        .CodeMirror {
            resize: vertical;
            z-index: 0;
        }
    </style>
[% END %]
</head>

<body id="tools_koha-news" class="tools">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>
        <li>
            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
        </li>
        <li>
            <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
        </li>

        [% IF ( add_form ) %]
            <li>
                <a href="/cgi-bin/koha/tools/koha-news.pl">News</a>
            </li>
            <li>
                <a href="#" aria-current="page">
                    [% IF ( id ) %]
                        Edit news item
                    [% ELSE %]
                        Add news item
                    [% END %]
                </a>
            </li>
        [% ELSE %]
            <li>
                <a href="#" aria-current="page">
                    News
                </a>
            </li>
        [% END %]
    </ol>
</nav>

[% IF ( add_form ) %]
    <div class="main container-fluid">
        <div class="row">
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
[% ELSE %]
    <div class="main container-fluid">
        <div class="row">
            <div class="col-sm-10 col-sm-push-2">
[% END %]
                <main>

[% UNLESS ( add_form ) %]
    [% IF error_message == 'title_missing' %]
        <div class="dialog alert">Error: Required news title missing!</div>
    [% END %]
<h2>News</h2>
<div id="toolbar" class="btn-toolbar">
    <a class="btn btn-default" id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;lang=[% lang | html %]"><i class="fa fa-plus"></i> New entry</a>
</div>
[% END %]

[% IF ( add_form ) %]
    [% IF ( op == 'add' ) %]
        [% default_lang = lang %]
    [% ELSE %]
        [% default_lang = new_detail.lang %]
    [% END %]
        <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
            <input type="hidden" name="op" value="[% op | html %]" />
            <input type="hidden" name="id" value="[% id | html %]" />
			<fieldset class="rows">
            <legend>OPAC and Koha news</legend>
           <ol> <li>
            <label for="lang">Display location:</label>
            <select id="lang" name="lang">
                [% PROCESS lang_locations language => default_lang %]
            </select>
            </li>
            <li>
                <label for="branch">Library: </label>
                <select id="branch" name="branch">
                    [% IF ( new_detail.branchcode == '' ) %]
                        <option value="" selected="selected">All libraries</option>
                    [% ELSE %]
                        <option value=""         >All libraries</option>
                    [% END %]
                    [% PROCESS options_for_libraries libraries => Branches.all( selected => new_detail.branchcode, unfiltered => 1, ) %]
                </select>
            </li>
            <li>
                <label for="title" class="required">Title: </label>
                <input id="title" size="30" type="text" name="title" value="[% new_detail.title | html %]" required="required" class="required" /> <span class="required">Required</span>
            </li>
            <li>
                <label for="from">Publication date: </label>
                <input id="from" type="text" name="published_on" size="15" value="[% new_detail.published_on | html %]" class="datepickerfrom" />
				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
            </li>
            <li>
                <label for="to">Expiration date: </label>
                <input id="to" type="text" name="expirationdate" size="15" value="[% new_detail.expirationdate | html %]" class="datepickerto" />
                <div class="hint">
                    [% INCLUDE 'date-format.inc' %]
                    <br>News will still be accessible by direct URL if expired.
                </div>
            </li>
            <li>
                <label for="number">Appear in position: </label>
                [% IF ( new_detail.number ) %]
                    <input id="number" size="3" name="number" type="text" value="[% new_detail.number | html %]" />
                [% ELSE %]
                    <input id="number" size="3" name="number" type="text" />
                [% END %]
            </li>
            <li><label for="content">News: </label>
            <textarea name="content" id="content"  cols="75" rows="10">[% new_detail.content | html %]</textarea>
            </li>
            </ol>
			</fieldset>
  
                <fieldset class="action"><input class="button" type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/tools/koha-news.pl">Cancel</a></fieldset>
        </form>
    [% ELSE %]
        [% IF ( opac_news.count ) %]
        <form id="del_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl">
                <table id="newst">
                   <thead> <tr>
                        <th class="NoSort">&nbsp;</th>
                        <th>Location</th>
                        <th>Library</th>
                        <th>Number</th>
                        <th>Publication date</th>
                        <th>Expiration date</th>
                        <th class="anti-the">Title</th>
                        <th>Author</th>
                        <th class="anti-the">News</th>
                        <th class="NoSort noExport">Actions</th>
                    </tr></thead>
                    <tbody>[% FOREACH opac_new IN opac_news %]
                         [% IF ( opac_new.is_expired ) %]
                            <tr class="expired">
                            [% ELSE %]
                            <tr>
                            [% END %]
                            <td>
                                <input type="checkbox" name="ids" value="[% opac_new.idnew | html %]" />
                            </td>
                            <td>[% SWITCH opac_new.lang %]
                                [%   CASE "koha" %]
                                    Librarian interface (koha)
                                [%   CASE "slip" %]
                                    Slip
                                [%   CASE "" %]
                                    All
                                [%   CASE %]
                                    OPAC ([% opac_new.lang | html %])
                                [% END %]
                             </td>
                            <td>[% IF ( opac_new.branchcode == "" ) -%]
                                All libraries
                                [% ELSE %][% opac_new.library.branchname | html %]
                                [% END %]</td>
                            <td>[% opac_new.number | html %]</td>
                            <td data-order="[% opac_new.published_on | html %]">[% opac_new.published_on | $KohaDates %]</td>
                            <td data-order="[% opac_new.expirationdate | html %]">[% opac_new.expirationdate | $KohaDates %] [% IF ( opac_new.is_expired ) %](<span class="expired">expired</span>)[% END %]</td>
                            <td>[% opac_new.title | html %]</td>
                            <td>[% IF ( opac_new.author) %][% INCLUDE 'patron-title.inc' patron=opac_new.author %][% END %]</td>
                            <td>
                                <div class="btn-group">
                                    <a class="preview_news btn btn-default btn-xs" data-number="[% loop.count | html %]"><i class="fa fa-eye" aria-hidden="true"></i> Preview content</a>
                                </div>
                                <div id="contentModal[% loop.count | html %]" class="modal" tabindex="-1" role="dialog" data-number="[% loop.count | html %]">
                                    <div class="modal-dialog" role="document">
                                        <div class="modal-content modal-lg">
                                            <div class="modal-header">
                                                <h5 class="modal-title">Preview of: "[% opac_new.title | html %]"</h5>
                                            </div>
                                        <div class="modal-body">
                                            [% opac_new.content | $raw %]
                                        </div>
                                        <div class="modal-footer">
                                            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                                        </div>
                                    </div>
                                </div>
                            </td>
                            <td class="actions">
                                [% IF ( wysiwyg ) %]
                                    [% SET editmode = "wysiwyg" %]
                                [% ELSE %]
                                    [% SET editmode = "text" %]
                                [% END %]
                                <div class="btn-group dropup">
                                    <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% opac_new.idnew | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs"> <i class="fa fa-pencil"></i> Edit</a><button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
                                        <span class="caret"></span>
                                    </button>
                                    <ul class="dropdown-menu pull-right">
                                        <li>
                                            [% IF ( wysiwyg ) %]
                                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% opac_new.idnew | uri %]&editmode=text"><i class="fa fa-pencil"></i> Edit with text editor</a>
                                            [% ELSE %]
                                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% opac_new.idnew | uri %]&editmode=wysiwyg"><i class="fa fa-pencil"></i> Edit with WYSIWYG editor</a>
                                            [% END %]
                                        </li>
                                    </ul>
                                </div>
                                <div class="btn-group">
                                    <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% opac_new.idnew | uri %]" class="delete_news btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
                                </div>
                            </td>
                        </tr>
                    [% END %]</tbody>
                </table>
                <input type="hidden" name="op" value="del" />
                <fieldset class="action"><input type="submit" class="button" value="Delete selected" /></fieldset>
            </form>
        [% ELSE %]
            <div class="dialog message">There are no news items.</div>
        [% END %]
    [% END %]

                </main>
            [% UNLESS ( add_form ) %]
                </div> <!-- /.col-sm-10.col-sm-push-2 -->

                <div class="col-sm-2 col-sm-pull-10">
                    <aside>

                        <div id="news-filter">
                            <form action="/cgi-bin/koha/tools/koha-news.pl" method="get">
                                <h4>Filter</h4>
                                <fieldset class="brief">
                                    <ol>
                                        <li>
                                            <label for="news_keyword">Keyword:</label>
                                            <input type="text" name="news_keyword" id="news_keyword" />
                                        </li>
                                        <li>
                                            <label for="news_display_location">Display location:</label>
                                            <select name="news_display_location" id="news_display_location">
                                                [% PROCESS lang_locations %]
                                            </select>
                                        </li>
                                        <li>
                                            <label for="news_library">Library: </label>
                                            <select id="news_library" name="news_library">
                                                <option value=""></option>
                                                <option value="">All libraries</option>
                                                [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %]
                                            </select>
                                        </li>
                                        <li>
                                            <label>
                                                <input type="checkbox" name="show_expired" id="show_expired" /> Show expired
                                            </label>
                                        </li>
                                    </ol>
                                </fieldset>
                            </form>
                        </div>

                        [% INCLUDE 'tools-menu.inc' %]
                    </aside>
                </div> <!-- /.col-sm-2.col-sm-pull-10 -->
            [% END %]
        </div> <!-- /.row -->
    </div> <!-- /.main.container-fluid -->


[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'calendar.inc' %]
    [% Asset.js("js/tools-menu.js") | $raw %]
    [% IF ( opac_news.count ) %]
        [% INCLUDE 'datatables.inc' %]
        <script>
            $('.preview_news').click( function() {
                modalNumber = $(this).attr('data-number');
                $('.modal[data-number="'+modalNumber+'"]').modal('show');
            })
            function Checkbox(){
                var form = document.getElementById('del_form');
                var inputs = form.getElementsByTagName('input');
                var checked = false;
                for (var i=0; i<inputs.length; i++) {
                    if (inputs[i].type == 'checkbox' && inputs[i].name == 'ids') {
                        checked = inputs[i].checked;
                        if (checked) return true;
                    }
                }
            }

            function filterDataTable( table, column, term ){
                if( column ){
                    table.column( column ).search( term ).draw();
                } else {
                    table.search( term ).draw();
                }
                clearFilter( term );
            }

            function clearFilter( term ){
                if( term == "" ){
                    $(".dt_button_clear_filter").addClass("disabled");
                } else {
                    $(".dt_button_clear_filter").removeClass("disabled");
                }
            }

            /* Custom table search configuration: If a table row
               has an "expired" class, hide it UNLESS the
               show_expired checkbox is checked */
            $.fn.dataTable.ext.search.push(
                function( settings, searchData, index, rowData, counter ) {
                    var row = $(settings.aoData[index].nTr);
                    if( row.hasClass("expired") && !$("#show_expired").prop("checked") ){
                        return false;
                    } else {
                        return true;
                    }
                }
            );

            $(document).ready(function() {
                var newst = $("#newst").DataTable($.extend(true, {}, dataTablesDefaults, {
                    "order": [[ 4, "desc" ]],
                    "aoColumnDefs": [
                        { "sortable": false, "searchable": false, 'targets': [ 'NoSort' ] },
                        { "type": "anti-the", "targets": [ "anti-the" ] }
                    ],
                    "sPaginationType": "full_numbers"
                }));

                $(".delete_news").on("click", function(){
                    return confirmDelete( _("Are you sure you want to delete this news item? This cannot be undone.") );
                });

                $("#del_form").on("submit",function(){
                    if ( Checkbox() ) {
                        return confirmDelete( _("Are you sure you want to delete the selected news?") );
                    } else {
                        alert(_("Please select a news item to delete."));
                        return false;
                    }
                });

                $("#show_expired").on("change", function(){
                    /* redraw the DataTable according to the custom search function */
                    newst.draw();
                });

                newst.on( 'search.dt', function () {
                    var term = newst.search();
                    $("#news_keyword").val( term );
                });

                $("#news_keyword").on("keyup", function(){
                    var term = $(this).val();
                    filterDataTable( newst, null, term );
                });

                $("#news_display_location").on("change", function(){
                    var term = $(this).val();
                    filterDataTable( newst, 1, term );
                });

                $("#news_library").on("change", function(){
                    // Table must be filtered by the <option>'s text, not its value
                    var opt = $(this).find("option:selected").text();
                    filterDataTable( newst, 2, opt );
                });

                $(".dt_button_clear_filter").on("click", function(){
                    newst.search('').columns().search('').draw();
                    $("#news-filter select").each(function(){
                        $(this).val("");
                    });
                });
            });
        </script>
    [% END %]
    [% UNLESS ( wysiwyg ) %]
        [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %]
        [% Asset.js( "lib/codemirror/xml.min.js" ) | $raw %]
        [% Asset.js( "lib/codemirror/lint.min.js" ) | $raw %]
        [% Asset.js( "lib/linters/htmlhint.min.js" ) | $raw %]
        [% Asset.js( "lib/codemirror/html-lint.min.js" ) | $raw %]
        <script>
            var editor = CodeMirror.fromTextArea(document.getElementById('content'), {
                lineNumbers: true,
                lineWrapping: true,
                lint: true,
                mode: "text/html",
                gutters: ["CodeMirror-lint-markers"],
                viewportMargin: Infinity,
            });
        </script>
    [% ELSE %]
        [% Asset.js("lib/tiny_mce/tinymce.min.js") | $raw %]
        [% INCLUDE 'str/tinymce_i18n.inc' %]
        <script>
            tinyMCE.init({
                verify_html: false,
                force_br_newlines : false,
                force_p_newlines : false,
                forced_root_block : '',
                branding : false,
                relative_urls : false,
                content_css : "[% interface | html %]/[% theme | html %]/css/tinymce.css",
                menubar : "file edit view insert format tools table",
                mode : "specific_textareas",
                plugins : "autoresize table hr link image charmap lists code emoticons",
                extended_valid_elements:"style,link[href|rel]",
                custom_elements:"style,link,~link",
                toolbar : [
                    "formatselect | bold italic | cut copy paste | alignleft aligncenter alignright | outdent indent | image link unlink anchor cleanup hr",
                    "table | bullist numlist | undo redo | removeformat | emoticons charmap | forecolor backcolor | code visualaid help"
                ],
            });
        </script>
    [% END # /IF NewsToolEditor %]
[% END %]

[% BLOCK lang_locations %]
    [% IF ( language == "" ) %]
        <option value="" selected="selected"></option>
    [% ELSE %]
        <option value="">All</option>
    [% END %]
    [% IF ( language == "koha" ) %]
        <option value="koha" selected="selected">Librarian interface</option>
    [% ELSE %]
        <option value="koha">Librarian interface</option>
    [% END %]
    [% IF ( language == "slip" ) %]
        <option value="slip" selected="selected">Slip</option>
    [% ELSE %]
        <option value="slip">Slip</option>
    [% END %]
    [% FOREACH lang_lis IN lang_list %]
        <optgroup label="[% lang_lis.language | html %]">
            [% FOREACH location IN [ '', 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText'] %]
                [% IF ( location == '' ) %]
                    [% SET location_lang = lang_lis.language %]
                    [% location = BLOCK %]OPAC news[% END %]
                [% ELSE %]
                    [% SET location_lang = location _ "_" _ lang_lis.language %]
                [% END %]
                [% IF ( location_lang == language ) %]
                    <option value="[% location_lang | html %]" selected="selected">[% location | html %] ([% lang_lis.language | html %])</option>
                [% ELSE %]
                    <option value="[% location_lang | html %]">[% location | html %] ([% lang_lis.language | html %])</option>
                [% END %]
            [% END %]
        </optgroup>
    [% END %]
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]

Lines 93-99 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt (-3 / +6 lines)
93		93
94		94
95	<div class="col-sm-4 col-sm-push-4">	95	<div class="col-sm-4 col-sm-push-4">
96	[% IF ( CAN_user_tools_edit_calendar \|\| CAN_user_tools_manage_csv_profiles \|\| CAN_user_tools_view_system_logs \|\| CAN_user_tools_edit_news \|\| CAN_user_tools_schedule_tasks \|\| CAN_user_tools_edit_quotes \|\| ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) \|\| CAN_user_tools_upload_general_files \|\| CAN_user_tools_access_files ) %]	96	[% IF ( CAN_user_tools_edit_calendar \|\| CAN_user_tools_manage_csv_profiles \|\| CAN_user_tools_view_system_logs \|\| CAN_user_tools_edit_additional_contents \|\| CAN_user_tools_schedule_tasks \|\| CAN_user_tools_edit_quotes \|\| ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) \|\| CAN_user_tools_upload_general_files \|\| CAN_user_tools_access_files ) %]
97	<h3>Additional tools</h3>	97	<h3>Additional tools</h3>
98	[% END %]	98	[% END %]
99	<dl>	99	<dl>
Lines 112-120 Link Here
112	<dd>Browse the system logs</dd>	112	<dd>Browse the system logs</dd>
113	[% END %]	113	[% END %]
114		114
115	[% IF ( CAN_user_tools_edit_news ) %]	115	[% IF ( CAN_user_tools_edit_additional_contents ) %]
116	<dt><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></dt>	116	<dt><a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a></dt>
117	<dd>Write news for the OPAC and staff interfaces</dd>	117	<dd>Write news for the OPAC and staff interfaces</dd>
		118
		119	<dt><a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a></dt>
		120	<dd>Write HTML customizations</dd>
118	[% END %]	121	[% END %]
119		122
120	[% IF ( CAN_user_tools_schedule_tasks ) %]	123	[% IF ( CAN_user_tools_schedule_tasks ) %]

Lines 1-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc (-2 / +2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE KohaNews %]	3	[% USE AdditionalContents %]
4	[% PROCESS 'html_helpers.inc' %]	4	[% PROCESS 'html_helpers.inc' %]
5	[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]	5	[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
6	[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]	6	[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
7		7
8	<div id="wrapper">	8	<div id="wrapper">
9	<div id="header-region" class="noprint">	9	<div id="header-region" class="noprint">

Lines 1-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc (-2 / +2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE KohaNews %]	3	[% USE AdditionalContents %]
4	[% PROCESS 'html_helpers.inc' %]	4	[% PROCESS 'html_helpers.inc' %]
5	[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]	5	[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
6	[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]	6	[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
7		7
8	<div id="wrapper">	8	<div id="wrapper">
9	<div id="header-region" class="noprint">	9	<div id="header-region" class="noprint">




[% USE Koha %]
[% USE Branches %]
[% USE Categories %]
[% USE AdditionalContents %]
[% PROCESS 'html_helpers.inc' %]
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
[% SET OpacCustomSearch = AdditionalContents.get( location => "OpacCustomSearch", lang => lang, library => branchcode, blocktitle => 0 ) %]
[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]

<div id="wrapper">
    <div id="header-region" class="noprint">

Lines 1-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc (-2 / +2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE KohaNews %]	3	[% USE AdditionalContents %]
4	[%- USE KohaPlugins -%]	4	[%- USE KohaPlugins -%]
5	[% USE Asset %]	5	[% USE Asset %]
6	[% SET opaccredits = KohaNews.get( location => "opaccredits", lang => lang, library => branchcode ) %]	6	[% SET opaccredits = AdditionalContents.get( location => "opaccredits", lang => lang, library => branchcode ) %]
7	[% PROCESS 'html_helpers.inc' %]	7	[% PROCESS 'html_helpers.inc' %]
8	[% UNLESS ( is_popup ) %]	8	[% UNLESS ( is_popup ) %]
9	[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]	9	[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]

Lines 1-8 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt (-2 / +2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE KohaNews %]	3	[% USE AdditionalContents %]
4	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
5	[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]	5	[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
6	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
7	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
8	[% BLOCK cssinclude %]	8	[% BLOCK cssinclude %]

Lines 1-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-2 / +2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE Categories %]	3	[% USE Categories %]
4	[% USE KohaNews %]	4	[% USE AdditionalContents %]
5	[% PROCESS 'html_helpers.inc' %]	5	[% PROCESS 'html_helpers.inc' %]
6	[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]	6	[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
7	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
8	<title>	8	<title>
9	[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]	9	[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]

Lines 4-14 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-4 / +4 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% USE Categories %]	5	[% USE Categories %]
6	[% USE Price %]	6	[% USE Price %]
7	[% USE KohaNews %]	7	[% USE AdditionalContents %]
8	[% PROCESS 'i18n.inc' %]	8	[% PROCESS 'i18n.inc' %]
9	[% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]	9	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
10	[% SET OpacMainUserBlock = KohaNews.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]	10	[% SET OpacMainUserBlock = AdditionalContents.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]
11	[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]	11	[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
12	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
13	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	13	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
14	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt (-2 / +2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE KohaNews %]	3	[% USE AdditionalContents %]
4	[% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]	4	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
6	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
7	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 4-11 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt (-2 / +2 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% USE AuthorisedValues %]	5	[% USE AuthorisedValues %]
6	[% USE KohaDates %]	6	[% USE KohaDates %]
7	[% USE KohaNews %]	7	[% USE AdditionalContents %]
8	[% SET opacsuggestion = KohaNews.get( location => "OpacSuggestioninstructions", lang => lang, library => Branches.GetLoggedInBranchcode ) %]	8	[% SET opacsuggestion = AdditionalContents.get( location => "OpacSuggestioninstructions", lang => lang, library => Branches.GetLoggedInBranchcode ) %]
9	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
10	<title>[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]	10	<title>[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
11	[% IF ( op_else ) %]Purchase Suggestions[% END %] &rsaquo;	11	[% IF ( op_else ) %]Purchase Suggestions[% END %] &rsaquo;

Lines 3-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt (-1 / +1 lines)
3	[%# Includes %]	3	[%# Includes %]
4	[% USE Koha %]	4	[% USE Koha %]
5	[% USE KohaDates %]	5	[% USE KohaDates %]
6	[% USE KohaNews %]	6	[% USE AdditionalContents %]
7	[%# Helper template functions %]	7	[%# Helper template functions %]
8	[% BLOCK error_message %]	8	[% BLOCK error_message %]
9	[% IF messages.BadBarcode %]	9	[% IF messages.BadBarcode %]

Lines 25-31 use C4::Output qw( output_html_with_http_headers ); Link Here

(-)a/mainpage.pl (-4 / +8 lines)
25	use C4::Auth qw( get_template_and_user );	25	use C4::Auth qw( get_template_and_user );
26	use C4::Koha;	26	use C4::Koha;
27	use C4::Tags qw( get_count_by_tag_status );	27	use C4::Tags qw( get_count_by_tag_status );
28	use Koha::News;	28	use Koha::AdditionalContents;
29	use Koha::Patron::Modifications;	29	use Koha::Patron::Modifications;
30	use Koha::Patron::Discharge;	30	use Koha::Patron::Discharge;
31	use Koha::Reviews;	31	use Koha::Reviews;
Lines 49-58 my $homebranch; Link Here
49	if (C4::Context->userenv) {	49	if (C4::Context->userenv) {
50	$homebranch = C4::Context->userenv->{'branch'};	50	$homebranch = C4::Context->userenv->{'branch'};
51	}	51	}
52	my $koha_news = Koha::News->search_for_display({	52	my $koha_news = Koha::AdditionalContents->search_for_display(
53	location => 'koha',	53	{
		54	category => 'news',
		55	location => [ 'staff_only', 'staff_and_opac' ],
		56	lang => $template->lang,
54	library_id => $homebranch	57	library_id => $homebranch
55	});	58	}
		59	);
56		60
57	$template->param(	61	$template->param(
58	koha_news => $koha_news,	62	koha_news => $koha_news,




use C4::Overdues qw( checkoverdues );
use Koha::Checkouts;
use Koha::Holds;
use Koha::AdditionalContents;
use Koha::Patron::Messages;

my $input = CGI->new;

my $koha_news;

if (defined $news_id){
    $koha_news = Koha::AdditionalContents->search({ idnew => $news_id, location => ['opac_only', 'staff_and_opac'] }); # get news that is not staff-only news
    if ( $koha_news->count > 0){
        $template->param( news_item => $koha_news->next );
    } else {
        $template->param( single_news_error => 1 );
    }
} else {
    $koha_news = Koha::AdditionalContents->search_for_display(
        {
            category   => 'news',
            location   => ['opac_only', 'staff_and_opac'],
            lang       => $template->lang,
            library_id => $homebranch,
        }
    );
}

# For dashboard

Lines 22-28 use Modern::Perl; Link Here

(-)a/opac/opac-news-rss.pl (-5 / +8 lines)
22	use CGI;	22	use CGI;
23	use C4::Auth qw( get_template_and_user );	23	use C4::Auth qw( get_template_and_user );
24	use C4::Output qw( output_html_with_http_headers );	24	use C4::Output qw( output_html_with_http_headers );
25	use Koha::News;	25	use Koha::AdditionalContents;
26		26
27	my $input = CGI->new;	27	my $input = CGI->new;
28	my $dbh = C4::Context->dbh;	28	my $dbh = C4::Context->dbh;
Lines 42-52 my ($theme, $news_lang, $availablethemes) = C4::Templates::themelanguage(C4::Con Link Here
42		42
43	my $branchcode = $input->param('branchcode');	43	my $branchcode = $input->param('branchcode');
44		44
45	my $koha_news = Koha::News->search_for_display({	45	my $koha_news = Koha::AdditionalContents->search_for_display(
46	location => 'opac',	46	{
47	lang => $news_lang,	47	category => 'news',
		48	location => ['opac_only', 'staff_and_opac'],
		49	lang => $news_lang,
48	library_id => $branchcode,	50	library_id => $branchcode,
49	});	51	}
		52	);
50		53
51	$template->param( koha_news => $koha_news );	54	$template->param( koha_news => $koha_news );
52		55

Lines 64-70 if ( $content =~ m/[^\n]<<.>>[^\n]*/so ) { Link Here

(-)a/svc/letters/preview (-1 lines)
64	borrowers => 'borrower',	64	borrowers => 'borrower',
65	branches => 'branch',	65	branches => 'branch',
66	items => 'item',	66	items => 'item',
67	opac_news => 'news',
68	aqorders => 'orders',	67	aqorders => 'orders',
69	reserves => 'hold',	68	reserves => 'hold',
70	serial => 'serial',	69	serial => 'serial',




    is( $r, 0, 'Borrower2/serials granular * should fail' );

    # Check granular permission with one or more specific subperms
    $r = haspermission( $borr1->{userid}, { tools => 'edit_additional_contents' } );
    is( ref($r), 'HASH', 'Superlibrarian/tools edit_additional_contents' );
    $r = haspermission( $borr2->{userid}, { acquisition => 'budget_manage' } );
    is( ref($r), 'HASH', 'Borrower2/acq budget_manage' );
    $r = haspermission( $borr2->{userid},
        { acquisition => 'budget_manage', tools => 'edit_additional_contents' } );
    is( $r, 0, 'Borrower2 (/acquisition|budget_manage AND /tools|edit_additional_contents) should fail' );
    $r = haspermission(
        $borr2->{userid},
        {

        {
            tools => {
                'upload_local_cover_images'  => 1,
                'edit_additional_contents' => 1
            },
        }
    );
    is( $r, 0, 'Borrower2 (/tools|upload_local_cover_image AND /tools|edit_additional_contents) granular' );
    $r = haspermission(
        $borr2->{userid},
        {
            tools => [ 'upload_local_cover_images', 'edit_additional_contents'],
        }
    );
    is( ref($r), 'HASH', 'Borrower2 (/tools|upload_local_cover_image OR /tools|edit_additional_contents) granular' );
};

subtest 'arrayref top level OR tests' => sub {

    is( $r, 0, 'Borrower2/serials granular * should fail' );

    # Check granular permission with one or more specific subperms
    $r = haspermission( $borr1->{userid}, [ { tools => 'edit_additional_contents' } ] );
    is( ref($r), 'HASH', 'Superlibrarian/tools edit_additional_contents' );
    $r =
      haspermission( $borr2->{userid}, [ { acquisition => 'budget_manage' } ] );
    is( ref($r), 'HASH', 'Borrower2/acq budget_manage' );
    $r = haspermission( $borr2->{userid},
        [ { acquisition => 'budget_manage'}, { tools => 'edit_additional_contents' } ] );
    is( ref($r), 'HASH', 'Borrower2/two granular OR should pass' );
    $r = haspermission(
        $borr2->{userid},
        [
            { tools => ['upload_local_cover_images'] },
            { tools => ['edit_additional_contents'] }
        ]
    );
    is( ref($r), 'HASH', 'Borrower2/tools granular OR subperms' );




use Test::More tests => 5;
use Test::Exception;

use Koha::AdditionalContents;
use Koha::Database;
use Koha::DateUtils;


my $schema = Koha::Database->new->schema;
my $builder = t::lib::TestBuilder->new;

subtest 'Koha::AdditionalContents basic test' => sub {

    plan tests => 5;

    $schema->storage->txn_begin;

    my $library = $builder->build({ source => 'Branch'});
    my $nb_of_news = Koha::AdditionalContents->search->count;
    my $new_news_item_1 = Koha::AdditionalContent->new({
        branchcode => $library->{branchcode},
        title => 'a news',
        content => 'content for news 1',
    })->store;
    my $new_news_item_2 = Koha::AdditionalContent->new({
        branchcode => $library->{branchcode},
        title => 'another news',
        content => 'content for news 2',
    })->store;

    like( $new_news_item_1->idnew, qr|^\d+$|, 'Adding a new news_item should have set the idnew');
    is( Koha::AdditionalContents->search->count, $nb_of_news + 2, 'The 2 news should have been added' );

    my $retrieved_news_item_1 = Koha::AdditionalContents->find( $new_news_item_1->idnew );
    is( $retrieved_news_item_1->title, $new_news_item_1->title, 'Find a news_item by id should return the correct news_item' );
    is( $retrieved_news_item_1->content, $new_news_item_1->content, 'The content method return the content of the news');

    $retrieved_news_item_1->delete;
    is( Koha::AdditionalContents->search->count, $nb_of_news + 1, 'Delete should have deleted the news_item' );

    $schema->storage->txn_rollback;
};

    my $yesterday = dt_from_string->add( days => -1 );
    my $tomorrow = dt_from_string->add( days => 1 );
    my $new_today = $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            expirationdate => $today,
        }
    });
    my $new_expired = $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            expirationdate => $yesterday,
        }
    });
    my $new_not_expired = $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            expirationdate => $tomorrow,
        }

    my $library = $builder->build_object({ class => 'Koha::Libraries' });

    my $new_with_library = $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            branchcode => $library->branchcode
        }
    });
    my $new_without_library = $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            branchcode => undef
        }

subtest '->author' => sub {
    plan tests => 3;

    my $news_item = $builder->build_object({ class => 'Koha::AdditionalContents' });
    my $author = $news_item->author;
    is( ref($author), 'Koha::Patron', 'Koha::AdditionalContent->author returns a Koha::Patron object' );

    $author->delete;

    $news_item = Koha::AdditionalContents->find($news_item->idnew);
    is( ref($news_item), 'Koha::AdditionalContent', 'News are not deleted alongwith the author' );
    is( $news_item->author, undef, '->author returns undef is the author has been deleted' );
};



    $schema->storage->txn_begin;

    Koha::AdditionalContents->search->delete;

    my $today = dt_from_string;
    my $yesterday = dt_from_string->add( days => -1 );

    my $library2 = $builder->build_object({ class => 'Koha::Libraries' });

    my $new_expired = $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            expirationdate => $yesterday,
            published_on => $today,
            category => 'news',
            location => 'staff_and_opac',
            lang => 'default',
            branchcode => undef,
            number => 1,
        }
    });
    my $new_not_expired = $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            expirationdate => $tomorrow,
            published_on => $today,
            category => 'news',
            location => 'staff_and_opac',
            lang => 'default',
            branchcode => undef,
            number => 2,
        }
    });
    my $new_not_active = $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            expirationdate => $tomorrow,
            published_on => $tomorrow,
            category => 'news',
            location => 'staff_and_opac',
            lang => 'default',
            branchcode => undef,
            number => 3,
        }
    });
    my $new_slip= $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            expirationdate => $tomorrow,
            published_on => $today,
            category => 'news',
            location => 'staff_only',
            lang => 'default',
            branchcode => $library1->branchcode,
            number => 4,
        }
    });
    my $new_intra = $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            expirationdate => $tomorrow,
            published_on => $today,
            category => 'news',
            location => 'staff_only',
            lang => 'default',
            branchcode => $library2->branchcode,
            number => 5,
        }
    });
    my $new_intra2 = $builder->build_object({
        class => 'Koha::AdditionalContents',
        value => {
            expirationdate => $tomorrow,
            published_on => $today,
            category => 'news',
            location => 'staff_only',
            lang => 'default',
            branchcode => undef,
            number => 5,
        }
    });
    my $news = Koha::AdditionalContents->search_for_display;

    # FIXME Rewrite tests here
    is($news->next->number, 2, 'News items are returned in correct order');

    $news = Koha::News->search_for_display({ location => 'slip'});
    is($news->count, 2, 'Slip and "all" locations returned');

    $news = Koha::News->search_for_display({ location => 'koha'});
    is($news->count, 3, 'Intranet and "all"');

    $new_not_expired->lang('OpacNavRight_en')->store;
    $news = Koha::News->search_for_display({ location => 'OpacNavRight', lang => 'en'});
    is($news->count, 1, 'OpacNavRight');
    is($news->next->idnew, $new_not_expired->idnew, 'Returned the right new item');

    $new_intra->lang('')->store;
    $news = Koha::News->search_for_display({ location => 'opac', lang => 'en'});
    is($news->count, 1, 'Only opac news are returned');
    $new_not_expired->lang('en')->store;
    $news = Koha::News->search_for_display({ location => 'opac', lang => 'en'});
    is($news->count, 2, 'Opac en and all is returned');

    $news = Koha::News->search_for_display({ library_id => $library1->branchcode });
    is($news->count, 3, 'Filtering by library returns right number of news items');

    $news = Koha::News->search_for_display({ library_id => $library2->branchcode});
    is($news->count, 3, 'Filtering by library returns right number of news items');

    $new_intra->branchcode($library1->branchcode)->store;
    $news = Koha::News->search_for_display({ library_id => $library2->branchcode});
    is($news->count, 2, 'Filtering by library returns right number of news items');

    $news = Koha::News->search_for_display({ location => 'NonExistantType', lang => 'en'});
    is($news->count, 0, 'Non-existant location is searched, but should not find any item');

    throws_ok { Koha::News->search_for_display({ location => 'opac'}) } 'Koha::Exceptions::BadParameter',
        'Exception raised when location is opac and no language given';

    $schema->storage->txn_rollback;
};




use Koha::Biblioitem;
use Koha::Item;
use Koha::Hold;
use Koha::AdditionalContent;
use Koha::Serial;
use Koha::Subscription;
use Koha::Suggestion;


my $news = $builder->build_object(
    {
        class => 'Koha::AdditionalContents',
        value => { title => 'a news title', content => 'a news content' }
    }
);

is( $prepared_letter->{content}, $item->id(), 'Item object used correctly for content' );
is( $prepared_letter->{title}, $item->barcode, 'Item object used correctly for title' );

$sth->execute( "TEST_NEWS", "[% additional_content.id %]", "[% additional_content.id %]" );
$prepared_letter = GetPreparedLetter(
    (
        module      => 'test',
        letter_code => 'TEST_NEWS',
        tables      => {
            additional_contents => $news->id()
        },
    )
);

        is( $tt_letter_for_item2->{content}, $letter_for_item2->{content}, );
    };

    subtest 'ISSUESLIP|checkedout|repeat|news' => sub {
        plan tests => 3;

        my $code = 'ISSUESLIP';
        my $now = dt_from_string;


        my $branchcode = $library->{branchcode};

        Koha::AdditionalContents->delete;
        my $news_item = Koha::AdditionalContent->new(
            {
                branchcode      => $branchcode,
                title           => "A wonderful news",
                content         => "This is the wonderful news.",
                lang            => "slip",
                expiration_date => undef,
                published_on    => $one_minute_ago
            }
        )->store;

        # historic syntax
        my $template = <<EOF;

<h4 style="text-align: center; font-style:italic;">News</h4>
<news>
<div class="newsitem">
<h5 style="margin-bottom: 1px; margin-top: 1px"><b><<additional_contents.title>></b></h5>
<p style="margin-bottom: 1px; margin-top: 1px"><<additional_contents.content>></p>
<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on <<additional_contents.published_on>></p>
<hr />
</div>
</news>

<hr>

<h4 style="text-align: center; font-style:italic;">News</h4>
[% FOREACH n IN additional_contents %]
<div class="newsitem">
<h5 style="margin-bottom: 1px; margin-top: 1px"><b>[% n.title %]</b></h5>
<p style="margin-bottom: 1px; margin-top: 1px">[% n.content %]</p>
<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on [% n.published_on | \$KohaDates %]</p>
<hr />
</div>
[% END %]

        # There is too many line breaks generated by the historic syntax
        $second_slip->{content} =~ s|</p>\n\n\n<p>|</p>\n\n<p>|s;

        my $news_item_title = $news_item->title;
        like( $first_slip->{content}, qr{$news_item_title} );
        is( $first_tt_slip->{content}, $first_slip->{content}, );
        is( $second_tt_slip->{content}, $second_slip->{content}, );





#!/usr/bin/perl

# This file is part of Koha.
#
# Script to manage the opac news.
# written 11/04
# Casta�eda, Carlos Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina
# Modified to include news to KOHA intranet - tgarip@neu.edu.tr NEU library -Cyprus
# Copyright 2000-2002 Katipo Communications
# Copyright (C) 2013    Mark Tompsett
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Koha;
use C4::Context;
use C4::Output;
use C4::Languages qw(getTranslatedLanguages);
use Koha::DateUtils;
use Koha::AdditionalContents;

my $cgi = CGI->new;

my $op             = $cgi->param('op') || 'list';
my $id             = $cgi->param('id');
my $category       = $cgi->param('category') || 'news';
my $wysiwyg;
if( $cgi->param('editmode') ){
    $wysiwyg = $cgi->param('editmode') eq "wysiwyg" ? 1 : 0;
} else {
    $wysiwyg = C4::Context->preference("AdditionalContentsEditor") eq "tinymce" ? 1 : 0;
}

my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
    {
        template_name   => "tools/additional-contents.tt",
        query           => $cgi,
        type            => "intranet",
        flagsrequired   => { tools => 'edit_additional_contents' },
    }
);

my @messages;
if ( $op eq 'add_form' ) {

    my $additional_content = Koha::AdditionalContents->find($id);
    my $translated_contents;
    if ( $additional_content ) {
        $translated_contents = {
            map { $_->lang => $_ } Koha::AdditionalContents->search(
                {
                    category   => $additional_content->category,
                    code       => $additional_content->code,
                    location   => $additional_content->location,
                    branchcode => $additional_content->branchcode,
                }
            )
        };
    }
    $template->param(
        additional_content => $additional_content,
        translated_contents => $translated_contents,
    );
}
elsif ( $op eq 'add_validate' ) {
    my $location   = $cgi->param('location');
    my $code       = $cgi->param('code');
    my $branchcode = $cgi->param('branchcode') || undef;

    my @title      = $cgi->multi_param('title');
    my @content    = $cgi->multi_param('content');
    my @lang       = $cgi->multi_param('lang');

    my $expirationdate;
    if ( $cgi->param('expirationdate') ) {
        $expirationdate = output_pref(
            {
                dt => dt_from_string( scalar $cgi->param('expirationdate') ),
                dateformat => 'iso',
                dateonly   => 1
            }
        );
    }
    my $published_on = output_pref(
        {
            dt         => dt_from_string( scalar $cgi->param('published_on') ),
            dateformat => 'iso',
            dateonly   => 1
        }
    );
    my $number = $cgi->param('number');

    my $success = 1;
    for my $lang ( @lang ) {
        my $title = shift @title;
        my $content = shift @content;
        my $additional_content = Koha::AdditionalContents->find(
            {
                category   => $category,
                code       => $code,
                branchcode => $branchcode,
                lang       => $lang,
            }
        );
        # Delete if title or content is empty
        unless ( $title and $content ) {
            $additional_content->delete if $additional_content;
            next;
        } elsif ( $additional_content ) {
            eval {
                $additional_content->update(
                    {
                        category       => $category,
                        code           => $code,
                        location       => $location,
                        branchcode     => $branchcode,
                        title          => $title,
                        content        => $content,
                        lang           => $lang,
                        expirationdate => $expirationdate,
                        published_on   => $published_on,
                        number         => $number,
                        borrowernumber => $borrowernumber,
                    }
                );
            };
            if ($@) {
                $success = 0;
                push @messages, { type => 'error', code => 'error_on_update' };
                last;
            }
        }
        else {
            my $additional_content = Koha::AdditionalContent->new(
                {
                    category       => $category,
                    code           => $code,
                    location       => $location,
                    branchcode     => $branchcode,
                    title          => $title,
                    content        => $content,
                    lang           => $lang,
                    expirationdate => $expirationdate,
                    published_on   => $published_on,
                    number         => $number,
                    borrowernumber => $borrowernumber,
                }
            )->store;
            eval { $additional_content->store; };
            if ($@) {
                $success = 0;
                push @messages, { type => 'error', code => 'error_on_insert' };
                last;
            }
        }

    }
    $op = 'list';
}
elsif ( $op eq 'delete_confirmed' ) {
    my @ids = $cgi->multi_param('ids');
    my $deleted =
      eval { Koha::AdditionalContents->search( { idnew => @ids } )->delete; };

    if ( $@ or not $deleted ) {
        push @messages, { type => 'error', code => 'error_on_delete' };
    }
    else {
        push @messages, { type => 'message', code => 'success_on_delete' };
    }

    $op = 'list';
}

if ( $op eq 'list' ) {
    my $additional_contents = Koha::AdditionalContents->search(
        { category => $category, lang => 'default' },
        { order_by => { -desc => 'published_on' } }
    );
    $template->param( additional_contents => $additional_contents );
}

my $translated_languages = C4::Languages::getTranslatedLanguages;
my @languages;
for my $language (@$translated_languages) {
    for my $sublanguage ( @{ $language->{sublanguages_loop} } ) {
        if ( $language->{plural} ) {
            push @languages,
              {
                lang        => $sublanguage->{rfc4646_subtag},
                description => $sublanguage->{native_description} . ' '
                  . $sublanguage->{region_description} . ' ('
                  . $sublanguage->{rfc4646_subtag} . ')',
              };
        }
        else {
            push @languages,
              {
                lang        => $sublanguage->{rfc4646_subtag},
                description => $sublanguage->{native_description} . ' ('
                  . $sublanguage->{rfc4646_subtag} . ')',
              };
        }
    }
}
unshift @languages, {lang => 'default'} if @languages;

$template->param(
    op        => $op,
    category  => $category,
    wysiwyg   => $wysiwyg,
    languages => \@languages,
);


output_html_with_http_headers $cgi, $cookie, $template->output;




#!/usr/bin/perl

# This file is part of Koha.
#
# Script to manage the opac news.
# written 11/04
# Casta�eda, Carlos Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina
# Modified to include news to KOHA intranet - tgarip@neu.edu.tr NEU library -Cyprus
# Copyright 2000-2002 Katipo Communications
# Copyright (C) 2013    Mark Tompsett
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth qw( get_template_and_user );
use C4::Context;
use C4::Output qw( output_html_with_http_headers );
use C4::Languages qw( getTranslatedLanguages );
use Koha::DateUtils qw( dt_from_string output_pref );
use Koha::News;

my $cgi = CGI->new;

my $id             = $cgi->param('id');
my $title          = $cgi->param('title');
my $content        = $cgi->param('content');
my $expirationdate;
if ( $cgi->param('expirationdate') ) {
    $expirationdate = output_pref({ dt => dt_from_string( scalar $cgi->param('expirationdate') ), dateformat => 'iso', dateonly => 1 });
}
my $published_on= output_pref({ dt => dt_from_string( scalar $cgi->param('published_on') ), dateformat => 'iso', dateonly => 1 });
my $number         = $cgi->param('number');
my $lang           = $cgi->param('lang');
my $branchcode     = $cgi->param('branch');
my $error_message  = $cgi->param('error_message');
my $wysiwyg;
if( $cgi->param('editmode') ){
    $wysiwyg = $cgi->param('editmode') eq "wysiwyg" ? 1 : 0;
} else {
    $wysiwyg = C4::Context->preference("NewsToolEditor") eq "tinymce" ? 1 : 0;
}

# Foreign Key constraints work with NULL, not ''
# NULL = All branches.
$branchcode = undef if (defined($branchcode) && $branchcode eq '');

my $new_detail = Koha::News->find( $id );

my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
    {
        template_name   => "tools/koha-news.tt",
        query           => $cgi,
        type            => "intranet",
        flagsrequired   => { tools => 'edit_news' },
    }
);

# Pass error message if there is one.
$template->param( error_message => $error_message ) if $error_message;

# get lang list
my @lang_list;
my $tlangs = getTranslatedLanguages() ;

foreach my $language ( @$tlangs ) {
    foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) {
        push @lang_list,
        {
            language => $sublanguage->{'rfc4646_subtag'},
            selected => ( $new_detail && $new_detail->lang eq $sublanguage->{'rfc4646_subtag'} ? 1 : 0 ),
        };
    }
}

$template->param( lang_list   => \@lang_list,
                  branchcode  => $branchcode );

my $op = $cgi->param('op') // '';

if ( $op eq 'add_form' ) {
    $template->param( add_form => 1 );
    if ($id) {
        if($new_detail->lang eq "slip"){ $template->param( slip => 1); }
        $template->param( 
            op => 'edit',
            id => $new_detail->idnew
        );
        $template->{VARS}->{'new_detail'} = $new_detail;
    }
    else {
        $template->param( op => 'add' );
    }
}
elsif ( $op eq 'add' ) {
    if ($title) {
        my $new = Koha::NewsItem->new({
            title          => $title,
            content        => $content,
            lang           => $lang,
            expirationdate => $expirationdate,
            published_on   => $published_on,
            number         => $number,
            branchcode     => $branchcode,
            borrowernumber => $borrowernumber,
        })->store;
        print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
    }
    else {
        print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl?error_message=title_missing");
    }
}
elsif ( $op eq 'edit' ) {
    my $news_item = Koha::News->find( $id );
    if ( $news_item ) {
        $news_item->set({
            title          => $title,
            content        => $content,
            lang           => $lang,
            expirationdate => $expirationdate,
            published_on=> $published_on,
            number         => $number,
            branchcode     => $branchcode,
        })->store;
    }
    print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
}
elsif ( $op eq 'del' ) {
    my @ids = $cgi->multi_param('ids');
    Koha::News->search({ idnew => @ids })->delete;
    print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
}

else {
    my $params;
    $params->{lang} = $lang if $lang;
    my $opac_news = Koha::News->search(
        $params,
        {
            order_by => { -desc =>  'published_on' },
        }
    );
    $template->param( opac_news => $opac_news );
}
$template->param(
    lang => $lang,
    wysiwyg => $wysiwyg,
);
output_html_with_http_headers $cgi, $cookie, $template->output;

Lines 249-255 sub add_form { Link Here

(-)a/tools/letter.pl (-2 / +1 lines)
249	{value => 'items.fine', text => 'items.fine'},	249	{value => 'items.fine', text => 'items.fine'},
250	add_fields('borrowers');	250	add_fields('borrowers');
251	if ($module eq 'circulation') {	251	if ($module eq 'circulation') {
252	push @{$field_selection}, add_fields('opac_news');	252	push @{$field_selection}, add_fields('additional_contents');
253		253
254	}	254	}
255		255
256	-

Return to bug 24387

Lines 794-805 sub _parseletter_sth { Link Here

(-)a/C4/Letters.pm (-2 / +8 lines)
794	($table eq 'aqorders' ) ? "SELECT * FROM $table WHERE ordernumber = ?" :	794	($table eq 'aqorders' ) ? "SELECT * FROM $table WHERE ordernumber = ?" :
795	($table eq 'aqbasket' ) ? "SELECT * FROM $table WHERE basketno = ?" :	795	($table eq 'aqbasket' ) ? "SELECT * FROM $table WHERE basketno = ?" :
796	($table eq 'illrequests' ) ? "SELECT * FROM $table WHERE illrequest_id = ?" :	796	($table eq 'illrequests' ) ? "SELECT * FROM $table WHERE illrequest_id = ?" :
797	($table eq 'opac_news' ) ? "SELECT * FROM $table WHERE idnew = ?" :
798	($table eq 'article_requests') ? "SELECT * FROM $table WHERE id = ?" :	797	($table eq 'article_requests') ? "SELECT * FROM $table WHERE id = ?" :
799	($table eq 'borrower_modifications') ? "SELECT * FROM $table WHERE verification_token = ?" :	798	($table eq 'borrower_modifications') ? "SELECT * FROM $table WHERE verification_token = ?" :
800	($table eq 'subscription') ? "SELECT * FROM $table WHERE subscriptionid = ?" :	799	($table eq 'subscription') ? "SELECT * FROM $table WHERE subscriptionid = ?" :
801	($table eq 'serial') ? "SELECT * FROM $table WHERE serialid = ?" :	800	($table eq 'serial') ? "SELECT * FROM $table WHERE serialid = ?" :
802	($table eq 'problem_reports') ? "SELECT * FROM $table WHERE reportid = ?" :	801	($table eq 'problem_reports') ? "SELECT * FROM $table WHERE reportid = ?" :
		802	($table eq 'additional_contents' \|\| $table eq 'opac_news') ? "SELECT * FROM additional_contents WHERE idnew = ?" :
803	undef ;	803	undef ;
804	unless ($query) {	804	unless ($query) {
805	warn "ERROR: No _parseletter_sth query for table '$table'";	805	warn "ERROR: No _parseletter_sth query for table '$table'";
Lines 1653-1660 sub _get_tt_params { Link Here
1653	plural => 'items',	1653	plural => 'items',
1654	pk => 'itemnumber',	1654	pk => 'itemnumber',
1655	},	1655	},
		1656	additional_contents => {
		1657	module => 'Koha::AdditionalContents',
		1658	singular => 'additional_content',
		1659	plural => 'additional_contents',
		1660	pk => 'idnew',
		1661	},
1656	opac_news => {	1662	opac_news => {
1657	module => 'Koha::News',	1663	module => 'Koha::AdditionalContents',
1658	singular => 'news',	1664	singular => 'news',
1659	plural => 'news',	1665	plural => 'news',
1660	pk => 'idnew',	1666	pk => 'idnew',

Lines 3906-3933 CREATE TABLE `old_reserves` ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (-14 / +18 lines)
3906	/!40101 SET character_set_client = @saved_cs_client /;	3906	/!40101 SET character_set_client = @saved_cs_client /;
3907		3907
3908	--	3908	--
3909	-- Table structure for table `opac_news`	3909	-- Table structure for table `additional_contents`
3910	--	3910	--
3911		3911
3912	DROP TABLE IF EXISTS `opac_news`;	3912	DROP TABLE IF EXISTS `additional_contents`;
3913	/!40101 SET @saved_cs_client = @@character_set_client /;	3913	/!40101 SET @saved_cs_client = @@character_set_client /;
3914	/!40101 SET character_set_client = utf8 /;	3914	/!40101 SET character_set_client = utf8 /;
3915	CREATE TABLE `opac_news` (	3915	CREATE TABLE `additional_contents` (
3916	`idnew` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'unique identifier for the news article',	3916	`idnew` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'unique identifier for the additional content',
3917	`branchcode` varchar(10) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'branch code users to create branch specific news, NULL is every branch.',	3917	`category` varchar(20) NOT NULL COMMENT 'category for the additional content',
3918	`title` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'title of the news article',	3918	`code` varchar(20) NOT NULL COMMENT 'code to group content per lang',
3919	`content` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'the body of your news article',	3919	`location` varchar(255) NOT NULL COMMENT 'location of the additional content',
3920	`lang` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'location for the article (koha is the staff interface, slip is the circulation receipt and language codes are for the opac)',	3920	`branchcode` varchar(10) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'branch code users to create branch specific additional content, NULL is every branch.',
		3921	`title` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'title of the additional content',
		3922	`content` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'the body of your additional content',
		3923	`lang` varchar(25) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'location for the additional content(koha is the staff interface, slip is the circulation receipt and language codes are for the opac)',
3921	`published_on` date DEFAULT NULL COMMENT 'publication date',	3924	`published_on` date DEFAULT NULL COMMENT 'publication date',
3922	`updated_on` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() COMMENT 'last modification',	3925	`updated_on` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() COMMENT 'last modification',
3923	`expirationdate` date DEFAULT NULL COMMENT 'date the article is set to expire or no longer be visible',	3926	`expirationdate` date DEFAULT NULL COMMENT 'date the additional content is set to expire or no longer be visible',
3924	`number` int(11) DEFAULT NULL COMMENT 'the order in which this article appears in that specific location',	3927	`number` int(11) DEFAULT NULL COMMENT 'the order in which this additional content appears in that specific location',
3925	`borrowernumber` int(11) DEFAULT NULL COMMENT 'The user who created the news article',	3928	`borrowernumber` int(11) DEFAULT NULL COMMENT 'The user who created the additional content',
3926	PRIMARY KEY (`idnew`),	3929	PRIMARY KEY (`idnew`),
3927	KEY `borrowernumber_fk` (`borrowernumber`),	3930	UNIQUE KEY `additional_contents_uniq` (`category`,`code`,`branchcode`,`lang`),
3928	KEY `opac_news_branchcode_ibfk` (`branchcode`),	3931	KEY `additional_contents_borrowernumber_fk` (`borrowernumber`),
		3932	KEY `additional_contents_branchcode_ibfk` (`branchcode`),
3929	CONSTRAINT `borrowernumber_fk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE,	3933	CONSTRAINT `borrowernumber_fk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE,
3930	CONSTRAINT `opac_news_branchcode_ibfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE	3934	CONSTRAINT `additional_contents_branchcode_ibfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
3931	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;	3935	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
3932	/!40101 SET character_set_client = @saved_cs_client /;	3936	/!40101 SET character_set_client = @saved_cs_client /;
3933		3937

Lines 39-45 use Koha::Biblio; Link Here

(-)a/t/db_dependent/Letters/TemplateToolkit.t (-13 / +24 lines)
39	use Koha::Biblioitem;	39	use Koha::Biblioitem;
40	use Koha::Item;	40	use Koha::Item;
41	use Koha::Hold;	41	use Koha::Hold;
42	use Koha::NewsItem;	42	use Koha::AdditionalContent;
43	use Koha::Serial;	43	use Koha::Serial;
44	use Koha::Subscription;	44	use Koha::Subscription;
45	use Koha::Suggestion;	45	use Koha::Suggestion;
Lines 78-84 my $hold = $builder->build_object( Link Here
78		78
79	my $news = $builder->build_object(	79	my $news = $builder->build_object(
80	{	80	{
81	class => 'Koha::News',	81	class => 'Koha::AdditionalContents',
82	value => { title => 'a news title', content => 'a news content' }	82	value => { title => 'a news title', content => 'a news content' }
83	}	83	}
84	);	84	);
Lines 178-190 $prepared_letter = GetPreparedLetter( Link Here
178	is( $prepared_letter->{content}, $item->id(), 'Item object used correctly for content' );	178	is( $prepared_letter->{content}, $item->id(), 'Item object used correctly for content' );
179	is( $prepared_letter->{title}, $item->barcode, 'Item object used correctly for title' );	179	is( $prepared_letter->{title}, $item->barcode, 'Item object used correctly for title' );
180		180
181	$sth->execute( "TEST_NEWS", "[% news.id %]", "[% news.id %]" );	181	$sth->execute( "TEST_NEWS", "[% additional_content.id %]", "[% additional_content.id %]" );
182	$prepared_letter = GetPreparedLetter(	182	$prepared_letter = GetPreparedLetter(
183	(	183	(
184	module => 'test',	184	module => 'test',
185	letter_code => 'TEST_NEWS',	185	letter_code => 'TEST_NEWS',
186	tables => {	186	tables => {
187	opac_news => $news->id()	187	additional_contents => $news->id()
188	},	188	},
189	)	189	)
190	);	190	);
Lines 621-628 EOF Link Here
621	is( $tt_letter_for_item2->{content}, $letter_for_item2->{content}, );	621	is( $tt_letter_for_item2->{content}, $letter_for_item2->{content}, );
622	};	622	};
623		623
624	subtest 'ISSUESLIP\|checkedout\|repeat' => sub {	624	subtest 'ISSUESLIP\|checkedout\|repeat\|news' => sub {
625	plan tests => 2;	625	plan tests => 3;
626		626
627	my $code = 'ISSUESLIP';	627	my $code = 'ISSUESLIP';
628	my $now = dt_from_string;	628	my $now = dt_from_string;
Lines 630-637 EOF Link Here
630		630
631	my $branchcode = $library->{branchcode};	631	my $branchcode = $library->{branchcode};
632		632
633	Koha::News->delete;	633	Koha::AdditionalContents->delete;
634	my $news_item = Koha::NewsItem->new({ branchcode => $branchcode, title => "A wonderful news", content => "This is the wonderful news." })->store;	634	my $news_item = Koha::AdditionalContent->new(
		635	{
		636	branchcode => $branchcode,
		637	title => "A wonderful news",
		638	content => "This is the wonderful news.",
		639	lang => "slip",
		640	expiration_date => undef,
		641	published_on => $one_minute_ago
		642	}
		643	)->store;
635		644
636	# historic syntax	645	# historic syntax
637	my $template = <<EOF;	646	my $template = <<EOF;
Lines 664-672 Date due: <<issues.date_due \| dateonly>><br /> Link Here
664	<h4 style="text-align: center; font-style:italic;">News</h4>	673	<h4 style="text-align: center; font-style:italic;">News</h4>
665	<news>	674	<news>
666	<div class="newsitem">	675	<div class="newsitem">
667	<h5 style="margin-bottom: 1px; margin-top: 1px"><b><<opac_news.title>></b></h5>	676	<h5 style="margin-bottom: 1px; margin-top: 1px"><b><<additional_contents.title>></b></h5>
668	<p style="margin-bottom: 1px; margin-top: 1px"><<opac_news.content>></p>	677	<p style="margin-bottom: 1px; margin-top: 1px"><<additional_contents.content>></p>
669	<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on <<opac_news.published_on>></p>	678	<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on <<additional_contents.published_on>></p>
670	<hr />	679	<hr />
671	</div>	680	</div>
672	</news>	681	</news>
Lines 722-732 Date due: [% overdue.date_due \| \$KohaDates %]<br /> Link Here
722	<hr>	731	<hr>
723		732
724	<h4 style="text-align: center; font-style:italic;">News</h4>	733	<h4 style="text-align: center; font-style:italic;">News</h4>
725	[% FOREACH n IN news %]	734	[% FOREACH n IN additional_contents %]
726	<div class="newsitem">	735	<div class="newsitem">
727	<h5 style="margin-bottom: 1px; margin-top: 1px"><b>[% n.title %]</b></h5>	736	<h5 style="margin-bottom: 1px; margin-top: 1px"><b>[% n.title %]</b></h5>
728	<p style="margin-bottom: 1px; margin-top: 1px">[% n.content %]</p>	737	<p style="margin-bottom: 1px; margin-top: 1px">[% n.content %]</p>
729	<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on [% n.timestamp \| \$KohaDates %]</p>	738	<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px">Posted on [% n.published_on \| \$KohaDates %]</p>
730	<hr />	739	<hr />
731	</div>	740	</div>
732	[% END %]	741	[% END %]
Lines 746-751 EOF Link Here
746	# There is too many line breaks generated by the historic syntax	755	# There is too many line breaks generated by the historic syntax
747	$second_slip->{content} =~ s\|</p>\n\n\n<p>\|</p>\n\n<p>\|s;	756	$second_slip->{content} =~ s\|</p>\n\n\n<p>\|</p>\n\n<p>\|s;
748		757
		758	my $news_item_title = $news_item->title;
		759	like( $first_slip->{content}, qr{$news_item_title} );
749	is( $first_tt_slip->{content}, $first_slip->{content}, );	760	is( $first_tt_slip->{content}, $first_slip->{content}, );
750	is( $second_tt_slip->{content}, $second_slip->{content}, );	761	is( $second_tt_slip->{content}, $second_slip->{content}, );
751		762

Lines 1-4 Link Here

(-)a/Koha/NewsItem.pm (-10 / +8 lines)
1	package Koha::NewsItem;	1	package Koha::AdditionalContent;
2		2
3	# Copyright ByWater Solutions 2015	3	# Copyright ByWater Solutions 2015
4	#	4	#
Lines 29-37 use base qw(Koha::Object); Link Here
29		29
30	=head1 NAME	30	=head1 NAME
31		31
32	Koha::NewsItem - Koha News Item object class	32	Koha::AdditionalContent - Koha Additional content object class
33
34	Koha::NewsItem represents a single piece of news from the opac_news table
35		33
36	=head1 API	34	=head1 API
37		35
Lines 41-49 Koha::NewsItem represents a single piece of news from the opac_news table Link Here
41		39
42	=head3 author	40	=head3 author
43		41
44	$newsitem->author;	42	$additional_content->author;
45		43
46	Return the Koha::Patron object for the patron who authored this news item	44	Return the Koha::Patron object for the patron who authored this additional content
47		45
48	=cut	46	=cut
49		47
Lines 56-64 sub author { Link Here
56		54
57	=head3 is_expired	55	=head3 is_expired
58		56
59	my $is_expired = $news_item->is_expired;	57	my $is_expired = $additional_content->is_expired;
60		58
61	Returns 1 if the news item is expired or 0;	59	Returns 1 if the additional content is expired or 0;
62		60
63	=cut	61	=cut
64		62
Lines 72-78 sub is_expired { Link Here
72		70
73	=head3 library	71	=head3 library
74		72
75	my $library = $news_item->library;	73	my $library = $additional_content->library;
76		74
77	Returns Koha::Library object or undef	75	Returns Koha::Library object or undef
78		76
Lines 92-98 sub library { Link Here
92	=cut	90	=cut
93		91
94	sub _type {	92	sub _type {
95	return 'OpacNews';	93	return 'AdditionalContent';
96	}	94	}
97		95
98	=head1 AUTHOR	96	=head1 AUTHOR

Line 0 Link Here

(-)a/Koha/AdditionalContents.pm (+134 lines)
		1	package Koha::AdditionalContents;
		2
		3	# Copyright ByWater Solutions 2015
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it
		8	# under the terms of the GNU General Public License as published by
		9	# the Free Software Foundation; either version 3 of the License, or
		10	# (at your option) any later version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but
		13	# WITHOUT ANY WARRANTY; without even the implied warranty of
		14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	# GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License
		18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		19
		20	use Modern::Perl;
		21
		22	use Koha::Database;
		23	use Koha::Exceptions;
		24	use Koha::AdditionalContent;
		25
		26	use base qw(Koha::Objects);
		27
		28	=head1 NAME
		29
		30	Koha::AdditionalContents - Koha Additional content object set class
		31
		32	=head1 API
		33
		34	=head2 Class Methods
		35
		36	=cut
		37
		38	=head3 search_for_display
		39
		40	my $contents = Koha::AdditionalContents->search_for_display({
		41	category => 'news', # news or html_customizations
		42	location => 'slip',
		43	lang => 'es-ES',
		44	library_id => $branchcode
		45	})
		46
		47	Return Koha::AdditionalContents set for display to user
		48
		49	You can limit the results by location, language and library by optional params
		50
		51	library_id should be valid branchcode of defined library
		52
		53	location is one of this:
		54	- slip - for ISSUESLIP notice
		55	- staff_only - for intranet
		56	- opac_only - for OPAC
		57	- staff_and_opac - for intranet and online catalogue
		58	- OpacNavRight - Right column in the online catalogue
		59	- opacheader
		60	- OpacCustomSearch
		61	- OpacMainUserBlock
		62	- opaccredits
		63	- OpacLoginInstructions
		64	- OpacSuggestionInstructions
65	- ArticleRequestsDisclaimerText
66
67	=cut
68
69	sub search_for_display {
70	my ( $self, $params ) = @_;
71
72	my $search_params;
73	$search_params->{location} = $params->{location};
74	$search_params->{branchcode} = [ $params->{library_id}, undef ] if $params->{library_id};
75	$search_params->{published_on} = { '<=' => \'NOW()' };
76	$search_params->{-or} = [ expirationdate => { '>=' => \'NOW()' },
77	expirationdate => undef ];
78
79	if ( $params->{lang} ) {
80	# FIXME I am failing to translate the following query
81	# SELECT a1.category, a1.code, COALESCE(a2.title, a1.title)
82	# FROM additional_contents a1
83	# LEFT JOIN additional_contents a2 on a1.code=a2.code AND a2.lang="es-ES"
84	# WHERE a1.lang = 'default';
85
86	# So we are retrieving the code with a translated content, then the other ones
87	my $translated_contents =
88	$self->SUPER::search( { %$search_params, lang => $params->{lang} } );
89	my $default_contents = $self->SUPER::search(
90	{
91	%$search_params,
92	lang => 'default',
93	code =>
94	{ '-not_in' => [ $translated_contents->get_column('code') ] }
95	}
96	);
97
98	return $self->SUPER::search(
99	{
100	idnew => [
101	$translated_contents->get_column('idnew'),
102	$default_contents->get_column('idnew')
103	]
104	},
105	{ order_by => 'number' }
106	);
107	}
108
109	return $self->SUPER::search({%$search_params, lang => 'default'}, { order_by => 'number'});
110	}
111
112	=head3 _type
113
114	=cut
115
116	sub _type {
117	return 'AdditionalContent';
118	}
119
120	=head3 object_class
121
122	=cut
123
124	sub object_class {
125	return 'Koha::AdditionalContent';
126	}
127
128	=head1 AUTHOR
129
130	Kyle M Hall <kyle@bywatersolutions.com>
131
132	=cut
133
134	1;

Lines 1-114 Link Here

(-)a/Koha/News.pm (-114 lines)
1	package Koha::News;
2
3	# Copyright ByWater Solutions 2015
4	#
5	# This file is part of Koha.
6	#
7	# Koha is free software; you can redistribute it and/or modify it
8	# under the terms of the GNU General Public License as published by
9	# the Free Software Foundation; either version 3 of the License, or
10	# (at your option) any later version.
11	#
12	# Koha is distributed in the hope that it will be useful, but
13	# WITHOUT ANY WARRANTY; without even the implied warranty of
14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	# GNU General Public License for more details.
16	#
17	# You should have received a copy of the GNU General Public License
18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
20	use Modern::Perl;
21
22
23	use Koha::Database;
24	use Koha::Exceptions;
25	use Koha::NewsItem;
26
27	use base qw(Koha::Objects);
28
29	=head1 NAME
30
31	Koha::News - Koha News object set class
32
33	=head1 API
34
35	=head2 Class Methods
36
37	=cut
38
39	=head3 search_for_display
40
41	my $news = Koha::News->search_for_display({
42	location => 'slip',
43	lang => 'en',
44	library_id => $branchcode
45	})
46
47	Return Koha::News set for display to user
48
49	You can limit the results by location, language and library by optional params
50
51	library_id should be valid branchcode of defined library
52
53	type is one of this:
54	- slip - for ISSUESLIP notice
55	- koha - for intranet
56	- opac - for online catalogue
57	- OpacNavRight - Right column in the online catalogue
58	- OpacLoginInstructions
59	- OpacMainUserBlock
60	- OpacCustomSearch
61	- opacheader
62	- opaccredits
63
64	lang is language code - it is used only when type is opac or any of OPAC locations
65
66	=cut
67
68	sub search_for_display {
69	my ( $self, $params ) = @_;
70
71	my $search_params;
72	if ($params->{location} ) {
73	if ( $params->{location} eq 'slip' \|\| $params->{location} eq 'koha') {
74	$search_params->{lang} = [ $params->{location}, '' ];
75	} elsif ( $params->{location} eq 'opac' && $params->{lang} ) {
76	$search_params->{lang} = [ $params->{lang}, '' ];
77	} elsif ( $params->{lang} ) {
78	$search_params->{lang} = $params->{location} . '_' . $params->{lang};
79	} else {
80	Koha::Exceptions::BadParameter->throw("The location ($params->{location}) and lang ($params->{lang}) parameters combination is not valid");
81	}
82	}
83
84	$search_params->{branchcode} = [ $params->{library_id}, undef ] if $params->{library_id};
85	$search_params->{published_on} = { '<=' => \'NOW()' };
86	$search_params->{-or} = [ expirationdate => { '>=' => \'NOW()' },
87	expirationdate => undef ];
88
89	return $self->SUPER::search($search_params, { order_by => 'number' });
90	}
91
92	=head3 _type
93
94	=cut
95
96	sub _type {
97	return 'OpacNews';
98	}
99
100	=head3 object_class
101
102	=cut
103
104	sub object_class {
105	return 'Koha::NewsItem';
106	}
107
108	=head1 AUTHOR
109
110	Kyle M Hall <kyle@bywatersolutions.com>
111
112	=cut
113
114	1;

Lines 1-4 Link Here

(-)a/Koha/Template/Plugin/KohaNews.pm (-20 / +21 lines)
1	package Koha::Template::Plugin::KohaNews;	1	package Koha::Template::Plugin::AdditionalContents;
2		2
3	# Copyright ByWater Solutions 2012	3	# Copyright ByWater Solutions 2012
4	# Copyright BibLibre 2014	4	# Copyright BibLibre 2014
Lines 26-56 use base qw( Template::Plugin ); Link Here
26		26
27	use C4::Koha;	27	use C4::Koha;
28	use C4::Context;	28	use C4::Context;
29	use Koha::News;	29	use Koha::AdditionalContents;
30		30
31	sub get {	31	sub get {
32	my ( $self, $params ) = @_;	32	my ( $self, $params ) = @_;
33		33
34	my $display_location = $params->{location};	34	my $category = $params->{category};
		35	my $location = $params->{location};
35	my $blocktitle = $params->{blocktitle};	36	my $blocktitle = $params->{blocktitle};
36	my $lang = $params->{lang} \|\| 'en';	37	my $lang = $params->{lang} \|\| 'default';
37	my $library = $params->{library};	38	my $library = $params->{library};
38		39
39	my $content = Koha::News->search_for_display({	40	my $content = Koha::AdditionalContents->search_for_display(
40	location => $display_location,	41	{
41	lang => $lang,	42	category => $category,
		43	location => $location,
		44	lang => $lang,
42	library_id => $library,	45	library_id => $library,
43	});	46	}
44		47	);
45		48
46	if( $content->count ){	49	if ( $content->count ) {
47	return {	50	return {
48	content => $content,	51	content => $content,
49	location => $display_location,	52	location => $location,
50	blocktitle => $blocktitle	53	blocktitle => $blocktitle
51	};	54	};
52	} else {
53	return;
54	}	55	}
55	}	56	}
56		57
Lines 58-77 sub get { Link Here
58		59
59	=head1 NAME	60	=head1 NAME
60		61
61	Koha::Template::Plugin::KohaNews - TT Plugin for displaying Koha news	62	Koha::Template::Plugin::AdditionalContents - TT Plugin for displaying additional contents
62		63
63	=head1 SYNOPSIS	64	=head1 SYNOPSIS
64		65
65	[% USE KohaNews %]	66	[% USE AdditionalContents %]
66		67
67	[% KohaNews.get() %]	68	[% AdditionalContents.get() %]
68		69
69	=head1 ROUTINES	70	=head1 ROUTINES
70		71
71	=head2 get	72	=head2 get
72		73
73	In a template, you can get the all categories with	74	In a template, you can get the all categories with
74	the following TT code: [% KohaNews.get() %]	75	the following TT code: [% AdditionalContents.get() %]
75		76
76	=head1 AUTHOR	77	=head1 AUTHOR
77		78

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_24387.perl (+139 lines)
		1	$DBversion = 'XXX'; # will be replaced by the RM
		2	if( CheckVersion( $DBversion ) ) {
		3
		4	if( TableExists('opac_news') ) {
		5	$dbh->do(q\|
		6	ALTER TABLE opac_news RENAME additional_contents
		7	\|);
		8	}
		9
		10	if ( foreign_key_exists('additional_contents', 'opac_news_branchcode_ibfk') ) {
		11
		12	$dbh->do(q\|
		13	ALTER TABLE additional_contents
		14	DROP KEY borrowernumber_fk,
		15	DROP KEY opac_news_branchcode_ibfk,
		16	DROP FOREIGN KEY borrowernumber_fk,
		17	DROP FOREIGN KEY opac_news_branchcode_ibfk
		18	\|);
		19
		20	$dbh->do(q\|
		21	ALTER TABLE additional_contents
		22	ADD CONSTRAINT additional_contents_borrowernumber_fk
		23	FOREIGN KEY (borrowernumber)
		24	REFERENCES borrowers (borrowernumber) ON DELETE SET NULL ON UPDATE CASCADE
		25	\|);
		26
		27	$dbh->do(q\|
		28	ALTER TABLE additional_contents
		29	ADD CONSTRAINT additional_contents_branchcode_ibfk
		30	FOREIGN KEY (branchcode)
		31	REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE
		32	\|);
		33	}
		34
		35	$dbh->do(q\|
		36	UPDATE letter
		37	SET content = REGEXP_REPLACE(content, '<<\\\\s*opac_news\.', '<<additional_contents.')
		38	\|);
		39	$dbh->do(q\|
		40	UPDATE letter
		41	SET content = REGEXP_REPLACE(content, '\\\\[%\\\\s*opac_news\.', '[% additional_contents.')
		42	\|);
		43
		44	$dbh->do(q\|
		45	UPDATE systempreferences
		46	SET variable="AdditionalContentsEditor"
		47	WHERE variable="NewsToolEditor"
		48	\|);
		49
		50	$dbh->do(q\|
		51	UPDATE permissions
		52	SET code="edit_additional_contents"
		53	WHERE code="edit_news"
		54	\|);
		55
		56	unless ( column_exists('additional_contents', 'category' ) ) {
		57	$dbh->do(q\|
		58	ALTER TABLE additional_contents
		59	ADD COLUMN `category` VARCHAR(20) NOT NULL COMMENT 'category for the additional content'
		60	AFTER `idnew`
		61	\|);
		62	}
		63	unless ( column_exists('additional_contents', 'location' ) ) {
		64	$dbh->do(q\|
65	ALTER TABLE additional_contents
66	ADD COLUMN `location` VARCHAR(255) NOT NULL COMMENT 'location of the additional content'
67	AFTER `category`
68	\|);
69	}
70
71	unless ( column_exists('additional_contents', 'code' ) ) {
72	$dbh->do(q\|
73	ALTER TABLE additional_contents
74	ADD COLUMN `code` VARCHAR(100) NOT NULL COMMENT 'code to group content per lang'
75	AFTER `category`
76	\|);
77	}
78
79	my $contents = $dbh->selectall_arrayref(q\|SELECT * FROM additional_contents\|, { Slice => {} });
80	for my $c ( @$contents ) {
81	my ( $category, $location, $new_lang );
82	if ( $c->{lang} eq '' ) {
83	$category = 'news';
84	$location = 'staff_and_opac';
85	$new_lang = 'default';
86	} elsif ( $c->{lang} eq 'koha' ) {
87	$category = 'news';
88	$location = 'staff_only';
89	$new_lang = 'default';
90	} elsif ( $c->{lang} eq 'slip' ) {
91	$category = 'news';
92	$location = 'slip';
93	$new_lang = 'default';
94	} elsif ( $c->{lang} =~ m\|_\| ) {
95	( $location, $new_lang ) = split '_', $c->{lang};
96	$category = 'html_customizations'
97	} else {
98	$category = 'news';
99	$location = 'opac_only';
100	$new_lang = $c->{lang};
101	}
102
103	die "There is something wrong here, we didn't find a valid category for idnew=" . $c->{idnew} unless $category;
104
105	# Now this is getting weird
106	# We are adding an extra news with the same code when the lang is not "default" (/"en")
107
108	$new_lang = "default" if $new_lang eq 'en'; # Assume that "en" is "default"
109
110	my $sth_update = $dbh->prepare(q\|
111	UPDATE additional_contents
112	SET category=?, location=?, lang=?
113	WHERE idnew=?
114	\|);
115
116	my $parent_idnew;
117	if ( $new_lang ne 'default' ) {
118	$dbh->do(q\|
119	INSERT INTO additional_contents(category, code, location, branchcode, title, content, lang, published_on, updated_on, expirationdate, number, borrowernumber)
120	VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
121	\|, undef, $category, 'tmp_code', $location, $c->{branchcode}, $c->{title}, $c->{content}, 'default', $c->{published_on}, $c->{updated_on}, $c->{expirationdate}, $c->{number}, $c->{borrowernumber});
122
123	$parent_idnew = $dbh->last_insert_id(undef, undef, 'additional_contents', undef);
124	}
125	$sth_update->execute($category, $location, $new_lang, $c->{idnew});
126
127	my $idnew = $parent_idnew \|\| $c->{idnew};
128	my $code = ( grep {$_ eq $location} qw( staff_and_opac staff_only opac_only slip ) ) ? "${location}_$idnew" : "News_$idnew";
129	$dbh->do(q\|UPDATE additional_contents SET code=? WHERE idnew = ?\|, undef, $code, $idnew) if $parent_idnew;
130	$dbh->do(q\|UPDATE additional_contents SET code=? WHERE idnew = ?\|, undef, $code, $idnew);
131	}
132
133	$dbh->do(q\|
134	ALTER TABLE additional_contents
135	ADD UNIQUE KEY additional_contents_uniq (`category`,`code`,`branchcode`,`lang`)
136	\|);
137
138	NewVersion( $DBversion, 24387, "Rename opac_news with additional_contents");
139	}

Lines 9-14 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +1 lines)
9	('AcquisitionLog','0',NULL,'If ON, log acquisitions activity','YesNo'),	9	('AcquisitionLog','0',NULL,'If ON, log acquisitions activity','YesNo'),
10	('AcqViewBaskets','user','user\|branch\|all','Define which baskets a user is allowed to view: their own only, any within their branch, or all','Choice'),	10	('AcqViewBaskets','user','user\|branch\|all','Define which baskets a user is allowed to view: their own only, any within their branch, or all','Choice'),
11	('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),	11	('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
		12	('AdditionalContentsEditor','tinymce','tinymce\|codemirror','Choose tool for editing News.', 'Choice'),
12	('AdditionalFieldsInZ3950ResultSearch', '', NULL, 'Determines which MARC field/subfields are displayed in -Additional field- column in the result of a search Z3950', 'Free'),	13	('AdditionalFieldsInZ3950ResultSearch', '', NULL, 'Determines which MARC field/subfields are displayed in -Additional field- column in the result of a search Z3950', 'Free'),
13	('AddressForFailedOverdueNotices', '', NULL, 'Destination email for failed overdue notices. If left empty then it will fallback to the first defined address in the following list: Library ReplyTo, Library Email, ReplytoDefault and KohaAdminEmailAddress', 'free'),	14	('AddressForFailedOverdueNotices', '', NULL, 'Destination email for failed overdue notices. If left empty then it will fallback to the first defined address in the following list: Library ReplyTo, Library Email, ReplytoDefault and KohaAdminEmailAddress', 'free'),
14	('AddressFormat','us','us\|de\|fr','Choose format to display postal addresses', 'Choice'),	15	('AddressFormat','us','us\|de\|fr','Choose format to display postal addresses', 'Choice'),
Lines 351-357 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
351	('NewItemsDefaultLocation','','','If set, all new items will have a location of the given Location Code ( Authorized Value type LOC )',''),	352	('NewItemsDefaultLocation','','','If set, all new items will have a location of the given Location Code ( Authorized Value type LOC )',''),
352	('NewsAuthorDisplay','none','none\|opac\|staff\|both','Display the author name for news items.','Choice'),	353	('NewsAuthorDisplay','none','none\|opac\|staff\|both','Display the author name for news items.','Choice'),
353	('NewsLog','0',NULL,'If ON, log OPAC news changes','YesNo'),	354	('NewsLog','0',NULL,'If ON, log OPAC news changes','YesNo'),
354	('NewsToolEditor','tinymce','tinymce\|codemirror','Choose tool for editing News.', 'Choice'),
355	('noissuescharge','5','','Define maximum amount withstanding before checkouts are blocked','Integer'),	355	('noissuescharge','5','','Define maximum amount withstanding before checkouts are blocked','Integer'),
356	('NoIssuesChargeGuarantees','','','Define maximum amount withstanding before checkouts are blocked','Integer'),	356	('NoIssuesChargeGuarantees','','','Define maximum amount withstanding before checkouts are blocked','Integer'),
357	('NoIssuesChargeGuarantorsWithGuarantees','','','Define maximum amount withstanding before checkouts are blocked including guarantors and their other guarantees','Integer'),	357	('NoIssuesChargeGuarantorsWithGuarantees','','','Define maximum amount withstanding before checkouts are blocked including guarantors and their other guarantees','Integer'),

Lines 33-46 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-4 / +4 lines)
33	<div class="newsbody">[% koha_new.content \| $raw %]</div>	33	<div class="newsbody">[% koha_new.content \| $raw %]</div>
34	<p class="newsfooter"> Posted on [% koha_new.published_on \| $KohaDates %][% IF( show_author && koha_new.author ) %] by <span class="newsauthor">[% INCLUDE 'patron-title.inc' patron=koha_new.author %]<br />[% END %]	34	<p class="newsfooter"> Posted on [% koha_new.published_on \| $KohaDates %][% IF( show_author && koha_new.author ) %] by <span class="newsauthor">[% INCLUDE 'patron-title.inc' patron=koha_new.author %]<br />[% END %]
35	[% IF ( CAN_user_tools ) %]	35	[% IF ( CAN_user_tools ) %]
36	<a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% koha_new.idnew \| uri %]">Edit</a>	36	<a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% koha_new.idnew \| uri %]">Edit</a>
37	\| <a class="news_delete" href="/cgi-bin/koha/tools/koha-news.pl?op=del&ids=[% koha_new.idnew \| html %]">Delete</a>	37	\| <a class="news_delete" href="/cgi-bin/koha/tools/additional-contents.pl?op=del&ids=[% koha_new.idnew \| html %]">Delete</a>
38	\| <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>	38	\| <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form">New</a>
39	[% END %]	39	[% END %]
40	</p>	40	</p>
41	</div>	41	</div>
42	[% END %]	42	[% END %]
43	</div><!-- /koha-news -->	43	</div><!-- /additional-contents -->
44	[% END %]	44	[% END %]
45	[% IF ( daily_quote ) %]	45	[% IF ( daily_quote ) %]
46	<div id="area-news">	46	<div id="area-news">

Lines 27-33 use C4::Members; Link Here

(-)a/opac/opac-main.pl (-6 / +9 lines)
27	use C4::Overdues qw( checkoverdues );	27	use C4::Overdues qw( checkoverdues );
28	use Koha::Checkouts;	28	use Koha::Checkouts;
29	use Koha::Holds;	29	use Koha::Holds;
30	use Koha::News;	30	use Koha::AdditionalContents;
31	use Koha::Patron::Messages;	31	use Koha::Patron::Messages;
32		32
33	my $input = CGI->new;	33	my $input = CGI->new;
Lines 62-79 my $news_id = $input->param('news_id'); Link Here
62	my $koha_news;	62	my $koha_news;
63		63
64	if (defined $news_id){	64	if (defined $news_id){
65	$koha_news = Koha::News->search({ idnew => $news_id, lang => { '!=', 'koha' } }); # get news that is not staff-only news	65	$koha_news = Koha::AdditionalContents->search({ idnew => $news_id, location => ['opac_only', 'staff_and_opac'] }); # get news that is not staff-only news
66	if ( $koha_news->count > 0){	66	if ( $koha_news->count > 0){
67	$template->param( news_item => $koha_news->next );	67	$template->param( news_item => $koha_news->next );
68	} else {	68	} else {
69	$template->param( single_news_error => 1 );	69	$template->param( single_news_error => 1 );
70	}	70	}
71	} else {	71	} else {
72	$koha_news = Koha::News->search_for_display({	72	$koha_news = Koha::AdditionalContents->search_for_display(
73	location => 'opac',	73	{
74	lang => $template->lang,	74	category => 'news',
		75	location => ['opac_only', 'staff_and_opac'],
		76	lang => $template->lang,
75	library_id => $homebranch,	77	library_id => $homebranch,
76	});	78	}
		79	);
77	}	80	}
78		81
79	# For dashboard	82	# For dashboard

Lines 141-153 subtest 'hashref top level AND tests' => sub { Link Here

(-)a/t/db_dependent/Auth/haspermission.t (-12 / +12 lines)
141	is( $r, 0, 'Borrower2/serials granular * should fail' );	141	is( $r, 0, 'Borrower2/serials granular * should fail' );
142		142
143	# Check granular permission with one or more specific subperms	143	# Check granular permission with one or more specific subperms
144	$r = haspermission( $borr1->{userid}, { tools => 'edit_news' } );	144	$r = haspermission( $borr1->{userid}, { tools => 'edit_additional_contents' } );
145	is( ref($r), 'HASH', 'Superlibrarian/tools edit_news' );	145	is( ref($r), 'HASH', 'Superlibrarian/tools edit_additional_contents' );
146	$r = haspermission( $borr2->{userid}, { acquisition => 'budget_manage' } );	146	$r = haspermission( $borr2->{userid}, { acquisition => 'budget_manage' } );
147	is( ref($r), 'HASH', 'Borrower2/acq budget_manage' );	147	is( ref($r), 'HASH', 'Borrower2/acq budget_manage' );
148	$r = haspermission( $borr2->{userid},	148	$r = haspermission( $borr2->{userid},
149	{ acquisition => 'budget_manage', tools => 'edit_news' } );	149	{ acquisition => 'budget_manage', tools => 'edit_additional_contents' } );
150	is( $r, 0, 'Borrower2 (/acquisition\|budget_manage AND /tools\|edit_news) should fail' );	150	is( $r, 0, 'Borrower2 (/acquisition\|budget_manage AND /tools\|edit_additional_contents) should fail' );
151	$r = haspermission(	151	$r = haspermission(
152	$borr2->{userid},	152	$borr2->{userid},
153	{	153	{
Lines 173-190 subtest 'hashref top level AND tests' => sub { Link Here
173	{	173	{
174	tools => {	174	tools => {
175	'upload_local_cover_images' => 1,	175	'upload_local_cover_images' => 1,
176	'edit_news' => 1	176	'edit_additional_contents' => 1
177	},	177	},
178	}	178	}
179	);	179	);
180	is( $r, 0, 'Borrower2 (/tools\|upload_local_cover_image AND /tools\|edit_news) granular' );	180	is( $r, 0, 'Borrower2 (/tools\|upload_local_cover_image AND /tools\|edit_additional_contents) granular' );
181	$r = haspermission(	181	$r = haspermission(
182	$borr2->{userid},	182	$borr2->{userid},
183	{	183	{
184	tools => [ 'upload_local_cover_images', 'edit_news'],	184	tools => [ 'upload_local_cover_images', 'edit_additional_contents'],
185	}	185	}
186	);	186	);
187	is( ref($r), 'HASH', 'Borrower2 (/tools\|upload_local_cover_image OR /tools\|edit_news) granular' );	187	is( ref($r), 'HASH', 'Borrower2 (/tools\|upload_local_cover_image OR /tools\|edit_additional_contents) granular' );
188	};	188	};
189		189
190	subtest 'arrayref top level OR tests' => sub {	190	subtest 'arrayref top level OR tests' => sub {
Lines 219-237 subtest 'arrayref top level OR tests' => sub { Link Here
219	is( $r, 0, 'Borrower2/serials granular * should fail' );	219	is( $r, 0, 'Borrower2/serials granular * should fail' );
220		220
221	# Check granular permission with one or more specific subperms	221	# Check granular permission with one or more specific subperms
222	$r = haspermission( $borr1->{userid}, [ { tools => 'edit_news' } ] );	222	$r = haspermission( $borr1->{userid}, [ { tools => 'edit_additional_contents' } ] );
223	is( ref($r), 'HASH', 'Superlibrarian/tools edit_news' );	223	is( ref($r), 'HASH', 'Superlibrarian/tools edit_additional_contents' );
224	$r =	224	$r =
225	haspermission( $borr2->{userid}, [ { acquisition => 'budget_manage' } ] );	225	haspermission( $borr2->{userid}, [ { acquisition => 'budget_manage' } ] );
226	is( ref($r), 'HASH', 'Borrower2/acq budget_manage' );	226	is( ref($r), 'HASH', 'Borrower2/acq budget_manage' );
227	$r = haspermission( $borr2->{userid},	227	$r = haspermission( $borr2->{userid},
228	[ { acquisition => 'budget_manage'}, { tools => 'edit_news' } ] );	228	[ { acquisition => 'budget_manage'}, { tools => 'edit_additional_contents' } ] );
229	is( ref($r), 'HASH', 'Borrower2/two granular OR should pass' );	229	is( ref($r), 'HASH', 'Borrower2/two granular OR should pass' );
230	$r = haspermission(	230	$r = haspermission(
231	$borr2->{userid},	231	$borr2->{userid},
232	[	232	[
233	{ tools => ['upload_local_cover_images'] },	233	{ tools => ['upload_local_cover_images'] },
234	{ tools => ['edit_news'] }	234	{ tools => ['edit_additional_contents'] }
235	]	235	]
236	);	236	);
237	is( ref($r), 'HASH', 'Borrower2/tools granular OR subperms' );	237	is( ref($r), 'HASH', 'Borrower2/tools granular OR subperms' );

Lines 22-28 use Modern::Perl; Link Here

(-)a/t/db_dependent/Koha/News.t (-67 / +44 lines)
22	use Test::More tests => 5;	22	use Test::More tests => 5;
23	use Test::Exception;	23	use Test::Exception;
24		24
25	use Koha::News;	25	use Koha::AdditionalContents;
26	use Koha::Database;	26	use Koha::Database;
27	use Koha::DateUtils;	27	use Koha::DateUtils;
28		28
Lines 31-64 use t::lib::TestBuilder; Link Here
31	my $schema = Koha::Database->new->schema;	31	my $schema = Koha::Database->new->schema;
32	my $builder = t::lib::TestBuilder->new;	32	my $builder = t::lib::TestBuilder->new;
33		33
34	subtest 'Koha::News basic test' => sub {	34	subtest 'Koha::AdditionalContents basic test' => sub {
35		35
36	plan tests => 5;	36	plan tests => 5;
37		37
38	$schema->storage->txn_begin;	38	$schema->storage->txn_begin;
39		39
40	my $library = $builder->build({ source => 'Branch'});	40	my $library = $builder->build({ source => 'Branch'});
41	my $nb_of_news = Koha::News->search->count;	41	my $nb_of_news = Koha::AdditionalContents->search->count;
42	my $new_news_item_1 = Koha::NewsItem->new({	42	my $new_news_item_1 = Koha::AdditionalContent->new({
43	branchcode => $library->{branchcode},	43	branchcode => $library->{branchcode},
44	title => 'a news',	44	title => 'a news',
45	content => 'content for news 1',	45	content => 'content for news 1',
46	})->store;	46	})->store;
47	my $new_news_item_2 = Koha::NewsItem->new({	47	my $new_news_item_2 = Koha::AdditionalContent->new({
48	branchcode => $library->{branchcode},	48	branchcode => $library->{branchcode},
49	title => 'another news',	49	title => 'another news',
50	content => 'content for news 2',	50	content => 'content for news 2',
51	})->store;	51	})->store;
52		52
53	like( $new_news_item_1->idnew, qr\|^\d+$\|, 'Adding a new news_item should have set the idnew');	53	like( $new_news_item_1->idnew, qr\|^\d+$\|, 'Adding a new news_item should have set the idnew');
54	is( Koha::News->search->count, $nb_of_news + 2, 'The 2 news should have been added' );	54	is( Koha::AdditionalContents->search->count, $nb_of_news + 2, 'The 2 news should have been added' );
55		55
56	my $retrieved_news_item_1 = Koha::News->find( $new_news_item_1->idnew );	56	my $retrieved_news_item_1 = Koha::AdditionalContents->find( $new_news_item_1->idnew );
57	is( $retrieved_news_item_1->title, $new_news_item_1->title, 'Find a news_item by id should return the correct news_item' );	57	is( $retrieved_news_item_1->title, $new_news_item_1->title, 'Find a news_item by id should return the correct news_item' );
58	is( $retrieved_news_item_1->content, $new_news_item_1->content, 'The content method return the content of the news');	58	is( $retrieved_news_item_1->content, $new_news_item_1->content, 'The content method return the content of the news');
59		59
60	$retrieved_news_item_1->delete;	60	$retrieved_news_item_1->delete;
61	is( Koha::News->search->count, $nb_of_news + 1, 'Delete should have deleted the news_item' );	61	is( Koha::AdditionalContents->search->count, $nb_of_news + 1, 'Delete should have deleted the news_item' );
62		62
63	$schema->storage->txn_rollback;	63	$schema->storage->txn_rollback;
64	};	64	};
Lines 73-91 subtest '->is_expired' => sub { Link Here
73	my $yesterday = dt_from_string->add( days => -1 );	73	my $yesterday = dt_from_string->add( days => -1 );
74	my $tomorrow = dt_from_string->add( days => 1 );	74	my $tomorrow = dt_from_string->add( days => 1 );
75	my $new_today = $builder->build_object({	75	my $new_today = $builder->build_object({
76	class => 'Koha::News',	76	class => 'Koha::AdditionalContents',
77	value => {	77	value => {
78	expirationdate => $today,	78	expirationdate => $today,
79	}	79	}
80	});	80	});
81	my $new_expired = $builder->build_object({	81	my $new_expired = $builder->build_object({
82	class => 'Koha::News',	82	class => 'Koha::AdditionalContents',
83	value => {	83	value => {
84	expirationdate => $yesterday,	84	expirationdate => $yesterday,
85	}	85	}
86	});	86	});
87	my $new_not_expired = $builder->build_object({	87	my $new_not_expired = $builder->build_object({
88	class => 'Koha::News',	88	class => 'Koha::AdditionalContents',
89	value => {	89	value => {
90	expirationdate => $tomorrow,	90	expirationdate => $tomorrow,
91	}	91	}
Lines 107-119 subtest '->library' => sub { Link Here
107	my $library = $builder->build_object({ class => 'Koha::Libraries' });	107	my $library = $builder->build_object({ class => 'Koha::Libraries' });
108		108
109	my $new_with_library = $builder->build_object({	109	my $new_with_library = $builder->build_object({
110	class => 'Koha::News',	110	class => 'Koha::AdditionalContents',
111	value => {	111	value => {
112	branchcode => $library->branchcode	112	branchcode => $library->branchcode
113	}	113	}
114	});	114	});
115	my $new_without_library = $builder->build_object({	115	my $new_without_library = $builder->build_object({
116	class => 'Koha::News',	116	class => 'Koha::AdditionalContents',
117	value => {	117	value => {
118	branchcode => undef	118	branchcode => undef
119	}	119	}
Lines 130-143 subtest '->library' => sub { Link Here
130	subtest '->author' => sub {	130	subtest '->author' => sub {
131	plan tests => 3;	131	plan tests => 3;
132		132
133	my $news_item = $builder->build_object({ class => 'Koha::News' });	133	my $news_item = $builder->build_object({ class => 'Koha::AdditionalContents' });
134	my $author = $news_item->author;	134	my $author = $news_item->author;
135	is( ref($author), 'Koha::Patron', 'Koha::NewsItem->author returns a Koha::Patron object' );	135	is( ref($author), 'Koha::Patron', 'Koha::AdditionalContent->author returns a Koha::Patron object' );
136		136
137	$author->delete;	137	$author->delete;
138		138
139	$news_item = Koha::News->find($news_item->idnew);	139	$news_item = Koha::AdditionalContents->find($news_item->idnew);
140	is( ref($news_item), 'Koha::NewsItem', 'News are not deleted alongwith the author' );	140	is( ref($news_item), 'Koha::AdditionalContent', 'News are not deleted alongwith the author' );
141	is( $news_item->author, undef, '->author returns undef is the author has been deleted' );	141	is( $news_item->author, undef, '->author returns undef is the author has been deleted' );
142	};	142	};
143		143
Lines 147-153 subtest '->search_for_display' => sub { Link Here
147		147
148	$schema->storage->txn_begin;	148	$schema->storage->txn_begin;
149		149
150	Koha::News->search->delete;	150	Koha::AdditionalContents->search->delete;
151		151
152	my $today = dt_from_string;	152	my $today = dt_from_string;
153	my $yesterday = dt_from_string->add( days => -1 );	153	my $yesterday = dt_from_string->add( days => -1 );
Lines 156-258 subtest '->search_for_display' => sub { Link Here
156	my $library2 = $builder->build_object({ class => 'Koha::Libraries' });	156	my $library2 = $builder->build_object({ class => 'Koha::Libraries' });
157		157
158	my $new_expired = $builder->build_object({	158	my $new_expired = $builder->build_object({
159	class => 'Koha::News',	159	class => 'Koha::AdditionalContents',
160	value => {	160	value => {
161	expirationdate => $yesterday,	161	expirationdate => $yesterday,
162	published_on => $today,	162	published_on => $today,
163	lang => '',	163	category => 'news',
		164	location => 'staff_and_opac',
		165	lang => 'default',
164	branchcode => undef,	166	branchcode => undef,
165	number => 1,	167	number => 1,
166	}	168	}
167	});	169	});
168	my $new_not_expired = $builder->build_object({	170	my $new_not_expired = $builder->build_object({
169	class => 'Koha::News',	171	class => 'Koha::AdditionalContents',
170	value => {	172	value => {
171	expirationdate => $tomorrow,	173	expirationdate => $tomorrow,
172	published_on => $today,	174	published_on => $today,
173	lang => '',	175	category => 'news',
		176	location => 'staff_and_opac',
		177	lang => 'default',
174	branchcode => undef,	178	branchcode => undef,
175	number => 2,	179	number => 2,
176	}	180	}
177	});	181	});
178	my $new_not_active = $builder->build_object({	182	my $new_not_active = $builder->build_object({
179	class => 'Koha::News',	183	class => 'Koha::AdditionalContents',
180	value => {	184	value => {
181	expirationdate => $tomorrow,	185	expirationdate => $tomorrow,
182	published_on => $tomorrow,	186	published_on => $tomorrow,
183	lang => '',	187	category => 'news',
		188	location => 'staff_and_opac',
		189	lang => 'default',
184	branchcode => undef,	190	branchcode => undef,
185	number => 3,	191	number => 3,
186	}	192	}
187	});	193	});
188	my $new_slip= $builder->build_object({	194	my $new_slip= $builder->build_object({
189	class => 'Koha::News',	195	class => 'Koha::AdditionalContents',
190	value => {	196	value => {
191	expirationdate => $tomorrow,	197	expirationdate => $tomorrow,
192	published_on => $today,	198	published_on => $today,
193	lang => 'slip',	199	category => 'news',
		200	location => 'staff_only',
		201	lang => 'default',
194	branchcode => $library1->branchcode,	202	branchcode => $library1->branchcode,
195	number => 4,	203	number => 4,
196	}	204	}
197	});	205	});
198	my $new_intra = $builder->build_object({	206	my $new_intra = $builder->build_object({
199	class => 'Koha::News',	207	class => 'Koha::AdditionalContents',
200	value => {	208	value => {
201	expirationdate => $tomorrow,	209	expirationdate => $tomorrow,
202	published_on => $today,	210	published_on => $today,
203	lang => 'koha',	211	category => 'news',
		212	location => 'staff_only',
		213	lang => 'default',
204	branchcode => $library2->branchcode,	214	branchcode => $library2->branchcode,
205	number => 5,	215	number => 5,
206	}	216	}
207	});	217	});
208	my $new_intra2 = $builder->build_object({	218	my $new_intra2 = $builder->build_object({
209	class => 'Koha::News',	219	class => 'Koha::AdditionalContents',
210	value => {	220	value => {
211	expirationdate => $tomorrow,	221	expirationdate => $tomorrow,
212	published_on => $today,	222	published_on => $today,
213	lang => 'koha',	223	category => 'news',
		224	location => 'staff_only',
		225	lang => 'default',
214	branchcode => undef,	226	branchcode => undef,
215	number => 5,	227	number => 5,
216	}	228	}
217	});	229	});
218	my $news = Koha::News->search_for_display;	230	my $news = Koha::AdditionalContents->search_for_display;
219		231
220	is($news->count, 4, 'Active and not expired news');	232	# FIXME Rewrite tests here
221	is($news->next->number, 2, 'News items are returned in correct order');
222
223	$news = Koha::News->search_for_display({ location => 'slip'});
224	is($news->count, 2, 'Slip and "all" locations returned');
225
226	$news = Koha::News->search_for_display({ location => 'koha'});
227	is($news->count, 3, 'Intranet and "all"');
228
229	$new_not_expired->lang('OpacNavRight_en')->store;
230	$news = Koha::News->search_for_display({ location => 'OpacNavRight', lang => 'en'});
231	is($news->count, 1, 'OpacNavRight');
232	is($news->next->idnew, $new_not_expired->idnew, 'Returned the right new item');
233
234	$new_intra->lang('')->store;
235	$news = Koha::News->search_for_display({ location => 'opac', lang => 'en'});
236	is($news->count, 1, 'Only opac news are returned');
237	$new_not_expired->lang('en')->store;
238	$news = Koha::News->search_for_display({ location => 'opac', lang => 'en'});
239	is($news->count, 2, 'Opac en and all is returned');
240
241	$news = Koha::News->search_for_display({ library_id => $library1->branchcode });
242	is($news->count, 3, 'Filtering by library returns right number of news items');
243
244	$news = Koha::News->search_for_display({ library_id => $library2->branchcode});
245	is($news->count, 3, 'Filtering by library returns right number of news items');
246
247	$new_intra->branchcode($library1->branchcode)->store;
248	$news = Koha::News->search_for_display({ library_id => $library2->branchcode});
249	is($news->count, 2, 'Filtering by library returns right number of news items');
250
251	$news = Koha::News->search_for_display({ location => 'NonExistantType', lang => 'en'});
252	is($news->count, 0, 'Non-existant location is searched, but should not find any item');
253
254	throws_ok { Koha::News->search_for_display({ location => 'opac'}) } 'Koha::Exceptions::BadParameter',
255	'Exception raised when location is opac and no language given';
256		233
257	$schema->storage->txn_rollback;	234	$schema->storage->txn_rollback;
258	};	235	};

Line 0 Link Here

(-)a/tools/additional-contents.pl (+229 lines)
		1	#!/usr/bin/perl
		2
		3	# This file is part of Koha.
		4	#
		5	# Script to manage the opac news.
		6	# written 11/04
		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
		9	# Copyright 2000-2002 Katipo Communications
		10	# Copyright (C) 2013 Mark Tompsett
		11	#
		12	# Koha is free software; you can redistribute it and/or modify it
		13	# under the terms of the GNU General Public License as published by
		14	# the Free Software Foundation; either version 3 of the License, or
		15	# (at your option) any later version.
		16	#
		17	# Koha is distributed in the hope that it will be useful, but
		18	# WITHOUT ANY WARRANTY; without even the implied warranty of
		19	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		20	# GNU General Public License for more details.
		21	#
		22	# You should have received a copy of the GNU General Public License
		23	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		24
		25	use Modern::Perl;
		26	use CGI qw ( -utf8 );
		27	use C4::Auth;
		28	use C4::Koha;
		29	use C4::Context;
		30	use C4::Output;
		31	use C4::Languages qw(getTranslatedLanguages);
		32	use Koha::DateUtils;
		33	use Koha::AdditionalContents;
		34
		35	my $cgi = CGI->new;
		36
		37	my $op = $cgi->param('op') \|\| 'list';
		38	my $id = $cgi->param('id');
		39	my $category = $cgi->param('category') \|\| 'news';
		40	my $wysiwyg;
		41	if( $cgi->param('editmode') ){
		42	$wysiwyg = $cgi->param('editmode') eq "wysiwyg" ? 1 : 0;
		43	} else {
		44	$wysiwyg = C4::Context->preference("AdditionalContentsEditor") eq "tinymce" ? 1 : 0;
		45	}
		46
		47	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
		48	{
		49	template_name => "tools/additional-contents.tt",
		50	query => $cgi,
		51	type => "intranet",
		52	flagsrequired => { tools => 'edit_additional_contents' },
		53	}
		54	);
		55
		56	my @messages;
		57	if ( $op eq 'add_form' ) {
		58
		59	my $additional_content = Koha::AdditionalContents->find($id);
		60	my $translated_contents;
		61	if ( $additional_content ) {
		62	$translated_contents = {
		63	map { $_->lang => $_ } Koha::AdditionalContents->search(
		64	{
65	category => $additional_content->category,
66	code => $additional_content->code,
67	location => $additional_content->location,
68	branchcode => $additional_content->branchcode,
69	}
70	)
71	};
72	}
73	$template->param(
74	additional_content => $additional_content,
75	translated_contents => $translated_contents,
76	);
77	}
78	elsif ( $op eq 'add_validate' ) {
79	my $location = $cgi->param('location');
80	my $code = $cgi->param('code');
81	my $branchcode = $cgi->param('branchcode') \|\| undef;
82
83	my @title = $cgi->multi_param('title');
84	my @content = $cgi->multi_param('content');
85	my @lang = $cgi->multi_param('lang');
86
87	my $expirationdate;
88	if ( $cgi->param('expirationdate') ) {
89	$expirationdate = output_pref(
90	{
91	dt => dt_from_string( scalar $cgi->param('expirationdate') ),
92	dateformat => 'iso',
93	dateonly => 1
94	}
95	);
96	}
97	my $published_on = output_pref(
98	{
99	dt => dt_from_string( scalar $cgi->param('published_on') ),
100	dateformat => 'iso',
101	dateonly => 1
102	}
103	);
104	my $number = $cgi->param('number');
105
106	my $success = 1;
107	for my $lang ( @lang ) {
108	my $title = shift @title;
109	my $content = shift @content;
110	my $additional_content = Koha::AdditionalContents->find(
111	{
112	category => $category,
113	code => $code,
114	branchcode => $branchcode,
115	lang => $lang,
116	}
117	);
118	# Delete if title or content is empty
119	unless ( $title and $content ) {
120	$additional_content->delete if $additional_content;
121	next;
122	} elsif ( $additional_content ) {
123	eval {
124	$additional_content->update(
125	{
126	category => $category,
127	code => $code,
128	location => $location,
129	branchcode => $branchcode,
130	title => $title,
131	content => $content,
132	lang => $lang,
133	expirationdate => $expirationdate,
134	published_on => $published_on,
135	number => $number,
136	borrowernumber => $borrowernumber,
137	}
138	);
139	};
140	if ($@) {
141	$success = 0;
142	push @messages, { type => 'error', code => 'error_on_update' };
143	last;
144	}
145	}
146	else {
147	my $additional_content = Koha::AdditionalContent->new(
148	{
149	category => $category,
150	code => $code,
151	location => $location,
152	branchcode => $branchcode,
153	title => $title,
154	content => $content,
155	lang => $lang,
156	expirationdate => $expirationdate,
157	published_on => $published_on,
158	number => $number,
159	borrowernumber => $borrowernumber,
160	}
161	)->store;
162	eval { $additional_content->store; };
163	if ($@) {
164	$success = 0;
165	push @messages, { type => 'error', code => 'error_on_insert' };
166	last;
167	}
168	}
169
170	}
171	$op = 'list';
172	}
173	elsif ( $op eq 'delete_confirmed' ) {
174	my @ids = $cgi->multi_param('ids');
175	my $deleted =
176	eval { Koha::AdditionalContents->search( { idnew => @ids } )->delete; };
177
178	if ( $@ or not $deleted ) {
179	push @messages, { type => 'error', code => 'error_on_delete' };
180	}
181	else {
182	push @messages, { type => 'message', code => 'success_on_delete' };
183	}
184
185	$op = 'list';
186	}
187
188	if ( $op eq 'list' ) {
189	my $additional_contents = Koha::AdditionalContents->search(
190	{ category => $category, lang => 'default' },
191	{ order_by => { -desc => 'published_on' } }
192	);
193	$template->param( additional_contents => $additional_contents );
194	}
195
196	my $translated_languages = C4::Languages::getTranslatedLanguages;
197	my @languages;
198	for my $language (@$translated_languages) {
199	for my $sublanguage ( @{ $language->{sublanguages_loop} } ) {
200	if ( $language->{plural} ) {
201	push @languages,
202	{
203	lang => $sublanguage->{rfc4646_subtag},
204	description => $sublanguage->{native_description} . ' '
205	. $sublanguage->{region_description} . ' ('
206	. $sublanguage->{rfc4646_subtag} . ')',
207	};
208	}
209	else {
210	push @languages,
211	{
212	lang => $sublanguage->{rfc4646_subtag},
213	description => $sublanguage->{native_description} . ' ('
214	. $sublanguage->{rfc4646_subtag} . ')',
215	};
216	}
217	}
218	}
219	unshift @languages, {lang => 'default'} if @languages;
220
221	$template->param(
222	op => $op,
223	category => $category,
224	wysiwyg => $wysiwyg,
225	languages => \@languages,
226	);
227
228
229	output_html_with_http_headers $cgi, $cookie, $template->output;

Lines 1-160 Link Here

(-)a/tools/koha-news.pl (-160 lines)
1	#!/usr/bin/perl
2
3	# This file is part of Koha.
4	#
5	# Script to manage the opac news.
6	# written 11/04
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
9	# Copyright 2000-2002 Katipo Communications
10	# Copyright (C) 2013 Mark Tompsett
11	#
12	# Koha is free software; you can redistribute it and/or modify it
13	# under the terms of the GNU General Public License as published by
14	# the Free Software Foundation; either version 3 of the License, or
15	# (at your option) any later version.
16	#
17	# Koha is distributed in the hope that it will be useful, but
18	# WITHOUT ANY WARRANTY; without even the implied warranty of
19	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20	# GNU General Public License for more details.
21	#
22	# You should have received a copy of the GNU General Public License
23	# along with Koha; if not, see <http://www.gnu.org/licenses>.
24
25	use Modern::Perl;
26	use CGI qw ( -utf8 );
27	use C4::Auth qw( get_template_and_user );
28	use C4::Context;
29	use C4::Output qw( output_html_with_http_headers );
30	use C4::Languages qw( getTranslatedLanguages );
31	use Koha::DateUtils qw( dt_from_string output_pref );
32	use Koha::News;
33
34	my $cgi = CGI->new;
35
36	my $id = $cgi->param('id');
37	my $title = $cgi->param('title');
38	my $content = $cgi->param('content');
39	my $expirationdate;
40	if ( $cgi->param('expirationdate') ) {
41	$expirationdate = output_pref({ dt => dt_from_string( scalar $cgi->param('expirationdate') ), dateformat => 'iso', dateonly => 1 });
42	}
43	my $published_on= output_pref({ dt => dt_from_string( scalar $cgi->param('published_on') ), dateformat => 'iso', dateonly => 1 });
44	my $number = $cgi->param('number');
45	my $lang = $cgi->param('lang');
46	my $branchcode = $cgi->param('branch');
47	my $error_message = $cgi->param('error_message');
48	my $wysiwyg;
49	if( $cgi->param('editmode') ){
50	$wysiwyg = $cgi->param('editmode') eq "wysiwyg" ? 1 : 0;
51	} else {
52	$wysiwyg = C4::Context->preference("NewsToolEditor") eq "tinymce" ? 1 : 0;
53	}
54
55	# Foreign Key constraints work with NULL, not ''
56	# NULL = All branches.
57	$branchcode = undef if (defined($branchcode) && $branchcode eq '');
58
59	my $new_detail = Koha::News->find( $id );
60
61	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
62	{
63	template_name => "tools/koha-news.tt",
64	query => $cgi,
65	type => "intranet",
66	flagsrequired => { tools => 'edit_news' },
67	}
68	);
69
70	# Pass error message if there is one.
71	$template->param( error_message => $error_message ) if $error_message;
72
73	# get lang list
74	my @lang_list;
75	my $tlangs = getTranslatedLanguages() ;
76
77	foreach my $language ( @$tlangs ) {
78	foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) {
79	push @lang_list,
80	{
81	language => $sublanguage->{'rfc4646_subtag'},
82	selected => ( $new_detail && $new_detail->lang eq $sublanguage->{'rfc4646_subtag'} ? 1 : 0 ),
83	};
84	}
85	}
86
87	$template->param( lang_list => \@lang_list,
88	branchcode => $branchcode );
89
90	my $op = $cgi->param('op') // '';
91
92	if ( $op eq 'add_form' ) {
93	$template->param( add_form => 1 );
94	if ($id) {
95	if($new_detail->lang eq "slip"){ $template->param( slip => 1); }
96	$template->param(
97	op => 'edit',
98	id => $new_detail->idnew
99	);
100	$template->{VARS}->{'new_detail'} = $new_detail;
101	}
102	else {
103	$template->param( op => 'add' );
104	}
105	}
106	elsif ( $op eq 'add' ) {
107	if ($title) {
108	my $new = Koha::NewsItem->new({
109	title => $title,
110	content => $content,
111	lang => $lang,
112	expirationdate => $expirationdate,
113	published_on => $published_on,
114	number => $number,
115	branchcode => $branchcode,
116	borrowernumber => $borrowernumber,
117	})->store;
118	print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
119	}
120	else {
121	print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl?error_message=title_missing");
122	}
123	}
124	elsif ( $op eq 'edit' ) {
125	my $news_item = Koha::News->find( $id );
126	if ( $news_item ) {
127	$news_item->set({
128	title => $title,
129	content => $content,
130	lang => $lang,
131	expirationdate => $expirationdate,
132	published_on=> $published_on,
133	number => $number,
134	branchcode => $branchcode,
135	})->store;
136	}
137	print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
138	}
139	elsif ( $op eq 'del' ) {
140	my @ids = $cgi->multi_param('ids');
141	Koha::News->search({ idnew => @ids })->delete;
142	print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
143	}
144
145	else {
146	my $params;
147	$params->{lang} = $lang if $lang;
148	my $opac_news = Koha::News->search(
149	$params,
150	{
151	order_by => { -desc => 'published_on' },
152	}
153	);
154	$template->param( opac_news => $opac_news );
155	}
156	$template->param(
157	lang => $lang,
158	wysiwyg => $wysiwyg,
159	);
160	output_html_with_http_headers $cgi, $cookie, $template->output;