zaihui
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao

This commit is contained in:
daiao 2017-09-30 21:35:11 +08:00
parent 112f350995 ae68c11d84
commit 766f1a416e
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/games/_shixun_comment_block.html.erb
View File

@ -1,13 +1,13 @@
<%= content_for(:header_tags) do %>
<%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
<% end %>
<li class="comment-input fl" id="shixun_comment_block">
<li class="comment-input fl" id="shixun_comment_block" style="width: 80%;;">
<!-- <%#= form_for('', :url => {:controller => 'discusses', :action => 'create', :dis_id => @shixun.id, :dis_type => "Shixun", :challenge_id => @game_challenge.try(:id)}, :method => "post", :remote => true, :html => {:id => 'new_comment_form'}) do |f| %>
<textarea id="comment_news" name="content" placeholder="我想说点什么~" MultiLine = True ScrollBars = 2 type="text"></textarea>
<input type="hidden" id="dis_reply_id" name="reply_id" value="">
<%# end %>-->
<div nhname='new_message_<%= @shixun.id%>' class="fr ml20 mr20" style="display:none; width: 92%;">
<div nhname='new_message_<%= @shixun.id%>' class="fr" style="display:none; width: 99%;">
<%= form_for('discuss', :url => {:controller => 'discusses', :action => 'create', :dis_id => @shixun.id, :dis_type => "Shixun", :challenge_id => @game_challenge.try(:id)}, :method => "post", :remote => true, :html => {:id => 'new_comment_form'}) do |f| %>
<div nhname='toolbar_container_<%= @shixun.id%>'></div>
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @shixun.id %>' name="content"></textarea>

8
app/views/games/_shixun_comment_list.html.erb
View File

@ -1,8 +1,11 @@
<% no_children_comments = get_no_children_comments_all @discusses %>
<div class="fit -scroll">
<div class="-layout-v -fit">
<div class="-flex -scroll panel-box-sizing new_li task-padding10" id="game_comment_show" style="padding: 10px 15px;">
<div class="-flex -scroll panel-box-sizing new_li task-padding10" id="game_comment_show" style="padding: 0px;">
<div class="panel-comment_item">
<% if @discusses.blank? %>
<%= render :partial => "welcome/no_data" %>
<% else %>
<% no_children_comments.each do |comment| %>
<% unless comment.nil? %>
<script type="text/javascript">
@ -11,7 +14,7 @@
autoUrl('reply_content_<%= comment.id %>');
});
</script>
<div class="comment_item_cont clearfix">
<div class="comment_item_cont clearfix" style="padding:10px 10px">
<div class="J_Comment_Face fl">
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 50, :height => 50, :alt => "用户头像"), user_url_in_org(comment.creator_user), :target => '_blank' %>
</div>
@ -87,6 +90,7 @@
</div>
<% end %>
<% end %>
<% end %>
</div>
</div>
</div>

2
app/views/projects/_reply_to.html.erb
View File

@ -1,6 +1,6 @@
<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 fl" 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 nhname='new_message_<%= reply.id%>'>
<% if @type == 'Message' %>

4
app/views/student_work/_homework_reply_detail.html.erb
View File

@ -7,8 +7,8 @@
autoUrl('reply_content_<%= comment.id %>');
});
</script>
<div class="" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
<div class="orig_right fl" style="width: 90%">
<div class="with90 fl" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
<div class="orig_right" style="width: 96%">
<div class="orig_content clearfix" id="reply_content_<%= comment.id %>">
<%= comment.content_detail.html_safe %>
</div>

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

@ -1,6 +1,6 @@
<div class="<%= User.current.logged? ? 'orig_reply_box' : 'orig_reply_box2' %> borderBottomNone reply_to_message" 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 fl" 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 nhname='new_message_<%= reply.id%>'>
<% if @type == 'HomeworkCommon' %>

2
app/views/users/_reply_to_comment.html.erb
View File

@ -1,6 +1,6 @@
<div class="<%= User.current.logged? ? 'orig_reply_box' : 'orig_reply_box2' %> borderBottomNone mt10" 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 fl" 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 nhname='new_message_<%= reply.id%>'>
<%= form_for('new_form',:url => {:controller => 'users', :action => 'reply_detail', :reply_id => reply.id, :type => @type, :is_project => @is_project, :user_activity_id => @user_activity_id},:method => "post", :remote => true) do |f| %>