Remove unused divs in markdown components, slightly increase padding for pages to improve scolling and navigation

This commit is contained in:
guerler
2021-08-30 23:37:11 -04:00
parent 06599fb0f7
commit ed3c4d8b8f
9 changed files with 186 additions and 198 deletions
@@ -1,54 +1,52 @@
<template>
<div class="w-100 p-2">
<b-card body-class="p-0">
<b-card-header>
<span class="float-right">
<b-button
:href="downloadUrl"
variant="link"
size="sm"
role="button"
title="Download Collection"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-download" />
</b-button>
<CurrentUser v-slot="{ user }">
<UserHistories v-if="user" :user="user" v-slot="{ currentHistoryId }">
<b-button
v-if="currentHistoryId"
@click="onCopyCollection(currentHistoryId)"
href="#"
role="button"
variant="link"
title="Import Collection"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-file-import" />
</b-button>
</UserHistories>
</CurrentUser>
</span>
<span>
<span>Dataset Collection:</span>
<span class="font-weight-light">{{ collectionName }}</span>
</span>
</b-card-header>
<b-card-body>
<LoadingSpan v-if="loading" message="Loading Collection" />
<div v-else class="content-height">
<b-alert v-if="!!messageText" :variant="messageVariant" show>
{{ messageText }}
</b-alert>
<CollectionTree :node="itemContent" :skip-head="true" />
</div>
</b-card-body>
</b-card>
</div>
<b-card body-class="p-0">
<b-card-header>
<span class="float-right">
<b-button
:href="downloadUrl"
variant="link"
size="sm"
role="button"
title="Download Collection"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-download" />
</b-button>
<CurrentUser v-slot="{ user }">
<UserHistories v-if="user" :user="user" v-slot="{ currentHistoryId }">
<b-button
v-if="currentHistoryId"
@click="onCopyCollection(currentHistoryId)"
href="#"
role="button"
variant="link"
title="Import Collection"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-file-import" />
</b-button>
</UserHistories>
</CurrentUser>
</span>
<span>
<span>Dataset Collection:</span>
<span class="font-weight-light">{{ collectionName }}</span>
</span>
</b-card-header>
<b-card-body>
<LoadingSpan v-if="loading" message="Loading Collection" />
<div v-else class="content-height">
<b-alert v-if="!!messageText" :variant="messageVariant" show>
{{ messageText }}
</b-alert>
<CollectionTree :node="itemContent" :skip-head="true" />
</div>
</b-card-body>
</b-card>
</template>
<script>
@@ -1,86 +1,79 @@
<template>
<div class="w-100 p-2">
<b-card body-class="p-0">
<b-card-header v-if="!embedded">
<span class="float-right">
<b-button
:href="downloadUrl"
variant="link"
size="sm"
role="button"
title="Download Dataset"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-download" />
</b-button>
<b-button
:href="importUrl"
role="button"
variant="link"
title="Import Dataset"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-file-import" />
</b-button>
</span>
<span>
<span>Dataset:</span>
<span class="font-weight-light">{{ datasetName }}</span>
</span>
</b-card-header>
<b-card-body>
<UrlDataProvider :url="itemUrl" v-slot="{ result: itemContent, loading, error }">
<LoadingSpan v-if="loading" message="Loading Dataset" />
<div v-else-if="error">{{ error }}</div>
<div v-else class="embedded-dataset content-height">
<UrlDataProvider
:url="datatypesUrl"
v-slot="{ result: datatypesModel, loading: datatypesLoading }"
>
<LoadingSpan v-if="datatypesLoading" message="Loading Datatypes" />
<div v-else>
<b-embed
v-if="isSubTypeOfAny(datasetType, ['pdf', 'html'], datatypesModel)"
type="iframe"
aspect="16by9"
:src="displayUrl"
/>
<div v-else-if="itemContent.item_data">
<div v-if="isSubTypeOfAny(datasetType, ['tabular'], datatypesModel)">
<UrlDataProvider
:url="metaUrl"
v-slot="{ result: metaData, loading: metaLoading, error: metaError }"
>
<LoadingSpan v-if="metaLoading" message="Loading Metadata" />
<div v-else-if="metaError">{{ metaError }}</div>
<b-table
v-else
striped
hover
:fields="getFields(metaData)"
:items="getItems(itemContent.item_data, metaData)"
/>
</UrlDataProvider>
</div>
<pre v-else>
<code class="text-normalwrap">{{ itemContent.item_data }}</code>
</pre>
<b-card body-class="p-0">
<b-card-header v-if="!embedded">
<span class="float-right">
<b-button
:href="downloadUrl"
variant="link"
size="sm"
role="button"
title="Download Dataset"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-download" />
</b-button>
<b-button
:href="importUrl"
role="button"
variant="link"
title="Import Dataset"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-file-import" />
</b-button>
</span>
<span>
<span>Dataset:</span>
<span class="font-weight-light">{{ datasetName }}</span>
</span>
</b-card-header>
<b-card-body>
<UrlDataProvider :url="itemUrl" v-slot="{ result: itemContent, loading, error }">
<LoadingSpan v-if="loading" message="Loading Dataset" />
<div v-else-if="error">{{ error }}</div>
<div v-else class="embedded-dataset content-height">
<UrlDataProvider :url="datatypesUrl" v-slot="{ result: datatypesModel, loading: datatypesLoading }">
<LoadingSpan v-if="datatypesLoading" message="Loading Datatypes" />
<div v-else>
<b-embed
v-if="isSubTypeOfAny(datasetType, ['pdf', 'html'], datatypesModel)"
type="iframe"
aspect="16by9"
:src="displayUrl"
/>
<div v-else-if="itemContent.item_data">
<div v-if="isSubTypeOfAny(datasetType, ['tabular'], datatypesModel)">
<UrlDataProvider
:url="metaUrl"
v-slot="{ result: metaData, loading: metaLoading, error: metaError }"
>
<LoadingSpan v-if="metaLoading" message="Loading Metadata" />
<div v-else-if="metaError">{{ metaError }}</div>
<b-table
v-else
striped
hover
:fields="getFields(metaData)"
:items="getItems(itemContent.item_data, metaData)"
/>
</UrlDataProvider>
</div>
<div v-else>No content found.</div>
<b-link v-if="itemContent.truncated" :href="itemContent.item_url">
Show More...
</b-link>
<pre v-else>
<code class="text-normalwrap">{{ itemContent.item_data }}</code>
</pre>
</div>
</UrlDataProvider>
</div>
</UrlDataProvider>
</b-card-body>
</b-card>
</div>
<div v-else>No content found.</div>
<b-link v-if="itemContent.truncated" :href="itemContent.item_url"> Show More... </b-link>
</div>
</UrlDataProvider>
</div>
</UrlDataProvider>
</b-card-body>
</b-card>
</template>
<script>
@@ -1,9 +1,7 @@
<template>
<div class="w-100 p-2">
<b-card nobody>
<JobMetrics class="job-metrics" :job-id="args.job_id" />
</b-card>
</div>
<b-card nobody>
<JobMetrics class="job-metrics" :job-id="args.job_id" />
</b-card>
</template>
<script>
@@ -1,9 +1,7 @@
<template>
<div class="w-100 p-2">
<b-card nobody>
<JobParameters class="job-parameters" :job-id="args.job_id" :param="args.param" :include-title="false" />
</b-card>
</div>
<b-card nobody>
<JobParameters class="job-parameters" :job-id="args.job_id" :param="args.param" :include-title="false" />
</b-card>
</template>
<script>
@@ -1,11 +1,9 @@
<template>
<div class="w-100 p-2">
<b-card nobody class="content-height">
<div :class="name" :job_id="args.job_id">
<pre><code class="text-normalwrap">{{ jobContent }}</code></pre>
</div>
</b-card>
</div>
<b-card nobody class="content-height">
<div :class="name" :job_id="args.job_id">
<pre><code class="text-normalwrap">{{ jobContent }}</code></pre>
</div>
</b-card>
</template>
<script>
@@ -1,11 +1,9 @@
<template>
<div class="w-100 p-2">
<b-card body-class="embed-responsive embed-responsive-4by3">
<LoadingSpan v-if="loading" class="m-2" message="Loading Visualization" />
<div v-else-if="error" class="m-2">{{ error }}</div>
<iframe v-else class="embed-responsive-item" :src="visualizationUrl" />
</b-card>
</div>
<b-card body-class="embed-responsive embed-responsive-4by3">
<LoadingSpan v-if="loading" class="m-2" message="Loading Visualization" />
<div v-else-if="error" class="m-2">{{ error }}</div>
<iframe v-else class="embed-responsive-item" :src="visualizationUrl" />
</b-card>
</template>
<script>
@@ -1,48 +1,46 @@
<template>
<div class="w-100 p-2">
<b-card body-class="p-0">
<b-card-header v-if="!embedded">
<span class="float-right">
<b-button
:href="downloadUrl"
variant="link"
size="sm"
role="button"
title="Download Workflow"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-download" />
</b-button>
<b-button
:href="importUrl"
role="button"
variant="link"
title="Import Workflow"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-file-import" />
</b-button>
</span>
<span>
<span>Workflow:</span>
<span class="font-weight-light">{{ workflowName }}</span>
</span>
</b-card-header>
<b-card-body>
<LoadingSpan v-if="loading" message="Loading Workflow" />
<div v-else class="content-height">
<div v-for="step in itemContent.steps" :key="step.order_index" class="mb-2">
<div>Step {{ step.order_index + 1 }}: {{ step.label }}</div>
<WorkflowTree :input="step" :skip-head="true" />
</div>
<b-card body-class="p-0">
<b-card-header v-if="!embedded">
<span class="float-right">
<b-button
:href="downloadUrl"
variant="link"
size="sm"
role="button"
title="Download Workflow"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-download" />
</b-button>
<b-button
:href="importUrl"
role="button"
variant="link"
title="Import Workflow"
type="button"
class="py-0 px-1"
v-b-tooltip.hover
>
<span class="fa fa-file-import" />
</b-button>
</span>
<span>
<span>Workflow:</span>
<span class="font-weight-light">{{ workflowName }}</span>
</span>
</b-card-header>
<b-card-body>
<LoadingSpan v-if="loading" message="Loading Workflow" />
<div v-else class="content-height">
<div v-for="step in itemContent.steps" :key="step.order_index" class="mb-2">
<div>Step {{ step.order_index + 1 }}: {{ step.label }}</div>
<WorkflowTree :input="step" :skip-head="true" />
</div>
</b-card-body>
</b-card>
</div>
</div>
</b-card-body>
</b-card>
</template>
<script>
+1 -1
View File
@@ -44,7 +44,7 @@
</div>
</b-alert>
</div>
<div v-for="(obj, index) in markdownObjects" :key="index">
<div v-for="(obj, index) in markdownObjects" :key="index" class="markdown-components">
<p v-if="obj.name == 'default'" v-html="obj.content" class="text-justify m-2" />
<div v-else-if="obj.name == 'generate_galaxy_version'" class="galaxy-version">
<pre><code>{{ getVersion }}</code></pre>
+7
View File
@@ -12,3 +12,10 @@
flex: 1;
}
}
.markdown-wrapper {
@extend .px-4;
.markdown-components {
@extend .py-2;
}
}