diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-03-12 23:24:52 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-03-12 23:24:52 +0100 |
| commit | c62ec2a14428b528e20896d4e62fa08891e1399c (patch) | |
| tree | cdf6cbbd2d1b9182d385db36ec0c86b08bcf442e /app/views | |
| parent | 8c562972062fbf3d750bd62893de248022850c23 (diff) | |
Grosse mise à jour du design, pas mal de trucs cassés au niveau du panneau de configuration
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/feed.phtml | 8 | ||||
| -rw-r--r-- | app/views/index/index.phtml | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index 0acec1872..1b8d77595 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -1,9 +1,15 @@ <div class="table"> - <?php $this->partial ('configure_aside'); ?> + <?php /* $this->partial ('configure_aside'); */ ?> <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"' : ''; ?>> diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml index 429792b71..127a09ddd 100644 --- a/app/views/index/index.phtml +++ b/app/views/index/index.phtml @@ -1,8 +1,6 @@ <?php $items = $this->entryPaginator->items (true); ?> - -<?php if (!empty ($items)) { ?> <div id="top"> - <a class="btn" href="<?php echo Url::display (array ('c' => 'feed', 'a' => 'actualize')); ?>"><i class="refresh"></i></a> + <a class="btn" href="<?php echo Url::display (array ('c' => 'feed', 'a' => 'actualize')); ?>"><i class="icon refresh"></i></a> <?php if (!login_is_conf ($this->conf) || is_logged ()) { ?> <a class="read_all btn" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'read', 'params' => array ('is_read' => 1))); ?>">Tout marquer comme lu</a><?php } ?><!-- @@ -13,6 +11,8 @@ <?php } ?> </div> +<?php if (!empty ($items)) { ?> + <div id="stream"> <?php foreach ($items as $item) { ?> <div class="post flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>"> |