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

* 'publication' of https://github.com/Rulingcom/orbit:
  view update
This commit is contained in:
Rueshyna 2012-12-05 17:54:17 +08:00
commit 9b4a07a2b0
2 changed files with 7 additions and 5 deletions

View File

@ -260,7 +260,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
o.tinyscrollbar_ext({
main: '.tinycanvas',
fill: '.s_grid_con'
fill: '.g_col'
})
$("div[container=true]").unbind(".editcoauthor").on("click.editcoauthor", "a.bt-edit", function(){
$.ajax({

View File

@ -18,10 +18,12 @@
<%= link_to 'Edit', edit_desktop_co_author_path(co_author), :class => "bt-edit" %>
<%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?', :class=>"bt-delete" %>
</div>
<%= co_author.co_author %>
<%= co_author.email %>
<%= @co_author_relations.find(co_author.co_author_relations_id).relation \
unless co_author.co_author_relations_id.nil?%>
<ul class="info">
<li><%= co_author.co_author %></li>
<li><%= co_author.email %></li>
<li><%= @co_author_relations.find(co_author.co_author_relations_id).relation \
unless co_author.co_author_relations_id.nil?%></li>
</ul>
</li>
<% if ( i % 5 ) == 4 %>
</ul>