resolve merge conflict

QutEcoacoustics · Feb 20, 2014 · cb6b99a · cb6b99a
1 parent fdc3691
commit cb6b99a
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 2 deletions.
diff --git a/src/app/annotationLibrary/_annotationLibrary.scss b/src/app/annotationLibrary/_annotationLibrary.scss
diff --git a/src/app/annotationLibrary/annotationItem.tpl.html b/src/app/annotationLibrary/annotationItem.tpl.html
diff --git a/src/app/annotationLibrary/annotationLibrary.js b/src/app/annotationLibrary/annotationLibrary.js
@@ -0,0 +1,6 @@
+angular.module('bawApp.annotationLibrary', ['bawApp.configuration'])
+
+    .controller('AnnotationLibraryCtrl', ['$scope',
+        function($scope){
+
+        }]);
diff --git a/src/app/annotationLibrary/annotationLibrary.tpl.html b/src/app/annotationLibrary/annotationLibrary.tpl.html
@@ -0,0 +1,33 @@
+<div class="tagitem ReadingSummary" style="min-width: 250px; max-width: 129px;
+                    height: 299px; background-color:#7E7E7E;">
+    <div style="position:relative; width:129px; margin:0 auto;">
+        <img src="/Spectrogram.ashx?height=256&amp;ppms=0.045&amp;ID=761c2204-2ed3-4f3e-b5b2-97878daf0431&amp;start=382379&amp;end=385244" alt="spectrogram" style="z-index: 1; width: 129px; height: 256px;">
+        <!-- div for displaying tag -->
+        <div style="position: absolute; z-index: 2; width: 89px;
+                            border: 1px solid #51FF00; left: 20px;
+                            top: 62px; height: 183px;
+                            opacity: .9; filter: alpha(opacity=90);">
+        </div>
+    </div>
+    <div class="spectrogramShow">
+        <a href="#t13471" name="t13471" id="t13471" class="audiotaglink" title="Tag: (no name) --
+Start: 2011 Mar 24 05:06:22 -- 
+Duration: 1 sec 1 ms excl. padding. -- 
+Frequency: 474 - 8355 --
+Sensor: Open Forest 24th Morning_Team 2994" audiomp3="/sensors/ByID/761c2204-2ed3-4f3e-b5b2-97878daf0431.mp3?start=382379&amp;end=385244" audioogg="/sensors/ByID/761c2204-2ed3-4f3e-b5b2-97878daf0431.ogg?start=382379&amp;end=385244">
+            (no name)</a>
+        <div class="freqLine freqLine10">10</div>
+        <div class="freqLine freqLine9">9</div>
+        <div class="freqLine freqLine8">8</div>
+        <div class="freqLine freqLine7">7</div>
+        <div class="freqLine freqLine6">6</div>
+        <div class="freqLine freqLine5">5</div>
+        <div class="freqLine freqLine4">4</div>
+        <div class="freqLine freqLine3">3</div>
+        <div class="freqLine freqLine2">2</div>
+        <div class="freqLine freqLine1">1</div>
+    </div>
+    <div style="height: 22px; overflow: hidden; text-align: center; background-color:#D9EBFF;">
+        [<a href="/UI/AudioReading/AudioReadingData.aspx?AudioReadingIds=761c2204-2ed3-4f3e-b5b2-97878daf0431&amp;subitemtoload=360000&amp;jumptotimeoffsetms=22823" title="Go to tag in audio player" target="_blank">link</a>] [<a href="/UI/Tag/ReferenceTagList.aspx?duration=1977&amp;maxfrequency=8355&amp;minfrequency=474">find similar</a>]
+    </div>
+</div>
diff --git a/src/app/app.js b/src/app/app.js
@@ -82,6 +82,7 @@ var app = angular.module('baw',
                              'bawApp.accounts',
                              'bawApp.annotationViewer',
                              'bawApp.audioEvents',
+                             'bawApp.annotationLibrary',
                              'bawApp.bookmarks',
                              'bawApp.error',
                              'bawApp.home',
@@ -143,6 +144,8 @@ var app = angular.module('baw',
                      when('/experiments/:experiment',
                           {templateUrl: '/assets/experiment_base.html', controller: 'ExperimentsCtrl'}).
 
+                     when('/library', {templateUrl: paths.site.files.library.list, controller: 'AnnotationLibraryCtrl', title: 'Reference Library' }).
+                     when('/library/:annotationId', {templateUrl: paths.site.files.library.item, controller: 'AnnotationLibraryCtrl', title: ':annotationId'}).
 
                      // missing route page
                      when('/', {templateUrl: paths.site.files.home, controller: 'HomeCtrl'}).

diff --git a/src/baw.configuration.tpl.js b/src/baw.configuration.tpl.js
@@ -108,6 +108,10 @@ angular.module('bawApp.configuration', ['url'])
                     listen: 'listen/listen.tpl.html',
                     annotationViewer: 'annotationViewer/annotationViewer.tpl.html',
                     gridLines: 'annotationViewer/gridLines/gridLines.tpl.html',
+                    library: {
+                        list: 'annotationLibrary/annotationLibrary.tpl.html',
+                        item: 'annotationLibrary/annotationItem.tpl.html'
+                    },
                     navigation: 'navigation/navigation.tpl.html',
                     birdWalk: {
                         list: 'birdWalks/birdWalks.tpl.html',
@@ -119,7 +123,9 @@ angular.module('bawApp.configuration', ['url'])
                 },
                 // routes used by angular
                 ngRoutes: {
-                    listen: "/listen/{recordingId}"
+                    listen: "/listen/{recordingId}",
+                    library: "/library",
+                    libraryItem: "/library/{annotationId}"
                 },
                 // general links for use in <a />'s
                 links: {

diff --git a/src/index.html b/src/index.html
@@ -34,8 +34,9 @@
 
         <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
-                <li ng-class="{ active: activePath('/projects') }"><a ng-href="{{paths.api.links.projectsAbsolute}}"  target="_self">Projects</a></li>
+                <li ng-class="{ active: activePath('/projects') }"><a ng-href="{{paths.api.links.projectsAbsolute}}" target="_self">Projects</a></li>
                 <li ng-class="{ active: activePath('/listen') }"><a href="#">Listen</a></li>
+                <li ng-class="{ active: activePath('/library') }"><a ng-href="{{paths.site.ngRoutes.library}}">Library</a></li>
                 <!--<li ng-class="{ active: activePath('/bird') }"><a href="/birdWalks">Bird Walks</a></li>-->
 
                 <li style="display: none" ng-controller="LoginCtrl">

diff --git a/src/sass/application.tpl.scss b/src/sass/application.tpl.scss
@@ -32,6 +32,7 @@ $IMAGE_ASSET_PATH: '<%= build_configs.current.siteDir %>';
 @import "../app/annotationViewer/annotation_viewer";
 @import "../app/annotationViewer/gridLines/gridLines";
 @import "../app/audioEvents/audio_events";
+@import "../app/annotationLibrary/annotationLibrary";
 @import "../app/bookmarks/bookmarks";
 @import "../app/home/home";
 @import "../app/listen/listen";
@@ -48,3 +49,4 @@ $IMAGE_ASSET_PATH: '<%= build_configs.current.siteDir %>';
 
 
 
+