summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2018-06-05 17:07:04 +0200
committerJulius Härtl <jus@bitgrid.net>2018-06-06 11:40:09 +0200
commita045159637cb9f6b4fee7e2850a23459f0c955b8 (patch)
tree462aece4f5548e783065226e9612f6cc221bc4c5
parent71524149033493ec11556fa2b8a24a82b7eac240 (diff)
downloadnextcloud-server-a045159637cb9f6b4fee7e2850a23459f0c955b8.tar.gz
nextcloud-server-a045159637cb9f6b4fee7e2850a23459f0c955b8.zip
Use icon instead of screenshot in the list view
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r--settings/Controller/AppSettingsController.php2
-rw-r--r--settings/src/components/appList/appItem.vue5
2 files changed, 3 insertions, 4 deletions
diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php
index fbcc21b1970..8cfa2a004e4 100644
--- a/settings/Controller/AppSettingsController.php
+++ b/settings/Controller/AppSettingsController.php
@@ -382,7 +382,7 @@ class AppSettingsController extends Controller {
'missingMaxOwnCloudVersion' => false,
'missingMinOwnCloudVersion' => false,
'canInstall' => true,
- 'preview' => isset($app['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($app['screenshots'][0]['url']) : '',
+ 'screenshot' => isset($app['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($app['screenshots'][0]['url']) : '',
'score' => $app['ratingOverall'],
'ratingNumOverall' => $app['ratingNumOverall'],
'ratingNumThresholdReached' => $app['ratingNumOverall'] > 5,
diff --git a/settings/src/components/appList/appItem.vue b/settings/src/components/appList/appItem.vue
index 47f3f3f42bf..5a4a503f3c9 100644
--- a/settings/src/components/appList/appItem.vue
+++ b/settings/src/components/appList/appItem.vue
@@ -23,10 +23,9 @@
<template>
<div class="section" v-bind:class="{ selected: isSelected }" v-on:click="showAppDetails">
<div class="app-image app-image-icon" v-on:click="showAppDetails">
- <div v-if="!app.preview" class="icon-settings-dark"></div>
- <img v-if="!app.previewAsIcon && app.preview && listView" :src="app.preview" width="100%" />
+ <div v-if="(listView && !app.preview) || (!listView && !app.screenshot)" class="icon-settings-dark"></div>
- <svg v-if="listView && app.previewAsIcon && app.preview" width="32" height="32" viewBox="0 0 32 32">
+ <svg v-if="listView && app.preview" width="32" height="32" viewBox="0 0 32 32">
<defs><filter :id="filterId"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" :filter="filterUrl" :xlink:href="app.preview" class="app-icon"></image>
</svg>