jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
xianbo 2014-05-23 14:32:26 +08:00
parent 734caef3dc 4081ef93a3
commit be1a0e0fea
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/softapplications/_new_message.erb
View File

@ -28,6 +28,7 @@
</div> </div>
<% if User.current.logged? %> <% if User.current.logged? %>
<% unless User.current.id == @softapplication.user_id %>
<table border="0" width="525px" align="center" > <table border="0" width="525px" align="center" >
<tr> <tr>
<td><%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_my_respond), :style => "resize: none;", :class => 'noline'%></td> <td><%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_my_respond), :style => "resize: none;", :class => 'noline'%></td>
@ -43,7 +44,7 @@
<%= submit_tag l(:button_clear_requirement), :name => nil, :onclick => "clearMessage('softapplication_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td> <%= submit_tag l(:button_clear_requirement), :name => nil, :onclick => "clearMessage('softapplication_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
</tr> </tr>
</table> </table>
<!-- end --> <% end %>
<% else %> <% else %>
<div style="font-size: 14px;margin:10px;"> <div style="font-size: 14px;margin:10px;">
<%= l(:label_user_login_score_and_comment) %> <%= l(:label_user_login_score_and_comment) %>

2
app/views/softapplications/show.html.erb
View File

@ -120,8 +120,10 @@
<div style="height: 50px"> <div style="height: 50px">
<div style="font-size: 15px"><strong>作品评论：</strong></div> <div style="font-size: 15px"><strong>作品评论：</strong></div>
<% if (User.current.logged? and User.current.id != @softapplication.user_id) %>
<div style="padding-left: 210px">评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %> <div style="padding-left: 210px">评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
<span style="font-size: 11px">(您可以重新打分，打分结果以最后一次打分为主！)</span></div> <span style="font-size: 11px">(您可以重新打分，打分结果以最后一次打分为主！)</span></div>
<% end %>
</div> </div>