saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent e64306e133 6006965870
commit 9b4a07a2b0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/desktop/journal_pages.js.erb
View File

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

10
app/views/desktop/co_authors/index.html.erb
View File

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