hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Browse Source 
Conflicts:
	app/views/layouts/base_projects.html.erb
memcached_alan
sw 11 years ago
parent 4b831c9e65 c773e0fd39
commit b27bb34662
26 changed files with 219 additions and 115 deletions
Show Stats Download Patch File Download Diff File

22
app/controllers/projects_controller.rb
Unescape View File

@ -180,6 +180,7 @@ class ProjectsController < ApplicationController
@project = Project.new @project = Project.new
@project.safe_attributes = params[:project] @project.safe_attributes = params[:project]
@project.organization_id = params[:organization_id] @project.organization_id = params[:organization_id]
@project.user_id = User.current.id
if validate_parent_id && @project.save if validate_parent_id && @project.save
@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
# Add current user as a project member if he is not admin # Add current user as a project member if he is not admin
@ -347,16 +348,27 @@ class ProjectsController < ApplicationController
end end
#发送邮件邀请新用户 #发送邮件邀请新用户
def invite_members_by_mail def invite_members_by_mail
@is_zhuce =false if User.current.member_of?(@project) || User.current.admin?
respond_to do |format| @is_zhuce = false
format.html respond_to do |format|
format.js format.html
format.js
end
else
render_403
end end
end end
# 邀请Trustie注册用户 # 邀请Trustie注册用户
def invite_members def invite_members
@member ||= @project.members.new if User.current.member_of?(@project) || User.current.admin?
@member ||= @project.members.new
respond_to do |format|
format.html
end
else
render_403
end
end end
def edit def edit

2
app/helpers/watchers_helper.rb
Unescape View File

@ -283,6 +283,6 @@ module WatchersHelper
def exit_project_link(project) def exit_project_link(project)
link_to(l(:label_exit_project),exit_cur_project_path(project.id), link_to(l(:label_exit_project),exit_cur_project_path(project.id),
:remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px;margin-right:10px;height:22px;background:none repeat scroll 0% 0% #64BDD9;TES" ) :remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 22px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES" )
end end
end end

4
app/views/kaminari/_gap.html.erb
Unescape View File

@ -5,4 +5,6 @@
per_page: number of items to fetch per page per_page: number of items to fetch per page
remote: data-remote remote: data-remote
-%> -%>
<span class="spacer">
<%= raw(t 'views.pagination.truncate') %>
</span>

14
app/views/layouts/_base_feedback.html.erb
Unescape View File

@ -107,7 +107,7 @@
$(function(){ $(function(){
$("#button1").click(function(){ $("#button1").click(function(){
myTips("您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！","success"); myTips("<%= l(:label_feedback_success) %>","success");
}); });
}) })
@ -153,7 +153,7 @@ function cookieget(n)
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>意见反馈</title> <title><%= l(:label_feedback) %></title>
</head> </head>
<body style="height:auto" > <body style="height:auto" >
@ -161,15 +161,15 @@ function cookieget(n)
<div class="scrollsidebar" id="scrollsidebar" style="float: right"> <div class="scrollsidebar" id="scrollsidebar" style="float: right">
<div class="side_content"> <div class="side_content">
<div class="side_list"> <div class="side_list">
<div class="side_title"><a title="意见反馈" class="close_btn"><span><%= l(:label_feedback) %></span></a></div> <div class="side_title"><a title="<%= l(:label_feedback) %>" class="close_btn"><span><%= l(:label_feedback) %></span></a></div>
<div class="side_center"> <div class="side_center">
<div class="custom_service"> <div class="custom_service">
<% get_memo %> <% get_memo %>
<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %>
<%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%> <%= f.text_area :subject, :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
<%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%> <%= f.hidden_field :content, :required => true , :value => l(:label_feedback_value) %>
<%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
<a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();">提&nbsp;&nbsp;交</a> <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();"><%= l(:label_submit)%></a>
<% end %> <% end %>
</div> </div>
<div class="msgserver"> <div class="msgserver">
@ -180,7 +180,7 @@ function cookieget(n)
<div class="side_bottom"></div> <div class="side_bottom"></div>
</div> </div>
</div> </div>
<div class="show_btn"><span>提交</span></div> <div class="show_btn"><span><%= l(:label_submit)%></span></div>
</div> </div>
<!-- ?ú?? ?á?? --> <!-- ?ú?? ?á?? -->
<script type="text/javascript"> <script type="text/javascript">

2
app/views/layouts/base_contest.html.erb
Unescape View File

@ -154,7 +154,7 @@
<!--description--> <!--description-->
<div class="inf_user_context"> <div class="inf_user_context">
<div class="font_title_left"> <div class="font_title_left">
<%= l(:label_project_overview) %> <%= l(:label_overview) %>
</div> </div>
<div style="padding-bottom: 8px"> <div style="padding-bottom: 8px">
<% if @bid.description.size>0 %> <% if @bid.description.size>0 %>

2
app/views/layouts/base_newcontest.html.erb
Unescape View File

@ -174,7 +174,7 @@
<div class="inf_user_context" style="line-height: normal;margin-top: 10px;"> <div class="inf_user_context" style="line-height: normal;margin-top: 10px;">
<div class="font_title_left"> <div class="font_title_left">
<%= l(:label_project_overview) %> <%= l(:label_overview) %>
</div> </div>
<div style="padding-bottom: 8px"> <div style="padding-bottom: 8px">
<% if @contest.description.size>0 %> <% if @contest.description.size>0 %>

2
app/views/layouts/base_opensource_p.html.erb
Unescape View File

@ -86,7 +86,7 @@
<div class="inf_user_context"> <div class="inf_user_context">
<div class="font_title_left"> <div class="font_title_left">
<%= l(:label_project_overview) %> <%= l(:label_overview) %>
</div> </div>
<div style="padding-bottom: 8px"> <div style="padding-bottom: 8px">

2
app/views/projects/show.html.erb
Unescape View File

@ -210,4 +210,4 @@
</div> </div>
</div> </div>
<%= paginate @events_pages, :window => 3%> <%= paginate @events_pages, :left => 3, :right => 3%>

2
app/views/tags/_project_tag.html.erb
Unescape View File

@ -2,7 +2,7 @@
<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %> <%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
</div> </div>
<% if User.current.logged? %> <% if User.current.logged? %>
<span> <%= toggle_link ("+ 添加标签"), 'put-tag-form', {:focus => 'tags_name'} %> </span> <span> <%= toggle_link ("+"+l(:label_add_tag)), 'put-tag-form', {:focus => 'tags_name'} %> </span>
<% end %> <% end %>
<div id="put-tag-form" style="display: none;text-align: center"> <div id="put-tag-form" style="display: none;text-align: center">
<%= form_for "tag_for_save",:remote=>true,:url=>tag_path, <%= form_for "tag_for_save",:remote=>true,:url=>tag_path,

2
config/initializers/kaminari_config.rb
Unescape View File

@ -23,7 +23,7 @@
Kaminari.configure do |config| Kaminari.configure do |config|
# config.default_per_page = 25 # config.default_per_page = 25
# config.max_per_page = nil # config.max_per_page = nil
config.window = 2 config.window = 0
# config.outer_window = 3 # config.outer_window = 3
# config.left = 2 # config.left = 2
# config.right = 2 # config.right = 2

14
config/locales/commons/en.yml
Unescape View File

@ -226,7 +226,7 @@ en:
label_tag: Tag label_tag: Tag
label_tags_no: no tags now！ label_tags_no: no tags now！
label_more_tags: More label_more_tags: More
label_add_tag: '+ Add tags' label_add_tag: "+ Add tags"
label_tags_count: "The total number of tags：" label_tags_count: "The total number of tags："
@ -313,6 +313,18 @@ en:
label_question_sponsor: Sponsor label_question_sponsor: Sponsor
label_final_reply: Last-reply label_final_reply: Last-reply
#
# 项目托管平台
#
# 意见反馈
#
label_feedback: Feedback
label_feedback_tips: "Anything you want to say， roar it here ~~"
label_technical_support: "Support: "
label_feedback_success: "Your comments have been posted back to the bar of discussion by newbie(in the Public Post Bar), we will be the first time to solve your problem, thanks for your support!"
label_feedback_value: "The posts comes from user feedback！"
# #
# Trustie # Trustie

14
config/locales/commons/zh.yml
Unescape View File

@ -321,8 +321,22 @@ zh:
label_updated_time: " 更新于 %{value} 之前" label_updated_time: " 更新于 %{value} 之前"
label_question_sponsor: 楼主 label_question_sponsor: 楼主
label_final_reply: 最后回复 label_final_reply: 最后回复
#
# 项目托管平台
#
# 意见反馈
#
label_feedback: 意见反馈
label_feedback_tips: "有什么想说的，尽管来咆哮吧~~"
label_technical_support: "技术支持："
label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
label_feedback_value: "该贴来自用户反馈！"
# #
# #
# #

6
config/locales/courses/en.yml
Unescape View File

@ -15,10 +15,10 @@ en:
label_course_term: 开课学期 label_course_term: 开课学期
label_join_course: 加入 label_join_course: 加入
label_exit_course: 退出
label_exit_course: exit course label_exit_course: exit course
# 资源库 (课程、项目按类型分)
label_course_file: File
label_upload_files: Upload
# #
# 课程托管平台主页 # 课程托管平台主页

4
config/locales/courses/zh.yml
Unescape View File

@ -20,7 +20,9 @@ zh:
label_join_course: 加入 label_join_course: 加入
label_exit_course: 退出 label_exit_course: 退出
# 资源库 (课程、项目按类型分)
label_course_file: 资源库
label_upload_files: 上传资源
# #
# 课程托管平台主页 # 课程托管平台主页

19
config/locales/en.yml
Unescape View File

@ -335,7 +335,6 @@ en:
project_module_documents: Documents project_module_documents: Documents
project_module_files: Files project_module_files: Files
project_module_wiki: Wiki project_module_wiki: Wiki
project_module_repository: Repository
project_module_boards: Forums project_module_boards: Forums
project_module_calendar: Calendar project_module_calendar: Calendar
project_module_gantt: Gantt project_module_gantt: Gantt
@ -385,10 +384,8 @@ en:
label_current_group: Current group label_current_group: Current group
# DTS Test tool # DTS Test tool
label_module_share: DTS Test tool label_module_share: DTS Test tool
# Feedback module
label_technical_support: Support ：
label_feedback: Feedback
#end
label_user_plural: Users label_user_plural: Users
label_user_new: New user label_user_new: New user
label_user_anonymous: Anonymous label_user_anonymous: Anonymous
@ -463,8 +460,7 @@ en:
label_home: Home label_home: Home
label_my_page: My page label_my_page: My page
label_my_message: Msgs
label_my_projects: My projects
label_my_page_block: My page block label_my_page_block: My page block
label_administration: Administration label_administration: Administration
@ -642,7 +638,6 @@ en:
label_roadmap_due_in: "Due in %{value}" label_roadmap_due_in: "Due in %{value}"
label_roadmap_overdue: "%{value} late" label_roadmap_overdue: "%{value} late"
label_roadmap_no_issues: No issues for this version label_roadmap_no_issues: No issues for this version
label_search: Search
label_result_plural: Results label_result_plural: Results
label_all_words: All words label_all_words: All words
label_wiki: Wiki label_wiki: Wiki
@ -1025,15 +1020,13 @@ en:
#huang #huang
label_file_new: Download label_file_new: Download
label_my_course: "My Course"
label_user_commits: "Code commits" label_user_commits: "Code commits"
label_user_watchered: "Followed by" # huang添加的
label_user_mail: "E-mail:" label_user_mail: "E-mail:"
label_project_overview: "Overview" label_overview: "Overview"
label_project_tool: "Tool" label_project_tool: "Tool"
label_project_issues: "Issues" label_project_issues: "Issues"
label_project_newother: "See other comments" label_project_newother: "See other comments"
@ -1400,7 +1393,7 @@ en:
label_main_term: Term label_main_term: Term
label_teacher_work_unit: Position label_teacher_work_unit: Position
label_course_overview: Status label_course_overview: Status
label_course_file: File
label_course_news: News label_course_news: News
#wang #wang
@ -1505,7 +1498,6 @@ en:
label_attendingcontestwork_deposit_project: Deposit project label_attendingcontestwork_deposit_project: Deposit project
label_attendingcontestwork_sorting_intimation: You can re-scoring, but just record the last scoring result! label_attendingcontestwork_sorting_intimation: You can re-scoring, but just record the last scoring result!
label_upload_files: Files-upload
label_upload_softwarepackage: Softwarepackage-upload label_upload_softwarepackage: Softwarepackage-upload
label_upload_cuttingphoto: Photo-upload label_upload_cuttingphoto: Photo-upload
label_system_platform: Platform label_system_platform: Platform
@ -1637,7 +1629,6 @@ en:
label_my_school: My school label_my_school: My school
label_all_schol: All school label_all_schol: All school
label_select_province: Please select the provinces label_select_province: Please select the provinces
label_search_conditions_not_null: The search conditions cannot be blank
label_attachment: attachment label_attachment: attachment
label_max_length: A maximum of 250 characters label_max_length: A maximum of 250 characters

4
config/locales/my/en.yml
Unescape View File

@ -12,6 +12,10 @@ en:
label_company_name: Company Name label_company_name: Company Name
label_location: Location label_location: Location
label_identity: Identity label_identity: Identity
# top_menu 个人相关
label_my_course: My Course
label_my_message: Msgs
label_my_projects: My projects
# #

9
config/locales/my/zh.yml
Unescape View File

@ -6,12 +6,15 @@ zh:
# Trustie个人账户模块 # Trustie个人账户模块
# #
# 公共类 # 公共类
# #
field_occupation: 工作单位 field_occupation: 工作单位
label_company_name: 组织名 label_company_name: 组织名
label_location: 位置 label_location: 位置
label_identity: 身份 label_identity: 身份
# top_menu 个人相关
label_my_course: 我的课程
label_my_projects: 我的项目
label_my_message: 留言
# #
# Trustie个人账户模块 # Trustie个人账户模块

2
config/locales/navigatiors/en.yml
Unescape View File

@ -50,6 +50,7 @@ en:
# #
# 搜索 # 搜索
# #
label_search: Search
welcome: welcome:
search: search:
information: "Please input the keywords!" # 搜索提示信息 information: "Please input the keywords!" # 搜索提示信息
@ -62,6 +63,7 @@ en:
showname: name showname: name
email: email email: email
label_search_conditions_not_null: The search conditions cannot be blank
label_resources_search_all: "Search all files in the website, while will not search the contents of private items." # 资源搜索提示信息 label_resources_search_all: "Search all files in the website, while will not search the contents of private items." # 资源搜索提示信息
# #

2
config/locales/navigatiors/zh.yml
Unescape View File

@ -53,6 +53,7 @@ zh:
# #
# 搜索 # 搜索
# #
label_search: 搜索
welcome: welcome:
search: search:
information: 请输入要搜索的关键字 # 搜索提示信息 information: 请输入要搜索的关键字 # 搜索提示信息
@ -65,6 +66,7 @@ zh:
showname: 姓名 showname: 姓名
email: 邮箱 email: 邮箱
label_search_conditions_not_null: 搜索条件不能为空
label_resources_search_all: "全站文件搜索，不会搜索私有项目中的内容。" # 资源搜索提示信息 label_resources_search_all: "全站文件搜索，不会搜索私有项目中的内容。" # 资源搜索提示信息

63
config/locales/projects/en.yml
Unescape View File

@ -24,6 +24,38 @@ en:
label_project_score: Score label_project_score: Score
#
# 项目托管平台主页
#
# 左边栏
#
label_id: "ID:"
label_apply_project: Apply to Join
label_exit_project: Exit
label_apply_project_waiting: "Application has been processed, please wait for administrator review."
label_unapply_project: Cancel the application
label_member: Members
project_module_attachments: Resources
label_invite: Invitation
label_invite_new_user: "Send e-mail to invite new user"
label_invite_trustie_user: "Invite the Trustie registered user"
label_issue_tracking: Issue Tracking
label_release_issue: New Issue
project_module_boards: Forums
project_module_boards_post: New Post
# 与课程公用资源库
project_module_repository: Repository
project_module_create_repository: New Repository
label_project_overview: "Profile:"
label_expend_information: More Information
# #
# 项目托管平台 # 项目托管平台
# #
@ -50,11 +82,36 @@ en:
# #
project: project:
join: join:
title: 快速进入项目通道 title: Quickly Join to Project
description: "只要持有项目的ID，就可快速申请加入所在项目。项目页面搜索不到的私有项目只能从此通道进入哦！" description: "Just hold the project ID, while you can quickly apply to join the project.Private projects can only join by this channel!"
id: id:
label: "Project ID:" label: "Project ID:"
tips: "Project ID is the number within the project's url" tips: "Project ID is the number within project URL"
#
# 项目托管平台
#
# 项目得分
#
label_projects_score: 项目综合得分
label_issue_score: issue得分
label_issue_number: issue的数量
label_issue_journal_number: issue的留言数量
label_news_score: 新闻得分
label_new_number: 新闻的数量
label_file_score: 文档得分
label_file_number: 文档的数量
label_code_submit_score: 代码提交得分
label_code_submit_number: 代码提交数量
label_topic_score: 讨论区得分
label_topic_number: 讨论区帖子数量

30
config/locales/projects/zh.yml
Unescape View File

@ -31,7 +31,37 @@ zh:
label_project_score_tips: 项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度 label_project_score_tips: 项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度
label_project_score: 项目评分 label_project_score: 项目评分
#
# 项目托管平台主页
#
# 左边栏
#
label_id: "ID:"
label_apply_project: 申请加入
label_exit_project: 退出项目
label_apply_project_waiting: 已处理申请，请等待管理员审核
label_unapply_project: 取消申请
label_member: 成员
project_module_attachments: 资源
label_invite: 邀请
label_invite_new_user: "发送邮件邀请新用户"
label_invite_trustie_user: "邀请Trustie注册用户"
label_issue_tracking: 问题跟踪
label_release_issue: 发布问题
project_module_boards: 讨论区
project_module_boards_post: 发帖
# 与课程公用资源库
project_module_repository: 版本库
project_module_create_repository: 创建版本库
label_project_overview: "项目简介："
label_expend_information: 展开更多信息
# #
# 项目托管平台 # 项目托管平台
# #

24
config/locales/users/zh.yml
Unescape View File

@ -16,7 +16,18 @@ zh:
# #
label_user_home: 创客空间 label_user_home: 创客空间
#
# Trustie用户主页
#
# 菜单栏 (公共)
#
label_activity: 动态
label_user_course: 课程
label_user_project: 项目
label_user_newfeedback: 留言
# #
# Trustie用户主页 # Trustie用户主页
# #
@ -85,17 +96,6 @@ zh:
label_no_current_watchers: 该用户暂未关注其他用户 label_no_current_watchers: 该用户暂未关注其他用户
#
# Trustie用户主页
#
# 菜单栏
#
label_activity: 动态
label_user_course: 课程
label_user_project: 项目
label_user_newfeedback: 留言
# #
# Trustie用户主页 # Trustie用户主页
# #

66
config/locales/zh.yml
Unescape View File

@ -522,11 +522,9 @@ zh:
project_module_time_tracking: 时间跟踪 project_module_time_tracking: 时间跟踪
project_module_news: 新闻 project_module_news: 新闻
project_module_documents: 文档 project_module_documents: 文档
project_module_files: 资源库
project_module_attachments: 资源
project_module_wiki: Wiki project_module_wiki: Wiki
project_module_repository: 版本库
project_module_boards: 讨论区
project_module_calendar: 日历 project_module_calendar: 日历
project_module_gantt: 甘特图 project_module_gantt: 甘特图
project_module_course: 课程 project_module_course: 课程
@ -593,7 +591,7 @@ zh:
label_role_plural: 角色 label_role_plural: 角色
label_role_new: 新建角色 label_role_new: 新建角色
label_role_and_permissions: 角色和权限 label_role_and_permissions: 角色和权限
label_member: 成员
label_search_member: 搜索 label_search_member: 搜索
label_search_member_count: 共搜索到 label_search_member_count: 共搜索到
label_member_people: 人 label_member_people: 人
@ -709,8 +707,6 @@ zh:
#end #end
label_my_page: 我的工作台 label_my_page: 我的工作台
label_my_account: 我的帐号 label_my_account: 我的帐号
label_my_message: 留言
label_my_projects: 我的项目
label_my_page_block: 我的工作台模块 label_my_page_block: 我的工作台模块
label_administration: 管理 label_administration: 管理
label_login: 登录 label_login: 登录
@ -719,7 +715,6 @@ zh:
label_assigned_to_me_issues: 指派给我的问题 label_assigned_to_me_issues: 指派给我的问题
label_last_login: 最后登录 label_last_login: 最后登录
label_registered_on: 注册于 label_registered_on: 注册于
label_activity: 动态 # modified by bai
label_overall_activity: 活动概览 label_overall_activity: 活动概览
label_new: 新建 label_new: 新建
@ -891,7 +886,6 @@ zh:
label_search_by_login: 登录名 label_search_by_login: 登录名
label_search_by_name: 名字 label_search_by_name: 名字
label_search_by_email: 邮箱 label_search_by_email: 邮箱
label_search: 搜索
label_result_plural: 结果 label_result_plural: 结果
label_all_words: 所有单词 label_all_words: 所有单词
label_wiki: Wiki label_wiki: Wiki
@ -905,7 +899,6 @@ zh:
label_preview: 预览 label_preview: 预览
label_feed_plural: Feeds label_feed_plural: Feeds
label_changes_details: 所有变更的详情 label_changes_details: 所有变更的详情
label_issue_tracking: 问题跟踪
label_spent_time: 耗时 label_spent_time: 耗时
label_overall_spent_time: 总体耗时 label_overall_spent_time: 总体耗时
label_f_hour: "%{value} 小时" label_f_hour: "%{value} 小时"
@ -988,23 +981,14 @@ zh:
label_poll_title: 问卷调查_问卷页面 label_poll_title: 问卷调查_问卷页面
#huang #huang
label_file_new: 下载 label_file_new: 下载
label_user_edit: "修改资料"
label_user_info: "个人简介" #huang 添加
label_user_watcher: "关注" # huang添加的
label_user_fans: "粉丝"
# modify by men
label_x_user_fans:
zero: 粉丝
one: 粉丝
other: 粉丝
#end
label_x_join_in_contest: label_x_join_in_contest:
zero: 参与者 zero: 参与者
one: 参与者 one: 参与者
other: 参与者 other: 参与者
#end #end
label_user_commits: "代码提交" label_user_commits: "代码提交"
label_user_watchered: "关注" # huang添加的
label_user_newfeedback: "留言" ## huang添加的 label_user_newfeedback: "留言" ## huang添加的
label_feedback_success: "留言成功" label_feedback_success: "留言成功"
label_feedback_fail: "留言失败" label_feedback_fail: "留言失败"
@ -1013,7 +997,7 @@ zh:
label_user_joinin: "加入时间" label_user_joinin: "加入时间"
label_project_overview: "概述" label_overview: "概述"
label_project_tool: "项目工具集" label_project_tool: "项目工具集"
label_project_issues: "问题" label_project_issues: "问题"
label_project_newother: "查看其他评论" label_project_newother: "查看其他评论"
@ -1472,10 +1456,6 @@ zh:
label_tags_bid_description: 需求描述 label_tags_bid_description: 需求描述
label_tags_issue_description: 问题描述 label_tags_issue_description: 问题描述
label_tags_all_objects: 所有 label_tags_all_objects: 所有
label_apply_project: 申请加入
label_exit_project: 退出项目
label_apply_project_waiting: 已处理申请，请等待管理员审核
label_unapply_project: 取消申请
#fq #fq
@ -1767,7 +1747,6 @@ zh:
label_i_new_activity: 有了新活动在 label_i_new_activity: 有了新活动在
label_choose_course: 选择课程 label_choose_course: 选择课程
button_submit_homework: 提交作业 button_submit_homework: 提交作业
label_my_course: 我的课程
button_submit_bid: 参与竞标 button_submit_bid: 参与竞标
label_requirement_from: 需求来源 label_requirement_from: 需求来源
label_course_view: 作业界面 label_course_view: 作业界面
@ -1831,7 +1810,7 @@ zh:
label_course_open_student_info: （打钩为“学生列表公开”，不打钩为不公开，若不公开，则课程外部人员看不到学生列表） label_course_open_student_info: （打钩为“学生列表公开”，不打钩为不公开，若不公开，则课程外部人员看不到学生列表）
label_course_view_student: 查看其他课程 label_course_view_student: 查看其他课程
label_course_student: 学生 label_course_student: 学生
label_course_file: 资源库 #资料共享
label_course_new_homework: 新建作业 label_course_new_homework: 新建作业
label_course_homework_list: 作业列表 label_course_homework_list: 作业列表
label_course_homework_new: 发布作业 label_course_homework_new: 发布作业
@ -2084,7 +2063,7 @@ zh:
zero: 个动态 zero: 个动态
one: 个动态 one: 个动态
other: 个动态 other: 个动态
label_upload_files: 上传资源
label_relation_files: 关联已有资源 label_relation_files: 关联已有资源
label_contest_settings: 配置竞赛 label_contest_settings: 配置竞赛
label_contest_delete: 删除竞赛 label_contest_delete: 删除竞赛
@ -2257,7 +2236,6 @@ zh:
label_all_schol: 全部学校 label_all_schol: 全部学校
label_school_all: 中国高校 label_school_all: 中国高校
label_select_province: 请选择省份 label_select_province: 请选择省份
label_search_conditions_not_null: 搜索条件不能为空
lable_hot_course: 活跃课程 lable_hot_course: 活跃课程
lable_student_list_visable: 学生列表是否公开 lable_student_list_visable: 学生列表是否公开
@ -2323,36 +2301,8 @@ zh:
label_answer_total: 总计： label_answer_total: 总计：
label_join_project: 加入项目 label_join_project: 加入项目
label_technical_support: 技术支持：
label_feedback: 意见反馈
label_forums_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
# 项目企业模块
# #
# #
# 项目企业模块 # 项目企业模块

21
db/migrate/20150311013036_add_project_create_info_to_forge_activities.rb
Unescape View File

@ -0,0 +1,21 @@
# Time 2015-03-11 14:25:45
# Author lizanle
# Description 给每个项目添加一条初始创建信息，如果有menber，最早加进来的就算创始人,并给projects表的更新创建人
class AddProjectCreateInfoToForgeActivities < ActiveRecord::Migration
def change
Project.all.each do |e|
user = e.members.order("members.created_on asc").first
next if user.nil?
execute("insert into forge_activities(forge_act_id,
forge_act_type,
project_id,
user_id,
created_at,
updated_at)
values(#{e.id},'ProjectCreateInfo',#{e.id},#{user.user_id},
'#{user.created_on.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}',
'#{user.created_on.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S")}')")
execute("update projects set user_id=#{user.user_id} where id =#{e.id}")
end
end
end

BIN
public/images/jiantou.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

2
public/stylesheets/application.css
Unescape View File

@ -63,6 +63,8 @@ a:hover.subnav_green{ background:#14ad5a;}
/*简介*/ /*简介*/
.project_intro{ width:220px; padding:10px; background:#fff; padding-top:5px; color:#6d6d6d;} .project_intro{ width:220px; padding:10px; background:#fff; padding-top:5px; color:#6d6d6d;}
.course_description{max-height: 105px;overflow:hidden;}
.course_description_none{max-height: none;}
.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;} .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;}
.lg-foot:hover{ color:#787b7e;} .lg-foot:hover{ color:#787b7e;}
/*右侧内容--动态*/ /*右侧内容--动态*/

Write Preview
Loading…
Cancel
Save