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

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

This commit is contained in:
huang 2017-06-05 15:35:33 +08:00
parent cda61e73fa af44ac07a6
commit e06c81639b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/courses/_courseList.html.erb
View File

@ -1,14 +1,14 @@
<% @syllabuses.each do | sy | %>
<div class="sub-con fl" style="cursor: default;">
<div class="task-index-list-box-top ">
<a href="<%= syllabus_path(sy) %>" title="<%= sy.title %>" target="_blank" >
<div class="task-index-list-box-top">
<a href="<%= syllabus_path(sy) %>" title="<%= sy.title %>" target="_blank">
<p class="font-14 task-index-list-title two_lines_show">
<%= sy.title %>
</p>
</a>
<div class=" clearfix task-index-list-user">
<img src="images/user/female.jpg" width="60" height="60" alt="用户" class="panel-warp-img mr10 fl">
<a href="#" class="task-index-name task-hide fl">Cillian</a>
<div class="clearfix task-index-list-user">
<%= link_to image_tag(url_to_avatar(sy.user), :width => "60", :height => "60", :class => "panel-warp-img mr10 fl", :alt => "用户"), user_path(sy.user), :target => '_blank' %>
<%= link_to sy.user.show_name, user_path(sy.user), :class => 'task-index-name task-hide fl', :target => '_blank' %>
</div>
<p class="color-grey">
<% sy_author = User.find(sy.user_id) %>

12
app/views/users/_edu_user_watch_fan_list.html.erb
View File

@ -31,9 +31,9 @@
<dd class="mb10"><%= link_to user.show_name, user_path(user), :target => '_blank' %></dd>
</dl>
<% end %>
<% if @user_watchlist_count > 12 %>
<%= link_to '查看更多', user_watchlist_user_path(@user), :target => '_blank', :class => 'color-grey many' %>
<% end %>
<%# if @user_watchlist_count > 12 %>
<%#= link_to '查看更多', user_watchlist_user_path(@user), :target => '_blank', :class => 'color-grey many' %>
<%# end %>
</div>
<% end %>
</div>
@ -55,9 +55,9 @@
<dd class="mb10"><%= link_to user.show_name, user_path(user), :target => '_blank' %></dd>
</dl>
<% end %>
<% if @user_fanlist_count > 12 %>
<%= link_to '查看更多', user_fanslist_user_path(@user), :target => '_blank', :class => 'color-grey many' %>
<% end %>
<%# if @user_fanlist_count > 12 %>
<%#= link_to '查看更多', user_fanslist_user_path(@user), :target => '_blank', :class => 'color-grey many' %>
<%# end %>
</div>
<% end %>
</div>