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:
daiao 2017-07-28 19:14:52 +08:00
parent 0e4cb4e613 51c4d8ed23
commit 079c9b441d
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/layouts/_logined_header.html.erb
View File

@ -41,13 +41,7 @@
<!--<li><%#= link_to '我的主页', user_path(User.current) %></li>-->
<li><%= link_to '我的课堂', syllabuses_path() %></li>
<li><%= link_to '我的实训', shixuns_user_path(User.current) %></li>
<li class="pr">
<%= link_to '我的留言', feedback_path(User.current, :host=> Setting.host_user) %>
<% onclick_time = User.current.onclick_time.onclick_time %>
<% if User.current.journals_for_messages.where("created_on > '#{onclick_time}'").count > 0 %>
<span class="inner-nav-cir ml5 mt5" style="position: absolute; font-style: italic;">new</span>
<% end %>
</li>
<li class="pr"><%= link_to '我的留言', feedback_path(User.current, :host=> Setting.host_user) %></li>
<span class="task-line"></span>
<li><%= link_to '修改资料', my_account_path %></li>
<li><%= link_to '退出', logout_url_without_domain %></li>

1
app/views/users/_course_boardlist.html.erb
View File

@ -32,6 +32,7 @@
</p>
<p class="fr panel-lightgrey">
<!--<span class="mr10"><i class="fa fa-eye color-grey mr5 "></i>473</span>-->
<span class="mr10"><i class="fa fa-eye color-grey mr5"></i><%= activity.visits %></span>
<span class="mr10"><i class="fa fa-thumbs-o-up color-grey mr5"></i><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span>
<span class="mr10"><i class="fa fa-comments-o color-grey mr5"></i><%= count %></span>
</p>

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

@ -100,9 +100,14 @@
<% update_visiti_count @user %>
<span><%= @user.visits.to_i %></span> 次访问
</p>
<p class="p3 font-14">
<span class="mr10 color-grey-6">经验值<span class="ml5 color-orange02"><%= @user.experience %></span></span>
<span class="color-grey-6">金币<span class="ml5 color-orange02"><%= @user.grade %></span></span>
<p class="p3 fr font-14">
<% onclick_time = User.current.onclick_time.onclick_time %>
<% new_message_count = User.current.journals_for_messages.where("created_on > '#{onclick_time}'").count %>
<% if new_message_count > 0 %>
<a href="<%= feedback_path(User.current) %>" class="fl mr10 link-color-grey">新留言<span style="margin-top: 5px;" class="user_filtrate_span2 user_filtrate_span2_bg ml10"><%= new_message_count %></span></a>
<% end %>
<span class="fl mr10 color-grey-6">经验值<span class="ml5 user_filtrate_span1_bg"><%= @user.experience %></span></span>
<span class="fl color-grey-6">金币<span class="ml5 user_filtrate_span1_bg"><%= @user.grade %></span></span>
</p>
<!-- <p class="p3">帐户安全：
<a class="<%#= @user.phone.blank? ? 'color-grey' : 'color-green' %>" href="<%#= security_settings_path %>">

1
public/stylesheets/css/edu-user.css
View File

@ -16,7 +16,6 @@
.-task-con-data .top .top-right .mynew p a{color:#5789c8;}
.-task-con-data .top .top-right .mynew .p2{color:#ccc;}
/*.-task-con-data .top .top-right .mynew .p3{display:flex;align-items: center;}*/
.-task-con-data .top .top-right .mynew .p3 a{position:relative;display:inline-block;width:16px;height:16px;overflow:hidden;top:2px;}
/*亮色手机*/
.-task-con-data .top .top-right .mynew .p3 a img{position:absolute;top:0;left:0;}
/*暗色手机*/