modified: Gemfile

modified: Gemfile.lock -- bumped versions of dependencies modified: app/assets/javascripts/angular/directives/directives.js -- added debug directive, and improved record_informaition modified: app/assets/javascripts/app.js -- fixed bug in scope printer new file: app/assets/stylesheets/record_information.css.scss modified: app/assets/templates/listen.html modified: app/assets/templates/project_details.html modified: app/assets/templates/record_information.html -- general site work
QutEcoacoustics · Nov 14, 2012 · 44234a8 · 44234a8
1 parent 4e0e991
commit 44234a8
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/app/assets/javascripts/angular/directives/directives.js b/app/assets/javascripts/angular/directives/directives.js
@@ -8,16 +8,16 @@
         }
     });
 
-    bads.directive('recordInformation', function(){
+    bads.directive('bawRecordInformation', function(){
         return {
             restrict: 'AE',
             /*scope: false,*/
             /* priority: ???  */
             /* controller: ??? */
             /* require: ??? */
             /*template: "<div></div>",*/
-            templateUrl: "/assets/record_information.html"
-            /*replace: false*/
+            templateUrl: "/assets/record_information.html",
+            replace: false
             /*compile: function(tElement, tAttrs, transclude) {
 
             },*/
@@ -28,6 +28,17 @@
         }
     });
 
+    bads.directive('bawDebugInfo', function() {
+        return {
+            restrict: 'AE',
+            replace: true,
+            template: '<div><a href ng-click="showOrHideDebugInfo= !showOrHideDebugInfo">Debug info {{showOrHideDebugInfo}}</a><pre ui-toggle="showOrHideDebugInfo" class="ui-hide"  ng-bind="print()"></pre></div>',
+            link: function(scope, element, attrs) {
+
+            }
+        }
+    });
+
 })();
 
 //bawApp.directive('nsDsFade', function() {

diff --git a/app/assets/javascripts/app.js b/app/assets/javascripts/app.js
@@ -43,7 +43,7 @@ var bawApp = angular.module('baw',
             $rootScope.print = function () {
                 var seen = [];
                 var badKeys = ["$digest", "$$watchers", "$$childHead", "$$childTail", "$$listeners", "$$nextSibling", "$$prevSibling", "$root", "this", "$parent"];
-                var str = JSON.stringify($rootScope,
+                var str = JSON.stringify(this,
                     (function (key, val) {
                         if (badKeys.indexOf(key) >= 0) {
                             return "[Can't do that]";

diff --git a/app/assets/stylesheets/record_information.css.scss b/app/assets/stylesheets/record_information.css.scss
@@ -0,0 +1,3 @@
+baw\:record-information {
+  display: block;
+}
diff --git a/app/assets/templates/listen.html b/app/assets/templates/listen.html
@@ -1,4 +1,4 @@
-<div id="content" data-ng-controller="ListenCtrl">
+<div id="content" data-ng-controller="ListenCtrl" xmlns:baw="">
     <a href="/listen/1bd0d668-1471-4396-adc3-09ccd8fe949a">demo</a>
     <a href="#" ng-click="refresh()">demo</a>
 
@@ -31,7 +31,6 @@ <h3>Annotations</h3>
         </tbody>
     </table>
 
-    <a href ng-click="showHide= !showHide">Debug info {{showHide}}</a>
-    <pre ui-toggle="showHide" class="ui-hide"  ng-bind="print()"></pre>
+    <baw:debug-info />
 
 </div>
diff --git a/app/assets/templates/project_details.html b/app/assets/templates/project_details.html
@@ -10,11 +10,11 @@ <h3><a ng-href="{{project.urn}}">{{project.name}}</a></h3>
     <p ng-bind="project.description" ></p>
     <pre>{{project.notes}}</pre>
     <small>{{project.updated_at}}</small>
-    <record-information></record-information>
-    <!--<baw:record-information></baw:record-information>-->
+    <baw:record-information></baw:record-information>
+    <!--<record-information></record-information>-->
 
     <!--<div baw:record-information ></div>-->
-    <div record-information ></div>
+    <div baw:record-information ></div>
 <ul>
     <li data-ng-repeat="site in project.sites">
         {{site.id}}
@@ -23,5 +23,6 @@ <h3><a ng-href="{{project.urn}}">{{project.name}}</a></h3>
     </li>
 </ul>
 
-    <pre ui-toggle="showOrHideDebugInfo" class="ui-hide"  ng-bind="print()"></pre>
+    <!--<pre ui-toggle="showOrHideDebugInfo" class="ui-hide"  ng-bind="print()"></pre>-->
+    <baw:debug-info />
 </div>
diff --git a/app/assets/templates/record_information.html b/app/assets/templates/record_information.html
@@ -1,3 +1 @@
-<div>
-    modified<span>{{{project.updated_at}}</span>&nbsp;created<span></span>&nbsp;archived<span></span>
-</div>
+modified<span>{{project.updated_at}}</span>&nbsp;created<span>{{project.created_at}}</span>&nbsp;archived<span>{{project.deleted_at}}</span>