From 9212cc42ae6227b6537a86654b55a005cc796b20 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Tue, 20 Aug 2019 12:20:36 +0530
Subject: [PATCH] details view and css margin fixes

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 ui/src/components/CloudMonkey/Resource.vue   | 47 +++++++++++++++-----
 ui/src/components/page/GlobalFooter.vue      |  3 +-
 ui/src/components/page/GlobalLayout.vue      |  2 +-
 ui/src/components/tools/Logo.vue             |  2 +-
 ui/src/components/tools/ProjectMenu.vue      |  2 +-
 ui/src/views/dashboard/CapacityDashboard.vue |  2 -
 ui/src/views/dashboard/UsageDashboard.vue    |  3 +-
 7 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/ui/src/components/CloudMonkey/Resource.vue b/ui/src/components/CloudMonkey/Resource.vue
index 75f5e013b07..a5b936bd481 100644
--- a/ui/src/components/CloudMonkey/Resource.vue
+++ b/ui/src/components/CloudMonkey/Resource.vue
@@ -1,6 +1,5 @@
 <template>
-  <div style="margin-top: 16px">
-
+  <div>
     <!--
     <font-awesome-icon :icon="['far', 'bell']" />
     <font-awesome-icon :icon="['fas', 'dharmachakra']" size='2x' />
@@ -132,10 +131,26 @@
     </a-drawer>
 
     <div v-if="$route.params && $route.params.id">
-      <p v-for="(value, key) in getResource($route.params.id)" :key="key">
-        <span>{{ key }}: </span>
-        <span>{{ value }}</span>
-      </p>
+      <a-row :gutter="12">
+        <a-col :xl="12">
+          <chart-card class="info-card" v-if="resource.name">
+            <h4>Name</h4>
+            <template slot="footer"><span>{{ resource.name }}</span></template>
+          </chart-card>
+        </a-col>
+        <a-col :xl="12">
+          <chart-card class="info-card" v-if="resource.id">
+            <h4>ID</h4>
+            <template slot="footer"><span>{{ resource.id }}</span></template>
+          </chart-card>
+        </a-col>
+        <a-col :xl="6" v-for="(value, key) in getResource($route.params.id)" :key="key">
+          <chart-card class="info-card" v-if="key !== 'id' && key !== 'name'">
+            <h4>{{ key }}</h4>
+            <template slot="footer"><span>{{ value }}</span></template>
+          </chart-card>
+        </a-col>
+      </a-row>
     </div>
     <div style="margin-top: 12px" v-else>
       <a-table
@@ -155,7 +170,8 @@
         </template>
 
         <a slot="name" slot-scope="text, record" href="javascript:;">
-          <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
+          <router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ text }}</router-link>
+          <span v-else>{{ text }}</span>
         </a>
         <a slot="displayname" slot-scope="text, record" href="javascript:;">
           <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
@@ -203,15 +219,20 @@
 <script>
 import { api } from '@/api'
 import store from '@/store'
+import ChartCard from '@/components/chart/ChartCard'
 
 export default {
   name: 'Resource',
+  components: {
+    ChartCard
+  },
   data () {
     return {
       apiName: '',
       loading: false,
       columns: [],
       items: [],
+      resource: {},
       selectedRowKeys: [],
       currentAction: {},
       showAction: false,
@@ -247,7 +268,6 @@ export default {
       this.columns = []
       this.columnKeys = []
       var params = { listall: true }
-      console.log(this.$route)
       if (Object.keys(this.$route.query).length > 0) {
         Object.assign(params, this.$route.query)
       } else if (this.$route.meta.params) {
@@ -331,7 +351,8 @@ export default {
           break
         }
       }
-      return res
+      this.resource = res
+      return this.resource
     },
     onSearch (value) {
       this.fetchData(value)
@@ -498,8 +519,12 @@ export default {
 <style>
 
 .ant-badge-status-dot {
-  width: 12px;
-  height: 12px;
+  width: 14px;
+  height: 14px;
+}
+
+.info-card {
+  margin-top: 12px;
 }
 
 .light-row {
diff --git a/ui/src/components/page/GlobalFooter.vue b/ui/src/components/page/GlobalFooter.vue
index b32fabc129f..b2470020b71 100644
--- a/ui/src/components/page/GlobalFooter.vue
+++ b/ui/src/components/page/GlobalFooter.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="footer">
     <div class="links">
-      <a href="https://github.com/apache/cloudstack" target="_blank">
+      <a href="https://github.com/apache/cloudstack-primate" target="_blank">
         <a-icon type="github"/>
       </a>
-      <a href="https://twitter.com/rhtyd">rhtyd</a>
     </div>
   </div>
 </template>
diff --git a/ui/src/components/page/GlobalLayout.vue b/ui/src/components/page/GlobalLayout.vue
index ff326c5fa05..e8e4ca2fac7 100644
--- a/ui/src/components/page/GlobalLayout.vue
+++ b/ui/src/components/page/GlobalLayout.vue
@@ -156,7 +156,7 @@ export default {
 <style lang="less">
 .layout-content {
   &.is-header-fixed {
-    margin: 68px 24px 0;
+    margin: 76px 12px 0;
   }
 }
 
diff --git a/ui/src/components/tools/Logo.vue b/ui/src/components/tools/Logo.vue
index 6f4c92ab7f3..e1a9b2352cc 100644
--- a/ui/src/components/tools/Logo.vue
+++ b/ui/src/components/tools/Logo.vue
@@ -47,7 +47,7 @@ export default {
 
 .logo-image {
   width: 54px;
-  margin-right: 12px;
+  margin-right: 10px;
   display: inline-block;
   vertical-align: middle;
 }
diff --git a/ui/src/components/tools/ProjectMenu.vue b/ui/src/components/tools/ProjectMenu.vue
index 172c67a63df..30050ba2fdf 100644
--- a/ui/src/components/tools/ProjectMenu.vue
+++ b/ui/src/components/tools/ProjectMenu.vue
@@ -2,7 +2,7 @@
   <span class="project-wrapper" :disabled="true">
     <a-select
       class="project-wrapper-select"
-      size="large"
+      size="default"
       defaultValue="Default View"
       :value="selectedProject"
       :disabled="isDisabled()"
diff --git a/ui/src/views/dashboard/CapacityDashboard.vue b/ui/src/views/dashboard/CapacityDashboard.vue
index 2f32d1f118d..bd7910c0446 100644
--- a/ui/src/views/dashboard/CapacityDashboard.vue
+++ b/ui/src/views/dashboard/CapacityDashboard.vue
@@ -200,8 +200,6 @@ export default {
 
 <style lang="less" scoped>
 .capacity-dashboard {
-  margin-top: 24px;
-
   &-wrapper {
     display: flex;
     margin-bottom: 12px;
diff --git a/ui/src/views/dashboard/UsageDashboard.vue b/ui/src/views/dashboard/UsageDashboard.vue
index 20906f27e5c..d430dc44214 100644
--- a/ui/src/views/dashboard/UsageDashboard.vue
+++ b/ui/src/views/dashboard/UsageDashboard.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-row class="usage-dashboard" :gutter="24">
+  <a-row class="usage-dashboard" :gutter="12">
     <a-col
       :xl="16">
       <a-row :gutter="12">
@@ -151,7 +151,6 @@ export default {
 
 <style lang="less" scoped>
   .usage-dashboard {
-    margin-top: 24px;
 
     &-chart-tile {
       margin-bottom: 12px;