From 62ea9d12f7d5e53bf0786a6b75dbd796382ba628 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 21 Nov 2016 14:11:35 +0800 Subject: [PATCH 1/5] =?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/5] =?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 f1ad70bb335fbf4e21695a9fe8d48fc62726b1ea Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Tue, 22 Nov 2016 08:52:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=B3=E6=B3=A8BUG=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81BUG=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/account.html.erb | 3 +- app/views/users/_user_fans_item.html.erb | 114 +++++++++++------------ app/views/users/user_fanslist.html.erb | 43 +++++---- 3 files changed, 80 insertions(+), 80 deletions(-) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 2a4b3b480..fd7425aab 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -214,7 +214,8 @@
  • 确认密码 : 
      • -
      • + +
    • 请输入8-12个字符
    • diff --git a/app/views/users/_user_fans_item.html.erb b/app/views/users/_user_fans_item.html.erb index 8614e0b61..36d1b1b73 100644 --- a/app/views/users/_user_fans_item.html.erb +++ b/app/views/users/_user_fans_item.html.erb @@ -1,65 +1,55 @@ <% unless list.nil?%> -<% for item in list %> -
      -
      - - <%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %> - -
      -
      - <%= item.show_name %> -
      -
      - <% if item.user_extensions && !item.user_extensions.brief_introduction.nil? && !item.user_extensions.brief_introduction.empty? %> -

      个性签名：<%= item.user_extensions.brief_introduction %>

      + <% for item in list %> +
      +
      + + <%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %> + +
      +
      + <%= item.show_name %> +
      +
      + <% if item.user_extensions && !item.user_extensions.brief_introduction.nil? && !item.user_extensions.brief_introduction.empty? %> +

      个性签名：<%= item.user_extensions.brief_introduction %>

      + <% end %> + + + + <% if (item.user_extensions.identity == 0 || item.user_extensions.identity == 1) && !item.user_extensions.school.nil? %> + + + <% elsif item.user_extensions.identity == 3 && !item.user_extensions.occupation.nil? && !item.user_extensions.occupation.empty? %> + + + <% elsif item.user_extensions.identity == 2 %> + + + <% end %> +
      加入时间：<%= format_date(item.created_on) %>工作单位： +
    • + <%= item.user_extensions.school.name %> +
      • +       		工作单位： +
    • + <%= item.user_extensions.occupation %> +
      • +       		工作单位： +
    • + <%= item.show_name %> +
      • +
      +
      +
      + + <% if(User.current.logged? && User.current != item )%> + <%if(item.watched_by?(User.current))%> + 取消关注 + <% else %> + 添加关注 + <% end %> <% end %> - - - - <% if (item.user_extensions.identity == 0 || item.user_extensions.identity == 1) && !item.user_extensions.school.nil? %> - - - <% elsif item.user_extensions.identity == 3 && !item.user_extensions.occupation.nil? && !item.user_extensions.occupation.empty? %> - - - <% elsif item.user_extensions.identity == 2 %> - - - <% end %> -
      加入时间：<%= format_date(item.created_on) %>工作单位： -
    • - <%= item.user_extensions.school.name %> -
      • -       		工作单位： -
    • - <%= item.user_extensions.occupation %> -
      • -       		工作单位： -
    • - <%= item.show_name %> -
      • -
      +
      -
      - - <% if(User.current.logged? && User.current != item )%> - <%if(item.watched_by?(User.current))%> - 取消关注 - <% else %> - 添加关注 - <% end %> - <% end %> -
      -
      -<% end %> -
      -
      -
        - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true%> -
      -
      -
      -
      -<% else %> -

      <%= l(:label_no_data) %>

      -<% end %> + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index 77d85565e..041dabd03 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -7,30 +7,39 @@ } -
      -
      - <% if @action == 'fans' %> +
      +
      + <% if @action == 'fans' %>

      粉丝

      共有<%=@obj_count%>名粉丝
      - <% elsif @action == 'visitor' %> + <% elsif @action == 'visitor' %>

      访客

      共有<%=@obj_count%>访客
      - <% else %> + <% else %>

      关注

      一共关注<%=@obj_count%>人
      - <% end %> + <% end %> +
      +
      +
      + <%# for item in @list %> + <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %> + <%# end %> +
      +

      <%= l(:label_no_data) %>

      + +
      +
      +
        + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%> +
      -
      - <%# for item in @list %> - <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %> - <%# end %> -
      - - - - - -
      + + + + + +
      From 8d980b16dba84b107f6007f2714e7af814a967fb Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Tue, 22 Nov 2016 10:10:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index f9a88baf8..3467214c9 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,5 +1,5 @@ -
      +
      <%= render :partial => 'projects/invite_code' %>
      <% if @project.description.blank? %> From c571d195483065c15af0aaf02d3571d12c1357b4 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Tue, 22 Nov 2016 10:16:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B?= =?UTF-8?q?=E5=8D=95=E8=AF=8D=E4=B8=8D=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 09ed2216a..5a38e3b38 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,5 +1,5 @@ -
      +
      <%= render :partial => 'projects/invite_code' %>
      <% if @project.description.blank? %>