added buttons, fixed marker problems

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 49dbcd211eda49d8a2ad2c662f9903e0fa396277..1c198e731500e613d90ce81bdb1f53c358943001 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -1002,7 +1002,7 @@ a.image-link {
     background-image: url('/images/cancel.png');
 }
 .mediaitem_button_save{
-    color:#6A0307 !important;
+    /*color:#6A0307 !important;*/
     background-image: url('/images/save.png');
 }
 .mediaitem_button_add{

diff --git a/telemeta/htdocs/js/application.js b/telemeta/htdocs/js/application.js
index b73a1b0cf3b30bdaee31b2eb4bf4c9d9dd2c3116..b10f200acd47ef08cb4c979739999c02ea62deb5 100644 (file)
--- a/telemeta/htdocs/js/application.js
+++ b/telemeta/htdocs/js/application.js
@@ -21,7 +21,7 @@ Array.prototype.move = function(from, to){
     }\r
     if(from != to){\r
         var elm = this.splice(from,1)[0];\r
-        this.markers.splice(to,0,elm);\r
+        this.splice(to,0,elm);\r
         return to;\r
     }\r
     return from;\r

diff --git a/telemeta/htdocs/timeside/src/controller.js b/telemeta/htdocs/timeside/src/controller.js
index e8f0935d6ac60e1d76076de8077ffc06388fb848..7636460f448e1e8d9fea9e8123bbe9469852e004 100644 (file)
--- a/telemeta/htdocs/timeside/src/controller.js
+++ b/telemeta/htdocs/timeside/src/controller.js
@@ -73,10 +73,8 @@ TimeSide(function($N) {
 //            }
             this.cfg.divmarkers.move(from,to);
             this.cfg.player.ruler.markers.move(from,to);
-//            this.cfg.player.ruler.move(from,to);
-//            var m = this.cfg.divmarkers.splice(from,1)[0]; //remove
-//            this.cfg.divmarkers.splice(to,0,m); //add
-            this.updateIndices(from,to);
+//           realIndex might not be equal to to
+            this.updateIndices(from,data.newIndex);
         },
 
         //called whenever a marker is added to the ruler BUT NOT in the map
@@ -132,11 +130,12 @@ TimeSide(function($N) {
             if(from===undefined || from==null){
                 from = 0;
             }
-            if(from>this.cfg.divmarkers.length){
+            var len = this.cfg.divmarkers.length-1;
+            if(from>len){
                 return;
             }
             if(to==undefined || to ==null){
-                to = this.cfg.divmarkers.length-1;
+                to = len;
             }
             if(to<from){
                 var tmp = to;

diff --git a/telemeta/htdocs/timeside/src/markermap.js b/telemeta/htdocs/timeside/src/markermap.js
index 230dc44811cd1d3e3ef402964669ef21cb7712d8..6bf72896c0e14292573025d7f4c6cd0bf0265c87 100644 (file)
--- a/telemeta/htdocs/timeside/src/markermap.js
+++ b/telemeta/htdocs/timeside/src/markermap.js
@@ -97,15 +97,16 @@ TimeSide(function($N, $J) {
 
         move: function(markerIndex, newOffset){
             var newIndex = this.indexOf(newOffset);
-            newIndex = this.markers.move(markerIndex,newIndex);
+            var realIndex = this.markers.move(markerIndex,newIndex);
 
-            var marker = this.markers[newIndex];
+            var marker = this.markers[realIndex];
             marker.offset = newOffset;
             marker.isSaved = marker.isEditable ? false : true;
             
             this.fire('moved', {
                 fromIndex: markerIndex,
-                toIndex: newIndex
+                toIndex: newIndex,
+                newIndex: realIndex
             });
 
 //            var newIndex = this.indexOf(newOffset);
@@ -195,10 +196,11 @@ TimeSide(function($N, $J) {
             //see http://stackoverflow.com/questions/4809157/i-need-to-pass-a-json-object-to-a-javascript-ajax-method-for-a-wcf-call-how-can
             //            var data2send = '{"id":"jsonrpc", "params":[{"item_id":"'+ itemid+'", "public_id": "'+marker.id+'", "time": "'+
             //            marker.offset+'","description": "'+marker.desc+'"}], "method":"telemeta.add_marker","jsonrpc":"1.0"}';
-           
-            var isSaved = marker.id !== undefined;
+
+           var id = marker.id;
+            var isSaved = id !== undefined;
             if(!isSaved){
-                marker.id=this.uniqid(); //defined in core;
+                id=this.uniqid(); //defined in core;
             }
             var method = isSaved ? "telemeta.update_marker" : "telemeta.add_marker";
             
@@ -210,7 +212,7 @@ TimeSide(function($N, $J) {
                 offset = "0.0";
             }
             var data2send = '{"id":"jsonrpc", "params":[{"item_id":"'+ s(itemid)+
-            '", "public_id": "'+s(marker.id)+'", "time": "'+s(offset)+
+            '", "public_id": "'+s(id)+'", "time": "'+s(offset)+
             '", "author": "'+s(marker.author)+
             '", "title": "'+s(marker.title)+
             '","description": "'+s(marker.desc)+'"}], "method":"'+method+'","jsonrpc":"1.0"}';
@@ -222,6 +224,7 @@ TimeSide(function($N, $J) {
                 data: data2send,
                 success: function(){
                     if(!isSaved){
+                        marker.id=id;
                         marker.isSaved = true;
                     }
                     if(functionOnSuccess){

diff --git a/telemeta/templates/telemeta_default/collection_add.html b/telemeta/templates/telemeta_default/collection_add.html
index 19b7d71351d55cdade1897818bfaa2d3aed59ba6..9a2402382908e248bf9e3264315f3c750957a41d 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_add.html
+++ b/telemeta/templates/telemeta_default/collection_add.html
@@ -3,8 +3,9 @@
 {% block submenu %}
     <div>    
      {% block tools %}
-     <a href="{% url telemeta-collections %}">
-          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
+<!--     <a href="{% url telemeta-collections %}">
+          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>-->
+<a href="{% url telemeta-collections %}" class="mediaitem_button mediaitem_button_cancel">Cancel</a>
      {% endblock tools %}
     </div>
 {% endblock %}
@@ -12,7 +13,7 @@
 
 {% block infos %}
         <div class="infos">
-        <form method="POST" action="">{% csrf_token %}
+        <form method="POST" id ="_addCollectionForm" action="">{% csrf_token %}
         <table>
         {% for field in form %}
             {% if not field.html_name == "copied_from_item" %}
@@ -24,9 +25,12 @@
         {% endfor %}
         </table>
         <div align="center">
-         <a href="{% url telemeta-collections %}">
+<!--         <a href="{% url telemeta-collections %}">
           <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
-         <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save"/>
+         <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save"/>-->
+<a href="{% url telemeta-collections %}" class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+         <a href="#" class="mediaitem_button mediaitem_button_save"
+   onclick="document.getElementById('_addCollectionForm').submit(); return false;">Save</a>
         </div>
         </form>
         </div>

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index 5abd52f047ec74f5cc9b55ea69c2e23aba9ce5b9..6363771334957a4770f202820db31198806b4722 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -12,13 +12,17 @@
 
 {% block submenu %}
     <div>
-    <a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>
+    <!--<a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>-->
+    <a href="{% url telemeta-collection-dublincore collection.public_id %}" class="mediaitem_button mediaitem_button_dublin_core">Dublin Core</a>
     
     {% if user.is_authenticated and perms.telemeta.change_mediacollection %}
      {% block tools %}
-     <a href="{% url telemeta-collection-edit collection.public_id %}">
+    <!-- <a href="{% url telemeta-collection-edit collection.public_id %}">
       <img src="images/edit_page.png" alt="EDIT" style="vertical-align:middle" /></a>
-      <button><a href="{% url telemeta-collection-copy collection.public_id %}">Copy</a></button>
+      <button><a href="{% url telemeta-collection-copy collection.public_id %}">Copy</a></button>-->
+
+       <a href="{% url telemeta-collection-edit collection.public_id %}" class="mediaitem_button mediaitem_button_edit">Edit</a>
+      <a href="{% url telemeta-collection-copy collection.public_id %}" class="mediaitem_button mediaitem_button_copy">Copy</a>
      {% endblock tools %}
     {% endif %}
     

diff --git a/telemeta/templates/telemeta_default/collection_edit.html b/telemeta/templates/telemeta_default/collection_edit.html
index dfb3f4e1fd4d2050828ebc274478bf47a4a09962..b58c2f943404f8826b285d9626c043591dff00b0 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_edit.html
+++ b/telemeta/templates/telemeta_default/collection_edit.html
@@ -1,13 +1,14 @@
 {% extends "telemeta/collection_detail.html" %}
 
 {% block tools %}
-    <a href="{% url telemeta-collection-detail collection.public_id %}">
-     <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
+<!--    <a href="{% url telemeta-collection-detail collection.public_id %}">
+     <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>-->
+     <a href="{% url telemeta-collection-detail collection.public_id %}">Cancel</a>
 {% endblock %}
 
 {% block infos %}
         <div class="infos">
-        <form method="POST" action="">{% csrf_token %}
+        <form method="POST" id="_editCollectionForm" action="">{% csrf_token %}
        <table>
        {% for field in form %}
         {% if not field.html_name == "copied_from_item" %}
@@ -19,9 +20,12 @@
        {% endfor %}
        </table>
         <div align="center">
-         <a href="{% url telemeta-collection-detail collection.public_id %}">
+<!--         <a href="{% url telemeta-collection-detail collection.public_id %}">
           <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
-         <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save"/>
+         <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save"/>-->
+         <a href="{% url telemeta-collection-detail collection.public_id %}">Cancel</a>
+         <a href="#" class="mediaitem_button mediaitem_button_save"
+   onclick="document.getElementById('_editCollectionForm').submit(); return false;">Save</a>
         </div>
         </form>
         </div>

diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html
index 7cf243b62733584a4e0c107ceda97a745ae496c1..1528c0491fd5d0d6ae3d5c28178b9a65f18cd059 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_list.html
+++ b/telemeta/templates/telemeta_default/collection_list.html
@@ -8,7 +8,7 @@
     <div class="buttons">  
     {% if user.is_authenticated and perms.telemeta.add_mediacollection %}
 <!--     <button><a href="{% url telemeta-collection-add %}">Add</a></button>-->
-      <a href="{% url telemeta-collection-add %}" class="roundBorder6 mediaitem_button mediaitem_button_add">Add</a>
+      <a href="{% url telemeta-collection-add %}" class="mediaitem_button mediaitem_button_add">Add</a>
 
     {% endif %}
     </div>

diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html
index 3b7eafc5c0ecfaa06e8617ec13d4c5a5b4a1223c..2bc1a027162fe8e937203ca4bc3a0fd80db3dff7 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_add.html
+++ b/telemeta/templates/telemeta_default/mediaitem_add.html
@@ -41,8 +41,8 @@
          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
         <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save" />-->
         <a href="{% url telemeta-item-detail item.public_id %}"
-           class="roundBorder6 mediaitem_button mediaitem_button_cancel">Cancel</a>
-<a href="#" class="roundBorder6 mediaitem_button mediaitem_button_save"
+           class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+<a href="#" class="mediaitem_button mediaitem_button_save"
    onclick="document.getElementById('_addItemForm').submit(); return false;">Save</a>
        </div>
      </form>

diff --git a/telemeta/templates/telemeta_default/mediaitem_copy.html b/telemeta/templates/telemeta_default/mediaitem_copy.html
index bb4c8797067c5a5165f892e0f841e23e3a7daf0d..28f6b1823fde07485859f4febfacd54bc2d9723d 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_copy.html
+++ b/telemeta/templates/telemeta_default/mediaitem_copy.html
@@ -11,8 +11,9 @@
 <div>
     {% if user.is_authenticated and perms.telemeta.add_mediaitem %}
     {% block tools %}
-     <a href="{% url telemeta-item-detail item.public_id %}">
-     <img src="images/edit_cancel.png" /></a>
+<!--     <a href="{% url telemeta-item-detail item.public_id %}">
+     <img src="images/edit_cancel.png" /></a>-->
+    <a href="{% url telemeta-item-detail item.public_id %}">Cancel</a>
     {% endblock tools %}
     {% endif %}
 </div>
@@ -23,7 +24,7 @@
   
   {% block infos %}    
     <div class="infos">
-     <form enctype="multipart/form-data" method="POST" action="">{% csrf_token %}
+     <form enctype="multipart/form-data" id="_mediaItemCopyForm" method="POST" action="">{% csrf_token %}
       <table>
        {% for field in form %}
         {% if not field.html_name == "copied_from_item" %}
@@ -35,9 +36,12 @@
        {% endfor %}
        </table>
        <div align="center">
-        <a href="{% url telemeta-item-detail item.public_id %}">
+<!--        <a href="{% url telemeta-item-detail item.public_id %}">
          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
-        <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save" />
+        <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save" />-->
+<a href="{% url telemeta-item-detail item.public_id %}">Cancel</a>
+         <a href="#" class="mediaitem_button mediaitem_button_save"
+   onclick="document.getElementById('_mediaItemCopyForm').submit(); return false;">Save</a>
        </div>
      </form>
     </div>

diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html
index e3b80b222c8632f97e3330c65ebf644c0af441af..1b320363d5ae103fdd6d833b2ef9bc38d099f88f 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_edit.html
@@ -3,7 +3,7 @@
     {% block tools %}
 <!--     <a href="{% url telemeta-item-detail item.public_id %}">
          <img src="images/edit_cancel.png" /></a>-->
- <a href="{% url telemeta-item-detail item.public_id %}"  class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+ <a href="{% url telemeta-item-detail item.public_id %}" class="mediaitem_button mediaitem_button_cancel">Cancel</a>
     {% endblock tools %}
 
   {% block infos %}    

diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html
index 5bbf9228fbccc3392e680f64a2efa9465d88b259..188bef52644acea97f8cd6ff33a0dc4e74e53bf7 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/mediaitem_list.html
@@ -8,7 +8,8 @@
 {% block submenu %}
     <div class="buttons">  
     {% if user.is_authenticated and perms.telemeta.add_mediaitem %}
-     <button><a href="{% url telemeta-item-add %}">Add</a></button>
+<!--     <button><a href="{% url telemeta-item-add %}">Add</a></button>-->
+<a href="{% url telemeta-item-add %}" class="mediaitem_button mediaitem_button_add">Add</a>
     {% endif %}
     </div>
 {% endblock %}