diff options
| author |  maTh <math-home@web.de>
| 2022-03-22 23:09:50 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-03-22 23:09:50 +0100 |
| commit | 7d00ad8ed75cae5dafd4ac1f2cc6e15e94333628 (patch) | |
| tree | ea523dba448e8d1760e50e166bdc0a3881609120 /app/views | |
| parent | eabe95e28cccb921d4874ae7210bb2bf38b68e4d (diff) | |
Improve: manage feed in view within a slider (#4226)
* it works
* small improvements
* Update slider.js
* fixed JS syntax
* slider.js included in main.js
* fix syntax
* delete including of slider.js
* Update extra.js
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/queries.phtml | 1 | ||||
| -rw-r--r-- | app/views/extension/index.phtml | 1 | ||||
| -rw-r--r-- | app/views/helpers/feed/update.phtml | 16 | ||||
| -rw-r--r-- | app/views/index/normal.phtml | 7 |
4 files changed, 20 insertions, 5 deletions
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml index 3e4b3684b..e9f4aed41 100644 --- a/app/views/configure/queries.phtml +++ b/app/views/configure/queries.phtml @@ -71,5 +71,4 @@ } ?> </div> - </main> diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml index 706d238e5..f72a25ed1 100644 --- a/app/views/extension/index.phtml +++ b/app/views/extension/index.phtml @@ -89,5 +89,4 @@ } ?> </div> - </main> diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 23906b36d..c22761bfa 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -23,7 +23,12 @@ if ($from === false) { $url = _url('subscription', 'feed', 'id', $this->feed->id()); } else { - $url = _url('subscription', 'feed', 'id', $this->feed->id(), 'from', $from); + $get = Minz_Request::param('get'); + if (!$get) { + $url = _url('subscription', 'feed', 'id', $this->feed->id(), 'from', $from); + } else { + $url = _url('subscription', 'feed', 'id', $this->feed->id(), 'from', $from, 'get', $get); + } } ?> <form method="post" action="<?= $url ?>" autocomplete="off"> @@ -129,9 +134,16 @@ <div class="group-controls"> <button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button> <button type="reset" class="btn"><?= _t('gen.action.cancel') ?></button> + <?php + if ($from === false) { + $url = _url('feed', 'delete', 'id', $this->feed->id()); + } else { + $url = _url('feed', 'delete', 'id', $this->feed->id(), 'from', $from); + } + ?> <button type="submit" class="btn btn-attention confirm" data-str-confirm="<?= _t('gen.js.confirm_action_feed_cat') ?>" - formaction="<?= _url('feed', 'delete', 'id', $this->feed->id()) ?>" + formaction="<?= $url ?>" formmethod="post"><?= _t('gen.action.remove') ?></button> </div> </div> diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml index 06323dcb0..92c10b1b7 100644 --- a/app/views/index/normal.phtml +++ b/app/views/index/normal.phtml @@ -114,7 +114,12 @@ $today = @strtotime('today'); if ($nbEntries > 0): call_user_func($this->callbackBeforePagination, $this, $nbEntries, $lastEntry); $this->renderHelper('stream-footer'); -?></main><?php +?><?php $class = $this->displaySlider ? ' class="active"' : ''; ?> +<a href="#" id="close-slider"<?= $class ?>> + <?= _i('close') ?> +</a> +<div id="slider"<?= $class ?>> +</div></main><?php else: ob_end_clean(); //Discard the articles headers, as we have no articles ?> |