diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-03-13 19:09:29 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-03-13 19:09:29 +0100 |
| commit | 8c72acbacb8fd4da39d505e8ac52e7e0cceed418 (patch) | |
| tree | 85f1d8445a29e9d374fa1b399ed843b779f01fdd /app/layout | |
| parent | c62ec2a14428b528e20896d4e62fa08891e1399c (diff) | |
Suppression code HTML inutile + amélioration CSS + restructuration du layout + correction bug mise à jour d'articles lorsqu'on visualise une catégorie
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_configure.phtml (renamed from app/layout/configure_aside.phtml) | 2 | ||||
| -rw-r--r-- | app/layout/aside_feed.phtml | 20 | ||||
| -rw-r--r-- | app/layout/aside_flux.phtml (renamed from app/layout/aside.phtml) | 0 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 8 |
4 files changed, 22 insertions, 8 deletions
diff --git a/app/layout/configure_aside.phtml b/app/layout/aside_configure.phtml index 26a111045..225026810 100644 --- a/app/layout/configure_aside.phtml +++ b/app/layout/aside_configure.phtml @@ -1,5 +1,5 @@ <div class="aside"> - <ul id="menu"> + <ul> <li><h2>Configuration</h2></li> <li <?php echo Request::actionName () == 'display' ? 'class="active"' : ''; ?>> <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Général et affichage</a> diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml new file mode 100644 index 000000000..98a82d6a7 --- /dev/null +++ b/app/layout/aside_feed.phtml @@ -0,0 +1,20 @@ +<div class="aside"> + <ul> + <li><h2>Vox flux RSS</h2></li> + <?php if (!login_is_conf ($this->conf) || is_logged ()) { ?> + <li><form id="add_rss" method="post" action="<?php echo Url::display (array ('c' => 'feed', 'a' => 'add')); ?>"> + <input type="url" name="url_rss" placeholder="Ajouter un flux RSS" /> + <input type="submit" value="+" /> + </form></li> + <?php } ?> + <?php if (!empty ($this->feeds)) { ?> + <?php foreach ($this->feeds as $feed) { ?> + <li <?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? 'class="active"' : ''; ?>> + <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed', 'params' => array ('id' => $feed->id ()))); ?>"><?php echo $feed->name (); ?></a> + </li> + <?php } ?> + <?php } else { ?> + <li class="disable"><span>Aucun flux</span></li> + <?php } ?> + </ul> +</div> diff --git a/app/layout/aside.phtml b/app/layout/aside_flux.phtml index f1f14cfc0..f1f14cfc0 100644 --- a/app/layout/aside.phtml +++ b/app/layout/aside_flux.phtml diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 4adcbef45..5cc128fc8 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -11,13 +11,7 @@ <?php $this->partial ('header'); ?> <div id="global"> - <?php if (Request::controllerName () != 'configure') { ?> - <?php $this->partial ('aside'); ?> - <?php } ?> - - <div id="main"> - <?php $this->render (); ?> - </div> + <?php $this->render (); ?> </div> <?php $this->partial ('persona'); ?> |