diff --git a/misc/cronjobs/rss/lastAcquired-1.0.conf b/misc/cronjobs/rss/lastAcquired-1.0.conf
index d70cf71f8f..9f7eb31a0a 100644
--- a/misc/cronjobs/rss/lastAcquired-1.0.conf
+++ b/misc/cronjobs/rss/lastAcquired-1.0.conf
@@ -9,6 +9,6 @@ url=http://www.koha-community.org/images/foo.jpg
link=http://www.koha-community.org
description=Koha, the worlds best Open Source Library System
config
-tmpl=lastAcquired-1.0.tmpl
+tmpl=lastAcquired-1.0.tt
output=lastAcquired-1.0.xml
query=select biblio.title as title, biblio.author as author, biblio.biblionumber, biblio.notes as notes, biblioitems.place as place, biblioitems.publishercode as publishercode, biblioitems.publicationyear as publicationyear, biblioitems.pages as pages, biblioitems.illus as illus, biblioitems.size as size from biblio, biblioitems, items where biblioitems.biblionumber = items.biblionumber and biblio.biblionumber = items.biblionumber and items.dateaccessioned is not NULL order by items.dateaccessioned desc
diff --git a/misc/cronjobs/rss/lastAcquired-1.0.tmpl b/misc/cronjobs/rss/lastAcquired-1.0.tmpl
deleted file mode 100644
index 6bd47803c4..0000000000
--- a/misc/cronjobs/rss/lastAcquired-1.0.tmpl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
- ">
-
-
-
-
-
- ">
-
-
-
-
-
-
-
- "/>
-
-
-
-
-
-
- ">
- by
- http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=
- by
-
-
-
-">View Details | ">Reserve this Item | &resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author
-]]>
-
-
-
diff --git a/misc/cronjobs/rss/lastAcquired-1.0.tt b/misc/cronjobs/rss/lastAcquired-1.0.tt
new file mode 100644
index 0000000000..0c137f4ee6
--- /dev/null
+++ b/misc/cronjobs/rss/lastAcquired-1.0.tt
@@ -0,0 +1,39 @@
+
+
+
+ [% CHANNELTITLE %]
+ [% CHANNELLINK %]
+ [% CHANNELDESC %]
+ [% CHANNELLANG %]
+ [% CHANNELLASTBUILD %]
+
+ [% IMAGETITLE %]
+ [% IMAGEURL %]
+ [% IMAGELINK %]
+
+
+
+ [% FOREACH i IN ITEMS %]
+
+ [% END %]
+
+
+
+
+ [% FOREACH i IN ITEMS %]
+
+ [% i.TITLE %][% IF i.AUTHOR %] by [% i.AUTHOR %][% END %]
+ http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]
+[% place %] [% i.publishercode %] [% i.publicationyear %]
+ [% pages %] [% i.illus %] [% i.size %]
+[% IF i.notes %]
[% i.notes %][% END %]
+View Details | Reserve this Item[% IF i.author %] | More by this Author[% END %]
+]]>
+
+[% END %]
+
diff --git a/misc/cronjobs/rss/lastAcquired-2.0.conf b/misc/cronjobs/rss/lastAcquired-2.0.conf
index 0a03937f94..01b6f97ee3 100644
--- a/misc/cronjobs/rss/lastAcquired-2.0.conf
+++ b/misc/cronjobs/rss/lastAcquired-2.0.conf
@@ -11,6 +11,6 @@ description=Koha, the worlds best Open Source Library System
width=88
height=31
config
-tmpl=lastAcquired-2.0.tmpl
+tmpl=lastAcquired-2.0.tt
output=lastAcquired-2.0.xml
query=select biblio.title as title, biblio.author as author, biblio.biblionumber, biblio.notes as notes, biblioitems.place as place, biblioitems.publishercode as publishercode, biblioitems.publicationyear as publicationyear, biblioitems.pages as pages, biblioitems.illus as illus, biblioitems.size as size from biblio, biblioitems, items where biblioitems.biblionumber = items.biblionumber and biblio.biblionumber = items.biblionumber and items.dateaccessioned is not NULL order by items.dateaccessioned desc
diff --git a/misc/cronjobs/rss/lastAcquired-2.0.tmpl b/misc/cronjobs/rss/lastAcquired-2.0.tmpl
deleted file mode 100644
index f90942fe56..0000000000
--- a/misc/cronjobs/rss/lastAcquired-2.0.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
- http://blogs.law.harvard.edu/tech/rss
- Koha
-
-
-
-
-
-
-
-
-
-
-
- by
- http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=
- by
-
-
-
-">View Details | ">Reserve this Item | &resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author
-]]>
-
-
-
-
-
diff --git a/misc/cronjobs/rss/lastAcquired-2.0.tt b/misc/cronjobs/rss/lastAcquired-2.0.tt
new file mode 100644
index 0000000000..85cded632d
--- /dev/null
+++ b/misc/cronjobs/rss/lastAcquired-2.0.tt
@@ -0,0 +1,34 @@
+
+
+
+ [% CHANNELTITLE %]
+ [% CHANNELLINK %]
+ [% CHANNELDESC %]
+ [% CHANNELLANG %]
+ [% CHANNELLASTBUILD %]
+ http://blogs.law.harvard.edu/tech/rss
+ Koha
+
+ [% IMAGETITLE %]
+ [% IMAGEURL %]
+ [% IMAGELINK %]
+ [% IMAGEWIDTH %]
+ [% IMAGEHEIGHT %]
+ [% IMAGEDESCRIPTION %]
+
+
+[% FOREACH i IN ITEMS %]
+
+ [% i.TITLE %][% IF i.AUTHOR %] by [% i.AUTHOR %][% END %]
+ http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]
+[% IF i.publishercode %][% i.place %] [% i.publishercode %] [% publicationyear %] [% END %]
+[% IF i.pages %][% i.pages %][% i.illus %][% i.size %][% END %]
+[% IF i.notes %]
[% i.notes %]
[% END %]
+View Details | Reserve this Item[% IF i.author %] | More by this Author[% END %]
+]]>
+
+[% END %]
+
+
+
diff --git a/misc/cronjobs/rss/lastAcquired.conf b/misc/cronjobs/rss/lastAcquired.conf
index 1147d9469b..4a6abaac2b 100644
--- a/misc/cronjobs/rss/lastAcquired.conf
+++ b/misc/cronjobs/rss/lastAcquired.conf
@@ -9,7 +9,7 @@ title=Koha, the world's best Open Source Library System
url=http://www.koha-community.org/images/foo.jpg
link=http://www.koha-community.org
config
-tmpl=lastAcquired.tmpl
+tmpl=lastAcquired.tt
output=lastAcquired.xml
query=select biblio.title as title, biblio.author as author, biblio.biblionumber from biblio, biblioitems, items where biblioitems.biblionumber = items.biblionumber and biblio.biblionumber = items.biblionumber and items.dateaccessioned is not NULL order by items.dateaccessioned desc
diff --git a/misc/cronjobs/rss/lastAcquired.tmpl b/misc/cronjobs/rss/lastAcquired.tmpl
deleted file mode 100644
index b47cd18fc3..0000000000
--- a/misc/cronjobs/rss/lastAcquired.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- , by
- http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=
-
-
-
-
-
-
diff --git a/misc/cronjobs/rss/lastAcquired.tt b/misc/cronjobs/rss/lastAcquired.tt
new file mode 100644
index 0000000000..6e92e2f398
--- /dev/null
+++ b/misc/cronjobs/rss/lastAcquired.tt
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+ [% CHANNELTITLE %]
+ [% CHANNELLINK %]
+ [% CHANNELDESC %]
+ [% CHANNELLANG %]
+ [% CHANNELLASTBUILD %]
+
+
+ [% IMAGETITLE %]
+ [% IMAGEURL %]
+ [% IMAGELINK %]
+
+
+[% FOREACH i IN ITEMS %]
+
+ [% i.TITLE %], by [% i.AUTHOR %]
+ http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]
+
+
+[% END %]
+
+
+
diff --git a/misc/cronjobs/rss/longestUnseen.conf b/misc/cronjobs/rss/longestUnseen.conf
index 7c0218cd38..7268556e62 100644
--- a/misc/cronjobs/rss/longestUnseen.conf
+++ b/misc/cronjobs/rss/longestUnseen.conf
@@ -8,7 +8,7 @@ title=Koha, the worlds best Open Source Library System
url=http://www.koha-community.org/images/foo.jpg
link=http://www.koha-community.org
config
-tmpl=longestUnseen.tmpl
+tmpl=longestUnseen.tt
output=longestUnseen.xml
query=select biblioitems.isbn as isbn, biblio.title as title, biblio.author as author from biblio, biblioitems, items where biblioitems.biblionumber = items.biblionumber and biblio.biblionumber = items.biblionumber and items.datelastseen is not NULL and items.datelastseen != items.datelastborrowed order by items.datelastseen
diff --git a/misc/cronjobs/rss/longestUnseen.tmpl b/misc/cronjobs/rss/longestUnseen.tmpl
deleted file mode 100644
index 99893bc896..0000000000
--- a/misc/cronjobs/rss/longestUnseen.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- , by
- http://opac.library.org.nz/cgi-bin/koha/opac-searchresults.pl?isbn=
-
-
-
-
-
-
diff --git a/misc/cronjobs/rss/longestUnseen.tt b/misc/cronjobs/rss/longestUnseen.tt
new file mode 100644
index 0000000000..12f6061ba5
--- /dev/null
+++ b/misc/cronjobs/rss/longestUnseen.tt
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+ [% CHANNELTITLE>
+ [% CHANNELLINK %]
+ [% CHANNELDESC %]
+ [% CHANNELLANG %]
+ [% CHANNELLASTBUILD %]
+
+
+ [% IMAGETITLE %]
+ [% IMAGEURL %]
+ [% IMAGELINK %]
+
+
+[% FOREACH i IN ITEMS %]
+
+ [% i.TITLE %], by [% i.AUTHOR %]
+ http://opac.library.org.nz/cgi-bin/koha/opac-searchresults.pl?isbn=[% i.ISBN %]
+
+
+[% END %]
+
+
+
diff --git a/misc/cronjobs/rss/mostReserved.conf b/misc/cronjobs/rss/mostReserved.conf
index f6c44ad523..9ef65a3495 100644
--- a/misc/cronjobs/rss/mostReserved.conf
+++ b/misc/cronjobs/rss/mostReserved.conf
@@ -8,7 +8,7 @@ title=Koha, the worlds best Open Source Library System
url=http://www.koha-community.org/images/foo.jpg
link=http://www.koha-community.org
config
-tmpl=mostReserved.tmpl
+tmpl=mostReserved.tt
output=mostReserved.xml
query=select biblioitems.isbn as isbn, biblio.title as title, biblio.author as author from biblio, biblioitems, items where biblioitems.biblionumber = items.biblionumber and biblio.biblionumber = items.biblionumber and items.reserves is not NULL order by items.reserves desc
diff --git a/misc/cronjobs/rss/mostReserved.tmpl b/misc/cronjobs/rss/mostReserved.tmpl
deleted file mode 100644
index 99893bc896..0000000000
--- a/misc/cronjobs/rss/mostReserved.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- , by
- http://opac.library.org.nz/cgi-bin/koha/opac-searchresults.pl?isbn=
-
-
-
-
-
-
diff --git a/misc/cronjobs/rss/mostReserved.tt b/misc/cronjobs/rss/mostReserved.tt
new file mode 100644
index 0000000000..f69d1355e9
--- /dev/null
+++ b/misc/cronjobs/rss/mostReserved.tt
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+ [% CHANNELTITLE %]
+ [% CHANNELLINK %]
+ [% CHANNELDESC %]
+ [% CHANNELLANG %]
+ [% CHANNELLASTBUILD %]
+
+
+ [% IMAGETITLE %]
+ [% IMAGEURL %]
+ [% IMAGELINK %]
+
+
+[% FOREACH i IN ITEMS %]
+
+ [% TITLE %], by [% AUTHOR %]
+ http://opac.library.org.nz/cgi-bin/koha/opac-searchresults.pl?isbn=[% ISBN %]
+
+
+[% END %]
+
+
+