wangtao
/
trustieplus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

其他用户头像去除点击事件 课程搜索

This commit is contained in:
XuCheng642 2017-10-13 23:28:34 +08:00
parent ee5cec2add
commit 6b8956e9ef
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/managements_controller.rb
View File

@ -889,10 +889,10 @@ end
user_id = User.where("concat(lastname, firstname) like '%#{search}%'") user_id = User.where("concat(lastname, firstname) like '%#{search}%'")
@courselist = @courselist.includes(:user).where("concat(users.lastname, users.firstname) like '%#{search}%'") @courselist = @courselist.includes(:user).where("concat(users.lastname, users.firstname) like '%#{search}%'")
else else
@courselist= @courselist.where("name like '%#{search}%'") @courselist = @courselist.where("name like '%#{search}%'")
end end
end end
@courselist = @courselist.order("id #{@sx_order}") @courselist = @courselist.order("created_at #{@sx_order}")
@courselist_count = @courselist.count @courselist_count = @courselist.count
limit = 20 limit = 20
@is_remote = true @is_remote = true

14
app/views/users/show.html.erb
View File

@ -3,12 +3,16 @@
<div class="-task-con"> <div class="-task-con">
<div class="-task-con-per box_bg_shandow bor-grey-e cl"> <div class="-task-con-per box_bg_shandow bor-grey-e cl">
<div class="photo fl" onclick="window.open('<%=avatar_account_path%>')"> <% if current_user %>
<%= image_tag(url_to_avatar(@user), :class => "person",:width => 100, :height => 100, :alt => "头像") %> <div class="photo fl" onclick="window.open('<%=avatar_account_path%>')">
<% if current_user %> <%= image_tag(url_to_avatar(@user), :class => "person",:width => 100, :height => 100, :alt => "头像") %>
<div class="changephoto font-14"><a href="<%= avatar_account_path %>" class="subchange" style="display: block" target="_blank" >更换头像</a></div> <div class="changephoto font-14"><a href="<%= avatar_account_path %>" class="subchange" style="display: block" target="_blank" >更换头像</a></div>
<% end %> </div>
</div> <% else %>
<div class="photo fl">
<%= image_tag(url_to_avatar(@user), :class => "person",:width => 100, :height => 100, :alt => "头像") %>
</div>
<% end %>
<div class="-task-con-data fl"> <div class="-task-con-data fl">
<div class="top cl"> <div class="top cl">
<div class="top-left fl"> <div class="top-left fl">

2
public/stylesheets/css/edu-class.css
View File

@ -326,7 +326,7 @@ img.ui-datepicker-trigger {display:block;background:url(../images/public_icon.pn
.edu-class-innner-conbox{ background:#fff;} .edu-class-innner-conbox{ background:#fff;}
.edu-class-con-list{ padding:10px 0; border-bottom:1px solid #eee;} .edu-class-con-list{ padding:10px 0; border-bottom:1px solid #eee;}
.edu-class-con-list .edu-bg-grey{ background:#f5f5f5;} .edu-class-con-list .edu-bg-grey{ background:#f5f5f5;}
a.edu-class-inner-list{display: block; color:#333; font-size: 16px; max-width:87%; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} a.edu-class-inner-list{display: block; color:#333; font-size: 16px; max-width:77%; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
a:hover.edu-class-inner-list{color:#FF7500!important;} a:hover.edu-class-inner-list{color:#FF7500!important;}
.popup_tip_box {position: absolute; padding: 5px 15px; display: inline-block;white-space: nowrap; background-color: #FFFEF4;border: 1px solid #F3DDB3; color:#888; font-size:12px;} .popup_tip_box {position: absolute; padding: 5px 15px; display: inline-block;white-space: nowrap; background-color: #FFFEF4;border: 1px solid #F3DDB3; color:#888; font-size:12px;}
.popup_tip_box em { display: block; border-width: 9px; position: absolute; top: 5px; left: -18px; .popup_tip_box em { display: block; border-width: 9px; position: absolute; top: 5px; left: -18px;