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 2019/06/10 15:32:28 UTC
[airavata-django-portal] 06/08: AIRAVATA-3057 Improving file
selection layout
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 70a566918dc4a253aaa6814a26437a91ad197172
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 10 11:21:19 2019 -0400
AIRAVATA-3057 Improving file selection layout
---
.../experiment/input-editors/FileInputEditor.vue | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/FileInputEditor.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/FileInputEditor.vue
index 6fa28ba..2c65b9f 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/FileInputEditor.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/FileInputEditor.vue
@@ -36,18 +36,18 @@
/>
</div>
<div
- class="d-flex"
+ class="d-flex align-items-baseline"
v-if="!isSelectingFile && !isDataProductURI"
>
- <!-- TODO: fix layout -->
- <b-button @click="isSelectingFile=true">Select user file</b-button>
- <span class="text-muted">OR</span>
+ <b-button @click="isSelectingFile=true" class="input-file-option">Select file from storage</b-button>
+ <span class="text-muted mx-3">OR</span>
<b-form-file
:id="id"
v-model="file"
v-if="!isDataProductURI"
- :state="componentValidState"
+ placeholder="Upload file"
@input="fileChanged"
+ class="input-file-option"
/>
</div>
</div>
@@ -158,3 +158,9 @@ export default {
}
};
</script>
+
+<style scoped>
+.input-file-option {
+ flex: 1 1 50%;
+}
+</style>