[cloudstack] branch 4.18 updated: ui: fix infocard tempalte, iso fields (#7527)

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.18 by this push:
     new 22871ad2da8 ui: fix infocard tempalte, iso fields (#7527)
22871ad2da8 is described below

commit 22871ad2da8b72becd46573ac4e2bc46a3f79407
Author: Abhishek Kumar <abhishek.mr...@gmail.com>
AuthorDate: Fri May 12 22:10:11 2023 +0530

    ui: fix infocard tempalte, iso fields (#7527)
    
    Signed-off-by: Abhishek Kumar <abhishek.mr...@gmail.com>
---
 ui/src/components/view/InfoCard.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ui/src/components/view/InfoCard.vue 
b/ui/src/components/view/InfoCard.vue
index 43d24a8f121..e56fc6eb54c 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -457,16 +457,19 @@
           </span>
         </div>
         <div class="resource-detail-item" v-if="resource.templateid">
-          <div class="resource-detail-item__label">{{ resource.isoid ? 
$t('label.iso') : $t('label.templatename') }}</div>
+          <div class="resource-detail-item__label">{{ $t('label.templatename') 
}}</div>
           <div class="resource-detail-item__details">
             <resource-icon v-if="resource.icon" 
:image="getImage(resource.icon.base64image)" size="1x" style="margin-right: 
5px"/>
-            <PictureOutlined v-else />
-            <div v-if="resource.isoid">
+            <SaveOutlined v-else />
+            <router-link :to="{ path: '/template/' + resource.templateid }">{{ 
resource.templatedisplaytext || resource.templatename || resource.templateid }} 
</router-link>
+          </div>
+        </div>
+        <div class="resource-detail-item" v-if="resource.isoid">
+          <div class="resource-detail-item__label">{{ $t('label.iso') }}</div>
+          <div class="resource-detail-item__details">
+            <resource-icon v-if="resource.icon" 
:image="getImage(resource.icon.base64image)" size="1x" style="margin-right: 
5px"/>
+            <UsbOutlined v-else />
               <router-link :to="{ path: '/iso/' + resource.isoid }">{{ 
resource.isodisplaytext || resource.isoname || resource.isoid }} </router-link>
-            </div>
-            <div v-else>
-              <router-link :to="{ path: '/template/' + resource.templateid 
}">{{ resource.templatedisplaytext || resource.templatename || 
resource.templateid }} </router-link>
-            </div>
           </div>
         </div>
         <div class="resource-detail-item" v-if="resource.serviceofferingname 
&& resource.serviceofferingid">