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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
huang 2016-08-01 09:50:31 +08:00
parent f7e8c5232c 87e3707b52
commit 3feb0680cc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@
<p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
<p>申请课程：<%= Course.find(ma.course_id).name%></p>
<div class="fl">课程描述：</div>
<div class="ml60"><%= Course.find(ma.course_id).description.html_safe if Course.find(ma.course_id).description %></div> <p>申请职位：<%= ma.content.include?('9') ? "教师" : "教辅"%></p>
<div class="ml60"><%= Course.find(ma.course_id).description.html_safe if Course.find(ma.course_id).description %></div> <p>申请职位：<%=ma.content && ma.content.include?('9') ? "教师" : "教辅"%></p>
</div>
<li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
<span id="deal_info_<%=ma.id%>">

4
app/views/users/_user_message_applied.html.erb
View File

@ -5,7 +5,7 @@
<ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl">
<a href="javascript:void(0);">
<% if ma.status == 1 || ma.status == 2 || ma.status == 3%>
<% if ma.status == 1 || ma.status == 2 || ma.status == 3 %>
<%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
<% elsif ma.status == 4 %>
<%= link_to image_tag(url_to_avatar(ma.user), :width => "30", :height => "30"), user_path(ma.user), :target => '_blank' %>
@ -31,7 +31,7 @@
<span class="newsBlue homepageNewsPublisher">系统提示</span>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
<li class="homepageNewsContent fl">
<%= link_to ma.name + "的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料", { :controller=> "my",:action => "account" }, :title => "#{ma.name}的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料", :target => '_blank'%>
<%= link_to "“"+ma.name+"”" + "的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料", { :controller=> "my",:action => "account" }, :title => "“#{ma.name}”的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料", :target => '_blank'%>
</li>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
<% elsif ma.status == 4 %>