diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2012-12-05 15:58:06 +0100 |
|---|---|---|
| committer |  Marien Fressinaud <marien@localhost.localdomain>
| 2012-12-05 15:59:08 +0100 |
| commit | 225fdf2295711752510d879885d7ce3e41b5a5d0 (patch) | |
| tree | 6eed21a4718571a79386ce42362a8aa4956f28d7 | |
| parent | 75f8898dcdfca963b731dffe7c1766d60fd410ea (diff) | |
Correction design / interface
| -rw-r--r-- | app/layout/aside.phtml | 2 | ||||
| -rw-r--r-- | app/layout/configure_aside.phtml | 10 | ||||
| -rw-r--r-- | public/theme/base.css | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/app/layout/aside.phtml b/app/layout/aside.phtml index 61efae7c3..82bd2b051 100644 --- a/app/layout/aside.phtml +++ b/app/layout/aside.phtml @@ -13,7 +13,7 @@ <?php if (!login_is_conf ($this->conf) || is_logged ()) { ?> <li <?php echo Request::controllerName () == 'configure' ? 'class="active"' : ''; ?>> - <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed')); ?>">Configurer</a> + <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Configurer</a> </li> <?php } ?> diff --git a/app/layout/configure_aside.phtml b/app/layout/configure_aside.phtml index c1dbda4f3..b7a8fdeef 100644 --- a/app/layout/configure_aside.phtml +++ b/app/layout/configure_aside.phtml @@ -1,20 +1,20 @@ <div class="aside"> <ul id="menu"> <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> + </li> <li <?php echo Request::actionName () == 'feed' ? 'class="active"' : ''; ?>> <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed')); ?>">Flux RSS</a> </li> <li <?php echo Request::actionName () == 'categorize' ? 'class="active"' : ''; ?>> <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'categorize')); ?>">Catégories</a> </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> + <li <?php echo Request::actionName () == 'shortcut' ? 'class="active"' : ''; ?>> + <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'shortcut')); ?>">Raccourcis</a> </li> <li <?php echo Request::actionName () == 'importExport' ? 'class="active"' : ''; ?>> <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport')); ?>">Import / Export OPML</a> </li> - <li <?php echo Request::actionName () == 'shortcut' ? 'class="active"' : ''; ?>> - <a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'shortcut')); ?>">Raccourcis</a> - </li> </ul> </div> diff --git a/public/theme/base.css b/public/theme/base.css index f3225f218..bac31b81c 100644 --- a/public/theme/base.css +++ b/public/theme/base.css @@ -4,6 +4,8 @@ } html, body { height: 100%; + font-size: 95%; + font-family: "Cantarell", "sans-serif"; } /* LIENS */ |