From 2da84a727bc52304ded4129ea2df8a147f47c6e9 Mon Sep 17 00:00:00 2001
From: Anon Ray <rayanon004@gmail.com>
Date: Wed, 10 Jul 2013 17:20:01 +0530
Subject: [PATCH] The annotation bar can now be shifted to top or bottom

---
 static/text-annotation.js |   18 ++++++++++++++++--
 static/tree.js            |   32 ++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/static/text-annotation.js b/static/text-annotation.js
index 10ad0ec..9dfbdfd 100644
--- a/static/text-annotation.js
+++ b/static/text-annotation.js
@@ -36,7 +36,7 @@ var attributes = {};
     //$(document).mouseout(onHoverOut);
   };
   window.listAnno = function() { // list annotations of current page
-    console.log('listing annotations');
+    //console.log('listing annotations');
     $.get(config.indexer + '/search?data=' +
         JSON.stringify({'where': window.location.search.split('url=')[1]}),
         function(data) {
@@ -61,6 +61,18 @@ var attributes = {};
     //$(document).unbind('mouseover', onHover);
     //$(document).unbind('mouseout', onHoverOut);
   };
+  window.shiftBar = function() {
+    var margin_top = $('#annotate-bar').css('marginTop');
+    var margin = Number(margin_top.split('px')[0]);
+    if(margin < 10) {
+      $('#annotate-bar').css('marginTop', (window.innerHeight-50)+'px');
+      $('#shift-bar').html('&uArr;');
+    }
+    else {
+      $('#annotate-bar').css('marginTop', '0px');
+      $('#shift-bar').html('&dArr;');
+    }
+  };
   var toolbar_template = function() {
     return '<div class="navbar">'+
       '<div class="navbar-inner"> <ul class="nav">'+
@@ -72,6 +84,8 @@ var attributes = {};
       '<li><button class="btn" id="list-anno-btn" onclick="listAnno();">Annotations</button></li>' +
       '<li><a></a></li>'+
       '<li><button class="btn" id="publish">Publish</button></li>' +
+      '<li><a></a></li>'+
+      '<li><button type="button" id="shift-bar" class="btn" onclick="shiftBar();">&dArr;</button></li>'+
       '</ul></div></div>' +
       '<div id="sweeted"></div> <div id="posted"></div> <div id="fail-posting"></div>'+
       '<div id="list-anno" class="modal hide fade" role="dialog" aria-labelledby="list-anno-label" aria-hidden="true">'+
@@ -90,7 +104,7 @@ var attributes = {};
   window.shiftModal = function() {
     var margin_left = $('#list-anno').css('marginLeft');
     var margin = Number(margin_left.split('px')[0]);
-    console.log(margin);
+    //console.log(margin);
     if(margin < 100) {
       $('#list-anno').css('marginLeft', '28%');
     }
diff --git a/static/tree.js b/static/tree.js
index 9a99e7b..11d51c7 100644
--- a/static/tree.js
+++ b/static/tree.js
@@ -42,19 +42,20 @@ function loadOntologyJSON() {
     drawRGraph();
     return;
   }
-  console.log('Loading ontology file');
+  //console.log('Loading ontology file');
   var url = 'static/graphs/GirijaKalyanaStory.json'
   $.ajax({
     type: 'GET',
     url: url,
     dataType: 'json',
     success: function(data) {
-      console.log('Ontology JSON loaded');
+      //console.log('Ontology JSON loaded');
       ontology_json = data;
       drawRGraph();
     },
     error: function(xhr, errtype, errtext) {
       console.log('Could not load Ontology JSON!');
+      alert('Could not load Ontology JSON!');
       console.log(errtype, ':', errtext);
     }
   });
@@ -93,7 +94,7 @@ var Stats = {
 };
 
 var removeItem = function(event) {
-  console.log($(event.currentTarget));
+  //console.log($(event.currentTarget));
   var id = $(event.currentTarget).parent().parent().attr('id');
   var node = id.split('-')[1];
   $(event.currentTarget).parent().parent().remove();
@@ -120,7 +121,7 @@ function centerNode(event, node) {
     event.stopPropagation();
   }
   //Log.write('centering node ', node.name);
-  console.log('centering node', node.name);
+  //console.log('centering node', node.name);
   RGraph.onClick(node.id, {
     hideLabels: false,
     onComplete: function() {
@@ -151,7 +152,7 @@ var sweet = {
     Stats.appendSelectedList();
   },
   remove: function(node) {
-    console.log(node);
+    //console.log(node);
     var idx = _.indexOf(sweet.nodes, node);
     if(idx !== -1) {
       sweet.nodes.splice(idx, 1);
@@ -197,12 +198,12 @@ var sweet = {
         var swts = '';
         for(var i in sweet.swts) {
           var data = sweet.swts[i];
-          console.log(data);
+          //console.log(data);
           var swt = '@'+data.who+' #'+data.what+' / '+data.where;
           swt += ' {' + data.how.join() + ' }';
           swts += swt + '\n';
         }
-        console.log(swts);
+        //console.log(swts);
         $('#sweeted').html(sweeted_template(swts));
         $('#sweeted').show();
         sweet.swts = [];
@@ -247,7 +248,7 @@ function drawRGraph() {
       //span: 5,
       //height: 40,
       //width: 150,
-      angularWidth: 100,
+      //angularWidth: 100,
       //autoHeight: true,
       //autoWidth: true,
       dim: 10
@@ -264,19 +265,21 @@ function drawRGraph() {
     transition: $jit.Trans.Sine.easeIn,
     levelDistance: 150,
     onCreateLabel: function(domElement, node) {
-      console.log('oncreatelabel');
+      //console.log('oncreatelabel');
     },
     onPlaceLabel: function(domElement, node) {
-      console.log('onplacelabel');
+      //console.log('onplacelabel');
       /*var style = domElement.style;
       var top = parseInt(style.top);
       console.log('top :', top);
       style.top = (top - 40) + 'px';*/
     },
     Events: {
+      enableForEdges: true,
       enable: true,
-      type: 'Native',
-      onMouseEnter: function() {
+      type: 'auto',
+      onMouseEnter: function(node, event, e) {
+        console.log(node, event, e);
         rgraph.canvas.getElement().style.cursor = 'pointer';
       },
       onMouseLeave: function() {
@@ -288,6 +291,11 @@ function drawRGraph() {
           return;
         }
         centerNode(e, node);
+      },
+      onDragMove: function(node, eventInfo, e) {  
+        var pos = eventInfo.getPos();  
+        node.pos.setc(pos.x, pos.y);  
+        rgraph.plot();  
       }
     }
   });
-- 
1.7.10.4