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

用户申请加入班级，被管理员审批后，用户收到的消息调整

This commit is contained in:
daiao 2017-01-05 14:32:33 +08:00
parent 602870069f
commit 25d8452b86
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/new_base_user.html.erb
View File

@ -170,7 +170,7 @@
<%= link_to user_course_count > 0 ? "课程<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top: 9px;font-size: 11px;background-color:#f5f2f2;color:#666;'>#{user_course_count}</span>".html_safe : "课程",
user_course_community_path(User.current), :id => "user_course_list", :target => "_blank" %>
</li>
<% if user_manage_homework_count %>
<% if user_manage_homework_count > 0 %>
<li class="home-user-leftnav-li icons-homework clear">
<%= link_to user_manage_homework_count > 0 ? "我发布的作业<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top:9px;font-size:11px;background-color:#f5f2f2;color:#666;'>#{user_manage_homework_count}</span>".html_safe : "我发布的作业",
user_manage_homeworks_user_path(@user), :target => "_blank" %>

34
app/views/users/_user_message_course.html.erb
View File

@ -704,34 +704,34 @@
<% end %>
<% if ma.course_message_type == "CourseRequestDealResult" %>
<ul class="homepageNewsList fl">
<div class="longMessageWidth">
<div class="shortMessageWidth">
<li class="homepageNewsPortrait fl">
<div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
<%= link_to image_tag(url_to_avatar(User.find(ma.user_id)), :width => "30", :height => "30"), user_path(User.find(ma.user_id)), :target => '_blank' %>
<!--<div class="navHomepageLogo fl"><%#= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>-->
</li>
<li class="homepageNewsPubType fl">
<span class="newsBlue homepageNewsPublisher">系统提示</span>
<span class="newsBlue homepageNewsPublisher">
<%=link_to User.find(ma.user_id).show_name, user_path(User.find(ma.user_id)),
:class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
</span>
<span class="homepageNewsType fl">
班级申请进度反馈：</span>
申请以“<%= ma.content.include?('9') ? '教师' : '教辅' %>”身份加入：
</span>
</li>
<li class="messageInformationContents">
<%= link_to ma.status == 1 ?
'您申请成为班级"'+Course.find(ma.course_id).name+'"的'+(ma.content.include?('9') ? '教师' : '教辅')+'申请已通过'
:
'您申请成为班级"'+Course.find(ma.course_id).name+'"的'+(ma.content.include?('9') ? '教师' : '教辅')+'的申请被拒绝', course_path(Course.find(ma.course_id)),
<%= link_to Course.find(ma.course_id).name, course_path(Course.find(ma.course_id)),
:class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<!--:onmouseover => "message_titile_show($(this),event)",-->
<!--:onmouseout => "message_titile_hide($(this))" %>-->
</li>
</div>
<div style="display: none" class="message_title_red system_message_style">
<p>
<%= User.current.lastname + User.current.firstname %>老师您好！您已成功加入班级<%= Course.find(ma.course_id).name%>。
</p>
<p>申请班级：<%= Course.find(ma.course_id).name%></p>
<div class="fl">班级描述：</div>
<div class="ml60"><%= Course.find(ma.course_id).description.nil? ? "" : Course.find(ma.course_id).description.html_safe %></div>
<p>申请职位：<%= ma.content == '9' ? "教师" : "教辅"%></p>
</div>
<li class="messageOperateContents fl">
<% if ma.status == 1 %>
<%= User.find(ma.course_message_id).show_name%>已通过
<% else %>
<%= User.find(ma.course_message_id).show_name%>已拒绝
<% end %>
</li>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<% end %>