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

@@ -304,9 +304,25 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
         })
         return false;
       })
+      $("a.bt-new-type").click(function(){
+        $.ajax({
+            url : $(this).attr("href"),
+            type : "get",
+            success : function(data){
+              var prev_data = $("div[container=true]").html();
+              $("div[container=true]").html(data);
+              o.tinyscrollbar_ext({
+                main: '.tinycanvas',
+                fill: '.s_grid_con'
+              })
+              $(".bt-cancel").click(function(){
+                $("div[container=true]").html(prev_data);
+              })
+            }
+          })
+          return false;
+      })
     }
     bindHandlers();
   }
-
-
-  };
+};

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

@@ -1,6 +1,6 @@
 <h1>list all coauthor</h1>
 <%= link_to "New Co-Author", new_desktop_co_author_path %>
-<%= link_to "New Type",  desktop_co_author_relations_path %>
+<%= link_to "New Type",  desktop_co_author_relations_path, :class=>"bt-new-type" %>
 <table>
   <tr>
     <th>Name</th>