Commit 7aa9ac53 authored by John Chilton's avatar John Chilton
Browse files

Allow static components in tours.

parent ef51574a

client/src/components/History/Content/ContentItem.vue

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
                        @click.stop="toggleHighlights">

                        <font-awesome-icon icon="check-circle" />

                    </span>

                    <span v-if="hasStateIcon">

                    <span v-if="hasStateIcon" class="state-icon">

                        <icon fixed-width :icon="contentState.icon" :spin="contentState.spin" />

                    </span>

                    <span class="id hid">{{ id }}</span>

client/src/components/History/Content/model/states.js

+2 −2
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ export const STATES = { 
        icon: "exclamation-triangle",

    },

    deferred: {

        status: "danger",

        status: "info",

        text: "This dataset is remote, has not be ingested by Galaxy, and full metadata may not be available.",

        icon: "exclamation-triangle",

        icon: "cloud",

    },

    /** has no data */

    empty: {

client/src/components/Upload/Default.vue

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
            <b-button

                id="btn-close"

                ref="btnClose"

                class="ui-button-default"

                class="ui-button-default upload-close"

                :title="btnCloseTitle"

                @click="$emit('dismiss')">

                {{ btnCloseTitle }}
@@ -62,7 +62,7 @@ 
            <b-button

                id="btn-start"

                ref="btnStart"

                class="ui-button-default"

                class="ui-button-default upload-start"

                :disabled="!enableStart"

                :title="btnStartTitle"

                :variant="enableStart ? 'primary' : ''"
@@ -72,7 +72,7 @@ 
            <b-button

                id="btn-new"

                ref="btnCreate"

                class="ui-button-default"

                class="ui-button-default upload-paste"

                :title="btnCreateTitle"

                :disabled="!enableSources"

                @click="_eventCreate()">

client/src/components/plugins/icons.js

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import { 
    faChartArea,

    faCheckSquare,

    faClock,

    faCloud,

    faCodeBranch,

    faColumns,

    faCompress,
@@ -47,6 +48,7 @@ library.add( 
    faChartArea,

    faCheckSquare,

    faClock,

    faCloud,

    faCodeBranch,

    faColumns,

    faCompress,

client/src/utils/navigation/navigation.yml

+13 −4
Original line number Diff line number Diff line
@@ -124,11 +124,15 @@ history_panel: 
    selectors:

      # These now appear other places :_( - e.g. in the invocation view so we'll try

      # prefixing ids with #current-history-panel but obviously we need to switch to classes or data

      _: '#current-history-panel #${history_content_type}-${id}'

      _:

      - '#current-history-panel [data-hid="${hid}"][data-state="${state}"]'

      - '#current-history-panel #${history_content_type}-${id}'

      - '#current-history-panel [data-hid="${hid}"]'



      title: '${_} .content-title'

      hid: '${_} .hid'

      name: '${_} .name'

      datatype: '${_} .datatype .value'

      details: '${_} .details'

      title_button_area: '${_} .primary-actions'

      primary_action_buttons: '${_} .actions .left'
@@ -139,6 +143,7 @@ history_panel: 
      info: '${_} .info .value'

      peek: '${_} .dataset-peek'

      toolhelp_title: '${_} .toolhelp strong'

      state_icon: '${_} .state-icon'



      # Title buttons...

      display_button: '${_} .display-btn'
@@ -146,10 +151,10 @@ history_panel: 
      delete_button: '${_} .delete-btn'



      # Action buttons...

      download_button: '${_} .icon-btn.download-btn'

      info_button: '${_} .icon-btn.params-btn'

      download_button: '${_} .download-btn'

      info_button: '${_} .params-btn'

      tool_help_button: '${_} .fa.fa-question'

      rerun_button: '${_} .icon-btn.rerun-btn'

      rerun_button: '${_} .rerun-btn'

      alltags: '${_} .alltags .ti-tags'



  # beta content item
@@ -881,9 +886,12 @@ upload: 
    ftp_close: '.popover-header .popover-close'

    row: '#upload-row-${n}'

    settings_button: '#upload-row-${n} .upload-settings'

    paste_content: '#upload-row-${n} .upload-text-content'

    settings: '.upload-settings-table'

    setting_deferred: '.upload-deferred'

    start: '.upload-button'

    start_uploading: '.upload-start'

    close: '.upload-close'

    rule_source_content: 'textarea.upload-rule-source-content'

    rule_select_data_type: '.rule-data-type'

    rule_select_input_type: '.rule-select-type'
@@ -896,6 +904,7 @@ upload: 
      type: xpath

      selector: '//span[contains(@title, "${path}")]'

    file_dialog_ok: '.file-dialog-modal-ok'

    paste_new: .upload-paste



rule_builder:

  selectors: