diff options
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/Rss.pm | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 8 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/EmptyHomes.pm | 11 | ||||
| -rw-r--r-- | web/xsl.eha.xsl | 95 | ||||
| -rw-r--r-- | web/xsl.xsl | 87 |
5 files changed, 0 insertions, 202 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index 62a889801..fe4b652ed 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -172,7 +172,6 @@ sub generate : Private { $c->stash->{rss} = new XML::RSS( version => '2.0', encoding => 'UTF-8', - stylesheet => $c->cobrand->feed_xsl, encode_output => undef ); $c->stash->{rss}->add_module( diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index c3fd8a287..6088f22a8 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -474,14 +474,6 @@ COUNCILS pass any extra checks. CONTEXT is where we are on the site. sub council_check { return ( 1, '' ); } -=head2 feed_xsl - -Return an XSL to be used in rendering feeds - -=cut - -sub feed_xsl { '/xsl.xsl' } - =head2 all_councils_report Return a boolean indicating whether the cobrand displays a report of all diff --git a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm index b9dea87c9..ed0c4ba73 100644 --- a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm +++ b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm @@ -48,17 +48,6 @@ sub base_url_with_lang { sub languages { [ 'en-gb,English,en_GB', 'cy,Cymraeg,cy_GB' ] } sub language_domain { 'FixMyStreet-EmptyHomes' } -=item feed_xsl - -Return the XSL file path to be used for feeds' - -=cut - -sub feed_xsl { - my ($self) = @_; - return '/xsl.eha.xsl'; -} - =item shorten_recency_if_new_greater_than_fixed For empty homes we don't want to shorten the recency diff --git a/web/xsl.eha.xsl b/web/xsl.eha.xsl deleted file mode 100644 index 41b86ea07..000000000 --- a/web/xsl.eha.xsl +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - <xsl:output method="html" /> - <xsl:variable name="title" select="/rss/channel/title"/> - <xsl:variable name="uri" select="/rss/channel/uri"/> - <xsl:template match="/"> -<html lang="en-gb"> - <head> - <title><xsl:value-of select="$title"/> RSS Feed</title> - <link rel="stylesheet" href="/css/core.css"/> - <link rel="stylesheet" href="/cobrands/emptyhomes/css.css"/> - </head> - <body> - <div id="header"><a href="http://www.emptyhomes.com/"><img border="0" src="/i/eha.png" alt="Empty Homes Agency" width="272" height="71"/></a></div> - <div id="navigation"> - <ul> - <li><a href="/">Report a property</a></li> - <li><a href="/reports">Reports</a></li> - <li><a href="/alert">Get local reports</a></li> - <li><a href="/faq">FAQs</a></li> - <li><a href="/about">About us</a></li> - </ul> - </div> - - <div id="wrapper"><div id="mysociety"> - <xsl:apply-templates select="rss/channel"/> - </div></div> - -<div id="footer"> -Empty Homes Agency <br/> -Downstream Building, 1 London Bridge, London, SE1 9BG - -<br/> -Tel: 020 7022 1870 <br/> -Fax: 020 7681 3214 <br/> -Email: <a href="mailto:info@emptyhomes.com">info@emptyhomes.com</a> -</div> - -</body> -</html> - </xsl:template> - - <xsl:template match="channel"> - <div id="rss_box"> - <h1>What is this page?</h1> - <p>This is an RSS feed from the ReportEmptyHomes website. RSS feeds allow you to stay up to date with the latest changes and additions to the site. - To subscribe to it, you will need a News Reader or other similar device. - <br/> - <a href="http://news.bbc.co.uk/1/hi/help/3223484.stm#whatisrss"><strong>Help</strong>, I don't know what a news reader is and still don't know what this is about <small>(from the BBC)</small>.</a></p> - </div> - - <p>Below is the latest content available from this feed, - <a href="#" class="item"><img height="16" hspace="5" vspace="0" border="0" width="16" alt="RSS News feeds" src="/i/feed.png" title="RSS News feeds" /><xsl:value-of select="$title"/></a>.</p> - - <div id="rss_items"><ul><xsl:apply-templates select="item"/></ul></div> - <div id="rss_rhs"> - <h2 style="margin:0">Subscribe to this feed</h2> - <p>You can subscribe to this RSS feed in a number of ways, including the following:</p> - <ul> - <li>Drag the orange RSS button into your News Reader</li> - <li>Drag the URL of the RSS feed into your News Reader</li> - <li>Cut and paste the URL of the RSS feed into your News Reader</li> - </ul> - <h3>One-click subscriptions</h3> - <p>If you use one of the following web-based News Readers, click on the appropriate button to subscribe to the RSS feed.</p> -<a href="http://www.bloglines.com/sub/{uri}"><img height="18" width="91" hspace="3" vspace="3" border="0" alt="bloglines" src="http://newsimg.bbc.co.uk/shared/bsp/xsl/rss/img/bloglines.gif" /></a> -<a href="http://www.feedzilla.com/mini/default.asp?ref=bbc&url={uri}"><img height="22" width="93" hspace="3" vspace="3" border="0" alt="feedzilla" src="http://newsimg.bbc.co.uk/shared/bsp/xsl/rss/img/feedzilla.gif" /></a> -<a href="http://add.my.yahoo.com/rss?url={uri}"><img height="17" width="91" hspace="3" vspace="3" border="0" alt="my yahoo" src="http://newsimg.bbc.co.uk/shared/bsp/xsl/rss/img/myyahoo.gif" /></a> -<a href="http://www.newsgator.com/ngs/subscriber/subext.aspx?url={uri}"><img height="17" width="91" hspace="3" vspace="3" border="0" alt="newsgator" src="http://newsimg.bbc.co.uk/shared/bsp/xsl/rss/img/newsgator.gif" /></a> -<a href="http://www.live.com/?add={uri}"><img height="17" width="91" hspace="3" vspace="3" border="0" alt="Microsoft Live" src="http://newsimg.bbc.co.uk/shared/bsp/xsl/rss/img/windowslive.gif" /></a> -<a href="http://feeds.my.aol.com/add.jsp?url={uri}"><img hspace="3" src="http://o.aolcdn.com/myfeeds/html/vis/myaol_cta1.gif" alt="Add to My AOL" border="0"/></a> -<a href="http://www.netvibes.com/subscribe.php?url={uri}"><img hspace="3" src="http://www.netvibes.com/img/add2netvibes.gif" alt="Add to netvibes" /></a> -<a href="http://fusion.google.com/add?feedurl={uri}"><img hspace="3" src="http://buttons.googlesyndication.com/fusion/add.gif" width="104" height="17" alt="Add to Google"/></a> -<a href="http://www.pageflakes.com/subscribe.aspx?url={uri}"><img hspace="3" src="http://www.pageflakes.com/subscribe2.gif" border="0"/></a> - -<ul> -<li><a href="http://google.com/reader/view/feed/{uri}">Google Reader</a></li> -<li><a href="http://my.msn.com/addtomymsn.armx?id=rss&ut={uri}&tt=CENTRALDIRECTORY&ru=http://rss.msn.com">My MSN</a></li> -<li><a href="http://127.0.0.1:5335/system/pages/subscriptions?url={uri}">Userland</a></li> -<li><a href="http://127.0.0.1:8888/index.html?add_url={uri}">Amphetadesk</a></li> -<li><a href="http://www.feedmarker.com/admin.php?do=add_feed&url={uri}">Feedmarker</a></li> -</ul> - - </div> - - </xsl:template> - - <xsl:template match="item"> - <li> - <a href="{link}" class="item"><xsl:value-of select="title"/></a><br/> - <div><xsl:value-of disable-output-escaping="yes" select="description" /></div> - </li> - </xsl:template> - -</xsl:stylesheet> diff --git a/web/xsl.xsl b/web/xsl.xsl deleted file mode 100644 index 12a4a93d5..000000000 --- a/web/xsl.xsl +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - <xsl:output method="html" /> - <xsl:variable name="title" select="/rss/channel/title"/> - <xsl:variable name="uri" select="/rss/channel/uri"/> - <xsl:template match="/"> -<html lang="en-gb"> - <head> - <title><xsl:value-of select="$title"/> XML Feed</title> - <link rel="stylesheet" href="/css/core.css"/> - <link rel="stylesheet" href="/css/main.css"/> - </head> - <body> - <div id="header"><a href="/">FixMyStreet</a></div> - <div id="wrapper"><div id="mysociety"> - <xsl:apply-templates select="rss/channel"/> - </div></div> - -<h2 class="v">Navigation</h2> -<ul id="navigation"> -<li><a href="/report/new">Report a problem</a></li> -<li><a href="/reports">All reports</a></li> -<li><a href="/faq">Help</a></li> -<li><a href="/contact">Contact</a></li> -</ul> - -<p id="footer">Built by <a href="http://www.mysociety.org/">mySociety</a>, -using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a -href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.</p> - -</body> -</html> - </xsl:template> - - <xsl:template match="channel"> - <div id="rss_box"> - <h1>What is this page?</h1> - <p>This is an RSS feed from the FixMyStreet website. RSS feeds allow you to stay up to date with the latest changes and additions to the site. - To subscribe to it, you will need a News Reader or other similar device. - <br/> - <a href="http://news.bbc.co.uk/1/hi/help/3223484.stm#whatisrss"><strong>Help</strong>, I don't know what a news reader is and still don't know what this is about <small>(from the BBC)</small>.</a></p> - </div> - - <p>Below is the latest content available from this feed, - <a href="#" class="item"><img height="16" hspace="5" vspace="0" border="0" width="16" alt="RSS News feeds" src="/i/feed.png" title="RSS News feeds" /><xsl:value-of select="$title"/></a>.</p> - - <div id="rss_items"><ul><xsl:apply-templates select="item"/></ul></div> - <div id="rss_rhs"> - <h2 style="margin:0">Subscribe to this feed</h2> - <p>You can subscribe to this RSS feed in a number of ways, including the following:</p> - <ul> - <li>Drag the orange RSS button into your News Reader</li> - <li>Drag the URL of the RSS feed into your News Reader</li> - <li>Cut and paste the URL of the RSS feed into your News Reader</li> - </ul> - <h3>One-click subscriptions</h3> - <p>If you use one of the following web-based News Readers, click on the appropriate button to subscribe to the RSS feed.</p> -<a href="http://www.bloglines.com/sub/{uri}"><img height="18" width="91" hspace="3" vspace="3" border="0" alt="bloglines" src="http://newsimg.bbc.co.uk/shared/bsp/xsl/rss/img/bloglines.gif" /></a> -<a href="http://www.feedzilla.com/mini/default.asp?ref=bbc&url={uri}"><img height="22" width="93" hspace="3" vspace="3" border="0" alt="feedzilla" src="http://newsimg.bbc.co.uk/shared/bsp/xsl/rss/img/feedzilla.gif" /></a> -<a href="http://add.my.yahoo.com/rss?url={uri}"><img height="17" width="91" hspace="3" vspace="3" border="0" alt="my yahoo" src="http://newsimg.bbc.co.uk/shared/bsp/xsl/rss/img/myyahoo.gif" /></a> -<a href="http://www.newsgator.com/ngs/subscriber/subext.aspx?url={uri}"><img height="17" width="91" hspace="3" vspace="3" border="0" alt="newsgator" src="http://newsimg.bbc.co.uk/shared/bsp/xsl/rss/img/newsgator.gif" /></a> -<a href="http://www.live.com/?add={uri}"><img height="17" width="91" hspace="3" vspace="3" border="0" alt="Microsoft Live" src="http://newsimg.bbc.co.uk/shared/bsp/xsl/rss/img/windowslive.gif" /></a> -<a href="http://feeds.my.aol.com/add.jsp?url={uri}"><img hspace="3" src="http://o.aolcdn.com/myfeeds/html/vis/myaol_cta1.gif" alt="Add to My AOL" border="0"/></a> -<a href="http://www.netvibes.com/subscribe.php?url={uri}"><img hspace="3" src="http://www.netvibes.com/img/add2netvibes.gif" alt="Add to netvibes" /></a> -<a href="http://fusion.google.com/add?feedurl={uri}"><img hspace="3" src="http://buttons.googlesyndication.com/fusion/add.gif" width="104" height="17" alt="Add to Google"/></a> -<a href="http://www.pageflakes.com/subscribe.aspx?url={uri}"><img hspace="3" src="http://www.pageflakes.com/subscribe2.gif" border="0"/></a> - -<ul> -<li><a href="http://google.com/reader/view/feed/{uri}">Google Reader</a></li> -<li><a href="http://my.msn.com/addtomymsn.armx?id=rss&ut={uri}&tt=CENTRALDIRECTORY&ru=http://rss.msn.com">My MSN</a></li> -<li><a href="http://127.0.0.1:5335/system/pages/subscriptions?url={uri}">Userland</a></li> -<li><a href="http://127.0.0.1:8888/index.html?add_url={uri}">Amphetadesk</a></li> -<li><a href="http://www.feedmarker.com/admin.php?do=add_feed&url={uri}">Feedmarker</a></li> -</ul> - - </div> - - </xsl:template> - - <xsl:template match="item"> - <li> - <a href="{link}" class="item"><xsl:value-of select="title"/></a><br/> - <div><xsl:value-of disable-output-escaping="yes" select="description" /></div> - </li> - </xsl:template> - -</xsl:stylesheet> |