diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-08-20 11:50:01 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-08-20 11:50:01 +0200 |
| commit | 06d8edd9637f59f914ec7f3d7f6846f3cbe88eaf (patch) | |
| tree | 49833fd9a8a80255b7ae2d91291e5371a047870b /core | |
| parent | 2fe070ca37c76bc118c0fe360b9c7008bf01e52b (diff) | |
| parent | a2674b2b303c6b2a5935638af04f0e4a61afae24 (diff) | |
| download | nextcloud-server-06d8edd9637f59f914ec7f3d7f6846f3cbe88eaf.tar.gz nextcloud-server-06d8edd9637f59f914ec7f3d7f6846f3cbe88eaf.zip | |
Merge pull request #17434 from owncloud/update-showappnameonappupdate
Display app names in update page for app updates
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 7 | ||||
| -rw-r--r-- | core/templates/update.admin.php | 20 |
2 files changed, 24 insertions, 3 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index db81f850303..ccb48010871 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -680,6 +680,13 @@ label.infield { color: #ccc; } +#body-login .update .appList { + list-style: disc; + text-align: left; + margin-left: 25px; + margin-right: 25px; +} + #body-login .v-align { width: inherit; } diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php index ccd5d236828..191f727df71 100644 --- a/core/templates/update.admin.php +++ b/core/templates/update.admin.php @@ -1,12 +1,26 @@ <div class="update" data-productname="<?php p($_['productName']) ?>" data-version="<?php p($_['version']) ?>"> <div class="updateOverview"> + <?php if ($_['isAppsOnlyUpgrade']) { ?> + <h2 class="title bold"><?php p($l->t('Apps update required.')); ?></h2> + <?php } else { ?> <h2 class="title bold"><?php p($l->t('%s will be updated to version %s.', array($_['productName'], $_['version']))); ?></h2> - <?php if (!empty($_['appList'])) { ?> + <?php } ?> + <?php if (!empty($_['appsToUpgrade'])) { ?> + <div class="infogroup"> + <span class="bold"><?php p($l->t('These apps will be updated:')); ?></span> + <ul class="content appList"> + <?php foreach ($_['appsToUpgrade'] as $appInfo) { ?> + <li><?php p($appInfo['name']) ?> (<?php p($appInfo['id']) ?>)</li> + <?php } ?> + </ul> + </div> + <?php } ?> + <?php if (!empty($_['incompatibleAppsList'])) { ?> <div class="infogroup"> - <span class="bold"><?php p($l->t('The following apps will be disabled:')) ?></span> + <span class="bold"><?php p($l->t('These incompatible apps will be disabled:')) ?></span> <ul class="content appList"> - <?php foreach ($_['appList'] as $appInfo) { ?> + <?php foreach ($_['incompatibleAppsList'] as $appInfo) { ?> <li><?php p($appInfo['name']) ?> (<?php p($appInfo['id']) ?>)</li> <?php } ?> </ul> |