Merge pull request #19110 from nextcloud/backpost/recommended_apps/master

Update recommended apps
This commit is contained in:
Roeland Jago Douma 2020-01-24 13:09:07 +01:00 committed by GitHub
commit 76229bd2e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 9 additions and 3 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
core/js/dist/login.js vendored

Binary file not shown.

Binary file not shown.

BIN
core/js/dist/main.js vendored

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -82,6 +82,12 @@ const recommended = {
talk: {
description: t('core', 'Screensharing, online meetings and web conferencing on desktop and with mobile apps.'),
},
onlyoffice: {
description: t('core', 'Collaboratively edit office documents.'),
},
documentserver_community: {
description: t('core', 'Local document editing back-end used by the OnlyOffice app.'),
},
}
const recommendedIds = Object.keys(recommended)
const defaultPageUrl = loadState('core', 'defaultPageUrl')
@ -149,7 +155,7 @@ export default {
.catch(error => logger.error('could not install recommended apps', { error }))
},
customIcon(appId) {
if (!(appId in recommended)) {
if (!(appId in recommended) || !recommended[appId].icon) {
logger.warn(`no app icon for recommended app ${appId}`)
return imagePath('core', 'places/default-app-icon.svg')
}
@ -168,7 +174,7 @@ export default {
<style lang="scss" scoped>
.body-login-container {
max-width: 290px;
}
p.loading, p.loading-error {

View file

@ -163,7 +163,7 @@ script('core', [
<input type="checkbox" id="install-recommended-apps" name="install-recommended-apps" class="checkbox checkbox--white" checked>
<label for="install-recommended-apps">
<?php p($l->t( 'Install recommended apps' )); ?>
<span><?php p($l->t( 'Calendar, Contacts, Talk & Mail' )); ?></span>
<span><?php p($l->t( 'Calendar, Contacts, Talk, Mail & OnlyOffice' )); ?></span>
</label>
</p>
</fieldset>