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 2017/12/04 17:18:59 UTC
[airavata-django-portal] 01/02: AIRAVATA-2598 Display app name in
ExperimentEditor
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 9597ac0f59b12be6b960607cd3ffae0706b3c31e
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Dec 4 11:26:34 2017 -0500
AIRAVATA-2598 Display app name in ExperimentEditor
---
django_airavata/apps/admin/package-lock.json | 1 -
.../js/views/CreateExperimentContainer.vue | 8 ++++++--
.../js/views/ExperimentEditor.vue | 15 ++++++++++++---
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/django_airavata/apps/admin/package-lock.json b/django_airavata/apps/admin/package-lock.json
index cd17321..769ee45 100644
--- a/django_airavata/apps/admin/package-lock.json
+++ b/django_airavata/apps/admin/package-lock.json
@@ -2662,7 +2662,6 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
- "fsevents": "1.1.3",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/CreateExperimentContainer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/CreateExperimentContainer.vue
index d9e7fcb..68a0828 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/CreateExperimentContainer.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/CreateExperimentContainer.vue
@@ -1,5 +1,7 @@
<template>
- <experiment-editor :experiment="experiment"></experiment-editor>
+ <experiment-editor :experiment="experiment" :app-module="appModule">
+ <span slot="title">Create a New Experiment</span>
+ </experiment-editor>
</template>
<script>
@@ -17,6 +19,7 @@ export default {
data () {
return {
'experiment': new models.Experiment(),
+ 'appModule': null,
}
},
components: {
@@ -30,7 +33,8 @@ export default {
// TODO: integrate loading spinner
services.ApplicationModuleService.get(this.appModuleId)
.then(appModule => {
- this.experiment.experimentName = appModule.appModuleName + ' ' + moment().format('lll');
+ this.experiment.experimentName = appModule.appModuleName + ' on ' + moment().format('lll');
+ this.appModule = appModule;
});
}
}
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ExperimentEditor.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ExperimentEditor.vue
index 829ca53..07d9b2e 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ExperimentEditor.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ExperimentEditor.vue
@@ -2,7 +2,10 @@
<div>
<div class="row">
<div class="col">
- <h1 class="h4 mb-4">Create a New Experiment</h1>
+ <h1 class="h4 mb-4">
+ <div v-if="appModule" class="application-name text-muted text-uppercase"><i class="fa fa-code" aria-hidden="true"></i> {{ appModule.appModuleName }}</div>
+ <slot name="title">Experiment Editor</slot>
+ </h1>
</div>
</div>
<div class="row">
@@ -26,10 +29,16 @@
<script>
export default {
name: 'edit-experiment',
- props: ['experiment'],
+ props: ['experiment', 'appModule'],
data () {
return {
}
},
}
-</script>
\ No newline at end of file
+</script>
+
+<style>
+.application-name {
+ font-size: 12px;
+}
+</style>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.