Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication

* 'publication' of https://github.com/Rulingcom/orbit:
  new type fixed

app/assets/javascripts/desktop/journal_pages.js.erb

@@ -281,7 +281,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
             })
             return false;
          })
-        $("a.bt-delete").click(function(){
+        $("div[container=true]").unbind(".delete").on("click.delete","a.bt-delete",function(){
           var delurl = $(this).attr("href");
           var parent = $(this).parent().parent();
           o.confirm({
@@ -346,6 +346,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
   this.initializeJournalPapers.coauthorRelationForm = function(data){
     if(data.success){
         o.notify(data.msg,"success");
+        $("#co_author_relation_table tbody").prepend(data.newvalue);
       }else{
         o.notify(data.msg,"alert");
     }

app/controllers/desktop/co_author_relations_controller.rb

@@ -16,7 +16,8 @@ class Desktop::CoAuthorRelationsController < ApplicationController
     @new_relation = CoAuthorRelation.new(params[:co_author_relation])
 
     if @new_relation.save
-      render json: {success:true, msg: "New Relation successfully saved!"}.to_json
+      newv = render_to_string :partial=>"show_form", :object=>@new_relation
+      render json: {success:true, msg: "New Relation successfully saved!","newvalue"=>newv}.to_json
     else
       error_msg = @new_relation.errors.full_messages.join("<br />")
       render json: {success: false, msg: error_msg}.to_json

app/views/desktop/co_author_relations/_show_form.html.erb

@@ -1,6 +1,6 @@
-<% @co_author_relations.each do |co_author_relation| %>
+<%# @co_author_relations.each do |co_author_relation| %>
   <tr>
-    <td><%= co_author_relation.relation %></td>
-    <td><%= link_to 'Destroy', desktop_co_author_relation_path(co_author_relation), confirm: 'Are you sure?', method: :delete %></td>
+    <td><%= show_form.relation %></td>
+    <td><%= link_to 'Destroy', desktop_co_author_relation_path(show_form), confirm: 'Are you sure?', method: :delete, :class=>"bt-delete" %></td>
   </tr>
-<% end %>
+<%# end %>

app/views/desktop/co_author_relations/index.html.erb

@@ -2,13 +2,15 @@
 
 <%= render 'form' %>
 
-<table>
+<table id="co_author_relation_table">
+<thead>
   <tr>
     <th>Relation</th>
     <th></th>
     <th></th>
   </tr>
-
-<%= render 'show_form'%>
-
+</thead>
+<tbody>
+ <%= render :partial => 'show_form', :collection => @co_author_relations %> 
+</tbody>
 </table>

app/views/desktop/co_authors/index.html.erb

@@ -2,6 +2,7 @@
 <%= link_to "New Co-Author", new_desktop_co_author_path, :class=>"bt-co-author" %>
 <%= link_to "New Type",  desktop_co_author_relations_path, :class=>"bt-new-type" %>
 <table>
+  <thead>
   <tr>
     <th>Name</th>
     <th>EMail</th>
@@ -10,7 +11,8 @@
     <th></th>
     <th></th>
   </tr>
-
+</thead>
+<tbody>
 <% @co_authors.each do |co_author| %>
   <tr>
     <td><%= co_author.co_author %></td>
@@ -20,5 +22,6 @@
     <td><%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?', :class=>"bt-delete"  %></td>
   </tr>
 <% end %>
+</tbody>
 </table>
 <br />