You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/08/16 13:19:39 UTC
[airavata-django-portal] 01/04: AIRAVATA-2727 Display name of group
resource profile, compute preference
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit dce54e0ca3538b57f52251fb2e77674362dc249a
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Aug 15 12:51:06 2018 -0400
AIRAVATA-2727 Display name of group resource profile, compute preference
---
.../admin/group_resource_preferences/ComputePreference.vue | 13 +++++++++++--
.../GroupComputeResourcePreference.vue | 5 ++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputePreference.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputePreference.vue
index 86a08de..a92ec70 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputePreference.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputePreference.vue
@@ -2,7 +2,10 @@
<div>
<div class="row">
<div class="col">
- <h1 class="h4 mb-4">Compute Preference</h1>
+ <h1 class="h4 mb-4">
+ <div v-if="localGroupResourceProfile" class="group-resource-profile-name text-muted text-uppercase"><i class="fa fa-server" aria-hidden="true"></i> {{ localGroupResourceProfile.groupResourceProfileName }}</div>
+ {{ computeResource.hostName }}
+ </h1>
</div>
</div>
<div class="row">
@@ -253,4 +256,10 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.group-resource-profile-name {
+ font-size: 12px;
+}
+</style>
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue
index 849bb6d..206661e 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue
@@ -2,7 +2,7 @@
<div>
<div class="row">
<div class="col">
- <h1 class="h4 mb-4">Group Resource Profile</h1>
+ <h1 class="h4 mb-4">{{ title }}</h1>
</div>
</div>
<div class="row">
@@ -130,6 +130,9 @@
options.sort((a, b) => a.text.toLowerCase().localeCompare(b.text.toLowerCase()));
return options;
},
+ title: function() {
+ return this.id ? this.data.groupResourceProfileName : "New Group Resource Profile";
+ }
},
methods: {
saveGroupResourceProfile: function () {