diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-10 22:16:55 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-10 22:16:55 +0100 |
| commit | 0c96d3489b3a74e10804206f1be0789fb63a6949 (patch) | |
| tree | 71e6ced84a78d208fd6c0eb58913fd49682734d8 /app | |
| parent | e7fa10dc9de6c136b0f57097c7d9d8b93460c43f (diff) | |
Mise à jour de la vue globale
* Nombre de non lus mis à jour automatiquement
* Mise à jour structure HTML
* Mise à jour design
Diffstat (limited to 'app')
| -rw-r--r-- | app/layout/aside_flux.phtml | 4 | ||||
| -rw-r--r-- | app/views/helpers/view/global_view.phtml | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index e6eb974d2..72de9b6dd 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -35,7 +35,9 @@ <li> <?php $c_active = false; if ($this->get_c == $cat->id ()) { $c_active = true; } ?> <div class="category stick<?php echo $c_active ? ' active' : ''; ?>"> - <a data-unread="<?php echo $cat->nbNotRead (); ?>" class="btn<?php echo $c_active ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id ()); ?>"><?php echo htmlspecialchars($cat->name (), ENT_NOQUOTES, 'UTF-8'); ?></a> + <a data-unread="<?php echo $cat->nbNotRead (); ?>" class="btn<?php echo $c_active ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id ()); ?>"> + <?php echo htmlspecialchars($cat->name (), ENT_NOQUOTES, 'UTF-8'); ?> + </a> <a class="btn dropdown-toggle" href="#"><i class="icon <?php echo $c_active ? 'i_up' : 'i_down'; ?>"></i></a> </div> diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml index fc55ed8ba..ae3bae9bc 100644 --- a/app/views/helpers/view/global_view.phtml +++ b/app/views/helpers/view/global_view.phtml @@ -1,30 +1,26 @@ <?php $this->partial ('nav_menu'); ?> -<div id="stream" class="global"> +<div id="stream" class="global categories"> <?php foreach ($this->cat_aside as $cat) { $feeds = $cat->feeds (); - $catNotRead = $cat->nbNotRead (); if (!empty ($feeds)) { ?> - <div class="category"> - <div class="cat_header"> - <a href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id (), 'output', 'normal'); ?>"> - <?php echo htmlspecialchars($cat->name(), ENT_NOQUOTES, 'UTF-8'); ?><?php echo $catNotRead > 0 ? ' (' . $catNotRead . ')' : ''; ?> + <div class="box-category"> + <div class="category"> + <a data-unread="<?php echo $cat->nbNotRead (); ?>" class="btn" href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id (), 'output', 'normal'); ?>"> + <?php echo htmlspecialchars($cat->name(), ENT_NOQUOTES, 'UTF-8'); ?> </a> </div> <ul class="feeds"> <?php foreach ($feeds as $feed) { ?> <?php $not_read = $feed->nbNotRead (); ?> - <li class="item"> + <li id="f_<?php echo $feed->id (); ?>" class="item<?php echo $feed->inError () ? ' error' : ''; ?><?php echo $feed->nbEntries () == 0 ? ' empty' : ''; ?>"> <img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" /> - <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id (), 'output', 'normal'); ?>"> - <?php echo $not_read > 0 ? '<b>' : ''; ?> + <a class="feed" data-unread="<?php echo $feed->nbNotRead (); ?>" data-priority="<?php echo $feed->priority (); ?>" href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id (), 'output', 'normal'); ?>"> <?php echo htmlspecialchars($feed->name(), ENT_NOQUOTES, 'UTF-8'); ?> - <?php echo $not_read > 0 ? ' (' . $not_read . ')' : ''; ?> - <?php echo $not_read > 0 ? '</b>' : ''; ?> </a> </li> <?php } ?> |