From 78868b34f0d914675c5bd5a6bec3e180007f8f9f Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 11 Apr 2015 15:12:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E4=B8=AD=E5=9B=9B=E4=B8=AD=E9=A2=9C=E8=89=B2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BC=9A=E6=8A=98=E6=96=AD=E6=8D=A2=E8=A1=8C=E7=9A=84bug=20?= =?UTF-8?q?=E5=8C=BA=E5=88=AB=E6=96=B0=E9=97=BB=E5=92=8C=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/news/_project_news.html.erb | 2 +- config/locales/projects/zh.yml | 1 + public/stylesheets/public.css | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb index 688635796..97902aa16 100644 --- a/app/views/news/_project_news.html.erb +++ b/app/views/news/_project_news.html.erb @@ -27,7 +27,7 @@ <%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %>
<%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %> - <%= l(:label_release_news) %>：<%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
+ <%= l(:label_add_news) %>：<%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>

<%= news.description %>
<%= l(:label_create_time) %> ：<%= format_time(news.created_on) %>

diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 99f8bafca..bbf9cc343 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -287,6 +287,7 @@ zh: label_topic_score: 讨论区得分 label_topic_number: 讨论区帖子数量 + label_add_news: 添加了新闻 # diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index e814a7495..6630a01d6 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -137,10 +137,10 @@ a:hover.orange_btn{ background:#d63502;} .nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;} .more_btn{-moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF; border-radius:3px; padding:0px 3px;} .upbtn{ margin:42px 0 0 10px; border:none;} -.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} -.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} -.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} -.orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;} +.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap; } +.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap; } +.orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;white-space:nowrap; } /* commonpic */ .pic_date{ display:block; background:url(../images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; float:left;} .pic_add{ display:block; background:url(../images/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; float:left;} From d2a77b3d4130a5704a3d23dff178c0110bca9f71 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 11 Apr 2015 15:34:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0issues=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_list.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index a336468dd..889a37cbd 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -21,7 +21,8 @@ <%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %>

- 001 + <%=link_to "#{issue.journals.all.count}".html_safe, issue_path(issue.id), :class => "pro_mes_w" %> +
<% end %>
From 7ad3c2d578fd92932cbadcd5b94f46365af452c8 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 11 Apr 2015 16:17:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AEjs=20=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9B=B8=E5=85=B3=E5=AD=90=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings.html.erb | 512 ++---------------- .../settings/_new_activities.html.erb | 23 + .../projects/settings/_new_edit.html.erb | 40 ++ .../settings/_new_issue_categories.html.erb | 57 ++ .../projects/settings/_new_members.html.erb | 67 +++ .../projects/settings/_new_modules.html.erb | 19 + .../settings/_new_repositories.html.erb | 69 +++ .../projects/settings/_new_versions.html.erb | 140 +++++ public/javascripts/project.js | 19 +- 9 files changed, 486 insertions(+), 460 deletions(-) create mode 100644 app/views/projects/settings/_new_activities.html.erb create mode 100644 app/views/projects/settings/_new_edit.html.erb create mode 100644 app/views/projects/settings/_new_issue_categories.html.erb create mode 100644 app/views/projects/settings/_new_members.html.erb create mode 100644 app/views/projects/settings/_new_modules.html.erb create mode 100644 app/views/projects/settings/_new_repositories.html.erb create mode 100644 app/views/projects/settings/_new_versions.html.erb diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index f57b62465..8598422b9 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -5,14 +5,14 @@
    -
  • 信息
    • -
  • 模块
    • -
  • 成员
    • -
  • 版本
    • -
  • 问题类别
    • -
  • 版本库
    • -
  • 活动（时间跟踪）
    • -
  • 代码评审
    • +
  • 信息
    • +
  • 模块
    • +
  • 成员
    • +
  • 版本
    • +
  • 问题类别
    • +
  • 版本库
    • +
  • 活动（时间跟踪）
    • +
  • 代码评审
@@ -20,471 +20,69 @@
-
    -
    -
  • - 上传图片 - -
    -
    • -
  • - - -
    • -
    - -
  • - - -
    -
    • -
  • - - -
    • -
    -
  • - - -
    -
    • -
  • - - -
    -
    • -
    -
- 保存 -
+ <%= render :partial=>"projects/settings/new_edit" %>
-
-

请选择此项目可以使用的模块：

-
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
-
-

全选   |   清除

-

保存

+ <%= render :partial=>"projects/settings/new_modules" %>
-
- - -
- -
-
-

+申请加入

- -
    -
  • 角色:
    • -
    • -
    • -
    • -
-
- 批准拒绝 - -
-
-
-

添加成员

-
- 搜索 -
-
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
-
- -
-
    -
  • 角色：
    • -
    • -
    • -
    • -
-
- 新增成员 -
-
-
+ <%= render :partial=>"projects/settings/new_members" %>
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
版本 日期描述 状态共享Wiki 页面
- 暑期版(Summer Beta) V0.8 - 2013-08-30打开 - 编辑 - 删除 -
- 正式版(First Release) V1.0 - 2013-11-01正式对外提供服务的版本打开 - 编辑 - 删除 -
- 商业版(Second Release) V2.0 - 2013-08-30增加在线支付、实名认证等功能，界面更加美化，用户交互更加友好！打开 - 编辑 - 删除 -
- JACK SUMMER V0.8 - 2014-08-25试用人员的开发版本打开 - 编辑 - 删除 -
- LongJun Contest - V1.0 - contest网站的开发分支打开 - 编辑 - 删除 -
- SZZH V1.1 (Supported by BJSZZH) - 神舟公司外包开发版本打开 - 编辑 - 删除 -
- 关闭已完成的版本 - - 新建版本 -
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - - -
    • -
    -
  • - - -
    • - 保存 -
-
+
+ <%= render :partial=>"projects/settings/new_versions" %>
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
问题类别 指派给
思路 编辑 - 删除
思路suntao 编辑 - 删除
思路gugu 编辑 - 删除
思路 编辑 - 删除
- - 新建问题类别 -
-
-
    -
  • - - -
    • -
    -
  • - - -
    • -
    -
- 保存 -
+
+ <%= render :partial=>"projects/settings/new_issue_categories" %>
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
标识 主版本库管理系统 库路径
trustie2Githttp://xianbo_trustie2用户列表
microsGithttp://xianbo_trustie2用户列表
socialforgeGithttp://xianbo_trustie2用户列表删除
- - 新建版本库 -
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - - 长度必须在 1 到 254 个字符之间。 仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。 -一旦保存，标识无法修改。 -
    • -
  • - - - 该密码在项目组内可共享 -
    • -
    -
- 保存 - 取消 -
+
+ <%= render :partial=>"projects/settings/new_repositories" %>
-
- - - - - - - - - - - - - - - - - - - -
名称 系统活动活动
Design
Development
- 保存 - 重置 +
+ <%= render :partial=>"projects/settings/new_activities" %>
-
-
-
    -
    • -
  • 设置代码评审的默认跟踪标签:
    • -
  • -
    • -
  • - - -
    • -
  • - - - 与之相关的评审问题 - - - 与之无关的评审问题 - - 什么也不做 -
    • -
  • - - 激活 -
    • -
- 保存 -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/app/views/projects/settings/_new_activities.html.erb b/app/views/projects/settings/_new_activities.html.erb new file mode 100644 index 000000000..8f0cbbf49 --- /dev/null +++ b/app/views/projects/settings/_new_activities.html.erb @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + +
名称 系统活动活动
Design
Development
+保存 +重置 \ No newline at end of file diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb new file mode 100644 index 000000000..92d52e5b6 --- /dev/null +++ b/app/views/projects/settings/_new_edit.html.erb @@ -0,0 +1,40 @@ +
    +
    +
  • + 上传图片 + +
    +
    • +
  • + + +
    • +
    + +
  • + + +
    +
    • +
  • + + +
    • +
    +
  • + + +
    +
    • +
  • + + +
    +
    • +
    +
+保存 +
\ No newline at end of file diff --git a/app/views/projects/settings/_new_issue_categories.html.erb b/app/views/projects/settings/_new_issue_categories.html.erb new file mode 100644 index 000000000..b690b11ce --- /dev/null +++ b/app/views/projects/settings/_new_issue_categories.html.erb @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
问题类别 指派给
思路 编辑 + 删除
思路suntao 编辑 + 删除
思路gugu 编辑 + 删除
思路 编辑 + 删除
+ +新建问题类别 +
+
+
    +
  • + + +
    • +
    +
  • + + +
    • +
    +
+ 保存 +
\ No newline at end of file diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb new file mode 100644 index 000000000..a38b462e2 --- /dev/null +++ b/app/views/projects/settings/_new_members.html.erb @@ -0,0 +1,67 @@ +
+ + +
+ +
+
+

+申请加入

+ +
    +
  • 角色:
    • +
    • +
    • +
    • +
+
+ 批准拒绝 + +
+
+
+

添加成员

+
+ 搜索 +
+
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+ +
+
    +
  • 角色：
    • +
    • +
    • +
    • +
+
+ 新增成员 +
+
+
\ No newline at end of file diff --git a/app/views/projects/settings/_new_modules.html.erb b/app/views/projects/settings/_new_modules.html.erb new file mode 100644 index 000000000..e2696a23e --- /dev/null +++ b/app/views/projects/settings/_new_modules.html.erb @@ -0,0 +1,19 @@ +
+

请选择此项目可以使用的模块：

+
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+

全选   |   清除

+

保存

\ No newline at end of file diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb new file mode 100644 index 000000000..d964c8f22 --- /dev/null +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
标识 主版本库管理系统 库路径
trustie2Githttp://xianbo_trustie2用户列表
microsGithttp://xianbo_trustie2用户列表
socialforgeGithttp://xianbo_trustie2用户列表删除
+ +新建版本库 +
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + + 长度必须在 1 到 254 个字符之间。 仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。 +一旦保存，标识无法修改。 +
    • +
  • + + + 该密码在项目组内可共享 +
    • +
    +
+ 保存 + 取消 +
\ No newline at end of file diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb new file mode 100644 index 000000000..28c3c42ef --- /dev/null +++ b/app/views/projects/settings/_new_versions.html.erb @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
版本 日期描述 状态共享Wiki 页面
+ 暑期版(Summer Beta) V0.8 + 2013-08-30打开 + 编辑 + 删除 +
+ 正式版(First Release) V1.0 + 2013-11-01正式对外提供服务的版本打开 + 编辑 + 删除 +
+ 商业版(Second Release) V2.0 + 2013-08-30增加在线支付、实名认证等功能，界面更加美化，用户交互更加友好！打开 + 编辑 + 删除 +
+ JACK SUMMER V0.8 + 2014-08-25试用人员的开发版本打开 + 编辑 + 删除 +
+ LongJun Contest - V1.0 + contest网站的开发分支打开 + 编辑 + 删除 +
+ SZZH V1.1 (Supported by BJSZZH) + 神舟公司外包开发版本打开 + 编辑 + 删除 +
+关闭已完成的版本 + +新建版本 +
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + +
    • +
    +
  • + + +
    • + 保存 +
+ +
\ No newline at end of file diff --git a/public/javascripts/project.js b/public/javascripts/project.js index 20ef731d7..148fe44cc 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -162,7 +162,20 @@ function close_window(type){ //弹框l ///////////////////////////////////////////// -function g(o){return document.getElementById(o);} -function HoverLi(n){ - for(var i=1;i<=8;i++){g('pro_st_tb_'+i).className='pro_st_normaltab';g('pro_st_tbc_0'+i).className='pro_st_undis';}g('pro_st_tbc_0'+n).className='pro_st_dis';g('pro_st_tb_'+n).className='pro_st_hovertab'; +//项目配置 +function project_setting(n) +{ + for(var i = 1;i < 9; i++) + { + if(i == n) + { + $("#pro_st_tb_"+i).removeClass().addClass("pro_st_hovertab"); + $("#pro_st_tbc_0"+i).removeClass().addClass("pro_st_dis"); + } + else + { + $("#pro_st_tb_"+i).removeClass().addClass("pro_st_dis"); + $("#pro_st_tbc_0"+i).removeClass().addClass("pro_st_undis"); + } + } } \ No newline at end of file From 36d76cfa074a1ccf0b9ca70eebfb98c3ea04a8cf Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 11 Apr 2015 16:33:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=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/views/issues/index.html.erb | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 9e9feb33c..7ac495c8a 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -20,11 +20,9 @@ <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
<%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get, :id => 'query_form', :class => 'query_form') do %> - <%= hidden_field_tag 'set_filter', '1' %> - -
+ <%= hidden_field_tag 'set_filter', '1' %> +
---<%= l :label_query_new %>--- -
"> @@ -34,24 +32,24 @@ <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-