Skip to content

Commit

Permalink
Mccalluc/details tab (#2060)
Browse files Browse the repository at this point in the history
* No empty accession; better file-size formatting.

* Date formatting

* datafile && datafile does not make sense. Add another condition on last expression, to match expression above.
  • Loading branch information
mccalluc committed Aug 28, 2017
1 parent b28b996 commit 218256e
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions refinery/ui/source/js/data-set-about/partials/details.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="refinery-header">
<div class="refinery-header-left">
<h3>{{ ADCtrl.dataSet.accession }}: {{ ADCtrl.dataSet.title }}</h3>
<h3>{{ ADCtrl.dataSet.title }}</h3>
<span ng-if="ADCtrl.dataSet.is_owner">
<a
ng-click="ADCtrl.isCollapsed.title = !ADCtrl.isCollapsed.title"
Expand Down Expand Up @@ -356,7 +356,7 @@ <h3>Meta Data</h3>
</span>
<div ng-if="ADCtrl.dataSet.isa_archive">
<p>
<a href="{{ADCtrl.fileStoreItem.datafile && ADCtrl.fileStoreItem.datafile}}">
<a href="{{ADCtrl.fileStoreItem.datafile}}">
{{ADCtrl.fileStoreItem.datafile | isaArchiveName}}
</a>
- {{ADCtrl.fileStoreItem.file_size | fileSizeFormat}}
Expand All @@ -370,7 +370,7 @@ <h3>Meta Data</h3>
- {{ADCtrl.fileStoreItem.file_size | fileSizeFormat}}
</p>
</div>
<div ng-if="!(ADCtrl.dataSet.isa_archive || ADCtrl.dataSet.pre_isa_archive)">
<div ng-if="!(ADCtrl.dataSet.isa_archive || ADCtrl.dataSet.pre_isa_archive && ADCtrl.fileStoreItem.datafile)">
<p class="emphasized">Not available.</p>
</div>

Expand All @@ -379,9 +379,9 @@ <h3>Data Files</h3>
</span>
<p>
{{ ADCtrl.dataSet.file_count }} files
<div ng-if="ADCtrl.dataSet.file_size > 0">
- {{ ADCtrl.dataSet.file_size | fileSizeFormat }}
</div>
<span ng-if="ADCtrl.dataSet.file_size > 0">
using {{ ADCtrl.dataSet.file_size | fileSizeFormat }}
</span>
</p>

<div class="refinery-header">
Expand All @@ -391,6 +391,6 @@ <h3>History</h3>
</div>
<p>
Current version <span class="emphasized">{{ ADCtrl.dataSet.version }}</span>.
Data set created <span class="emphasized">{{ ADCtrl.dataSet.creation_date }}</span>.
Last modified <span class="emphasized">{{ ADCtrl.dataSet.modification_date }}</span>.
Data set created <span class="emphasized">{{ ADCtrl.dataSet.creation_date | date:'medium' }}</span>.
Last modified <span class="emphasized">{{ ADCtrl.dataSet.modification_date | date:'medium' }}</span>.
</p>

0 comments on commit 218256e

Please sign in to comment.