diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb index c83d9133f..e2b58e683 100644 --- a/app/views/news/_project_show.html.erb +++ b/app/views/news/_project_show.html.erb @@ -1,129 +1,69 @@ +<% + btn_tips = l(:label_news_new) + label_tips = l(:label_news) +%>
-

<%= l(:label_news) %>

+

<%= label_tips %>

- +
+ <% if @newss.empty? %> +

+ <%= l(:label_no_data) %> +

+ <% else %> + <% @newss.each do |news| %> +
+ <%= 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' %>
+
+

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

+ +
+
+
-<% if authorize_for('news', 'edit') %> - -<% end %> + <% end %> +
+ + -
- <%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %> -
-

<%=h @news.title %>

- <%#= watcher_link(@news, User.current) %> - <%= link_to(l(:button_edit), - edit_news_path(@news), - :class => 'talk_edit fr', - :accesskey => accesskey(:edit), - :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %> - <%= delete_link news_path(@news),:class => 'talk_edit fr' if User.current.allowed_to?(:manage_news, @project) %> -
-
<%= textAreailizable(@news, :description) %>
<%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %>
- <%= link_to_attachments_course @news %> - -
-
-
- -<% if @news.commentable? %> -
- <%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %> -

- <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %> -
- <%= text_area 'comment', 'comments', :rows => 5, :style => "width:98%" %> +<% other_formats_links do |f| %> + <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> +<% end %> -
- <%= l(:label_comment_add) %> - <% end %> - <% end %> -
-<% comments = @comments.reverse %> -<% comments.each do |comment| %> - <% next if comment.new_record? %> -
-
<%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author), :class => "ping_dispic" %>
-
-
- <%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %><%= format_time(comment.created_on) %> -
-

<%= textAreailizable(comment.comments) %>

-
-
<%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment}, - :data => {:confirm => l(:text_are_you_sure)}, - :method => :delete, - :title => l(:button_delete) %> -
-
-
-
- <% end if @comments.any? %> - <% content_for :header_tags do %> + <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> <%= stylesheet_link_tag 'scm' %> <% end %> -<% html_title @news.title -%> + +<% html_title(l(:label_news_plural)) -%> + + diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 68f49689b..f57b62465 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -1,9 +1,490 @@
-

<%=l(:label_settings)%>

+

配置

-<% if @project.project_type == 1 %> - <%= render_tabs course_settings_tabs %> -<% else %> - <%= render_project_settings_tabs project_settings_tabs %> -<% end %> -<% html_title(l(:label_settings)) -%> + +
+
+ +
+
+ +
+
+
    +
    +
  • + 上传图片 + +
    +
    • +
  • + + +
    • +
    + +
  • + + +
    +
    • +
  • + + +
    • +
    +
  • + + +
    +
    • +
  • + + +
    +
    • +
    +
+ 保存 +
+
+ +
+
+

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

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

全选   |   清除

+

保存

+
+ +
+
+ + +
+ +
+
+

+申请加入

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

添加成员

+
+ 搜索 +
+
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+ +
+
    +
  • 角色：
    • +
    • +
    • +
    • +
+
+ 新增成员 +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
版本 日期描述 状态共享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) + 神舟公司外包开发版本打开 + 编辑 + 删除 +
+ 关闭已完成的版本 + + 新建版本 +
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + +
    • +
    +
  • + + +
    • + 保存 +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
问题类别 指派给
思路 编辑 + 删除
思路suntao 编辑 + 删除
思路gugu 编辑 + 删除
思路 编辑 + 删除
+ + 新建问题类别 +
+
+
    +
  • + + +
    • +
    +
  • + + +
    • +
    +
+ 保存 +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
标识 主版本库管理系统 库路径
trustie2Githttp://xianbo_trustie2用户列表
microsGithttp://xianbo_trustie2用户列表
socialforgeGithttp://xianbo_trustie2用户列表删除
+ + 新建版本库 +
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + + 长度必须在 1 到 254 个字符之间。 仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。 +一旦保存，标识无法修改。 +
    • +
  • + + + 该密码在项目组内可共享 +
    • +
    +
+ 保存 + 取消 +
+
+
+ + + + + + + + + + + + + + + + + + + + +
名称 系统活动活动
Design
Development
+ 保存 + 重置 +
+
+
+
    +
    • +
  • 设置代码评审的默认跟踪标签:
    • +
  • +
    • +
  • + + +
    • +
  • + + + 与之相关的评审问题 + + + 与之无关的评审问题 + + + 什么也不做 +
    • +
  • + + 激活 +
    • +
+ 保存 +
+
+ +
+
\ No newline at end of file diff --git a/public/javascripts/project.js b/public/javascripts/project.js index 52d96f2d7..20ef731d7 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -159,4 +159,10 @@ function close_window(type){ $("#" + type).attr("checked","checked"); } -//弹框l \ No newline at end of file +//弹框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'; +} \ No newline at end of file diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css index 7a87c3c77..a64d3671f 100644 --- a/public/stylesheets/pleft.css +++ b/public/stylesheets/pleft.css @@ -35,9 +35,9 @@ a:hover.pr_join_a{ background:#41a8c8;} .subNavBox{width:240px; background:#fff;margin:10px 10px 0 0;} .subNav{border-bottom:solid 1px #e5e3da;cursor:pointer;font-weight:bold;font-size:14px;color:#3ca5c6; height:26px;padding-left:10px;background-color:#fff; padding-top:2px;} .subNav_jiantou{background:url(../images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;} -a:hover.subNav_jiantou:hover{color:#0781b4; } -.currentDd{color:#0781b4; } -.currentDt{background-color:#fff; } +.subNav_jiantou:hover{color:#0781b4; } +.currentDd{color:#0781b4;} +.currentDt{background-color:#fff;} .navContent{display: none;border-bottom:solid 1px #e5e3da; } .navContent li a{display:block;width:240px;heigh:28px;text-align:center;font-size:12px;line-height:28px;color:#333} .navContent li a:hover{color:#fff;background-color:#b3e0ee} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 5c88c6be3..c28f3709e 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -106,15 +106,24 @@ a.talk_edit{ color:#426e9a; margin-right:5px;} a:hover.talk_edit{ color:#ff5722;} .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;} .talkpage_text{ border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px; background:#fff;} -/*.ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;}*/ -/*.ping_dispic a:hover{border:1px solid #15bccf;}*/ +.ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;} +.ping_dispic a:hover{border:1px solid #15bccf;} +.ping_discon{ float:left; width:610px; margin-left:10px; } +.ping_distop p{ color:#5f5f5f;} +.ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;} +.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;} +.recall{ border-top:1px solid #CCC; padding:5px 0;} +.recall_head{ float:left;} +.recall_head a{ display:block; width:30px; height:30px; border:1px solid #CCC; padding:1px;} +.recall_head a:hover{border:1px solid #15bccf;} +.recall_con{ float:left;color:#777777; width:520px; margin-left:10px; } /****新建讨论***/ .talk_new{ color:#4c4c4c;} .talk_input{ border:1px solid #64bdd9; height:16px; width:585px; background:#fff; margin-bottom:10px; padding:5px;} .talk_text{ border:1px solid #64bdd9; height:100px;width:585px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;} .talk_new ul li{ } .sb{width:70px; height:26px; color:#606060; cursor:pointer;} -a.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;} +/*a.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;}*/ a:hover.blue_btn{ background:#329cbd;} a.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;} a:hover.grey_btn{ background:#717171; color:#fff;} @@ -160,8 +169,8 @@ a:hover.upload_btn_grey{background:#8a8a8a;} .upload_btn{width:80px; height:26px;} .upload_check{ margin-top:4px;} -a.link_file{ background:url(../images/courses/pic_file.png) 0 2px no-repeat; padding-left:20px; color:#64bdd9; } -a:hover.link_file{ background:url(../images/courses/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} +a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; color:#64bdd9; } +a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} .r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} /* 新建问题 */ .newpro_box{ color:#6d6d6d;} @@ -338,7 +347,64 @@ a:hover.st_add{ color:#ff8e15;} padding-top: 2px; padding-bottom: 3px; } -/*新闻*/ -.msg_box{ width:670px; height:173px; border-bottom:1px dashed #CCC; padding-top:10px;} -.msg_box h4{ } -.msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666; font-size:12px; } \ No newline at end of file + +/*add by sw*/ +blockquote { + border-left: 1px solid #e0e0e0; + border-right: 1px solid #e0e0e0; + border-top: 1px solid #e0e0e0; + border-bottom: 1px solid #e0e0e0; + padding-left: .6em; + padding-top: .6em; + padding-right: .6em; + padding-bottom: .6em; + margin-left: 1.4em; + margin-right: .4em; + border-radius: 4px; + font-family: "Microsoft YaHei"; + background: url(http://test.forge.trustie.net/images/requirements/xreference.jpg.pagespeed.ic.h4inUJNyH0.jpg); +} +.pro_st_ttl{ height:24px;} +.pro_st_ctt{height:auto; clear:both;} +.pro_setting{width:670px;/*滑动门的宽度*/} +.pro_st_tb_{ border-bottom:3px solid #e4e4e4; text-align:center; margin-bottom:10px; } +.pro_st_tb_ ul{height:24px;} +.pro_st_tb_ li{float:left;height: 24px;width: auto; padding:0 10px;cursor:pointer; } +.pro_st_normaltab { color:#15bccf ; border-bottom:3px solid #e4e4e4; } +.pro_st_hovertab { color:#656767; font-weight:bold; border-bottom:3px solid #15bccf; } +.pro_st_normaltab a { color:#64bdd9 ; } +.pro_st_hovertab a{color:#fff; background-color:#64bdd9; text-decoration:none;} +.pro_st_dis{display:block; } +.pro_st_undis{display:none;} + +.upimg{ border:1px solid #eaeaea; display:block; width:60px; height:60px; padding:1px;} +.upimg:hover{ border:1px solid #64bdd9; } +.box{ margin-bottom:10px;} +.box ul li{ line-height:1.9;} +.members_left{ float:left; width:410px; margin-right:20px; text-align:center;} +.members_left{} +.members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:10px; } +.members_left ul li a{ float:left; text-align:center;} +.members_left ul li span{ float:left; text-align:center; color:#484747;} +.w150{ text-align:center; width:150px;} +.f_b{ font-weight: bold;} +.members_right{ float:left; width:240px;} +.members_right label{ margin-left:15px;} +.members_jion{ background:#f0fbff; padding:10px; height:200px; margin-bottom:10px;} +.members_add{ padding-left:10px; } +.member_search_input{ border:1px solid #15bccf; background:#fff; width:170px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;} +.member_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} +.member_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;} +a.member_btn{ padding:5px; background:#15bccf; color:#fff;} +a:hover.member_btn{ background:#329cbd;} +.pro_table{ text-align:center; color:#333; margin-bottom:20px;} +.pro_table tr td{ height:30px;} +.pro_table_tit{ text-align:center; font-weight:bold;} +.pro_table_on{ background:#f0fbff; } +.pro_st_edit_issues{ display:none; margin-top:20px;} +.pro_st_edit_issues ul li{ margin-bottom:10px;} +.pro_st_edit_ban{ display:none; margin-top:20px;} +.pro_st_edit_ban ul li{ margin-bottom:10px;} +.pro_st_edit_ku{display:none; margin-top:20px;} +.pro_st_edit_ku ul li{margin-bottom:10px;} +/*end*/ \ No newline at end of file diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 3a87bb42d..e814a7495 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -42,6 +42,7 @@ h4{ font-size:14px; color:#3b3b3b;} .clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden} .clearfix{clear:both;zoom:1} .break_word{ word-break:break-all; word-wrap: break-word;} +.flow_hidden{ width:300px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} /* Spacing */ .ml2{ margin-left:2px;} @@ -59,6 +60,7 @@ h4{ font-size:14px; color:#3b3b3b;} .ml60{ margin-left:60px;} .ml80{ margin-left:80px;} .ml90{ margin-left:90px;} +.ml110{ margin-left:110px;} .mr5{ margin-right:5px;} .mr10{ margin-right:10px;} .mr20{ margin-right:20px;} @@ -71,10 +73,12 @@ h4{ font-size:14px; color:#3b3b3b;} .mb10{ margin-bottom:10px;} .pl15{ padding-left:15px;} .w90{ width:90px;} +.w210{ width:210px;} .w150{ width:150px;} .w280{ width:280px;} .w430{ width:470px;} .w520{ width:520px;} +.w543{ width:543px;} .w557{ width:557px;} .w583{ width:583px;} .w350{ width:350px;} @@ -106,6 +110,8 @@ a.c_blue02{color: #3ca5c6;} a:hover.c_blue02{color: #0781b4;} a.c_red{ color:#F00;} a:hover.c_red{ color: #C00;} +a.c_purple{color: #426e9a;} +a:hover.c_purple{color: #d33503;} .b_grey{ background: #F5F5F5;} .b_dgrey{ background: #CCC;} @@ -361,7 +367,7 @@ div.flash.warning, .conflict { /*弹出框*/ .black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);} .white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} +.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} .floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;} a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;} a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} -.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}