diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index b9e658bb5..221331338 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -43,7 +43,7 @@ module WatchersHelper ) method = watched ? 'delete' : 'post' - link_to text, url, :remote => true, :method => method, :class => css + link_to text, url, :remote => true, :method => method, :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 ############## added by linchun @@ -278,7 +278,7 @@ module WatchersHelper ) method = applied ? 'delete' : 'post' - link_to text, url, :remote => true, :method => method ,:class=>css + link_to text, url, :remote => true, :method => method ,: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 def exit_project_link(project) diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index d5449e44d..7ddd37ad6 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -44,7 +44,7 @@
项目讨论区共有<%= @topic_count %>个帖子
<% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %> - <%= link_to l(:label_message_new), new_board_message_path(@board), + <%= link_to l(:label_message_new), new_board_message_path(@board), :class => 'problem_new_btn fl', :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %> <% end %> @@ -61,14 +61,14 @@
<%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %> <% if topic.sticky? %> - 置顶 + 置顶 <% end %>
- 由<%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %> - 添加于<%= format_time topic.created_on %> + 由<%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %> + 添加于<%= format_time topic.created_on %>
-
+ 回复<%= link_to (topic.replies_count), board_message_path(@board, topic), :style =>"color:#fff;" %>
diff --git a/app/views/files/_show_all_attachment.html.erb b/app/views/files/_show_all_attachment.html.erb index c32280c2c..6935c186f 100644 --- a/app/views/files/_show_all_attachment.html.erb +++ b/app/views/files/_show_all_attachment.html.erb @@ -16,8 +16,8 @@ <%= 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 @@
diff --git a/app/views/files/_sort_by_attachtypel.html.erb b/app/views/files/_sort_by_attachtypel.html.erb index 5faa73b0f..27aaf2f3d 100644 --- a/app/views/files/_sort_by_attachtypel.html.erb +++ b/app/views/files/_sort_by_attachtypel.html.erb @@ -15,8 +15,8 @@ <%= 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 @@
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index c5be3f4fd..c24ab84e7 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -41,7 +41,8 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
-

<%= l(:mail_issue_greetings)%>

+ +
<%= yield %>
diff --git a/app/views/tags/_show_attachments.html.erb b/app/views/tags/_show_attachments.html.erb index a76211fc6..ca6a2dd7a 100644 --- a/app/views/tags/_show_attachments.html.erb +++ b/app/views/tags/_show_attachments.html.erb @@ -24,19 +24,19 @@    <%= file.description %>
- <%= l('label_attachment_category')%> + <%= l('attachment.category')%> <%=result_come_from file%>
- <%= 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')%> <%= link_to file.author, user_path(file.author), target: "_blank" unless file.author.blank? %> | - <%= l('label_attachment_upload_time')%> + <%= l('attachment.upload_time')%> <%= format_time(file.created_on) %>
diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml index 561fc09cc..b9a6e89c4 100644 --- a/config/locales/commons/en.yml +++ b/config/locales/commons/en.yml @@ -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 diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 35087eb06..a238e1234 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -173,7 +173,7 @@ zh: label_requirement: 需求 label_forum: 公共贴吧 label_contest: 竞赛 - + label_attachment_plural: 文件 field_description: 描述 diff --git a/config/locales/contests/en.yml b/config/locales/contests/en.yml index e124e3f1a..1c2784050 100644 --- a/config/locales/contests/en.yml +++ b/config/locales/contests/en.yml @@ -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 \ No newline at end of file diff --git a/config/locales/contests/zh.yml b/config/locales/contests/zh.yml index 08115110b..1c4c4d126 100644 --- a/config/locales/contests/zh.yml +++ b/config/locales/contests/zh.yml @@ -3,4 +3,15 @@ # by tsechingho (http://github.com/tsechingho) zh: # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl) - direction: ltr \ No newline at end of file + direction: ltr + + # + # 竞赛托管平台 + # + # 主页 + # + label_current_hot_contest: 最新热门竞赛 + label_current_attendingcontest_work: 最新参赛作品 + label_issue_feedback_activities: 问题和反馈动态 + label_more_information: 更多>> + label_release_time: 发布时间 diff --git a/config/locales/en.yml b/config/locales/en.yml index ac98c4005..e84a26815 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 458311bda..ba6b81a5c 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -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 + diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index b68d9b64d..a58536e10 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -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: 未知类型 # # 项目托管平台 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 626a12abd..dc1937926 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -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: 最近更新了通知 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 3c487db5a..e665e11dc 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -109,8 +109,8 @@ a:hover.more{ color:#64bdd9;} .icon_addm:hover{background:url(../images/img_floatbox.png) 0 -61px no-repeat; } .icon_removem{ background:url(../images/img_floatbox.png) -22px -33px no-repeat;width:16px; height:16px; display:block; margin:5px 0 0 5px} .icon_removem:hover{background:url(../images/img_floatbox.png) -22px -61px no-repeat;} -.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;} -.btn_free:hover{ background:#d63502;} +.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff !important; height:25px; padding-top:5px; margin-bottom:10px;} +.btn_free:hover{ background:#d63502;text-decoration:none;} /*成员邀请*/ .invi_search{ margin-left:50px;} .invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}