From d947ebff0cfbdc132c52c00070ec2f4590f0f266 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 9 Mar 2015 10:31:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 494341ab3..8bf84d90c 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -135,10 +135,10 @@ <% end %>
- <%= link_to "动态", {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> + <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
- <%= link_to "问题跟踪", project_issues_path(@project), :style => "color:#3CA5C6" %>(<%= @project.issues.count %>) + <%= link_to l(:label_issue_tracking), project_issues_path(@project), :style => "color:#3CA5C6" %>(<%= @project.issues.count %>) <% if User.current.logged? && User.current.member_of?(@project) %> <%= link_to "+发布问题", 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;" %> @@ -148,24 +148,24 @@ <%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %> (<%= @project.boards.first.topics.count %>) <% if User.current.logged? && User.current.member_of?(@project) %> - <%= link_to "+发贴", new_board_message_path(@project.boards.first), :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 "+发贴", new_board_message_path(@project.boards.first, 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;" %> <% end %>
- <%= link_to "资源库", project_files_path(@project), :style => "color:#3CA5C6" %>(<%= @project.attachments.count %>) + <%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %>(<%= @project.attachments.count %>) <% if User.current.logged? && User.current.member_of?(@project) %> <%= link_to "+上传资源", new_project_file_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 %>
- <%= link_to "版本库", {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> + <%= link_to l(:field_user_active_changeset), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> (<%= @project.repositories.count %>) <% if User.current.logged? && User.current.member_of?(@project) %> <%= link_to "+创建版本库", 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 %>
-
更多
+
<%= l(:label_more) %>
From 0402fee6deda19d6d5f29dda9d51f1891378e2c5 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 9 Mar 2015 11:31:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E9=82=80=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_invite_members_by_mail.html.erb | 24 ------------------ app/views/projects/invite_members.html.erb | 6 +---- .../projects/invite_members_by_mail.html.erb | 25 ++++++++++++++++++- .../projects/invite_members_by_mail.js.erb | 10 -------- 4 files changed, 25 insertions(+), 40 deletions(-) delete mode 100644 app/views/projects/_invite_members_by_mail.html.erb delete mode 100644 app/views/projects/invite_members_by_mail.js.erb diff --git a/app/views/projects/_invite_members_by_mail.html.erb b/app/views/projects/_invite_members_by_mail.html.erb deleted file mode 100644 index 42a36bce0..000000000 --- a/app/views/projects/_invite_members_by_mail.html.erb +++ /dev/null @@ -1,24 +0,0 @@ -
-
-
-
-

发送邮件邀请新用户

-

输入好友邮箱地址，Trustie帮您免费发送！

-
- <%= render :partial => 'regested', locals: { :isregisted => false} %> -
- <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %> -
    -
  • - <%= text_field_tag 'mail', '邮箱', :class => "fb_item fl" %> -
    • -
    - -
    -
- <%= submit_tag '免费发送', :class=> "btn_free" %> - - <% end %> -
- -
\ No newline at end of file diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb index 8b0a5a183..d31a5bbe8 100644 --- a/app/views/projects/invite_members.html.erb +++ b/app/views/projects/invite_members.html.erb @@ -44,11 +44,7 @@ <% end %> <% end %> - - - - - +