Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix conditional and icon name. #2686

Merged
merged 1 commit into from
Mar 22, 2018
Merged

Fix conditional and icon name. #2686

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions refinery/ui/source/js/data-set-about/partials/details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,8 @@ <h3>History</h3>
<div
id="isaTabImportForm"
ng-if="(ADCtrl.userPerms === 'read' || ADCtrl.userPerms === 'change') &&
!ADCtrl.dataSet.is_owner && ADCtrl.dataSet.pre_isa_archive && ADCtrl
.fileStoreItem.datafile && ADCtrl.loggedIn">
(ADCtrl.dataSet.isa_archive || ADCtrl.dataSet.pre_isa_archive && ADCtrl
.fileStoreItem.datafile) && !ADCtrl.dataSet.is_owner && ADCtrl.loggedIn">
<button
id="isa-import-button"
class="refinery-base btn btn-default"
Expand All @@ -456,15 +456,15 @@ <h3>History</h3>
<i class="fa fa-question-circle info-icon icon-only"></i>
</a>

<span class="text-warning" ng-if="ADCtrl.dataSetImportStatus=='RUNNING'">
<span class="text-warning p-l-1" ng-if="ADCtrl.dataSetImportStatus=='RUNNING'">
<i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
Data set is importing.
</span>
<span class="text-success" ng-if="ADCtrl.dataSetImportStatus=='SUCCESS'">
<i class="fa check-square-o" aria-hidden="true"></i>
<span class="text-success p-l-1" ng-if="ADCtrl.dataSetImportStatus=='SUCCESS'">
<i class="fa fa-check-square-o" aria-hidden="true"></i>
Data set imported.
</span>
<span class="text-danger" ng-if="ADCtrl.dataSetImportStatus=='FAIL'">
<span class="text-danger p-l-1" ng-if="ADCtrl.dataSetImportStatus=='FAIL'">
<i class="fa fa-warning" aria-hidden="true"></i>
Data set failed to import.
</span>
Expand Down