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' diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 23f0be5e6..3098a5cda 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 %> @@ -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,16 +173,14 @@ (<%= @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%> - <% 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/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/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 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 7af41945c..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: 加入 @@ -2078,5 +2076,7 @@ zh: label_recently_updated_courseware: 最近更新了课件 label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！ label_end_time: 截止时间 + label_send_email: 确定发送 + label_input_email: 请输入邮箱地址 diff --git a/public/images/jiantou1.jpg b/public/images/jiantou1.jpg new file mode 100644 index 000000000..208f44244 Binary files /dev/null and b/public/images/jiantou1.jpg differ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e0ab6f711..5786c5758 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -55,7 +55,7 @@ a:hover.info_foot_num{ color:#2390b2;} /*左侧导航*/ .subNavBox{width:222px; background:#fff;margin:10px 10px 0 0;} .subNav{border-bottom:solid 1px #e5e3da;cursor:pointer;font-weight:bold;font-size:14px;color:#3ca5c6;line-height:28px;padding-left:10px;background-color:#fff;} -.subNav_jiantou{background:url(../images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;} +.subNav_jiantou{background:url(/images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;} .subNav_jiantou:hover{color:#0781b4; } .currentDd{color:#0781b4; } .currentDt{background-color:#fff; } @@ -100,7 +100,7 @@ a:hover.more{ color:#64bdd9;} .box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;} .box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} /*邮件邀请*/ -.box_main{ width:345px; margin:0 auto;padding-left:40px;} +.box_main{ width:345px; margin:0 auto;padding-left:28px;} .box_h3{ color:#15bccf; text-align:center; font-size:16px;margin-right:40px;} .box_p{ color:#404040; margin-bottom:5px;} .fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}