diff options
| author |  maTh <math-home@web.de>
| 2023-06-13 22:39:33 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-06-13 22:39:33 +0200 |
| commit | 3d9e0c47ecb19fea4f194d3a4a81d7d931e2bc0b (patch) | |
| tree | 52ca8a7131822807d5cd1e7188b42100594d2988 /app/views | |
| parent | 67130bca3aa0a8d225c43df57a08cf8c81995136 (diff) | |
Improved: update page (#5420)
* prependTitle()
* do not need the "damn" in the alert
* update page layout improved
* release channel
* i18n labels
* add log messages while updating
* Delete updatee.php
* Update updateController.php
* Update updateController.php
* Update updateController.php
* Update updateController.php
* add getCurrentGitBranch()
* Update updateController.php
* state2 buttons
* i18n
* loading
* Update feedback.php
* Update feedback.php
* Update feedback.php
* Update extra.js
* Apply suggestions from code review
Co-authored-by: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com>
* Update updateController.php
* Update terminology
* update button is now armed
---------
Co-authored-by: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/update/index.phtml | 53 |
1 files changed, 40 insertions, 13 deletions
diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml index d2838a5a5..2210b9520 100644 --- a/app/views/update/index.phtml +++ b/app/views/update/index.phtml @@ -10,14 +10,6 @@ <h1><?= _t('admin.update') ?></h1> - <p> - <?= _i('help') ?> <?= _t('admin.update.current_version', FRESHRSS_VERSION) ?> - </p> - - <p> - <?= _t('admin.update.last', $this->last_update_time) ?> - </p> - <?php if (!empty($this->message)) { ?> <?php $class = 'alert-warn'; @@ -34,20 +26,55 @@ } ?> <p class="alert <?= $class ?>"> - <span class="alert-head"><?= $this->message['title'] ?></span> <?= $this->message['body'] ?> </p> <?php } ?> + <div class="form-group"> + <label class="group-name"><?= _t('admin.update.current_version') ?></label> + <div class="group-controls"> + <?= FRESHRSS_VERSION ?> (<a href="https://github.com/FreshRSS/FreshRSS/releases" target="_blank"><?= _t('admin.update.changelog') ?></a>) + </div> + </div> + + <div class="form-group"> + <label class="group-name"><?= _t('admin.update.releaseChannel') ?></label> + <div class="group-controls"> + <?php if($this->is_release_channel_stable) { ?> + <a href="https://github.com/FreshRSS/FreshRSS/releases/latest" target="_blank"> + <?= _t('admin.update.releaseChannel.latest') ?> + </a> + <?php } else { ?> + <a href="https://github.com/FreshRSS/FreshRSS/tree/edge" target="_blank"> + <?= _t('admin.update.releaseChannel.edge') ?> + </a> + <?php } ?> + </div> + </div> + + <div class="form-group"> + <label class="group-name"><?= _t('admin.update.last') ?></label> + <div class="group-controls"> + <?= $this->last_update_time ?> + </div> + </div> + <?php if (empty($this->message) || $this->message['status'] !== 'good') { ?> - <p> - <a href="<?= _url('update', 'check') ?>" class="btn"><?= _t('admin.update.check') ?></a> - </p> + <div class="form-group form-actions"> + <div class="group-controls"> + <a href="<?= _url('update', 'check') ?>" class="btn btn-important"><?= _t('admin.update.check') ?></a> + </div> + </div> <?php } ?> <?php if ($this->update_to_apply) { ?> - <a class="btn btn-important" href="<?= _url('update', 'apply') ?>"><?= _t('admin.update.apply') ?></a> + <div class="form-group form-actions"> + <div class="group-controls"> + <a class="btn btn-important btn-state1" href="<?= _url('update', 'apply') ?>" data-state2-id="button-update-loading"><?= _t('admin.update.apply') ?></a> + <span class="btn btn-state2" id="button-update-loading"><?= _t('admin.update.loading') ?></span> + </div> + </div> <?php } ?> </main> |