Skip to content

Commit

Permalink
Closes #22 and closes #19. Fixed height for specgrogram container, lo…
Browse files Browse the repository at this point in the history
…ading gif, title attribues for playback controls.

- Loading gif is just the background image behind the spectrogram, which gets covered when the spectrogram image loads.
  • Loading branch information
Phil committed Dec 10, 2013
1 parent 4fae3a8 commit 3eb3195
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
13 changes: 12 additions & 1 deletion src/app/annotationViewer/_annotation_viewer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,19 @@ $marqueeBorderColorInactive: #00FF00;

baw-annotation-viewer {



width: 100%;
text-align: center;



& .annotation-viewer-ctrl {
background: url(/assets/img/load.gif) center center no-repeat;

}


& #scroller {
display: inline-block;
}
Expand Down Expand Up @@ -59,13 +69,14 @@ baw-annotation-viewer {


& #scroller{

overflow-x: scroll;
overflow-y: hidden;
line-height: 0;
}

& .annotation-viewer {

height: 255px;
display: inline-block;
position: relative;
line-height: 0;
Expand Down
3 changes: 2 additions & 1 deletion src/app/annotationViewer/annotationViewer.tpl.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div ng-controller="AnnotationViewerCtrl">
<div ng-controller="AnnotationViewerCtrl" class="annotation-viewer-ctrl">



<div id="scroller">
<div class="tag-preview">
Expand Down
5 changes: 3 additions & 2 deletions src/app/listen/listen.tpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<h4 class="center-block">Site: {{model.audioRecording.siteId}}, <span class="hint absolute-time hint--top">{{absoluteDateChunkStart() | moment:"format":"dddd, MMMM Do YYYY, HH:mm:ss ZZ"}}</span><span></span>
</h4>

<baw-annotation-viewer model="model"></baw-annotation-viewer>

<div id="chunkTimeStamps" class="clear-pseudo">
Expand All @@ -18,7 +19,7 @@ <h4 class="center-block">Site: {{model.audioRecording.siteId}}, <span class="hin


<div class="btn-group">
<a class="btn btn-default" ng-href="{{createNavigationHref('previous')}}" ng-disabled="!previousEnabled">
<a class="btn btn-default" ng-href="{{createNavigationHref('previous')}}" ng-disabled="!previousEnabled" title="Previous Recording">
<span class="glyphicon glyphicon-step-backward"></span>
</a>
</div>
Expand All @@ -35,7 +36,7 @@ <h4 class="center-block">Site: {{model.audioRecording.siteId}}, <span class="hin

</div>
<div class="btn-group">
<a class="btn btn-default" ng-href="{{createNavigationHref('next')}}" ng-disabled="!nextEnabled">
<a class="btn btn-default" ng-href="{{createNavigationHref('next')}}" ng-disabled="!nextEnabled" title="Next Recording">
<span class="glyphicon glyphicon-step-forward"></span>
</a>
</div>
Expand Down
Binary file added src/assets/img/load.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3eb3195

Please sign in to comment.