mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-26 09:17:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Meilleur affichage page d'erreur + on n'affiche plus une catégorie si aucun flux n'en fait partie

Browse Source
This commit is contained in:
Marien Fressinaud
2013-03-14 18:04:45 +01:00
parent 87e07e66c9
commit 6fc16ed8a3
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/configureController.php
View File

@@ -10,8 +10,6 @@ class configureController extends ActionController {
}
}
public function indexAction () { }
public function categorizeAction () {
$catDAO = new CategoryDAO ();

2
app/layout/aside_feed.phtml
View File

@@ -4,7 +4,7 @@
<?php if (!empty ($this->feeds)) { ?>
<?php foreach ($this->feeds as $feed) { ?>
<li class="item<?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?>">
<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed', 'params' => array ('id' => $feed->id ()))); ?>"><?php echo $feed->name (); ?></a>
<a href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>"><?php echo $feed->name (); ?></a>
</li>
<?php } ?>
<?php } else { ?>

5
app/layout/aside_flux.phtml
View File

@@ -21,6 +21,7 @@
<?php foreach ($this->cat_aside as $cat) { ?>
<?php $feeds = $cat->feeds (); $catNotRead = $cat->nbNotRead (); ?>
<?php if (!empty ($feeds)) { ?>
<li>
<a class="btn category<?php echo $this->get == $cat->id () ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id ()); ?>">
<?php echo $cat->name (); ?>
@@ -31,7 +32,7 @@
<ul class="feeds">
<?php foreach ($feeds as $feed) { ?>
<li>
<a class="website" href="<?php echo $feed->website(); ?>"><i class="icon link"></i></a>
<a class="website" href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>"><i class="icon configure"></i></a>
<img src="http://www.google.com/s2/favicons?domain=<?php echo get_domain ($feed->website ()); ?>" alt="" />
<a class="feed" href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>">
<?php echo $feed->name(); ?>
@@ -41,6 +42,6 @@
</ul>
<?php } ?>
</li>
<?php } ?>
<?php } } ?>
</ul>
</div>

6
app/views/error/index.phtml
View File

@@ -1,6 +1,6 @@
<div class="table">
<div class="nothing">
<h2><?php echo $this->code; ?></h2>
<div class="post">
<div class="alert">
<h1 class="alert-head"><?php echo $this->code; ?></h1>
<p><a href="<?php echo Url::display (); ?>">Revenir à l'accueil</a></p>
</div>

4
public/theme/base.css
View File

@@ -240,8 +240,9 @@ input {
box-shadow: 1px 1px 3px #aaa inset;
}
.alert .alert-head {
margin: 0;
font-weight: bold;
font-size: 105%;
font-size: 110%;
}
/* ICONES */
@@ -301,6 +302,7 @@ input {
}
.header .item.title h1 {
margin: 0;
text-shadow: 1px -1px 0 #ccc;
}
.header .item.title a:hover {
text-decoration: none;