# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1353624853 -3600
# Node ID 435851345c78da59f47d54ce333b787aff80118a
# Parent  ac95f4f710db96163826daf32b6aec38a607f221# Parent  3171f61c7be6a6adb064a56694eab22bc7411440
Merge with 3171f61c7be6a6adb064a56694eab22bc7411440

diff -r ac95f4f710db -r 435851345c78 src/hp/static/hp/tmgraph/event.pde
--- a/src/hp/static/hp/tmgraph/event.pde	Thu Nov 22 23:25:34 2012 +0100
+++ b/src/hp/static/hp/tmgraph/event.pde	Thu Nov 22 23:54:13 2012 +0100
@@ -30,6 +30,9 @@
   pressStartY = pointY;
   doSelectEdge();
   doSelectNode();
+  // ADDED BY IRI
+  if (javascript != null) javascript.click(selection);
+  //
   if (mouseButton == RIGHT) {
     if (selection != null && selected == null && !menu_active) 
       doBeginMenu();
diff -r ac95f4f710db -r 435851345c78 src/hp/static/hp/tmgraph/javascript.pde
--- a/src/hp/static/hp/tmgraph/javascript.pde	Thu Nov 22 23:25:34 2012 +0100
+++ b/src/hp/static/hp/tmgraph/javascript.pde	Thu Nov 22 23:54:13 2012 +0100
@@ -17,6 +17,8 @@
   void startexpand();
   void endexpand();
   void username(String uid);
+  void mousemove(sel);
+  void click(sel);
 }
 
 void bindJavascript(JavaScript js) {
diff -r ac95f4f710db -r 435851345c78 src/hp/static/hp/tmgraph/menu.pde
--- a/src/hp/static/hp/tmgraph/menu.pde	Thu Nov 22 23:25:34 2012 +0100
+++ b/src/hp/static/hp/tmgraph/menu.pde	Thu Nov 22 23:54:13 2012 +0100
@@ -32,6 +32,9 @@
       //selected  = null;
     }    
   }
+  //ADDED BY IRI
+  if (javascript != null) javascript.mousemove(selection);
+  //
 }
 
 void doSelectEdge() {
diff -r ac95f4f710db -r 435851345c78 src/hp/static/hp/tmgraph/model.pde
--- a/src/hp/static/hp/tmgraph/model.pde	Thu Nov 22 23:25:34 2012 +0100
+++ b/src/hp/static/hp/tmgraph/model.pde	Thu Nov 22 23:54:13 2012 +0100
@@ -21,6 +21,8 @@
   return edges;
 }
 
+// END ADDITION
+
 ////////  SAVE & LOAD NODES, EDGED  ////////////////////////////////////////////
 void allSave() {
   String proj, asc_id, a_proj, id, from_proj, name, grp, to_id, to_proj, r_name, r_from, r_to;
diff -r ac95f4f710db -r 435851345c78 src/hp/templates/hp/all_videos.html
--- a/src/hp/templates/hp/all_videos.html	Thu Nov 22 23:25:34 2012 +0100
+++ b/src/hp/templates/hp/all_videos.html	Thu Nov 22 23:54:13 2012 +0100
@@ -45,7 +45,7 @@
     <div class="pagination">
         <span class="step-links">
         {% if results.has_previous %}
-            <a href="{% url hp.views.all_videos %}"><<</a> <a href="{% url hp.views.all_videos %}?page={{ results.previous_page_number }}"><</a>
+            <a href="{% url hp.views.all_videos %}">&lt;&lt;</a> <a href="{% url hp.views.all_videos %}?page={{ results.previous_page_number }}">&lt;</a>
         {% else %}
             {{"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"|safe}}
         {% endif %}
@@ -53,7 +53,7 @@
             {{ results.number }}/{{ results.paginator.num_pages }}
         </span>
         {% if results.has_next %}
-            <a href="{% url hp.views.all_videos %}?page={{ results.next_page_number }}">></a> <a href="{% url hp.views.all_videos %}?page=last">>></a>
+            <a href="{% url hp.views.all_videos %}?page={{ results.next_page_number }}">&gt;</a> <a href="{% url hp.views.all_videos %}?page=last">&gt;&gt;</a>
         {% else %}
             {{"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"|safe}}
         {% endif %}