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

Merge branch 'yuanke' into develop

This commit is contained in:
yuanke 2016-06-17 17:25:53 +08:00
parent 1135e99b5a 948ec58248
commit f3014c3993
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/users/_reply_to.html.erb
View File

@ -1,7 +1,7 @@
<div class="orig_reply_box borderBottomNone" id="reply_to_message_<%= reply.id%>"> <div class="<%= User.current.logged? ? 'orig_reply_box' : 'orig_reply_box2' %> borderBottomNone" id="reply_to_message_<%= reply.id%>">
<% if User.current.logged? %>
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div> <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
<div class="orig_textarea mb10 fl"> <div class="orig_textarea mb10 fl">
<% if User.current.logged? %>
<div nhname='new_message_<%= reply.id%>'> <div nhname='new_message_<%= reply.id%>'>
<%= form_for('new_form',:url => {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %> <%= form_for('new_form',:url => {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
<input type="hidden" name="is_in_course" value=<%=@is_in_course %>> <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
@ -16,7 +16,7 @@
<% end%> <% end%>
</div> </div>
<% else %> <% else %>
<%= render :partial => "users/show_unlogged" %> <%= render :partial => "users/show_unlogged_reply" %>
<% end %> <% end %>
<div class="cl"></div> <div class="cl"></div>
</div> </div>

4
app/views/users/_show_unlogged_reply.html.erb Normal file
View File

@ -0,0 +1,4 @@
<div class="visitor-box fontGrey2 mt10">
<a href='<%= signin_url_without_domain %>' class='linkBlue' target='_Blank' >登录</a>后可添加回复
<%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
</div>

1
public/stylesheets/courses.css
View File

@ -1372,6 +1372,7 @@ a:hover.comment_ding_link{ color:#269ac9;}
.comment_content{ color:#333;} .comment_content{ color:#333;}
.t_txt{ margin-top:10px;} .t_txt{ margin-top:10px;}
.orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;} .orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
.orig_reply_box2{border-top:1px solid #e3e3e3; width:95%; padding:10px 25px 10px 0;}
.orig_textarea{width:90%; margin-bottom:10px;} .orig_textarea{width:90%; margin-bottom:10px;}
.orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;} .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
.orig_sub:hover{ background:#297fb8;} .orig_sub:hover{ background:#297fb8;}

1
public/stylesheets/new_user.css
View File

@ -1553,6 +1553,7 @@ a:hover.comment_ding_link{ color:#269ac9;}
.comment_content{ color:#333;} .comment_content{ color:#333;}
.t_txt{ margin-top:10px;} .t_txt{ margin-top:10px;}
.orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;} .orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
.orig_reply_box2{border-top:1px solid #e3e3e3; width:95%; padding:10px 25px 10px 0;}
.orig_textarea{width:90%; margin-bottom:10px;} .orig_textarea{width:90%; margin-bottom:10px;}
.orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;} .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
.orig_sub:hover{ background:#297fb8;} .orig_sub:hover{ background:#297fb8;}