aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-08 20:32:35 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-08 20:32:35 +0100
commit1b9f16771c9feaf44c088f58f598fcc08b7bbea8 (patch)
tree5925f392825424ccd1d9e0c97b8f4e7cb262c5ec
parent2dc26c215741e0e7a103b570cbb20fa60ed21d9d (diff)
Fix issue #208: chargement dynamique des jours
Les indications de jours (aujourd'hui, hier, à partir d'avant-hier) sont maintenant chargés dynamiquement
-rw-r--r--app/views/helpers/view/normal_view.phtml6
-rw-r--r--public/scripts/main.js7
2 files changed, 9 insertions, 4 deletions
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 2f6748263..ad6154163 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -16,21 +16,21 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
<?php foreach ($items as $item) { ?>
<?php if ($display_today && $item->isDay (Days::TODAY)) { ?>
- <div class="day">
+ <div class="day" id="day_today">
<?php echo Translate::t ('today'); ?>
<span class="date"> - <?php echo timestamptodate (time (), false); ?></span>
<span class="name"><?php echo $this->currentName; ?></span>
</div>
<?php $display_today = false; } ?>
<?php if ($display_yesterday && $item->isDay (Days::YESTERDAY)) { ?>
- <div class="day">
+ <div class="day" id="day_yesterday">
<?php echo Translate::t ('yesterday'); ?>
<span class="date"> - <?php echo timestamptodate (time () - 86400, false); ?></span>
<span class="name"><?php echo $this->currentName; ?></span>
</div>
<?php $display_yesterday = false; } ?>
<?php if ($display_others && $item->isDay (Days::BEFORE_YESTERDAY)) { ?>
- <div class="day">
+ <div class="day" id="day_before_yesterday">
<?php echo Translate::t ('before_yesterday'); ?>
<span class="name"><?php echo $this->currentName; ?></span>
</div>
diff --git a/public/scripts/main.js b/public/scripts/main.js
index e408b4dce..40c802ae7 100644
--- a/public/scripts/main.js
+++ b/public/scripts/main.js
@@ -477,9 +477,14 @@ function load_more_posts() {
load_more = true;
$('#load_more').addClass('loading');
$.get(url_load_more, function (data) {
- $stream.children('.flux:last').after($('#stream', data).children('.flux'));
+ $stream.children('.flux:last').after($('#stream', data).children('.flux, .day'));
$('.pagination').replaceWith($('.pagination', data));
+ $('[id^=day_]').each(function (i) {
+ var ids = $('[id="' + this.id + '"]');
+ if (ids.length > 1) $('[id="' + this.id + '"]:gt(0)').remove();
+ });
+
init_load_more();
init_lazyload();