From 62ea9d12f7d5e53bf0786a6b75dbd796382ba628 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 21 Nov 2016 14:11:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/show.html.erb | 4 ++-- public/stylesheets/css/common.css | 11 +++++++++++ public/stylesheets/css/project.css | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index f9a88baf8..09ed2216a 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,7 +1,7 @@ -
+
<%= render :partial => 'projects/invite_code' %>
-
+
<% if @project.description.blank? %>

<%= @project.name %>

<% else %> diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index bbc85f3ce..455047d91 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -812,3 +812,14 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;} .my_issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; text-align:center} .my_issues_form_filter select.issues_filter_select_min{width:50px; } .my_issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none;} + +.ke-block pre{ + font-size:9pt; + font-family:Courier New,Arial; + border:1px solid #ddd; + border-left:5px solid #6CE26C; + background:#f6f6f6; + padding:5px; +} +.ke-block ol li{list-style-type: decimal;margin-left: 40px;} +.ke-block ul li{list-style-type: disc;margin-left: 40px;} diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 4ccaab242..d9e46ab73 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -888,7 +888,7 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;} /*项目简介*/ .pro_new_info{ border:1px solid #ddd; background-color:#fff; width: 998px;} .pro_new_info h2{ background: #fff; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px; border-bottom:1px solid #e5e5e5;} -.pro_new_info p{ padding-bottom:2px; padding-left: 15px; color: #666; padding-right: 5px} +/*.pro_new_info p{ padding-bottom:2px; padding-left: 15px; color: #666; padding-right: 5px}*/ .pro_new_info_weight{ font-size: 16px; font-weight: bold;} /* 新版项目配置*/ .pro_new_setting_leftnav{ width: 162px; border:1px solid #ddd; background-color:#fff; padding:3px; padding-bottom: 0;} From 30d0c73e4b69feb3ea16e1a63ab72a0f8d627fb3 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Nov 2016 17:17:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E5=AF=BC=E8=87=B4=E7=89=88=E6=9C=AC=E5=BA=93?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=88=9B=E5=BB=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/trustie/gitlab/sync.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb index 3520098a9..21c3bce47 100644 --- a/lib/trustie/gitlab/sync.rb +++ b/lib/trustie/gitlab/sync.rb @@ -42,7 +42,7 @@ module Trustie gproject = g.create_project(repository.identifier, path: repository.identifier, - description: project.description, + description: false, wiki_enabled: false, wall_enabled: false, issues_enabled: false, @@ -88,7 +88,7 @@ module Trustie # can use password gproject = self.g.create_project(path, path: path, - description: project.description, + description: false, wiki_enabled: false, wall_enabled: false, issues_enabled: false, From 79b1cdcf84af48de9621b003cb6722930b52ab1d Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 22 Nov 2016 11:06:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?pull=20request=20=E6=BA=90=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8B=89=E5=8F=96=E4=BB=A3=E7=A0=81=E5=8F=8A=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index ad60f2b70..c02421c78 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -91,10 +91,11 @@ class PullRequestsController < ApplicationController # 如果分支有改动 if compare_pull_request(source_branch, target_project_id, target_branch) # 如果传送了目标项目ID即向fork源项目发送请求 - if params[:forked_project_id] && params[:source_project] == "forked_project_name" - target_project_id = params[:forked_project_id].to_i + # if params[:forked_project_id] && params[:source_project] == "forked_project_name" + if params[:target_project_id] + target_project_id = params[:target_project_id].to_i request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch, :target_project_id => target_project_id) - @fork_project_name = Project.find(@project.forked_from_project_id).try(:name) + @fork_project_name = Project.find(target_project_id).try(:name) @fork_pr_message = true if @fork_project_name else request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch) From fca68c24dc38b6c47cc8002aa0c5cbfa1a1a782f Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 22 Nov 2016 15:05:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?pull=5Frequest=E5=90=88=E5=B9=B6=E5=88=B0?= =?UTF-8?q?=E6=BA=90=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index c02421c78..e481b09a6 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -93,7 +93,7 @@ class PullRequestsController < ApplicationController # 如果传送了目标项目ID即向fork源项目发送请求 # if params[:forked_project_id] && params[:source_project] == "forked_project_name" if params[:target_project_id] - target_project_id = params[:target_project_id].to_i + target_project_id = params[:forked_project_id].to_i request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch, :target_project_id => target_project_id) @fork_project_name = Project.find(target_project_id).try(:name) @fork_pr_message = true if @fork_project_name From 67a9d04a642332f58fdc50f6a68acb0318dd14ed Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 23 Nov 2016 17:14:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 27 ++++++++++++++++++- app/helpers/projects_helper.rb | 10 +++++++ .../_reposistory_destory_pop.html.erb | 22 +++++++++++++++ app/views/projects/destroy_repository.js.erb | 6 +++++ .../settings/_new_repositories.html.erb | 14 +++++++--- config/routes.rb | 1 + public/stylesheets/css/common.css | 1 + 7 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 app/views/projects/_reposistory_destory_pop.html.erb create mode 100644 app/views/projects/destroy_repository.js.erb diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2bdaddb25..304ab8e02 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -739,7 +739,7 @@ class ProjectsController < ApplicationController rescue Exception => e puts e end - # 删除Trustie班额本库记录 + # 删除Trustie版本库记录 repoisitory = Repository.where(:project_id => @project.id, :type => GITLABTYPE).first repoisitory.delete @project.update_column(:gpid, nil) @@ -799,6 +799,31 @@ class ProjectsController < ApplicationController @project = nil end + REP_TYPE = "Repository::Gitlab" + # Delete @project's repository + def destroy_repository + if is_project_manager?(User.current.id, @project.id) + @gitlab_repository = Repository.where(:project_id => @project, :type => REP_TYPE).first + @is_true = params[:is_true] + if @is_true + begin + g = Gitlab.client + @gitlab_repository.destroy + @gitlab_repository = nil + @project.update_attribute(:gpid, nil) + scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first + @repository = Repository.factory(scm) + @repository.is_default = @project.repository.nil? + g.delete_project(@project.gpid) + rescue Exception => e + puts e + end + end + else + return render_403 + end + end + def show_projects_score respond_to do |format| format.html { render :layout => "base_projects"} diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 3dff9c414..fb757665f 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -302,6 +302,16 @@ module ProjectsHelper type << option2 end + # 判断用户是否为项目管理员 + def is_project_manager?(user_id, project_id) + @result = false + mem = Member.where("user_id = ? and project_id = ?",user_id, project_id) + unless mem.blank? + @result = mem.first.roles.to_s.include?("Manager") ? true : false + end + return @result + end + # 用来判断用户是否是项目的管理员 # added by william def is_manager?(user_id,project_id) diff --git a/app/views/projects/_reposistory_destory_pop.html.erb b/app/views/projects/_reposistory_destory_pop.html.erb new file mode 100644 index 000000000..1f8dd06f2 --- /dev/null +++ b/app/views/projects/_reposistory_destory_pop.html.erb @@ -0,0 +1,22 @@ +
+
+

提示

+ +
+
+
+
    +
  • + 删除操作会彻底删除版本库及源码，一旦删除不能恢复
    + 你确定删除吗？ +
    • +
  • + + 取  消 + + <%= link_to "确 定", destroy_repository_project_path(@project, :is_true => true), :remote => true, :class => "sy_btn_blue fl ml20", :onclick => "hideModal();" %> +
    +
    • +
+
+
\ No newline at end of file diff --git a/app/views/projects/destroy_repository.js.erb b/app/views/projects/destroy_repository.js.erb new file mode 100644 index 000000000..3bc1d727b --- /dev/null +++ b/app/views/projects/destroy_repository.js.erb @@ -0,0 +1,6 @@ +<% if @is_true %> +$("#pro_st_tbc_06").html('<%= escape_javascript( render :partial => 'projects/settings/new_repositories') %>'); +<% else %> +var htmlvalue = "<%= escape_javascript(render :partial => 'projects/reposistory_destory_pop') %>"; +pop_box_new(htmlvalue,460,316); +<% end %> diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index a531e904a..1fb4f7b7a 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -14,7 +14,7 @@ - <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false, :label=>"", :no_label => true, :class => "w650 fl", :style => "height: 28px;", :id => "project_setting_repository" %> + <%= f.text_field :identifier, :disabled => @repository.nil? || @repository.identifier_frozen? ? true:false, :label=>"", :no_label => true, :class => "w650 fl", :style => "height: 28px;", :id => "project_setting_repository" %>
  • @@ -35,14 +35,22 @@ 版本库名 管理系统 - 库路径 + 库路径 +   <%= @gitlab_repository.identifier %> Git - <%=h @repos_url %> + <%=h @repos_url %> + + <% if is_project_manager?(User.current.id, @project.id) %> + <%= link_to "删除", destroy_repository_project_path(@project), :class => "c_blue", :remote => true %> + <% else %> + <%= "删除" %> + <% end %> + diff --git a/config/routes.rb b/config/routes.rb index 3848c4b46..db1ad27e3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -783,6 +783,7 @@ RedmineApp::Application.routes.draw do get 'file', :action => 'file', :as => 'file' get 'statistics', :action => 'statistics', :as => 'statistics' get 'repository_tree_changes', :action => 'repository_tree_changes', :as => 'repository_tree_changes' + get 'destroy_repository', :action => 'destroy_repository', :as => 'destroy_repository' get 'feedback', :action => 'feedback', :as => 'project_feedback' get 'watcherlist', :action=> 'watcherlist' diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index bbc85f3ce..fad7e766a 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -233,6 +233,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .w20{ width:20px;} .w40{width: 40px;} .w45{ width: 45px;} +.w46{ width: 46px;} .w48{width:48px;} .w50 {width:50px;} .w56 {width:56px;} From 30a0347cd6f1465ced846fc05d679a3958d4234e Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Nov 2016 17:40:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8F=8A=E5=85=B6=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E5=85=B3=E6=B3=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=A0=B7=E5=BC=8F=EF=BC=88=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/watchers_helper.rb | 10 ++++- app/views/projects/_applied_status.html.erb | 26 ++++++++--- .../projects/_project_member_list.html.erb | 37 +++++++-------- app/views/projects/member.html.erb | 9 ++-- app/views/projects/member_forked.html.erb | 2 +- app/views/projects/watcherlist.html.erb | 45 +++++++------------ config/locales/commons/zh.yml | 2 +- config/locales/projects/zh.yml | 2 +- public/stylesheets/css/project.css | 3 +- 9 files changed, 75 insertions(+), 61 deletions(-) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index acece2307..09d9115b4 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -333,6 +333,7 @@ module WatchersHelper return '' unless user && user.logged? objects = Array.wrap(objects) watched = objects.any? {|object| object.watched_by?(user)} + watched = true if user.id == @project.user_id @watch_flag = objects.first.instance_of?(Project) id = watcher_css(objects) text = @watch_flag ? @@ -340,8 +341,13 @@ module WatchersHelper url = watch_path(:object_type => objects.first.class.to_s.underscore, :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort)) method = watched ? 'delete' : 'post' - link_to text, url, :remote => true, :method => method, - :class => "pro_new_topbtn_left fl" ,:id=>id + if user.id != @project.user_id + link_to text, url, :remote => true, :method => method, + :class => "pro_new_topbtn_left fl" ,:id => id + else + link_to "关注", "javascript:void(0)", :remote => true, :method => method, + :class => "pro_new_grey_topbtn_left fl" , :id => id + end end def store_project_link project_id, user_id diff --git a/app/views/projects/_applied_status.html.erb b/app/views/projects/_applied_status.html.erb index ec64a08ae..55190c613 100644 --- a/app/views/projects/_applied_status.html.erb +++ b/app/views/projects/_applied_status.html.erb @@ -3,7 +3,8 @@
  • <%= watcher_link_for_project(@project, User.current) %> - <%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id},:id=>"fans_num", :class => 'pro_new_topbtn fl' %> + <%= link_to "#{@project.watcher_users.count}", {:controller => "projects", :action => "watcherlist", + :id => @project.id}, :id => "fans_num", :class => 'pro_new_topbtn fl', :title => "关注成员列表" %>
  • @@ -12,15 +13,21 @@ <% else %> 等待审批 <% end %> - <%= link_to "#{Member.where(:project_id => @project.id).count}", project_member_path(@project), :class => 'pro_new_topbtn fl', :title => "项目成员" %> + <%= link_to "#{Member.where(:project_id => @project.id).count}", project_member_path(@project), :class => 'pro_new_topbtn fl', :title => "项目成员列表" %>
    • <% end %> <% else %> - <% if User.current.id != @project.user_id %> + <% if User.current.login? %> +
  • + <%= watcher_link_for_project(@project, User.current) %> + <%= link_to "#{@project.watcher_users.count}", {:controller => "projects", :action => "watcherlist", + :id => @project.id}, :id => "fans_num", :class => 'pro_new_topbtn fl', :title => "关注成员列表" %> +
  • 已加入 - <%= Member.where(:project_id => @project.id).count %> + + <%= link_to "#{Member.where(:project_id => @project.id).count}", project_member_path(@project), :class => 'pro_new_topbtn fl', :title => "项目成员列表" %>
    • <%#= link_to "#{Member.where(:project_id => @project.id).count}", project_member_path(@project), :class => 'pro_new_topbtn fl', :title => "项目成员" %> <% end %> @@ -35,8 +42,17 @@ <%= link_to "".html_safe+"Fork", forked_pop_project_path(@project), :class=>"pro_new_topbtn_left fl", :remote => true %> - <%= @project.forked_count.to_i %> + <%= @project.forked_count.to_i %> + +<% else%> +
  • + <%#= link_to "".html_safe+"Fork","#", + :class=>"pro_new_grey_topbtn_left fl"%> + + Fork + + <%= @project.forked_count.to_i %> <% end %> diff --git a/app/views/projects/_project_member_list.html.erb b/app/views/projects/_project_member_list.html.erb index eb2573d03..31a86e8c9 100644 --- a/app/views/projects/_project_member_list.html.erb +++ b/app/views/projects/_project_member_list.html.erb @@ -1,30 +1,31 @@
    -
    - 加入时间 -
    +
      <% members.each do |member| %> -
      - - <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> - - <%= l(:label_user_for_project_grade) %>：<%= format("%.2f" ,read_user_project_scores(member.user,@project)).to_i %> +
    • + <%= link_to image_tag(url_to_avatar(member.user), :width => "50", :height => "50"), user_path(member.user), :alt => "用户头像", :class => "pro_new_users fl mr5" %> +
      + <%= link_to member.user.try(:show_name), user_path(member.user), :class => "pro_new_users mt5 fl" %> + +
      + <%= h time_tag(member.created_on) %> +
      +
      • + <% end %> +
    - <%= l(:label_username)%> - <%= link_to(member.user.name, user_path(member.user),:class => "ml10 c_blue02") %>（<%= rolesToLanguage(member.roles.sort.collect(&:to_s)).join(', ') %>）
    +
    - - <%= format_date(member.created_on)%> -
    -
    - <% end%> - -
      - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
      +
      +
        + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true %>
      +
      diff --git a/app/views/projects/member.html.erb b/app/views/projects/member.html.erb index e24dab160..49ab1ac68 100644 --- a/app/views/projects/member.html.erb +++ b/app/views/projects/member.html.erb @@ -1,11 +1,12 @@ -
      -
      -

      <%= @subPage_title %>

      +
      +
      +

      <%= @subPage_title %> <% if is_project_manager?(User.current, @project) %> - <%=link_to "成员管理", :controller => 'projects', :action => 'settings', :id => @project.id, :tab => 'members' %> + <%=link_to "成员管理", {:controller => 'projects', :action => 'settings'}, :id => @project.id, :tab => 'members', :class => "sy_cblue", :style => "font-weight: normal;" %> <% end %> +

      <%= error_messages_for 'member' %> diff --git a/app/views/projects/member_forked.html.erb b/app/views/projects/member_forked.html.erb index 488952057..5ea62b4c9 100644 --- a/app/views/projects/member_forked.html.erb +++ b/app/views/projects/member_forked.html.erb @@ -9,7 +9,7 @@ / <%= link_to project.name, project_path(project), :class => "pro_new_users mt5 fl" %>
      - <%=h time_tag(project.created_on) %>前 + <%=h time_tag(project.created_on) %>
      <% end %> diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb index effef316b..65239b53a 100644 --- a/app/views/projects/watcherlist.html.erb +++ b/app/views/projects/watcherlist.html.erb @@ -1,28 +1,17 @@ -
      -
      -

      <%= l(:label_user_watcher)%>

      -
      -
      -
      - 加入时间 -
      - - <% for user in @project.watcher_users %> -
      - - <%= user.nil? ? '' : (image_tag(url_to_avatar(user), :width => 32, :height => 32)) %> - - <%= l(:label_username)%> - <%= link_to(user.name, user_path(user),:class => "ml10 c_blue02") %> - <%= format_date(user.created_on) %> -
      -
      - <% end%> - - -
      -
      -
      - - <% html_title(l(:label_followers)) -%> -
      \ No newline at end of file +
      +

      成员 本页面展示关注了 <%= link_to @project.owner.try(:show_name), user_path(@project.owner) %>/<%= link_to @project.name, project_path(@project) %> 的用户

      +
        + <% @project.watcher_users.each do |user| %> +
      • + <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像", :class => "pro_new_users fl mr5" %> +
        + <%= link_to user.try(:show_name), user_path(user), :class => "pro_new_users mt5 fl" %> + +
        + <%=h time_tag(user.created_on) %> +
        +
        • + <% end %> +
      +
      diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 1b8dcff89..0f7ba1969 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -226,7 +226,7 @@ zh: button_download: 下载 button_more: "更多" button_delete: 删除 - button_unfollow: 取消关注 + button_unfollow: 已关注 button_follow: 关注 button_watch: 跟踪 button_unwatch: 取消跟踪 diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 75125f258..77e17a8b7 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -52,7 +52,7 @@ zh: label_agree_join_project: 同意加入 label_apply_project: "加入" - label_button_following: "添加关注" + label_button_following: "关注" label_project_collect: 收藏 label_project_collect_cancel: 取消收藏 label_exit_project: 退出项目 diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index d9e46ab73..33d6d1dbf 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -867,6 +867,7 @@ a.pro_new_project_name{ width: 250px; overflow: hidden;white-space: nowrap;text- a.pro_new_topbtn{ padding: 3px 7px; font-size: 12px; line-height: 20px; color: #333;vertical-align: middle;background-color: #fff; border: 1px solid #ddd; border-left: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; color: #333;} a.pro_new_topbtn_left { padding: 3px 10px; font-size: 12px;line-height: 20px; background-image: linear-gradient(#fcfcfc, #eee); border: 1px solid #d5d5d5;border-radius: 3px;border-top-right-radius: 0;border-bottom-right-radius: 0; color: #333; } a:hover.pro_new_topbtn_left{background-image: linear-gradient(#ededed, #dddddd);} +a.pro_new_grey_topbtn_left{padding: 3px 10px; font-size: 12px;line-height: 20px; background: #fff; border: 1px solid #d5d5d5;border-radius: 3px;border-top-right-radius: 0;border-bottom-right-radius: 0; color: #888888; } .pro_new_topnav ul{border-bottom: 3px solid #fff; height: 30px; line-height: 30px;} .pro_new_topnav ul li{ float: left;padding:0 15px; height: 30px; line-height: 30px;text-align: center; } .pro_new_topnav_active{border-bottom: 3px solid #3b94d6; } @@ -1028,7 +1029,7 @@ textarea.muban_textarea{ width: 98.5%;border:1px solid #ddd; background:#fff; co .pro_new_users_box{ margin:0 10px;} .pro_new_users_box li{ width:25%; float: left; margin:10px 0;} .pro_new_users{ } -a.pro_new_users { max-width:80px; overflow:hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap; word-break:break-all; display: inline-block; font-weight: bold; color: #666;} +a.pro_new_users { max-width:130px; overflow:hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap; word-break:break-all; display: inline-block; font-weight: bold; color: #666;} a:hover.pro_new_users {color: #3b94d6} .pro_new_users img{ width:40px;height:40px; border: 3px solid #fff;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;} .pro_new_users img:hover{border: 3px solid #e6e6e6;}