aboutsummaryrefslogtreecommitdiff
path: root/app/layout
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-03-14 18:04:45 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-03-14 18:04:45 +0100
commit6fc16ed8a307cb95ef9e60f2e3e781b4734cabfd (patch)
tree77274ba7ab1d25c3d74caafeeed76404f0490650 /app/layout
parent87e07e66c97200445253070ed607a3a5bebad0ae (diff)
Meilleur affichage page d'erreur + on n'affiche plus une catégorie si aucun flux n'en fait partie
Diffstat (limited to 'app/layout')
-rw-r--r--app/layout/aside_feed.phtml2
-rw-r--r--app/layout/aside_flux.phtml5
2 files changed, 4 insertions, 3 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index aca000cd6..7e37b2ac4 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -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 { ?>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 9403a0445..f6d8b3887 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -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>