Merge pull request #502 from YunoHost/fix-testing

Misc fix testing

app/src/components/ConfigPanels.vue

@@ -1,13 +1,22 @@
 <template>
+  <div class="config-panel">
     <routable-tabs
+      v-if="routes_.length > 1"
       :routes="routes_"
       v-bind="{ panels, forms, v: $v, ...$attrs }"
       v-on="$listeners"
     >
-    <slot name="tab-top" slot="tab-top"></slot>
-    <slot name="tab-before" slot="tab-before"></slot>
-    <slot name="tab-after" slot="tab-after"></slot>
+      <slot name="tab-top" slot="tab-top" />
+      <slot name="tab-before" slot="tab-before" />
+      <slot name="tab-after" slot="tab-after" />
     </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>
 
 <script>

app/src/i18n/locales/en.json

@@ -55,7 +55,7 @@
     "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...",
     "app": {
-      "installed_version": "Installed version: {version}",
+      "installed_version": "Installed version:",
       "open_this_app": "Open this app",
       "antifeatures": "This app has features you may not like:",
       "doc": {

app/src/scss/main.scss

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

app/src/views/app/AppCatalog.vue

@@ -73,9 +73,10 @@
         tabindex="0" :aria-posinset="i + 1" :aria-setsize="filteredApps.length"
         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`" />
 
+          <div>
             <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">
                 {{ app.manifest.name }}
@@ -107,6 +108,7 @@
                 <icon iname="warning" /> {{ $t('orphaned') }}
               </span>
             </b-card-text>
+          </div>
         </b-card-body>
       </b-card>
     </card-deck-feed>
@@ -456,10 +458,9 @@ export default {
   .app-card {
     min-height: 125px;
     text-align: start;
-    background-color: $gray-200;
 
     .app-logo {
-      float: left;
+      align-self: flex-start;
       background-color: white;
       max-width: 91px;
       margin-right: 1rem;

app/src/views/app/AppInfo.vue

@@ -72,10 +72,10 @@
       </div>
 
       <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">
-          {{ $t('app.potential_alternative_to') }} {{ app.alternativeTo }}
+          <strong v-t="'app.potential_alternative_to'" /> {{ app.alternativeTo }}
         </template>
       </p>
 

app/src/views/domain/DomainInfo.vue

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