From 9ad00e437f92eb3fca5dd603ab85fddcbb09230c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 11 Apr 2015 11:51:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=A0=B7=E5=BC=8F=202=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=99=E8=AF=AF=E5=9B=BE=E7=89=87=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/project.css | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index b07f1ac9f..b44661654 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -160,8 +160,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;} @@ -337,4 +337,22 @@ a:hover.st_add{ color:#ff8e15;} padding-left: 20px; padding-top: 2px; padding-bottom: 3px; -} \ 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); +} +/*end*/ \ No newline at end of file From db0cc88142f1f15c60befc3036b4ce3b9b30202a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 11 Apr 2015 13:32:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings.html.erb | 495 ++++++++++++++++++++++++++- 1 file changed, 488 insertions(+), 7 deletions(-) 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 From 837fe88545219cccaaa8b1026d6e1b96a0ecddb2 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 11 Apr 2015 14:19:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=86=B2=E7=AA=81?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=87=E6=8D=A2js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/news/_project_show.html.erb | 204 ++++++++------------------ public/javascripts/project.js | 8 +- 2 files changed, 65 insertions(+), 147 deletions(-) diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb index bde061f31..e2b58e683 100644 --- a/app/views/news/_project_show.html.erb +++ b/app/views/news/_project_show.html.erb @@ -1,157 +1,69 @@ +<% + btn_tips = l(:label_news_new) + label_tips = l(:label_news) +%>
-

<%= l(:label_news) %>

+

<%= label_tips %>

- -
- <%= watcher_link(@news, User.current) %> - <%= link_to(l(:button_edit), - edit_news_path(@news), - :class => 'icon icon-edit', - :accesskey => accesskey(:edit), - :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %> - <%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %> + <% end %> +
-

<%=h @news.title %>

+
+ <% 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 %> +
+ + + +<% other_formats_links do |f| %> + <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> <% end %> -
+<% 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 %> -
- - <%= textilizable(@news, :description) %> - -
- <%= link_to_attachments @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", :style => "display:none;") do %> -
- <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %> - <%= wikitoolbar_for 'comment_comments' %> -
-

- <%= submit_tag l(:button_add) %> -

- <% end %> - <% end %> +<% html_title(l(:label_news_plural)) -%> - <% html_title @news.title -%> - - <% content_for :header_tags do %> - <%= stylesheet_link_tag 'scm' %> - <% end %> - - -
-
-

<%= l(:label_comment_plural) %>

- <% comments = @comments.reverse %> - <% comments.each do |comment| %> - <% next if comment.new_record? %> - - - - - -
- <%= image_tag(url_to_avatar(comment.author), :class => "avatar")%> - - - - - - - - - - - - -
- <%= link_to_user(comment.author) if comment.respond_to?(:author) %> - <%= l(:label_project_newadd) %> - <%= l(:label_comment_plural) %> -
- - <%= textilizable(comment.comments) %> - -
- <%= format_time(comment.created_on) %> - - <%= 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? %> -
+ 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 From b06e9ce468ce152818bd6fe4422709d71e987d4e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 11 Apr 2015 14:22:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B9=B2=E6=8E=89=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 8963b5256..c28f3709e 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -123,7 +123,7 @@ a:hover.talk_edit{ color:#ff5722;} .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;}