Skip to content

Commit

Permalink
Jkmarx/analysis launch ui removal (#2248)
Browse files Browse the repository at this point in the history
* Remove analysis-launch module.

* Remove from unit test.

* Remove node-relationship module. (#2249)

* Remove node-relationship module.

* Remove node-mapping module and add third party dependency to refinery… (#2250)

* Remove node-mapping module and add third party dependency to refinery.js.

* Jkmarx/decongest data set nav ui (#2268)

* Clean up data-set-nav and remove references.

* Update unit tests.

* Jkmarx/remove select workflows and igv module (#2269)

* Remove select workflow module.

* Remove igv module.

* Fix typo ,
  • Loading branch information
jkmarx committed Oct 26, 2017
1 parent 6097bb5 commit 2f412db
Show file tree
Hide file tree
Showing 73 changed files with 128 additions and 3,926 deletions.
10 changes: 0 additions & 10 deletions refinery/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,6 @@
{% endblock %}
</div>

<script type="text/ng-template" id="analysislaunchmodal.html">
<rp-analysis-launch-modal-detail>
</rp-analysis-launch-modal-detail>
</script>

<!-- 3rd party libraries -->
<script src="{% static "vendor/jquery/dist/jquery.min.js" %}"></script>
<script src="{% static "js/jquery-ui/jquery-ui-1.10.0.custom.min.js" %}"></script>
Expand Down Expand Up @@ -296,14 +291,9 @@
<script src="{% static "js/refinery-controller.js" %}"></script>
<script src="{% static "js/globals.js" %}"></script>
<script src="{% static "js/commons.js" %}"></script>
<script src="{% static "js/analysis-launch.js" %}"></script>
<script src="{% static "js/analysis-monitor.js" %}"></script>
<script src="{% static "js/file-browser.js" %}"></script>
<script src="{% static "js/node-mapping.js" %}"></script>
<script src="{% static "js/workflows.js" %}"></script>
<script src="{% static "js/data-set-nav.js" %}"></script>
<script src="{% static "js/node-relationship.js" %}"></script>
<script src="{% static "js/data-set-explorer.js" %}"></script>
<script src="{% static "js/statistics.js" %}"></script>
<script src="{% static "js/provvis/provvis.js" %}"></script>
<script src="{% static "js/dashboard.js" %}"></script>
Expand Down
90 changes: 43 additions & 47 deletions refinery/templates/core/data_set.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,57 +29,53 @@ <h1>Data Set

{% block content %}
<!-- tab headers -->

<div ng-controller="DataSetNavCtrl" ng-cloak>
<div ng-controller="DataSetUiModeCtrl">

<div class="refinery-panel-tabs">
<div class="row">
<div class="col-md-9 col-md-offset-3">
<ul class="nav nav-tabs float-right" id="tabs">
<li ui-sref-active="active" id="filesTab">
<a ui-sref="files" class="dataSetTabs">
Files
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="analyses" id="analyze-tab" class="dataSetTabs">
<span ng-controller="AnalysisMonitorCtrl">
<span rp-analysis-monitor-running-tab-icon></span>
</span>
Analyses
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="about" class="dataSetTabs" >
Details
</a>
</li>
<li>
<a href="/provenance/{{ data_set.uuid }}">Provenance</a>
</li>
</ul>
</div>
</div>
</div>
<div class="refinery-panel refinery-panel-content jquery-full-height
handle-overflow" id="data-set-view">
{% if data_set %}
<!-- tabs -->
<form id="sampleForm" method="post" class="form-inline" hidden>
{% csrf_token %}
<!-- pass study information into the receiving view when posting -->
<input type="hidden" name="study_uuid" value="{{ study_uuid }}"/>
</form>
<!-- Tab views -->
<div ui-view></div>
{% else %}
<p>No valid data set.</p>
{% endif %}
<div class="refinery-panel-tabs">
<div class="row">
<div class="col-md-9 col-md-offset-3">
<ul class="nav nav-tabs float-right" id="tabs">
<li ui-sref-active="active" id="filesTab">
<a ui-sref="files" class="dataSetTabs">
Files
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="analyses" id="analyze-tab" class="dataSetTabs">
<span ng-controller="AnalysisMonitorCtrl">
<span rp-analysis-monitor-running-tab-icon></span>
</span>
Analyses
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="about" class="dataSetTabs" >
Details
</a>
</li>
<li>
<a href="/provenance/{{ data_set.uuid }}">Provenance</a>
</li>
</ul>
</div>
</div>
</div>


<div class="refinery-panel refinery-panel-content jquery-full-height
handle-overflow" id="data-set-view">
{% if data_set %}
<!-- tabs -->
<form id="sampleForm" method="post" class="form-inline" hidden>
{% csrf_token %}
<!-- pass study information into the receiving view when posting -->
<input type="hidden" name="study_uuid" value="{{ study_uuid }}"/>
</form>
<!-- Tab views -->
<div ui-view></div>
{% else %}
<p>No valid data set.</p>
{% endif %}
</div>

{% endblock %}

{% block vendor_scripts %}
Expand Down

0 comments on commit 2f412db

Please sign in to comment.