YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #502 from YunoHost/fix-testing

Browse source 
Misc fix testing
This commit is contained in:
Alexandre Aubin 2023-01-19 16:53:17 +01:00 committed by GitHub
commit ea2c0a8c10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 54 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/components/ConfigPanels.vue
View file

@ -1,13 +1,22 @@
<template> <template>
<div class="config-panel">
<routable-tabs <routable-tabs
v-if="routes_.length > 1"
:routes="routes_" :routes="routes_"
v-bind="{ panels, forms, v: $v, ...$attrs }" v-bind="{ panels, forms, v: $v, ...$attrs }"
v-on="$listeners" v-on="$listeners"
> >
<slot name="tab-top" slot="tab-top"></slot> <slot name="tab-top" slot="tab-top" />
<slot name="tab-before" slot="tab-before"></slot> <slot name="tab-before" slot="tab-before" />
<slot name="tab-after" slot="tab-after"></slot> <slot name="tab-after" slot="tab-after" />
</routable-tabs> </routable-tabs>
<card v-else :title="routes_[0].text" :icon="routes_[0].icon">
<slot name="tab-top" />
<slot name="tab-before" />
<slot name="tab-after" />
</card>
</div>
</template> </template>
<script> <script>

2
app/src/i18n/locales/en.json
View file

@ -55,7 +55,7 @@
"api_not_responding": "The YunoHost API is not responding. Maybe 'yunohost-api' is down or got restarted?", "api_not_responding": "The YunoHost API is not responding. Maybe 'yunohost-api' is down or got restarted?",
"api_waiting": "Waiting for the server's response...", "api_waiting": "Waiting for the server's response...",
"app": { "app": {
"installed_version": "Installed version: {version}", "installed_version": "Installed version:",
"open_this_app": "Open this app", "open_this_app": "Open this app",
"antifeatures": "This app has features you may not like:", "antifeatures": "This app has features you may not like:",
"doc": { "doc": {

2
app/src/scss/main.scss
View file

@ -209,7 +209,7 @@ body {
} }
} }
.card + .card { .card + .card, .card + .config-panel, .config-panel + .card {
margin-top: 2rem; margin-top: 2rem;
} }
.card-deck .card + .card { .card-deck .card + .card {

7
app/src/views/app/AppCatalog.vue
View file

@ -73,9 +73,10 @@
tabindex="0" :aria-posinset="i + 1" :aria-setsize="filteredApps.length" tabindex="0" :aria-posinset="i + 1" :aria-setsize="filteredApps.length"
no-body class="app-card" no-body class="app-card"
> >
<b-card-body> <b-card-body class="d-flex">
<b-img v-if="app.logo_hash" class="app-logo rounded" :src="`./applogos/${app.logo_hash}.png`" /> <b-img v-if="app.logo_hash" class="app-logo rounded" :src="`./applogos/${app.logo_hash}.png`" />
<div>
<b-card-title :id="`${app.id}-title`" class="d-flex mb-2"> <b-card-title :id="`${app.id}-title`" class="d-flex mb-2">
<b-link :to="{ name: 'app-install', params: { id: app.id }}" class="card-link"> <b-link :to="{ name: 'app-install', params: { id: app.id }}" class="card-link">
{{ app.manifest.name }} {{ app.manifest.name }}
@ -107,6 +108,7 @@
<icon iname="warning" /> {{ $t('orphaned') }} <icon iname="warning" /> {{ $t('orphaned') }}
</span> </span>
</b-card-text> </b-card-text>
</div>
</b-card-body> </b-card-body>
</b-card> </b-card>
</card-deck-feed> </card-deck-feed>
@ -456,10 +458,9 @@ export default {
.app-card { .app-card {
min-height: 125px; min-height: 125px;
text-align: start; text-align: start;
background-color: $gray-200;
.app-logo { .app-logo {
float: left; align-self: flex-start;
background-color: white; background-color: white;
max-width: 91px; max-width: 91px;
margin-right: 1rem; margin-right: 1rem;

4
app/src/views/app/AppInfo.vue
View file

@ -72,10 +72,10 @@
</div> </div>
<p class="text-secondary"> <p class="text-secondary">
{{ $t('app.installed_version', { version: app.version }) }}<br> <strong v-t="'app.installed_version'" /> {{ app.version }}<br>
<template v-if="app.alternativeTo"> <template v-if="app.alternativeTo">
{{ $t('app.potential_alternative_to') }} {{ app.alternativeTo }} <strong v-t="'app.potential_alternative_to'" /> {{ app.alternativeTo }}
</template> </template>
</p> </p>

2
app/src/views/domain/DomainInfo.vue
View file

@ -163,7 +163,7 @@ export default {
}, },
methods: { methods: {
onQueriesResponse (domains, mainDomain, domain, config) { onQueriesResponse (domains, domain, config) {
this.config = formatYunoHostConfigPanels(config) this.config = formatYunoHostConfigPanels(config)
}, },