p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
yanxd 2014-03-11 11:28:19 +08:00
parent 6fd970973d 6b8e51211a
commit ffad898914
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/views/memos/show.html.erb
View File

@ -12,7 +12,13 @@
:method => 'get', :method => 'get',
:title => l(:button_quote) :title => l(:button_quote)
)if !@memo.locked? && User.current.logged? %> --> )if !@memo.locked? && User.current.logged? %> -->
<%= link_to(l(:button_quote))if !@memo.locked? && User.current.logged? %> <%= link_to(
l(:button_quote),
{:action => 'quote', :id => @memo},
:remote => true,
:method => 'get',
:title => l(:button_quote)
)if !@memo.locked? && User.current.logged? %>
<%= link_to( <%= link_to(
image_tag('edit.png'), image_tag('edit.png'),
@ -20,13 +26,22 @@
:method => 'get', :method => 'get',
:title => l(:button_edit) :title => l(:button_edit)
) if @memo.editable_by?(User.current) %> ) if @memo.editable_by?(User.current) %>
<%= link_to( <!-- <%= link_to(
image_tag('delete.png'), image_tag('delete.png'),
{:action => 'destroy', :id => @memo}, {:action => 'destroy', :id => @memo},
:method => :delete, :method => :delete,
:data => {:confirm => l(:text_are_you_sure)}, :data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete) :title => l(:button_delete)
) if @memo.destroyable_by?(User.current) %> -->
<%= link_to(
l(:button_delete),
{:action => 'destroy', :id => @memo},
:method => :delete,
:data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete)
) if @memo.destroyable_by?(User.current) %> ) if @memo.destroyable_by?(User.current) %>
</div> </div>
<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div> <div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
@ -59,20 +74,34 @@
:method => 'get', :method => 'get',
:title => l(:button_quote) :title => l(:button_quote)
)if !@memo.locked? && User.current.logged? %> --> )if !@memo.locked? && User.current.logged? %> -->
<%= link_to(l(:button_quote))if !@memo.locked? && User.current.logged? %> <%= link_to(
l(:button_quote),
{:action => 'quote', :id => reply},
:remote => true,
:method => 'get',
:title => l(:button_quote)
)if !@memo.locked? && User.current.logged? %>
<%= link_to( <%= link_to(
image_tag('edit.png'), image_tag('edit.png'),
{:action => 'edit', :id => reply}, {:action => 'edit', :id => reply},
:title => l(:button_edit) :title => l(:button_edit)
) if reply.editable_by?(User.current) %> ) if reply.editable_by?(User.current) %>
<%= link_to( <!-- <%= link_to(
image_tag('delete.png'), image_tag('delete.png'),
{:action => 'destroy', :id => reply}, {:action => 'destroy', :id => reply},
:method => :delete, :method => :delete,
:data => {:confirm => l(:text_are_you_sure)}, :data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete) :title => l(:button_delete)
) if reply.destroyable_by?(User.current) %> ) if reply.destroyable_by?(User.current) %> -->
<%= link_to(
l(:button_delete),
{:action => 'destroy', :id => reply},
:method => :delete,
:data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete)
) if reply.destroyable_by?(User.current) %>
</div> </div>
<table class="borad-text-list"> <table class="borad-text-list">