From 10778fabc9c4f04c572f335639129dfbcf511446 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 12 Oct 2016 17:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E7=89=88=E6=9C=AC=E5=BA=93?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 3 +- .../projects/settings/_new_edit.html.erb | 82 +++++------ .../settings/_new_repositories.html.erb | 136 +++--------------- config/locales/zh.yml | 2 +- public/stylesheets/css/common.css | 1 + 5 files changed, 66 insertions(+), 158 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 8a502bfa9..44aecb143 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -400,7 +400,8 @@ class ProjectsController < ApplicationController @gitlab_repository = Repository.where(:project_id => @project, :type => "Repository::Gitlab").first unless @gitlab_repository.nil? gitlab_address = Redmine::Configuration['gitlab_address'] - @repos_url = gitlab_address.to_s+"/" + @creator + "/" + @repository.identifier+"."+"git" + creator = @project.owner.try(:login) + @repos_url = gitlab_address+"/" + creator + "/" + @gitlab_repository.identifier+"."+"git" end scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb index 8f8e8b561..345d6bd1e 100644 --- a/app/views/projects/settings/_new_edit.html.erb +++ b/app/views/projects/settings/_new_edit.html.erb @@ -1,42 +1,44 @@ -<%= error_messages_for 'project' %> -<%= labelled_form_for @project do |f| %> - -<% end %> +
  • + + > + （打钩为公开项目，不打钩为私有项目；私有项目仅项目成员可见。） +
    • +
  • + + > +
    • +
  • + <% if Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") %> + <%= link_to(l(:button_delete_project), { :controller => 'projects', :action => 'archive', :id => @project, :status => params[:status], :type =>"project" }, + :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => "sy_btn_grey mr5 fl ml15") unless @project.archived? %> +

    （友情提示：删除该项目后如果您想恢复该项目，请联系系统管理员！）

    + <% end %> + 保存 +
    • + + <% end %> + diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index 3980de325..7f9674c61 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -1,6 +1,6 @@

    温馨提示：每个项目只能创建一个版本库

    -
    <% if @gitlab_repository.nil? %> +
    新建版本库 <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
    <% else %> -
    - - - - - - - - - - - - - - - -
    版本库名管理系统库路径
    <%= repository.identifier %>Gitlab<%=h truncate(@repos_url,:length=>10) %>
    -
    +
    + + + + + + + + + + + + + + + +
    +
    <% end %> - -
    - - - - -<% unless @project.repositories.any? %> -

    温馨提示：<%= l(:label_repository_no_data) %>

    -<% end %> -<%= str = error_messages_for 'repository' %> -<% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> -<% ip = RepositoriesHelper::REPO_IP_ADDRESS %> -<%# 提示 %> -<% if @project.repositories.count>1 %> -
    - 项目管理员您好！近日平台完成了版本库升级，以后每个项目将唯一的对应一个版本库。请您按照以下步骤完成项目版本库的更新： -

    1. 点击下面的"创建版本库按钮"，为本项目创建一个新的版本库；

    -

    2. 从本项目的历史版本库中选择一个您将使用的版本库，将其完整的克隆(clone)到本地(需要提供您之前设置的版本库口令)，然后推送(push)到新建的版本库(注意不能仅推送代码，否则之前各开发者的提交记录将丢失)。

    -

    3. 本项目的历史版本库将在您新建版本库的一周内自动隐藏，如果您以后需要这些版本库，请与网站联系，我们将为您提供这些版本库的所有数据。

    -
    -<% end %> -<%# 新建版本库 %> -<% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %> -
    - - - <% course_tag = @project.project_type %> - <% if User.current.allowed_to?(:manage_repository, @project) %> - - <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %>

    - <% end %> -     -
    - - <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %> -
    -
      -
    • - - <%= select_tag('repository_scm', - options_for_select(["Git"],@repository.class.name.demodulize), - :data => {:remote => true, :method => 'get'}) %> - <% if @repository && ! @repository.class.scm_available %> - <%= l(:text_scm_command_not_available) %> - <% end %> -
      • -
    • - - - *<%=l(:label_repository_name)%>： - <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %> - <%# unless @repository.identifier_frozen? %> - <%=l(:text_length_between,:min=>1,:max=>254)< - <%# end %> -
      • -
      -
    - <%=l(:lable_project_rep_create) %> - <%=l(:button_cancel)%> -
    - <% end %> -
    -<% end %> - - -<% if @project.repositories.any? %> - <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> - <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> -
    历史版本库
    - - - <% rep_forge(@project).sort.each do |repository| %> - - - - <%if repository.scm_name=="Git"%> - <% rep_url = "http://" + repository.login.to_s + '_'+ repository.identifier.to_s + "@" + ip.to_s + h( repository.url.slice(project_path_cut, repository.url.length)) %> - - <%else %> - - <% end %> - - <% end %> - -
    - <%= repository.identifier %><%=h repository.scm_name %> - - - - <%#= rep_url %> - - <%=h truncate(repository.url,:length=>10) %>
    -<% end %> - - - - diff --git a/config/locales/zh.yml b/config/locales/zh.yml index d57f29c39..4e2a43962 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1413,7 +1413,7 @@ zh: label_board_description: 七嘴八舌，汇聚众人智慧，为您排忧解难！ label_create_course_description: 课程小社区，创建新课程，让我们共同分享多到想不到的公共资源！ label_welcome_page_to: 参与了 %{project_count} 个项目！ - label_repository_path_not_null: 库路径 不能为空字符 + label_repository_path_not_null: 库路径不能为空字符 label_password_not_null: 密码不能设置为空。 label_exist_repository_path: 定义已有版本库URL路径，定义格式file://, http://, https://, svn:// label_project_no_activity: 该项目暂无动态！ diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index defbdbed1..d2f1457b5 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -261,6 +261,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .w465{width:465px !important;} .w490{width:490px;} .w520{ width:520px;} +.w536{ width:536px;} .w543{ width:543px;} .w557{ width:557px;} .w576{ width:576px;}