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 %>
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} %>
- @@ -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/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/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 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;}