From a010c800d6b610892c085005a80fb6f2301e73ea Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 Mar 2015 15:37:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=BA=93=E4=B8=BA=E7=A9=BA=E6=83=85=E5=86=B5=E4=B8=8B403?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=B7=E5=BC=8F=20=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=9B=BD=E9=99=85=E5=8C=96=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 12 +++++------- config/locales/zh.yml | 2 +- public/images/jiantou1.jpg | Bin 0 -> 1308 bytes public/stylesheets/application.css | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 public/images/jiantou1.jpg diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 23f0be5e6..8a731668c 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -101,8 +101,8 @@
-
- <%= link_to @project.name, project_path(@project) %> +
+ <%= link_to @project.name, project_path(@project), :style => "color:#3E4040"%> <% if !@project.is_public? %> <%= l(:label_private)%> <% end %> @@ -177,12 +177,10 @@ <% end %>
<% end%> - <% unless @project.enabled_modules.where("name = 'repository'").empty? %> + <% unless @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
- <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> - <% unless @project.repositories.count == 0 %> - (<%= @project.repositories.count %>) - <% end %> + <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> + (<%= @project.repositories.count %>) <%# if User.current.member_of?(@project) %> <%#= link_to "+"+l(:project_module_create_repository), new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> <%# end %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 8858b0a38..d4a09b30b 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2082,6 +2082,6 @@ zh: label_recently_updated_courseware: 最近更新了课件 label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！ label_end_time: 截止时间 - label_send_email: 免费发送 + label_send_email: 确定发送 label_input_email: 请输入邮箱地址 diff --git a/public/images/jiantou1.jpg b/public/images/jiantou1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..208f4424463bf1128eefe17d60f6c85050c4e01a GIT binary patch literal 1308 zcmbVMOKa3n6uz0X^+6HitGbbpy6}~EW+n;7QYTX^I#z0ZAR=aNZf$In8S}n$$uOErV_xrgWGY1B zFpBYH1QBuXZGlPe{!WxRl5EVO$Rj_+nXoaO^ihxu+7?G{1lM!TyrN6Gq3S%+iZZX} zHH9}+1M*G*8Bi@kNkLL8&U|=PDeK#8RV{2&2V}Xd>4vTkl*{FQNmdHFVYje@L7X@N zL@jQQa5u5aU$JH>LQaCC5sW8VQ?PpsCpaF%AzLc3>-T$si)-<|4a*hZ0e9JvD# z_Sr^@O>Z9h{3z6`1xMngsv`5SpsA$lVv%>D4o5YoswoAHYvSGiZJkJx60^`gh6A3Eh?^JV#OFmVE7te^t^u zfLRE-K^ILiAjeQNL#4Ce5J_zAA<4AP#eZ4=SPH0IC*47}Jv(xp6uo?97qe^?Sh23B zS6#sT5r#ZL&p9S$y&4rs~yGt2gds)*OL7Cuh~ORtjGHxN!bbaQ!9jdARxD Date: Fri, 13 Mar 2015 15:45:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=BA=E7=A9=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/tags/_tag_name.html.erb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb index d1b3060f9..225a09aec 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -101,11 +101,6 @@ <% end %>
- <% end %> - <% else %> - -     - <%= l(:label_tags_no) %> - + <% end %> <% end %> <% end %> \ No newline at end of file From cc5a22f2c6cb3055c25dbad548d11cad95a583e7 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 Mar 2015 16:16:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 8a731668c..3098a5cda 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -151,7 +151,7 @@ (<%= @project.issues.count %>) <% end %> <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> + <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> <% end %>
<% end %> @@ -162,7 +162,7 @@ (<%= @project.boards.first.topics.count %>) <% end %> <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> + <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:0px 3px 3px 3px;height:16px;margin-top:5px;background:#28be6c;float:right;line-height:20px;" %> <% end %> <% end%> @@ -173,7 +173,7 @@ (<%= @project.attachments.count %>) <% end %> <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> + <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> <% end %> <% end%> From ff65bf4ba58a762c25b4960039a2b5780fa945a0 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 13 Mar 2015 17:10:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?app=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/mobile/apis/upgrade.rb | 2 +- app/controllers/attachments_controller.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/api/mobile/apis/upgrade.rb b/app/api/mobile/apis/upgrade.rb index e6a7916d9..9ce1831f3 100644 --- a/app/api/mobile/apis/upgrade.rb +++ b/app/api/mobile/apis/upgrade.rb @@ -15,7 +15,7 @@ module Mobile if attachment.nil? raise '未发现客户端！' end - url = Setting.host_name + "/attachments/download/" + attachment.id.to_s + "/" + attachment.filename + url = "http://" + Setting.host_name + "/attachments/download/" + attachment.id.to_s + "/" + attachment.filename { version: @current_version.version, url: url, diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 72f4bdd92..23b080d94 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -20,9 +20,9 @@ class AttachmentsController < ApplicationController before_filter :find_project, :only => [:show, :download, :thumbnail, :destroy, :delete_homework]#, :except => [:upload, :autocomplete] before_filter :file_readable, :read_authorize, :only => [:show, :thumbnail]#Modified by young - before_filter :delete_authorize, :only => :destroy - before_filter :authorize_global, :only => :upload - before_filter :authorize_attachment_download1, :only => :download + before_filter :delete_authorize, :only => [:destroy] + before_filter :authorize_global, :only => [:upload] + before_filter :authorize_attachment_download1, :only => [:download] #before_filter :login_without_softapplication, only: [:download] accept_api_auth :show, :download, :upload require 'iconv' From aee987d6346dc91205b0b37fd69b9a1e90211157 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 13 Mar 2015 17:47:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=82=80=E8=AF=B7Trustie=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/invite_members.html.erb | 6 +++--- config/locales/projects/en.yml | 5 ++++- config/locales/projects/zh.yml | 5 ++++- config/locales/zh.yml | 4 +--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb index 4b07b9b3e..55fa2487b 100644 --- a/app/views/projects/invite_members.html.erb +++ b/app/views/projects/invite_members.html.erb @@ -1,6 +1,6 @@
-

邀请加入

+

<%= l(:label_invite_join) %>

<%#= render_flash_messages %> <% @@ -20,12 +20,12 @@
-

邀请Trustie注册用户

+

<%= l(:label_invite_trustie_user) %>

<% if roles.any? %> <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :method => :post}) do |f| %>
- + <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js',:flag => true) }')" %>
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index fdc426ca5..56177bea3 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -90,8 +90,11 @@ en: label_send_email: Send label_input_email: Please input email address - label_invite_trustie_user: "Invite Trustie registered users" + label_invite_trustie_user_tips: "Please enter the Trustie user name" + label_invite_project: "invites you to join the project" + label_invite_success: Successful invitation + label_invite_members: Invite # diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index b0a122dd1..c70392171 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -95,7 +95,10 @@ zh: label_input_email: 请输入邮箱地址 label_invite_trustie_user: "邀请Trustie注册用户" - + label_invite_trustie_user_tips: "请输入用户名称来搜索好友" + label_invite_project: 邀请您加入项目 + label_invite_success: 邀请成功 + label_invite_members: 邀请用户 # # 项目托管平台 # diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 8fdd3ae67..b040d0da5 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1714,9 +1714,7 @@ zh: label_bids_task_list: 作业列表 label_join_course: 加入 - label_invite_project: 邀请您加入项目 - label_invite_success: 邀请成功 - label_invite_members: 邀请用户 + label_exit_course: 退出 label_exit_group: 退出当前分班 label_new_join: 加入