Commit 62c424c2 authored by yPhil's avatar yPhil
Browse files

Merge branch 'everyday' into dev

parents fc1afcbd 6d433203
......@@ -8,7 +8,7 @@ Read about it in French [ici](http://linuxfr.org/users/philippemc/journaux/avec-
NeWS is a simple but powerful web app to view and manage various XML (RSS, aTom, etc) news feeds and present them in a nice, ergonomic fashion. I made it to replace the online news services (NetVibes, Google news, etc.) that I use up until around 2007, when they became bloated and **crippled with spyware**. It's a fast, simple and light system, and I've been using it for ~~weeks~~ years now ; It does what I want from a no-nonsense, every-morning-every-day news reader.
![NeWS screenshot](https://bitbucket.org/yassinphilip/nws/raw/master/screenshot.png)
![NeWS screenshot](https://bitbucket.org/yassinphilip/nws/raw/master/img/screenshot.png)
### Features
......@@ -29,7 +29,7 @@ NeWS is a simple but powerful web app to view and manage various XML (RSS, aTom,
- Point your browser to that directory. That's it.
- Oh, if you want to use the favicon caching feature (those favicons can take a loong time to get) make sure that the web server has the right to write to our directory:
- On the average web server (Debian / Apache) it's generally just a matter of, in the `nws` folder: `sudo chown .www-data .`
- Recommended in installed online : Protect (restrict access to) the back-office / feeds file:
- Recommended if installed online : Protect (restrict access to) the back-office / feeds file:
- Use [a trusted online htpassword generator](https://duckduckgo.com/?q%3Dhtpassword%2Bgenerator) (You can also create user/password pair(s) directly on the server with the command `htpasswd -b .access username password`)
- Paste this user/password pair in a file, and point to it from the [.htaccess](http://bitbucket.org/yassinphilip/nws/src/master/.htaccess) file
......@@ -70,3 +70,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*Icon by [Buuf](https://mattahan.deviantart.com/art/Buuf-37966044)*
---
img/nws.png

689 Bytes | W: | H:

img/nws.png

1.62 KB | W: | H:

img/nws.png
img/nws.png
img/nws.png
img/nws.png
  • 2-up
  • Swipe
  • Onion skin
img/rss.png

689 Bytes

......@@ -17,11 +17,11 @@ $feeds = 'feeds.xml';
<title>NeWS</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="robots" content="noindex,nofollow">
<link rel="shortcut icon" type="image/x-icon" href="img/nws.png" />
<link rel="shortcut icon" type="image/x-icon" href="img/favicon.ico" />
<link href="https://code.jquery.com/ui/1.12.1/themes/eggplant/jquery-ui.css" rel="stylesheet" type="text/css" />
<style type="text/css" media="screen">@import "nws-style.css";</style>
<style type="text/css" media="screen">@import "libs/nws-style.css";</style>
<base target='_blank' />
</head>
<body>
......@@ -66,7 +66,7 @@ $feeds = 'feeds.xml';
var totaltabs = $(".tabulators").find( "li" ).size();
var direction = null;
var ajax_loader = 'nws-load-feed.php';
var ajax_loader = 'libs/nws-load-feed.php';
var feed_max_age = 3600;
var ajax_spinner = '<img src="img/ellipsis.svg" class="loading" alt="loading..." />';
......@@ -458,7 +458,7 @@ $feeds = 'feeds.xml';
<span id="play" title="Start Slideshow" aria-hidden="true" class="icon-play playpause"></span>
</div>
</div>
<a href="nws-manage.php"><img src="img/nws.png" alt="manage" style="margin-top:.5em" /> Manage feeds</a>
<a href="libs/nws-manage.php"><img src="img/nws.png" alt="Manage feeds link" style="margin-top:.5em" /> Manage feeds</a>
';
......
......@@ -27,7 +27,7 @@ if (isset($_GET['all'])) {
<head>
<title>nws</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="shortcut icon" type="image/x-icon" href="img/nws.png" />
<link rel="shortcut icon" type="image/x-icon" href="img/rss.png" />
<style type="text/css" media="screen">@import "nws-style.css";</style>
</head>
<body>
......@@ -91,7 +91,7 @@ function delTree($dir) {
echo '<a href='.__FILE__.'?all>DELETE CACHE DIR</a>';
?>
<a href="./"><img src="img/nws.png" alt="NWS" style="margin-top:.5em" /> NWS</a> | <a href="./nws-manage.php">Manage feeds</a>
<a href="./"><img src="img/rss.png" alt="NWS" style="margin-top:.5em" /> NWS</a> | <a href="./nws-manage.php">Manage feeds</a>
</body>
</html>
......
......@@ -17,7 +17,7 @@ function removeslashes($string) {
return stripslashes(trim($string));
}
$fallback_favicon = "img/nws.png";
$fallback_favicon = "img/rss.png";
// 7889400 secs is a quarter
......
......@@ -177,7 +177,7 @@ echo '<form method="post" action="'.$_SERVER['PHP_SELF'].'">';
<input type="text" title="Add a new feed" name="a">
<input type="submit" name="submit" value="+">
</form>
<a href="./"><img src="img/nws.png" alt="NWS" style="margin-top:.5em" /> NWS</a> | <a href="./nws-clean-cache.php">Cache cleanup</a>
<a href="./"><img src="img/rss.png" alt="NWS" style="margin-top:.5em" /> NWS</a> | <a href="./nws-clean-cache.php">Cache cleanup</a>
</div>
</body>
</html>
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