Commit f77cb28e authored by yPhil's avatar yPhil
Browse files

Merge branch 'everyday' into dev

parents 9bae8eb5 7730d320
......@@ -43,11 +43,11 @@ Make the page your home page, and read it every morning. You know instantly what
#### Annex: A simple local server
To run NWS locally, simply install a basic LAMP server:
To run NWS locally, simply install a basic PHP server:
- Install the server components: `sudo apt install apache2 php7.0 php7.0-xml libapache2-mod-php7.0` (you may have to log in and out)
- Copy NeWS to the HTML root: `cp -r nws /var/www/html/`
- Point your browser to http://localhost/nws
- Install the server components: `sudo apt install php7.0 php7.0-xml` (you may have to log in and out)
- Start the server in the NWS directory : `php -S localhost:8000`
- Point your browser to http://localhost:8000/nws
### Usage
......
<?xml version="1.0" encoding="utf-8"?>
<feeds>
<!--
img can be either { none first all }
photo can be either {true false}
-->
<url tab="news">http://cabinporn.com/rss/</url>
<url tab="news">http://www.futura-sciences.com/rss/actualites.xml</url>
<url tab="news" img="none">http://www.pcinpact.com/rss/news.xml</url>
<url tab="news">http://www.pcinpact.com/rss/news.xml</url>
<url tab="news">https://news.google.com/news?cf=all&amp;hl=en&amp;pz=1&amp;ned=us&amp;output=rss</url>
<url tab="example" photo="true" numItems="1">http://xkcd.com/rss.xml</url>
<url tab="example" numItems="10">http://feeds.bbci.co.uk/news/world/rss.xml</url>
<url tab="example" numItems="8">http://feeds.bbci.co.uk/news/world/africa/rss.xml</url>
<url tab="example" photo="true" numItems="3">http://beautiful-wildlife.tumblr.com/rss/</url>
<url tab="example" numItems="6" photo="true">http://cabinporn.com/rss/</url>
<url tab="example">http://xkcd.com/rss.xml</url>
<url tab="example">http://feeds.bbci.co.uk/news/world/rss.xml</url>
<url tab="example">http://feeds.bbci.co.uk/news/world/africa/rss.xml</url>
<url tab="example">http://beautiful-wildlife.tumblr.com/rss/</url>
<url tab="example">http://www.premierguitar.com/rss/1</url>
<url tab="example" numItems="1" photo="true">http://what-if.xkcd.com/feed.atom</url>
<url tab="example" photo="true" numItems="6">http://comicfeeds.chrisbenard.net/view/dilbert/default</url>
<!-- disabled feeds
<url tab="snd">http://planet.linuxaudio.org/rss20.xml</url>
<url tab="snd">http://feeds2.feedburner.com/PitchforkAlbumReviews/</url>
<url tab="snd">http://feeds.feedburner.com/LinuxJournalAudioVideo/</url>
Remember to encode & with $amp; in your feed's URI
-->
<url tab="example">http://what-if.xkcd.com/feed.atom</url>
<url tab="example">http://comicfeeds.chrisbenard.net/view/dilbert/default</url>
</feeds>
......@@ -17,7 +17,7 @@ function removeslashes($string) {
return stripslashes(trim($string));
}
$fallback_favicon = "img/rss.png";
$fallback_favicon = "../img/rss.png";
// 7889400 secs is a quarter
......
......@@ -140,7 +140,7 @@ function reparse($u, $numItems, $imgMode, $photoblog) {
<div class="feed" title ="'.$feedLink.'">
<div class="'.$title_class.'">
<span class="favicon">
<a class="nws-feed-icon" href="'.$u.'"><img src="'.$favicon.'" /></a>&nbsp;<a class="nws-feed-title" href="'.$feedLink.'" title="'.$title_link.'">'.$feedTitle.'</a>
<a class="nws-feed-icon" href="'.$u.'"><img src="libs/'.$favicon.'" /></a>&nbsp;<a class="nws-feed-title" href="'.$feedLink.'" title="'.$title_link.'">'.$feedTitle.'</a>
</span>
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment