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

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

This commit is contained in:
huang 2015-03-18 21:18:31 +08:00
parent 1cdf397bc0 3faec141ce
commit 7e40ea7604
16 changed files with 88 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/mobile/apis/users.rb
View File

@ -82,7 +82,7 @@ module Mobile
desc "用户搜索"
params do
requires :name, type: String, desc: '用户名关键字'
requires :search_by, type: String,desc: '搜索依据：0 昵称，1 用户名，2 邮箱'
requires :search_by, type: String,desc: '搜索依据：0 昵称，1 用户名，2 邮箱,3 昵称和姓名'
end
get 'search/search_user' do
us = UsersService.new

2
app/api/mobile/entities/course_dynamic.rb
View File

@ -15,6 +15,8 @@ module Mobile
course_dynamic_expose :type
course_dynamic_expose :count
course_dynamic_expose :course_name
course_dynamic_expose :course_term
course_dynamic_expose :course_time
course_dynamic_expose :course_id
course_dynamic_expose :course_img_url
course_dynamic_expose :message

2
app/models/user.rb
View File

@ -214,6 +214,8 @@ class User < Principal
where(" LOWER(login) LIKE '#{pattern}' ")
elsif type == "1"
where(" LOWER(concat(lastname, firstname)) LIKE '#{pattern}' ")
elsif type == "3"
where(" LOWER(concat(lastname, firstname,login)) LIKE '#{pattern}' ")
else
where(" LOWER(mail) LIKE '#{pattern}' ")
end

2
app/services/courses_service.rb
View File

@ -402,7 +402,7 @@ class CoursesService
latest_course_dynamics.sort!{|order,newer| newer[:time] <=> order[:time]}
latest_course_dynamic = latest_course_dynamics.first
unless latest_course_dynamic.nil?
result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => latest_course_dynamic[:type],:update_time => latest_course_dynamic[:time],:message => latest_course_dynamic[:message],:count => nil}
result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:course_time => course.time,:course_term => course.term,:type => latest_course_dynamic[:type],:update_time => latest_course_dynamic[:time],:message => latest_course_dynamic[:message],:count => nil}
end
end
result.sort!{|order,newer| newer[:update_time] <=> order[:update_time]}

6
app/views/files/_show_all_attachment.html.erb
View File

@ -16,8 +16,8 @@
<tr>
<%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure",:class => "tableth") %>
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children",:class => "tableth") %>
<%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype",:class => "tableth") %>
<%= content_tag('th', l(:attachment_sufix_browse), id: 'vzebra-contenttype', class: 'tableth', style: 'color: black')%>
<%= sort_header_tag('attach_type', :caption => l(:field_filecontenttype), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype",:class => "tableth") %>
<%= content_tag('th', l(:field_filetype), id: 'vzebra-contenttype', class: 'tableth', style: 'color: black')%>
<%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense",:class => "tableth") %>
<%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action",:class => "tableth") %>
<%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children",:class => "tableth") %>
@ -73,7 +73,7 @@
<div class="tags_gradint"></div>
</div>
<div class="read-more hidden">
<a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
<a href="javascript:void(0);" onclick="readmore(this);"> <%= l(:button_more)%> </a>
</div>
</td>
</tr>

6
app/views/files/_sort_by_attachtypel.html.erb
View File

@ -15,8 +15,8 @@
<tr>
<%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure" ,:class => "tableth") %>
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children",:class => "tableth") %>
<%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype",:class => "tableth") %>
<%= content_tag('th', l(:attachment_sufix_browse), id: 'vzebra-contenttype', class: 'tableth', style: 'color: black')%>
<%= sort_header_tag('attach_type', :caption => l(:field_filecontenttype), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype",:class => "tableth") %>
<%= content_tag('th', l(:field_filetype), id: 'vzebra-contenttype', class: 'tableth', style: 'color: black')%>
<%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense",:class => "tableth") %>
<%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action",:class => "tableth") %>
<%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children",:class => "tableth") %>
@ -76,7 +76,7 @@
<div class="tags_gradint"></div>
</div>
<div class="read-more hidden">
<a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
<a href="javascript:void(0);" onclick="readmore(this);"> <%= l(:button_more)%> </a>
</div>
</td>
</tr>

2
app/views/issues/show.html.erb
View File

@ -89,7 +89,7 @@ end %>
<%= render_custom_fields_rows(@issue) %>
<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
</table>
woca
<% if @issue.description? || @issue.attachments.any? -%>
<hr />
<% if @issue.description? %>

10
app/views/tags/_show_attachments.html.erb
View File

@ -24,19 +24,19 @@
&nbsp;&nbsp;
<%= file.description %>
<div class="c9 gray-color">
<%= l('label_attachment_category')%>
<%= l('attachment.category')%>
<%=result_come_from file%>
</div>
<span class="gray blue-color">
<%= l('label_attachment_download_num')%>
<%= l('attachment.download_num')%>
<%= file.downloads%>|
<%= l('label_attachment_size')%>
<%= l('attachment.size')%>
<%= number_to_human_size(file.filesize) %>|
<%= l('label_attachment_sharer')%>
<%= l('attachment.sharer')%>
<a class="gray" >
<%= link_to file.author, user_path(file.author), target: "_blank" unless file.author.blank? %>
</a>|
<%= l('label_attachment_upload_time')%>
<%= l('attachment.upload_time')%>
<%= format_time(file.created_on) %>
</span>
<div style="display: none"></div>

7
config/locales/commons/en.yml
View File

@ -138,10 +138,7 @@ en:
circular_dependency: "This relation would create a circular dependency"
cant_link_an_issue_with_a_descendant: "An issue cannot be linked to one of its subtasks"
attachment_all: "All"
attachment_browse: "Attachment Content Browse"
attachment_sufix_browse: "Attachment Type Browse"
attachment_type: "Attachment Type"
general_text_No: 'No'
general_text_Yes: 'Yes'
general_text_no: 'no'
@ -166,7 +163,7 @@ en:
label_requirement: Calls
label_forum: Forum
label_contest: Contest
label_attachment_plural: Files

2
config/locales/commons/zh.yml
View File

@ -173,7 +173,7 @@ zh:
label_requirement: 需求
label_forum: 公共贴吧
label_contest: 竞赛
label_attachment_plural: 文件
field_description: 描述

10
config/locales/contests/en.yml
View File

@ -2,3 +2,13 @@ en:
# Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
direction: ltr
#
# 竞赛托管平台
#
# 主页
#
label_current_hot_contest: Latest Hot Competition
label_current_attendingcontest_work: Latest Competition Work
label_issue_feedback_activities: Question&Feedback
label_more_information: More...
label_release_time: Release-time

11
config/locales/contests/zh.yml
View File

@ -4,3 +4,14 @@
zh:
# Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
direction: ltr
#
# 竞赛托管平台
#
# 主页
#
label_current_hot_contest: 最新热门竞赛
label_current_attendingcontest_work: 最新参赛作品
label_issue_feedback_activities: 问题和反馈动态
label_more_information: 更多>>
label_release_time: 发布时间

20
config/locales/en.yml
View File

@ -71,10 +71,9 @@ en:
field_summary: Summary
field_job_category: Job category # added by bai
field_filename: File
field_file_dense: File Dense
field_filesize: Size
field_downloads: Downloads
field_author: Author
field_created_on: Created
field_closed_on: Closed
@ -340,7 +339,7 @@ en:
label_create_new_projects: Create a project
label_work_scores_people: The total number of users given scores
label_project_grade: Score
label_relation_files: Select an existing resource
# Personal signature tips
@ -482,7 +481,7 @@ en:
label_attachment: Files
label_attachment_new: New file
label_attachment_delete: Delete file
label_attachment_plural: Files
label_file_added: File added
label_report: Report
label_report_plural: Reports
@ -792,7 +791,7 @@ en:
label_cross_project_hierarchy: With project hierarchy
label_cross_project_system: With all projects
label_gantt_progress_line: Progress line
label_files_filter: Files Filter：
button_check_all: Check all
button_uncheck_all: Uncheck all
@ -1430,13 +1429,7 @@ en:
label_your_course: your course
label_have_message: have a new message
lable_not_receive_mail: Click here don't receive email form site！
#added by linchun as competition#
label_current_hot_contest: Latest Hot Competition
label_current_attendingcontest_work: Latest Competition Work
label_issue_feedback_activities: Question&Feedback
label_more_information: More...
label_release_time: Release-time
label_weixin: WeiXin
@ -1571,7 +1564,6 @@ en:
label_trustie_team: The Trustie development team
label_memos_max_length: The content of the post up to 65535 characters in length
label_forums_max_length: Post Bar describing the maximum length of 65535 characters
label_unknow_type: Unknow type
review_assignments: Review assignments
label_my_school: My school

25
config/locales/projects/en.yml
View File

@ -37,7 +37,7 @@ en:
label_unapply_project: Cancel the application
label_member: Members
project_module_attachments: Resources
project_module_attachments: Files
label_invite: Invitation
label_invite_new_user: "Send e-mail to invite new user"
@ -95,6 +95,29 @@ en:
#
# 资源库
#
lable_file_sharingarea: Files
label_upload_files: Upload
# 资源库（附件）公用
label_relation_files: Select an existing resource
label_search_by_keyword: "Search by keywords"
label_files_filter: "Files Filter:"
attachment_all: "All"
attachment_browse: "Attachment Content Browse"
attachment_sufix_browse: "Attachment Type Browse"
attachment_type: "Attachment Type"
label_unknow_type: Unknow type
field_filename: File
field_filesize: Size
field_filecontenttype: Content Typ
field_filetype: File Typ
field_downloads: Downloads
field_file_dense: Dense

15
config/locales/projects/zh.yml
View File

@ -101,16 +101,23 @@ zh:
label_upload_files: 上传文件
# 附件公用
# 资源库（附件）公用
label_relation_files: 关联已有资源
label_search_by_keyword: "按关键字搜索："
label_files_filter: "资源过滤："
attachment_all: "全部"
field_filename: 文件
field_filesize: 大小
field_filecontenttype: 内容分类
field_filetype: 文件格式
field_file_dense: 是否公开
field_downloads: 下载次数
attachment_sufix_browse: "文件类型"
attachment_browse: "内容类型"
attachment_all: "全部"
attachment_type: "分类"
label_unknow_type: 未知类型
#
# 项目托管平台

22
config/locales/zh.yml
View File

@ -99,10 +99,9 @@ zh:
lastname_empty: 姓氏不能为空
enterprise_empty: 企业名不能为空
field_lastname_eg: '(例：张三丰，请填写[张])'
field_filename: 文件
field_file_dense: 是否公开
field_filesize: 大小
field_downloads: 下载次数
field_author: 作者
field_created_on: 创建于
field_updated_on: 更新于
@ -566,7 +565,7 @@ zh:
label_file_upload: 上传资料
label_course_file_upload: 上传了课件
label_attachment_delete: 删除文件
label_attachment_plural: 文件
label_file_added: 文件已添加
label_report: 报表
label_report_plural: 报表
@ -1918,12 +1917,6 @@ zh:
lable_not_receive_mail: 点此设置接收本站邮件偏好！
label_contest_notification: 竞赛通知
#english site translation
label_current_hot_contest: 最新热门竞赛
label_current_attendingcontest_work: 最新参赛作品
label_issue_feedback_activities: 问题和反馈动态
label_more_information: 更多>>
label_release_time: 发布时间
label_weixin: 微信扫码
@ -2032,13 +2025,6 @@ zh:
label_enterprise_nil: 该模块为最新上线模块，目前还没有创建企业项目！
label_enterprises: 组织
label_tags_opensource: 开源项目
label_attachment_category: 所属分类
label_attachment_download_num: 下载
label_attachment_size: 大小
label_attachment_sharer: 共享者
label_attachment_upload_time: 上传时间
#api
label_recently_updated_notification: 最近更新了通知