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/07/19 21:13:52 UTC
[airavata-django-portal] branch master updated (2a90690 -> 2ab8bb9)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 2a90690 Separate user's writeable projects from ones shared with user
new 526c38a Fix editor buttons to the bottom so they are always on screen
new 2ab8bb9 Rename input Metadata field
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../applications/ApplicationEditorContainer.vue | 6 ++----
.../applications/ApplicationInputFieldEditor.vue | 2 +-
django_airavata/static/common/scss/main.scss | 17 +++++++++++++++++
3 files changed, 20 insertions(+), 5 deletions(-)
[airavata-django-portal] 01/02: Fix editor buttons to the bottom so
they are always on screen
Posted by ma...@apache.org.
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 526c38ac1ad804be0b4e952b5c6cdb76e447ca36
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jul 19 17:13:31 2019 -0400
Fix editor buttons to the bottom so they are always on screen
---
.../applications/ApplicationEditorContainer.vue | 6 ++----
django_airavata/static/common/scss/main.scss | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationEditorContainer.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationEditorContainer.vue
index 5b72088..c7a7400 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationEditorContainer.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationEditorContainer.vue
@@ -1,5 +1,5 @@
<template>
- <div>
+ <div class="has-fixed-footer">
<unsaved-changes-guard :dirty="isDirty" />
<confirmation-dialog ref="unsavedChangesDialog" title="You have unsaved changes">
You have unsaved changes. Are you sure you want to leave this page?
@@ -28,8 +28,7 @@
@sharing-changed="deploymentSharingChanged" @input="currentDeploymentChanged" />
</div>
</div>
- <div class="row">
- <div class="col">
+ <div class="fixed-footer">
<b-button class="editor-button" variant="primary" @click="saveAll" :disabled="readonly || !isDirty">
Save
</b-button>
@@ -39,7 +38,6 @@
<b-button class="editor-button" variant="secondary" @click="cancel">
Cancel
</b-button>
- </div>
</div>
</div>
</template>
diff --git a/django_airavata/static/common/scss/main.scss b/django_airavata/static/common/scss/main.scss
index 3c39cf4..008a79a 100644
--- a/django_airavata/static/common/scss/main.scss
+++ b/django_airavata/static/common/scss/main.scss
@@ -317,3 +317,20 @@ text-align:center;
min-width:2em;
font-weight:bold;
}
+
+.fixed-footer {
+ position: fixed;
+ bottom: 0px;
+ left: 70px;
+ right: 0px;
+ padding-left: calc(1rem + 15px);
+ padding-right: calc(1rem + 15px);
+ padding-top: 1rem;
+ padding-bottom: 1rem;
+ background-color: #f7f7f7;
+ border-top: 1px solid #ddd;
+}
+/* Add to elements that contain a .fixed-footer */
+.has-fixed-footer {
+ padding-bottom: 100px;
+}
[airavata-django-portal] 02/02: Rename input Metadata field
Posted by ma...@apache.org.
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 2ab8bb95784eacb93e004bcf229e25e8c1295580
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jul 19 17:13:41 2019 -0400
Rename input Metadata field
---
.../src/components/applications/ApplicationInputFieldEditor.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue
index fc342fc..2f6f472 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue
@@ -54,7 +54,7 @@
:disabled="readonly">
</b-form-radio-group>
</b-form-group>
- <b-form-group label="Metadata" :label-for="id+'-metadata'" description="Metadata for this input, in the JSON format">
+ <b-form-group label="Advanced Input Field Modification Metadata" :label-for="id+'-metadata'" description="Metadata for this input, in the JSON format">
<json-editor :id="id+'-metadata'" v-model="data.metaData" :rows="5" :disabled="readonly" />
</b-form-group>
</b-collapse>