消息通知
This commit is contained in:
parent
88505a22a4
commit
0da8977115
|
@ -490,6 +490,7 @@ class UsersController < ApplicationController
|
|||
# 说明: homework 发布作业;message:讨论区; news:新闻; poll:问卷;works_reviewers:作品评阅;works_reply:作品回复,exercise:课程测验
|
||||
# issue:问题;journal:缺陷状态更新; forum:公共贴吧: user_feedback: 用户留言; new_reply:新闻回复(comment)
|
||||
def user_messages
|
||||
@msg_type = params[:type] || "all"
|
||||
if !User.current.logged?
|
||||
redirect_to signin_url
|
||||
return
|
||||
|
@ -498,71 +499,38 @@ class UsersController < ApplicationController
|
|||
end
|
||||
# 初始化/更新 点击按钮时间, 24小时内显示系统消息
|
||||
update_onclick_time
|
||||
user_all_messages = MessageAll.where(:user_id => @user.id).includes(:message)
|
||||
# 全部设为已读
|
||||
# if params[:viewed] == "all"
|
||||
# update_message_viewed(@user)
|
||||
# end
|
||||
# @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
|
||||
courses = @user.courses.where("is_delete = 1")
|
||||
course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
|
||||
case params[:type]
|
||||
when nil
|
||||
# 系统消息为管理员发送,我的消息中包含有系统消息
|
||||
@message_alls = []
|
||||
messages = MessageAll.where(:user_id => @user.id).includes(:message).order("created_at desc")
|
||||
messages.each do |message_all|
|
||||
mess = message_all.message
|
||||
unless (message_all.message_type == 'CourseMessage' && mess && mess.course && mess.course.is_delete == 1)
|
||||
@message_alls << mess
|
||||
end
|
||||
end
|
||||
when 'unviewed'
|
||||
@message_alls = []
|
||||
messages = MessageAll.where("message_alls.user_id =?", @user.id).includes(:message).order("created_at desc")
|
||||
messages.each do |message_all|
|
||||
# 在点击或者刷新消息列表后未读的消息存放在数组
|
||||
mess = message_all.message
|
||||
if message_all.message_type != "SystemMessage"&& !mess.nil? && (mess.viewed == 0 || !mess.viewed)
|
||||
unless (message_all.message_type == 'CourseMessage' && mess && mess.course && mess.course.is_delete == 1)
|
||||
@message_alls << mess
|
||||
end
|
||||
end
|
||||
end
|
||||
#课程相关消息
|
||||
when 'homework'
|
||||
@message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','StudentWork','Exercise') and user_id =? and course_id NOT IN #{course_ids}", @user.id).order("created_at desc")
|
||||
when 'course_message'
|
||||
@message_alls = CourseMessage.where("course_message_type =? and user_id =? and course_id NOT IN #{course_ids}", "Message", @user.id).order("created_at desc")
|
||||
when 'course_news'
|
||||
# 课程通知包含发布的通知和回复的通知
|
||||
@message_alls = CourseMessage.where("course_message_type in ('News', 'Comment') and user_id =? and course_id NOT IN #{course_ids}", @user.id).order("created_at desc")
|
||||
when 'poll'
|
||||
@message_alls = CourseMessage.where("course_message_type =? and user_id =? and course_id NOT IN #{course_ids}", "Poll", @user.id).order("created_at desc")
|
||||
#项目相关消息
|
||||
when 'issue'
|
||||
@message_alls = ForgeMessage.where("forge_message_type in ('Issue', 'Journal') and user_id =?" , @user.id).order("created_at desc")
|
||||
when 'forge_message'
|
||||
@message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user.id).order("created_at desc")
|
||||
when 'forge_news'
|
||||
@message_alls = ForgeMessage.where("forge_message_type in (?,?) and user_id =?", "News", "Comment", @user.id).order("created_at desc")
|
||||
when 'apply'
|
||||
@message_alls = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'AppliedProject', 'JoinProject', 'RemoveFromProject') and user_id =?", @user.id).order("created_at desc")
|
||||
#贴吧消息
|
||||
when 'forum'
|
||||
@message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user.id).order("created_at desc")
|
||||
#用户留言
|
||||
when 'user_feedback'
|
||||
@message_alls = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "JournalsForMessage", @user.id).order("created_at desc")
|
||||
else
|
||||
render_404
|
||||
return
|
||||
end
|
||||
|
||||
@message_alls = paginateHelper @message_alls, 25
|
||||
case @msg_type
|
||||
when "all"
|
||||
@message_alls = user_all_messages
|
||||
when "course"
|
||||
@message_alls = user_all_messages.where(message_type: "CourseMessage")
|
||||
when "project"
|
||||
@message_alls = user_all_messages.where(message_type: "ForgeMessage")
|
||||
when "at"
|
||||
@message_alls = user_all_messages.where(message_type: %w(UserFeedbackMessage MemoMessage AtMessage BlogMessage))
|
||||
when "apply"
|
||||
@message_alls = user_all_messages.where(message_type: "AppliedMessage")
|
||||
else
|
||||
@message_alls = user_all_messages.where(message_type: %w(SystemMessage ContestMessage OrgMessage))
|
||||
end
|
||||
@unred_all_messages = @message_alls.map{|m| (m.message_type != "SystemMessage") &&( m.message.try(:viewed) == 0)}.size
|
||||
@message_alls = @message_alls.order("created_at desc")
|
||||
|
||||
@limit = 20
|
||||
@message_count = @message_alls.count
|
||||
# @message_alls = paginateHelper @message_alls, 25
|
||||
@message_all_pages = Paginator.new @message_count, @limit, params['page'] || 1
|
||||
@offset ||= @message_all_pages.offset
|
||||
# @message_alls = messages_all
|
||||
@message_alls = paginateHelper @message_alls, @limit
|
||||
respond_to do |format|
|
||||
format.js
|
||||
format.html{render :layout=>'new_base_user'}
|
||||
format.html{render layout: "base_user_message"}
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
# 初始化/更新 点击按钮时间
|
||||
|
|
|
@ -0,0 +1,45 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title><%= h html_title %></title>
|
||||
<meta name="description" content="<%= Redmine::Info.app_name %>" />
|
||||
<meta name="keywords" content="issue,bug,tracker" />
|
||||
<%= csrf_meta_tag %>
|
||||
<%= favicon %>
|
||||
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', 'css/font-awesome.css','css/iconfont/iconfont', :media => 'all' %>
|
||||
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
|
||||
<%= javascript_heads %>
|
||||
<%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
|
||||
<%= heads_for_theme %>
|
||||
<%= call_hook :view_layouts_base_html_head %>
|
||||
<%= yield :header_tags -%>
|
||||
</head>
|
||||
<body onload="prettyPrint();">
|
||||
<div class="pageContainer">
|
||||
<div class="navContainer">
|
||||
<% if User.current.logged? %>
|
||||
<%= render :partial => 'layouts/logined_header' %>
|
||||
<% else%>
|
||||
<%= render :partial => 'layouts/unlogin_header' %>
|
||||
<% end%>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
<div class="homepageContentContainer">
|
||||
<div class="mt15">
|
||||
<div class="df middlePanel">
|
||||
<div class="fl pagePanel_left">
|
||||
<%= render partial: "users/user_message_left" %>
|
||||
</div>
|
||||
<div class="fl pagePanel_right mb20">
|
||||
<%= yield %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= render :partial => 'layouts/footer' %>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
|
@ -1,16 +1,34 @@
|
|||
<div class="shortMessageWidth">
|
||||
<li class="homepageNewsPortrait fl">
|
||||
<%=link_to image_tag(url_to_avatar(ma.applied), :width => "30", :height => "30"), organization_path(ma.applied_id), :target => '_blank' %>
|
||||
</li>
|
||||
<li class="homepageNewsPubType fl">
|
||||
<%=link_to ma.applied.name, organization_path(ma.applied_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
|
||||
<span class='homepageNewsType fl'>申请子域名:</span>
|
||||
</li>
|
||||
<li class="messageInformationContents">
|
||||
<!--<div class="shortMessageWidth">-->
|
||||
<!-- <li class="homepageNewsPortrait fl">-->
|
||||
<%#=link_to image_tag(url_to_avatar(ma.applied), :width => "30", :height => "30"), organization_path(ma.applied_id), :target => '_blank' %>
|
||||
<!-- </li>-->
|
||||
<!-- <li class="homepageNewsPubType fl">-->
|
||||
<%#=link_to ma.applied.name, organization_path(ma.applied_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
|
||||
<!-- <span class='homepageNewsType fl'>申请子域名:</span>-->
|
||||
<!-- </li>-->
|
||||
<!-- <li class="messageInformationContents">-->
|
||||
<%#= ma.name %>
|
||||
<!-- </li>-->
|
||||
<!--</div>-->
|
||||
<!--<li class="messageOperateContents fl">-->
|
||||
<!-- <span><%#= render :partial => "users/user_message_organization_applied_action", :locals => {:ma => ma} %></span>-->
|
||||
<!--</li>-->
|
||||
<!--<li class="homepageNewsTime fr"><%#= time_tag(ma.updated_at).html_safe %> </li>-->
|
||||
|
||||
|
||||
<%=link_to image_tag(url_to_avatar(ma.applied), :width => "30", :height => "30"), organization_path(ma.applied_id), :target => '_blank' %>
|
||||
<div>
|
||||
<p class="lh25 mb10">
|
||||
<span class="mr20 f16 color-grey3">
|
||||
<%=link_to ma.applied.name, organization_path(ma.applied_id), :target => '_blank' %>
|
||||
</span>
|
||||
<span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
|
||||
<span><%= render :partial => "users/user_message_organization_applied_action", :locals => {:ma => ma} %></span>
|
||||
</p>
|
||||
<p class="c_grey02 f14">
|
||||
<span class="homepageNewsType fl">
|
||||
申请子域名:
|
||||
</span>
|
||||
<%= ma.name %>
|
||||
</li>
|
||||
</div>
|
||||
<li class="messageOperateContents fl">
|
||||
<span><%= render :partial => "users/user_message_organization_applied_action", :locals => {:ma => ma} %></span>
|
||||
</li>
|
||||
<li class="homepageNewsTime fr"><%= time_tag(ma.updated_at).html_safe %> </li>
|
||||
</p>
|
||||
</div>
|
|
@ -1,96 +1,10 @@
|
|||
<div class="mt20">
|
||||
<div class="df middlePanel">
|
||||
<div class="fl pagePanel_left">
|
||||
<div class="mb15 l_headPhoto">
|
||||
<div class="l_img">
|
||||
<% if User.current.logged? && User.current == @user %>
|
||||
<%= link_to image_tag(url_to_avatar(@user),width:"238", height: "238", :id => 'nh_source_tx'),
|
||||
my_clear_user_avatar_temp_path, :remote => true %>
|
||||
<% else %>
|
||||
<%=image_tag(url_to_avatar(@user),width:"238", height: "238", :id=>'nh_source_tx') %>
|
||||
<% end %>
|
||||
</div>
|
||||
<p><%= link_to @user.show_name, user_path(@user), :class => "f22 color-grey3" %></p>
|
||||
<p>
|
||||
<% if @user.user_extensions && @user.user_extensions.identity %>
|
||||
<span class="f18"><%= get_user_roll @user %></span>
|
||||
<% end%>
|
||||
</p>
|
||||
</div>
|
||||
<div class="l_InfoNav mb20">
|
||||
<li class="clearfix active">
|
||||
<a href="javascript:void(0)" class="ml30">消息</a>
|
||||
<span class="readingNum">20</span>
|
||||
</li>
|
||||
<li class="clearfix">
|
||||
<a href="javascript:void(0)" class="ml30">私信</a>
|
||||
</li>
|
||||
</div>
|
||||
</div>
|
||||
<div class="fl pagePanel_right mb20">
|
||||
<div class="r_infos_menu">
|
||||
<li class="active"><a href="javascript:void(0)">全部</a></li>
|
||||
<li><a href="javascript:void(0)">课堂提醒</a></li>
|
||||
<li><a href="javascript:void(0)">项目提醒</a></li>
|
||||
<li><a href="javascript:void(0)">互动提醒</a></li>
|
||||
<li><a href="javascript:void(0)">审核</a></li>
|
||||
<li><a href="javascript:void(0)">通知</a></li>
|
||||
</div>
|
||||
<ul class="p_list_ul">
|
||||
<li>
|
||||
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
|
||||
<div>
|
||||
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span><span class="infoTips tips_high ml15">高</span></p>
|
||||
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
|
||||
<div>
|
||||
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span>
|
||||
<span class="infoTips tips_rightNow ml15">立刻</span></p>
|
||||
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
|
||||
<div>
|
||||
<p class="lh25 mb10">
|
||||
<span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span>
|
||||
<span class="infoTips tips_normal ml15">正常</span>
|
||||
</p>
|
||||
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
|
||||
<div>
|
||||
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span>
|
||||
<span class="infoTips tips_urgent ml15">紧急</span></p>
|
||||
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<img src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3276179142,1686381254&fm=26&gp=0.jpg" class="r_list_img" />
|
||||
<div>
|
||||
<p class="lh25 mb10"><span class="mr20 f16 color-grey3">阿黄</span><span class="fontGrey4 f12">1个月前</span><span class="infoTips tips_low ml15">低</span></p>
|
||||
<p class="c_grey02 f14">更新了issue: 首次创建实训后没有默认脚本</p>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$(function () {
|
||||
$(".l_InfoNav").on("click","li",function () {
|
||||
$(".l_InfoNav li").removeClass("active");
|
||||
$(this).addClass("active");
|
||||
})
|
||||
<%= render partial: "users/user_message_header" %>
|
||||
|
||||
<% if @message_count > 0 %>
|
||||
<ul class="p_list_ul">
|
||||
<%= render :partial => 'users/new_user_message', :locals => { :message_alls => @message_alls } %>
|
||||
</ul>
|
||||
<% else %>
|
||||
<%= render partial: "users/no_data" %>
|
||||
<% end %>
|
||||
|
||||
$(".r_infos_menu").on("click","li",function () {
|
||||
$(".r_infos_menu li").removeClass("active");
|
||||
$(this).addClass("active");
|
||||
})
|
||||
})
|
||||
</script>
|
|
@ -47,7 +47,9 @@
|
|||
|
||||
<!--子域名申请通知-->
|
||||
<% if ma.class == OrgMessage %>
|
||||
<%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
|
||||
<li>
|
||||
<%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<%# 申请类消息 %>
|
||||
|
|
|
@ -35,9 +35,9 @@
|
|||
<div>
|
||||
<p class="lh25 mb10">
|
||||
<span class="mr20 f16 color-grey3">
|
||||
<%= link_to ma.author.try(:show_name), user_path(ma.author_id), :target => "_blank", :title => "#{ma.author.try(:show_name)}" %>
|
||||
<%= link_to ma.author.try(:show_name), user_path(ma.author), :target => "_blank", :title => "#{ma.author.try(:show_name)}" %>
|
||||
</span>
|
||||
<span class="fontGrey4 f12"><%= time_from_now(ma.updated_on) %></span>
|
||||
<span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
|
||||
</p>
|
||||
<p class="c_grey02 f14">
|
||||
<span class="homepageNewsType fl">
|
||||
|
@ -48,15 +48,15 @@
|
|||
:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id,
|
||||
:topic_id => ma.at_message.id),
|
||||
:title => "#{ma.subject.html_safe}",
|
||||
:class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
|
||||
:class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", target: "_blank" %>
|
||||
<% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
|
||||
<%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
|
||||
:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id,
|
||||
:topic_id => ma.at_message.id),
|
||||
:title => "#{ma.subject.html_safe}",
|
||||
:class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
|
||||
:class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", target: "_blank" %>
|
||||
<% else %>
|
||||
<%= link_to ma.subject.html_safe, ma.url,
|
||||
<%= link_to ma.subject.html_safe, "javascript:void(0)",
|
||||
:class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
|
||||
:title => "#{ma.subject.html_safe}" %>
|
||||
<% end %>
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
<div class="r_infos_menu">
|
||||
<li class="<%= @msg_type == "all" ? "active" : "" %>">
|
||||
<%= link_to "全部", user_message_path(current_user, type: "all"), remote: true %>
|
||||
</li>
|
||||
<li class="<%= @msg_type == "course" ? "active" : "" %>"><%= link_to "课堂提醒", user_message_path(current_user, type: "course"), remote: true %></li>
|
||||
<li class="<%= @msg_type == "project" ? "active" : "" %>"><%= link_to "项目提醒", user_message_path(current_user, type: "project"), remote: true %></li>
|
||||
<li class="<%= @msg_type == "at" ? "active" : "" %>"><%= link_to "互动提醒", user_message_path(current_user, type: "at"), remote: true %></li>
|
||||
<li class="<%= @msg_type == "apply" ? "active" : "" %>"><%= link_to "审核", user_message_path(current_user, type: "apply"), remote: true %></li>
|
||||
<li class="<%= @msg_type == "notice" ? "active" : "" %>"><%= link_to "通知", user_message_path(current_user, type: "notice"), remote: true %></li>
|
||||
</div>
|
|
@ -0,0 +1,25 @@
|
|||
<div class="mb15 l_headPhoto">
|
||||
<div class="l_img">
|
||||
<% if User.current.logged? && User.current == @user %>
|
||||
<%= link_to image_tag(url_to_avatar(@user),width:"238", height: "238", :id => 'nh_source_tx'),
|
||||
my_clear_user_avatar_temp_path, :remote => true %>
|
||||
<% else %>
|
||||
<%=image_tag(url_to_avatar(@user),width:"238", height: "238", :id=>'nh_source_tx') %>
|
||||
<% end %>
|
||||
</div>
|
||||
<p><%= link_to @user.show_name, user_path(@user), :class => "f22 color-grey3" %></p>
|
||||
<p>
|
||||
<% if @user.user_extensions && @user.user_extensions.identity %>
|
||||
<span class="f18"><%= get_user_roll @user %></span>
|
||||
<% end%>
|
||||
</p>
|
||||
</div>
|
||||
<div class="l_InfoNav mb20">
|
||||
<li class="clearfix active">
|
||||
<a href="javascript:void(0)" class="ml30">消息</a>
|
||||
<span class="readingNum" id="unread-message-count-<%= @user.login %>"><%= @unred_all_messages %></span>
|
||||
</li>
|
||||
<li class="clearfix">
|
||||
<a href="javascript:void(0)" class="ml30">私信</a>
|
||||
</li>
|
||||
</div>
|
|
@ -1,59 +1,57 @@
|
|||
|
||||
<% if ma.message_type == 'ApplySubdomain'%>
|
||||
<ul class="homepageNewsList fl">
|
||||
<div class="shortMessageWidth">
|
||||
<li class="homepageNewsPortrait fl">
|
||||
<%=link_to image_tag(url_to_avatar(ma.organization), :width => "30", :height => "30"), organization_path(ma.organization_id), :target => '_blank' %>
|
||||
</li>
|
||||
<li class="homepageNewsPubType fl">
|
||||
<%=link_to ma.organization.name, organization_path(ma.organization_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
|
||||
<span class='homepageNewsType fl'>申请子域名:</span>
|
||||
</li>
|
||||
<li class="messageInformationContents">
|
||||
<%= ma.content %>
|
||||
</li>
|
||||
</div>
|
||||
<li class="messageOperateContents fl">
|
||||
<%=link_to image_tag(url_to_avatar(ma.organization), class: "r_list_img"), organization_path(ma.organization_id), :target => '_blank' %>
|
||||
<div>
|
||||
<p class="lh25 mb10">
|
||||
<span class="mr20 f16 color-grey3">
|
||||
<%=link_to ma.organization.name, organization_path(ma.organization_id), :target => '_blank' %>
|
||||
</span>
|
||||
<span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
|
||||
<span class="ml15">
|
||||
<%=link_to (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准",
|
||||
agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ),
|
||||
:id => "agree_apply_subdomain_#{ma.id}",
|
||||
:method => 'post',
|
||||
:remote => true,
|
||||
:class => 'link-blue'
|
||||
%>
|
||||
</li>
|
||||
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ),
|
||||
:id => "agree_apply_subdomain_#{ma.id}",
|
||||
:method => 'post',
|
||||
:remote => true,
|
||||
:class => 'fs12 infoTips bg-green text-white'
|
||||
%>
|
||||
</span>
|
||||
</p>
|
||||
<p class="c_grey02 f14 break_word">
|
||||
<span class="homepageNewsType fl">
|
||||
申请子域名:
|
||||
</span>
|
||||
<%= ma.content %>
|
||||
</p>
|
||||
</div>
|
||||
<% end %>
|
||||
<% if ma.message_type == 'AgreeApplySubdomain'%>
|
||||
<ul class="homepageNewsList fl">
|
||||
<div class="longMessageWidth">
|
||||
<li class="homepageNewsPortrait fl">
|
||||
<div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
|
||||
</li>
|
||||
<li class="homepageNewsPubType fl">
|
||||
<span class='homepageNewsType fl'>管理员同意了您的子域名申请:</span>
|
||||
</li>
|
||||
<li class="messageInformationContents">
|
||||
<%= ma.content %>
|
||||
</li>
|
||||
</div>
|
||||
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
<%=link_to image_tag("/images/trustie_logo1.png", class: "r_list_img"), "javascript:void(0)" %>
|
||||
<div>
|
||||
<p class="lh25 mb10">
|
||||
<span class="mr20 f16 color-grey3">
|
||||
管理员
|
||||
</span>
|
||||
<span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
|
||||
</p>
|
||||
<p class="c_grey02 f14 break_word">
|
||||
<span class="c_grey02 fs12">同意了您的子域名申请:</span>
|
||||
<%= ma.content %>
|
||||
</p>
|
||||
</div>
|
||||
<% end %>
|
||||
<% if ma.message_type == 'DisagreeApplySubdomain'%>
|
||||
<ul class="homepageNewsList fl">
|
||||
<div class="longMessageWidth">
|
||||
<li class="homepageNewsPortrait fl">
|
||||
<div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
|
||||
</li>
|
||||
<li class="homepageNewsPubType fl">
|
||||
<span class='homepageNewsType fl'>管理员拒绝了您的子域名申请:</span>
|
||||
</li>
|
||||
<li class="messageInformationContents">
|
||||
<%= ma.content %>
|
||||
</li>
|
||||
</div>
|
||||
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||
</ul>
|
||||
<%=link_to image_tag("/images/trustie_logo1.png", class: "r_list_img"), "javascript:void(0)" %>
|
||||
<div>
|
||||
<p class="lh25 mb10">
|
||||
<span class="mr20 f16 color-grey3">
|
||||
管理员
|
||||
</span>
|
||||
<span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
|
||||
</p>
|
||||
<p class="c_grey02 f14 break_word">
|
||||
<span class="c_grey02 fs12">拒绝了您的子域名申请:</span>
|
||||
<%= ma.content %>
|
||||
</p>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
|
@ -1,59 +1,8 @@
|
|||
<%= render :partial => 'users/selector_for_messages'%>
|
||||
<div class="resources mt10" id="users_setting">
|
||||
<div>
|
||||
<% if (!@message_alls.nil? && @message_alls.count >0) %>
|
||||
<% if params[:type].nil? || params[:type] == "unviewed" %>
|
||||
<div class="newsReadSetting">
|
||||
<% count = unviewed_message(@user) %>
|
||||
有 <span class="c_red"><%= count %></span> 条未读
|
||||
<% unless (count == 0 || User.current != @user) %>
|
||||
<a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<!--总消息列表-->
|
||||
<div id="all_message_list">
|
||||
<% unless @message_alls.nil? %>
|
||||
<%= render :partial => 'users/new_user_message', :locals => { :message_alls => @message_alls } %>
|
||||
<% end %>
|
||||
</div>
|
||||
<!--项目消息-->
|
||||
<% else %>
|
||||
<div class="flash notice">您目前还没有相关消息!</div>
|
||||
<% end %>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<div id="user-messages-<%= current_user.try(:login) %>">
|
||||
<%= render partial: "users/infos" %>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
function message_titile_show(obj,e)
|
||||
{
|
||||
obj.parent().next("div").show();
|
||||
obj.parent().next("div").css("top",e.pageY).css("left",e.pageX).css("position","absolute");
|
||||
}
|
||||
function message_titile_hide(obj)
|
||||
{
|
||||
obj.parent().next("div").hide();
|
||||
}
|
||||
|
||||
function show_more_system_messages(list,content, id2, id3) {
|
||||
$(list).toggleClass("show_more_li");
|
||||
$(content).toggleClass("show_more_system_message");
|
||||
var information = $(id2);
|
||||
var val = information.attr("value");
|
||||
if (val == "show_more") {
|
||||
$(id2).text("[收起]");
|
||||
information.attr("value", "hide_more");
|
||||
information.attr("style", "color:#3ca5c6");
|
||||
}
|
||||
else {
|
||||
$(id2).text("[展开]");
|
||||
information.attr("value", "show_more");
|
||||
information.attr("style", "color:#0781b4;");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1 +1,3 @@
|
|||
$("#all_message_list").html("<%= escape_javascript( render :partial => 'users/new_user_message', :locals => { :message_alls => @message_alls }) %>");
|
||||
$("#unread-message-count-<%= @user.login %>").html("<%= @unred_all_messages %>")
|
||||
|
||||
$("#user-messages-<%= current_user.try(:login) %>").html("<%= escape_javascript( render :partial => 'users/infos', :locals => { :message_alls => @message_alls }) %>");
|
|
@ -563,7 +563,7 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
|
|||
.bg-green{background:#60B25E;}
|
||||
.bg-refuse{background:#E74C3B;}
|
||||
.fs12{font-size:12px !important;}
|
||||
|
||||
.text-white{color: #fff !important;}
|
||||
/*introduce页面*/
|
||||
.content_Intruduce{min-width: 1200px;}
|
||||
.inline{width: auto;display: inline-block;}
|
||||
|
|
Loading…
Reference in New Issue