diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2012-10-23 18:29:43 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2012-10-23 18:29:43 +0200 |
| commit | fca236dc6d6ff6e09182c560f3566904cbc7a70a (patch) | |
| tree | 850bfab52359702dad2a9eccd03f01b5c68c9bcb /app/views | |
| parent | 9a95cb844e80512205c519da69ec373e046b7f52 (diff) | |
affichage par catégories + meilleur exportation opml
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/importExport.phtml | 4 | ||||
| -rw-r--r-- | app/views/index/index.phtml | 4 | ||||
| -rw-r--r-- | app/views/javascript/main.phtml | 17 |
3 files changed, 8 insertions, 17 deletions
diff --git a/app/views/configure/importExport.phtml b/app/views/configure/importExport.phtml index 634800157..7f2fbd7c5 100644 --- a/app/views/configure/importExport.phtml +++ b/app/views/configure/importExport.phtml @@ -7,12 +7,12 @@ <dateCreated><?php echo date('D, d M Y H:i:s'); ?></dateCreated> </head> <body> -<?php echo opml_export ($this->feeds); ?> +<?php echo opml_export ($this->categories); ?> </body> </opml> <?php } else { ?> -<form method="post" action="" enctype="multipart/form-data"> +<form method="post" action="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport', 'params' => array ('q' => 'import'))); ?>" enctype="multipart/form-data"> <h1>Exporter au format OPML</h1> <a class="button" href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport', 'params' => array ('q' => 'export'))); ?>">Exporter</a> diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml index af01f3fd2..c3f4242c4 100644 --- a/app/views/index/index.phtml +++ b/app/views/index/index.phtml @@ -16,10 +16,10 @@ <div class="post flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>"> <?php $author = $item->author (); ?> <div class="before"> + <?php $feed = $item->feed (true); ?> <?php echo $author != '' ? $author . ' a écrit' : ''; ?> le <?php echo $item->date (); ?> - <?php $feed = $item->feed (true); ?> - sur <a target="_blank" href="<?php echo $feed->website (); ?>"><?php echo $feed->name (); ?></a>, + sur <a target="_blank" href="<?php echo $feed->website (); ?>"><?php echo $feed->name (); ?> <img src="http://www.google.com/s2/favicons?domain=<?php echo get_domain ($feed->website ()); ?>" alt="" /></a>, </div> <h1><a target="_blank" href="<?php echo $item->link (); ?>"> <?php echo $item->title (); ?></a></h1> diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml index 87b53ca9a..f5682d1f0 100644 --- a/app/views/javascript/main.phtml +++ b/app/views/javascript/main.phtml @@ -68,18 +68,9 @@ $(document).ready (function () { } }); }); - shortcut.add("space", function () { - // On plie / déplie l'article - active = $(".post.flux.active"); - active.children (".content").slideToggle (200, function () { - $.smoothScroll({ - offset: active.position ().top + 25 - }); - }); - }); // Touches de navigation - shortcut.add("up", function () { + /*shortcut.add("up", function () { old_active = $(".post.flux.active"); last_active = $(".post.flux:last"); new_active = old_active.prev (); @@ -89,15 +80,15 @@ $(document).ready (function () { } else { slide (last_active, old_active); } - }); - shortcut.add("down", function () { + });*/ + shortcut.add("space", function () { old_active = $(".post.flux.active"); first_active = $(".post.flux:first"); new_active = old_active.next (); if (new_active[0] instanceof HTMLDivElement) { slide (new_active, old_active); - } else { + } else if (new_active[0] === undefined) { slide (first_active, old_active); } }); |