Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
50171ad0f8
|
@ -29,6 +29,11 @@ class MailHandlerController < ActionController::Base
|
|||
end
|
||||
end
|
||||
|
||||
#取消邮件通知
|
||||
def cancel_mail_notify
|
||||
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def check_credential
|
||||
|
|
|
@ -237,7 +237,7 @@ module WelcomeHelper
|
|||
content_tag('span', find_all_event_type(event)) <<
|
||||
': '.html_safe <<
|
||||
link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url) <<
|
||||
link_to((' ['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container), :class => "attachments_list_color")
|
||||
link_to((' ['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container.project), :class => "attachments_list_color")
|
||||
else
|
||||
str << content_tag("span", "更新了") <<
|
||||
content_tag("span", find_all_event_type(event)) <<
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
<span class="borad-title"><%= (@project.project_type == 1) ? t(:label_user_course) : t(:label_project) %>资源共享区</span>
|
||||
|
||||
<div class="content-title-top">
|
||||
|
||||
<%#= link_to(l(:label_attachment_new), 'javascript:void(0);', :onclick=>"$('#file_buttons').slideToggle();", :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
|
||||
<div class="clearfix"></div>
|
||||
<div id="file_buttons" class="nhidden">
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
<em>尊敬的用户,<%= @user %>给你留言了:</em>
|
||||
<div><%= @message %></div>
|
||||
<h1>点击链接查看最新回复<%= link_to(@url, @url) %></h1>
|
||||
<h4><%= link_to(l(:lable_not_receive_mail),"http://forge.trustie.net/my/account")%></h4>
|
||||
|
||||
|
|
|
@ -1620,6 +1620,6 @@ en:
|
|||
label_your_course: your course
|
||||
label_have_message : have a new message
|
||||
label_login_prompt: Email/NickName
|
||||
|
||||
:lable_not_receive_mail: Click here don't receive email form site!
|
||||
# ajax异步验证
|
||||
modal_valid_passing: can be used.
|
||||
|
|
|
@ -1966,7 +1966,7 @@ zh:
|
|||
label_attendingcontestwork_release_time: 发布时间
|
||||
label_attendingcontestwork_deposit_project: 托管项目
|
||||
label_attendingcontestwork_sorting_intimation: 您可以重新打分,打分结果以最后一次打分为主!
|
||||
|
||||
lable_not_receive_mail: 点此设置接收本站邮件偏好!
|
||||
#end
|
||||
|
||||
# ajax异步验证
|
||||
|
|
|
@ -522,6 +522,7 @@ RedmineApp::Application.routes.draw do
|
|||
get 'search', :controller => 'search', :action => 'index'
|
||||
|
||||
match 'mail_handler', :controller => 'mail_handler', :action => 'index', :via => :post
|
||||
match 'mail_handler/cancel/:id', :controller => 'mail_handler', :action => 'cancel_mail_notify',:via => :get
|
||||
|
||||
match 'admin', :controller => 'admin', :action => 'index', :via => :get
|
||||
match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
|
||||
|
|
|
@ -799,6 +799,7 @@ ActiveRecord::Schema.define(:version => 20140527060344) do
|
|||
t.string "application_developers"
|
||||
t.string "deposit_project_url"
|
||||
t.string "deposit_project"
|
||||
t.integer "project_id"
|
||||
end
|
||||
|
||||
create_table "students_for_courses", :force => true do |t|
|
||||
|
|
Loading…
Reference in New Issue