From af28461cf0dbee73850e836cf5dc7db35263a3e2 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 17 Apr 2015 14:51:10 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AD=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E9=A1=B9=E7=9B=AE=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 | 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 d4cfd88c8..abc63601e 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -11,7 +11,7 @@ <%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %>
<%= link_to e.user, user_path(e.user), :class => "problem_name c_orange fl" %> <%= l(:label_project_create) %> ： - <%= link_to e.project.name, :class => "problem_tit fl fb" %>
+ <%= link_to e.project.name,{} ,:class => "problem_tit fl fb" %>


<%= l :label_create_time %> ：<%= format_time(e.project.created_on) %>

From 22a4bf921692ced6a0aad52b40f6e6bd198e35b0 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 17 Apr 2015 16:06:24 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_revisions.html.erb | 2 +- public/stylesheets/project.css | 57 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb index 844c06500..8af6e4776 100644 --- a/app/views/repositories/_revisions.html.erb +++ b/app/views/repositories/_revisions.html.erb @@ -33,7 +33,7 @@ end %> <% line_num = 1 %> <% revisions.each do |changeset| %> -<% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 20}px" : nil) %> +<% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 12}px" : nil) %> <%= content_tag(:td, :class => 'id', :style => id_style) do %> <%= link_to_revision(changeset, @repository) %> <% end %> diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index b5244b73c..c7e6841ac 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -598,3 +598,60 @@ div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;} #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;} #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;} + +/***** Tables *****/ +table.list{ border:none; border-collapse: collapse; width: 100%; margin-bottom: 4px; } +table.list th { background-color:#EEEEEE; padding: 4px; white-space:pre-line; } +table.list td { vertical-align: top; padding-right:10px; } +table.list td.id { width: 2%; text-align: center;} +table.list td.checkbox { width: 15px; padding: 2px 0 0 0; } +table.list td.checkbox input {padding:0px;} +table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; } +table.list td.buttons a { padding-right: 0.6em; } +table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; } + +table.list tbody td, table.list tbody tr td, table.list tbody tr td.checkbox { + border-bottom: solid 1px #ddd; + font-size: 11px; + padding: 4px 10px 4px 3px; +} + + +table.list thead th +{ + border:none; + border-bottom:1px solid #999; + font-size:12px;/*by young*/ + font-weight:400; + padding:0 3px 3px; + text-transform:uppercase +} + +table.list th +{ + background-color:#fff} + +table.list thead th +{ + border:none; + border-bottom:1px solid #999; + font-size:12px;/*by young*/ + font-weight:400; + padding:0 3px 3px; + text-transform:uppercase +} + + + + +tr.changeset { height: 20px } +tr.changeset ul, ol { margin-top: 0px; margin-bottom: 0px; } +tr.changeset td.revision_graph { width: 15%; background-color: #fffffb; } +tr.changeset td.author { text-align: center; width: 15%; white-space:nowrap;} +tr.changeset td.committed_on { text-align: center; width: 15%; white-space:nowrap;} + +div.changeset { padding: 4px;} +div.changeset { border-bottom: 1px solid #ddd; } + +.odd {background-color:#f6f7f8;} +.even {background-color: #fff;} \ No newline at end of file From 7340ef793cad2358c6fc1c2b61e85d8262f9a4a1 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 17 Apr 2015 16:26:05 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/show.html.erb | 2 +- public/stylesheets/project.css | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index d4cfd88c8..52d6108f2 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -11,7 +11,7 @@ <%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %>
<%= link_to e.user, user_path(e.user), :class => "problem_name c_orange fl" %> <%= l(:label_project_create) %> ： - <%= link_to e.project.name, :class => "problem_tit fl fb" %>
+ <%= link_to (e.project.name),"", :class => "problem_tit fl fb" %>


<%= l :label_create_time %> ：<%= format_time(e.project.created_on) %>

diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index b5244b73c..4330f98c0 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -470,16 +470,8 @@ img.ui-datepicker-trigger { .wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;} #wiki_new_box{ display:none;} /*wiki显示附加*/ -.wiki-page { - font-size: 14px; - color: #09658C !important; - font-weight: bold; - width: 630px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - margin-bottom: 10px; -} +.wiki-page {font-size: 14px;color: #09658C !important; font-weight: bold;width: 630px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-bottom: 10px;} +.wiki_con_tit{font-size: 14px;color: #09658C !important; font-weight: bold;width: 630px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-bottom: 10px;} /*.author{*/ /*color: #FF5722;*/ /*margin-left:20px;*/ From ab39d54b45033583e6a657b11877da59e5757fde Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 17 Apr 2015 17:07:23 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_revisions.html.erb | 5 ++- public/stylesheets/project.css | 42 +++++++++++++++++++--- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb index 8af6e4776..33474978f 100644 --- a/app/views/repositories/_revisions.html.erb +++ b/app/views/repositories/_revisions.html.erb @@ -47,5 +47,8 @@ end %> <% end %> -<%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %> +

+ <%= submit_tag(l(:label_view_diff), :name => nil, :class=>"orange_u_btn ") if show_diff %> +

+ <% end %> diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index c7e6841ac..10e9b7eba 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -599,7 +599,7 @@ div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;} #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;} -/***** Tables *****/ +/*****项目版本库修订 Tables *****/ table.list{ border:none; border-collapse: collapse; width: 100%; margin-bottom: 4px; } table.list th { background-color:#EEEEEE; padding: 4px; white-space:pre-line; } table.list td { vertical-align: top; padding-right:10px; } @@ -641,9 +641,6 @@ table.list thead th text-transform:uppercase } - - - tr.changeset { height: 20px } tr.changeset ul, ol { margin-top: 0px; margin-bottom: 0px; } tr.changeset td.revision_graph { width: 15%; background-color: #fffffb; } @@ -654,4 +651,39 @@ div.changeset { padding: 4px;} div.changeset { border-bottom: 1px solid #ddd; } .odd {background-color:#f6f7f8;} -.even {background-color: #fff;} \ No newline at end of file +.even {background-color: #fff;} + + +/*****项目版本库文件 Tables *****/ +.autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;} +tr.entry { border: 1px solid #f8f8f8; } +tr.entry td { white-space: nowrap; } +tr.entry td.filename { width: 30%; } +tr.entry td.filename_no_report { width: 70%; } +tr.entry td.size { text-align: right; font-size: 90%; } +tr.entry td.revision, tr.entry td.author { text-align: center; } +tr.entry td.age { text-align: right; } +tr.entry.file td.filename a { margin-center: 16px; } +tr.entry.file td.filename_no_report a { margin-left: 16px; } + +tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;} +tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);} +.open .icon-folder { background-image: url(../images/folder_open.png); } +.icon-file { background-image: url(../images/files/default.png); } +.icon-file.text-plain { background-image: url(../images/files/text.png); } +.icon-file.text-x-c { background-image: url(../images/files/c.png); } +.icon-file.text-x-csharp { background-image: url(../images/files/csharp.png); } +.icon-file.text-x-java { background-image: url(../images/files/java.png); } +.icon-file.text-x-javascript { background-image: url(../images/files/js.png); } +.icon-file.text-x-php { background-image: url(../images/files/php.png); } +.icon-file.text-x-ruby { background-image: url(../images/files/ruby.png); } +.icon-file.text-xml { background-image: url(../images/files/xml.png); } +.icon-file.text-css { background-image: url(../images/files/css.png); } +.icon-file.text-html { background-image: url(../images/files/html.png); } +.icon-file.image-gif { background-image: url(../images/files/image.png); } +.icon-file.image-jpeg { background-image: url(../images/files/image.png); } +.icon-file.image-png { background-image: url(../images/files/image.png); } +.icon-file.image-tiff { background-image: url(../images/files/image.png); } +.icon-file.application-pdf { background-image: url(../images/files/pdf.png); } +.icon-file.application-zip { background-image: url(../images/files/zip.png); } +.icon-file.application-x-gzip { background-image: url(../images/files/zip.png); } From 8dd0e985a04e4f096028903141bbd290c87f6279 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 20 Apr 2015 10:48:36 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_new_members.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index f2b48d341..faccfbeeb 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -24,7 +24,7 @@ :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}} ) do |f| %> <% roles.each do |role| %> -
    +
      <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> @@ -32,7 +32,7 @@ <% end %> <%= hidden_field_tag 'membership[role_ids][]', '' %> -
      +
      <%= l(:button_change)%> From 86ef3e680aec1fb7e5f247808ece802135b63db3 Mon Sep 17 00:00:00 2001 From: whimlex Date: Mon, 20 Apr 2015 14:45:46 +0800 Subject: [PATCH 06/28] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B?= =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF=E4=B8=8D?= =?UTF-8?q?=E8=B6=85=E8=BF=87=E4=B8=80=E5=AE=9A=E5=86=85=E5=AE=B9=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 4 ++-- public/javascripts/project.js | 6 +++--- public/stylesheets/pleft.css | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index d71722ce8..ca9f43d53 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -182,12 +182,12 @@

      <%= l(:label_project_overview)%>：

      -
      +
      <%= textilizable(@project.description) if @project.description && !@project.description.blank? %>
      - + diff --git a/public/javascripts/project.js b/public/javascripts/project.js index b5f769723..cf278b480 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -47,14 +47,14 @@ function show_more_msg() { var information = $("#expend_more_information"); var arrow = $("#arrow"); var val = information.attr("value"); - if (val == "展开更多信息") { + if (val == "show_more") { $("#expend_more_information").text("收起描述信息"); - information.attr("value", "收起描述信息"); + information.attr("value", "hide_more"); arrow.attr("src", "/images/jiantouup.jpg") } else { $("#expend_more_information").text("展开更多信息"); - information.attr("value", "展开更多信息"); + information.attr("value", "show_more"); arrow.attr("src", "/images/jiantou.jpg") } } diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css index cc7e18465..a64d3671f 100644 --- a/public/stylesheets/pleft.css +++ b/public/stylesheets/pleft.css @@ -50,7 +50,7 @@ a:hover.subnav_green{ background:#14ad5a;} .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;} .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;} .course_description_none{max-height: none;} -.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;} +.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;} .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;} /****标签(和资源库的tag样式一致)***/ .project_Label{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; margin-bottom:10px;} From 93e3247685183df2d6ee0ebb651cbe8f3fc80f3c Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 20 Apr 2015 14:54:04 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/settings/_new_edit.html.erb | 7 +++-- public/javascripts/project.js | 30 +++++++++++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb index 58c328e87..a8998ece5 100644 --- a/app/views/projects/settings/_new_edit.html.erb +++ b/app/views/projects/settings/_new_edit.html.erb @@ -1,3 +1,4 @@ +<%= error_messages_for 'project' %> <%= labelled_form_for @project do |f| %>
      • @@ -7,7 +8,9 @@
      • - + + +
        • @@ -32,6 +35,6 @@
      - 保存 + 保存 <% end %>
      diff --git a/public/javascripts/project.js b/public/javascripts/project.js index b5f769723..68ac2bc45 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -90,7 +90,7 @@ function regexContent() { return false; } -// 项目编辑和提交 +// 项目讨论区编辑和提交 function submitProjectsBoard() { if (regexSubject() && regexContent()) { $("#message-form").submit(); @@ -161,7 +161,7 @@ function course_setting(id) { $('#tbc_0' + (3 - id)).removeClass().addClass("undis"); } -//项目类型 +//项目类型（朋友圈、开发组、科研组） function show_window() { $('#light').css('display', 'block'); $('#fade').css('display', 'block'); @@ -189,6 +189,32 @@ function project_setting(n) { } } } + +//配置-验证项目名称 +function regex_project_name() +{ + var name = $.trim($("#project_name").val()); + if(name.length == 0) + { + $("#project_name_notice").show(); + return false; + } + else + { + $("#project_name_notice").hide(); + return true; + } +} + +//配置-信息提交 +function submit_edit_project(id) +{ + if(regex_project_name()) + { + $("#edit_project_"+id).submit(); + } +} + //配置--成员---申请列表--拒绝 function refusal_applied_member() { $('#new_membership').append(""); From 3bd4f2d0f6ef41ace3d801a9fedbbc2105a67c64 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 20 Apr 2015 17:55:07 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_project_file_new.html.erb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/views/files/_project_file_new.html.erb b/app/views/files/_project_file_new.html.erb index ad489742e..f71783ba2 100644 --- a/app/views/files/_project_file_new.html.erb +++ b/app/views/files/_project_file_new.html.erb @@ -1,8 +1,3 @@ - -
      -

      <%= l(:lable_file_sharingarea) %>

      -
      -

      <%= l(:label_issue_tracking) %>

      -
      <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %> - - <%= link_to l(:label_query), '#', - :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %> - + <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> + <%= hidden_field_tag 'set_filter', '1' %> +
      + + 搜索 +
      + +
      + <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给",0]), + { :include_blank => false,:selected=>0 + }, + {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"v[assigned_to_id]",:class=>"w90"} + ) + %> + <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]), + { :include_blank => false,:selected=>0 + }, + {:onchange=>"remote_function();",:id=>"priority_id",:name=>"v[priority_id]",:class=>"w90"} + ) + %> + <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]), + { :include_blank => false,:selected=>0 + }, + {:onchange=>"remote_function();",:id=>"status_id",:name=>"v[status_id]",:class=>"w90"} + ) + %> + <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]), + { :include_blank => false,:selected=>0 + }, + {:onchange=>"remote_function();",:id=>"author_id",:name=>"v[author_id]",:class=>"w90"} + ) + %> +
      +
      + <% end %> +

      <%= l(:label_issues_sum) %>： + <%= @project.issues.count %> <%= l(:lable_issues_undo) %> + <%= @project.issues.where('status_id in (1,2,4,6)').count %> +

      + +
      <% end %> - <%= l(:label_issues_sum) %>：<%= @project.issues.count %> <%= l(:lable_issues_undo) %>：<%= @project.issues.where('status_id in (1,2,4,6)').count %>
      <% if !@query.new_record? && @query.editable_by?(User.current) %> @@ -20,49 +76,6 @@ <% 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' %> -
      - ---<%= l :label_query_new %>--- -
      -
      "> - - <%= l(:label_issue_query_condition) %> - -
      "> - <%= render :partial => 'queries/filters', :locals => {:query => @query} %> -
      -
      - -
      - <%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %> - <%= link_to l(:label_issue_cancel_query), {:set_filter => 1, :project_id => @project}, :class => 'icon icon-reload' %> -
      -
      -
      - <% end %>
      <%= error_messages_for 'query' %> @@ -73,10 +86,10 @@ <%= l(:label_no_data) %>

      <% else %> - <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %> -
        - <%= pagination_links_full @issue_pages, @issue_count, :per_page_links => false, :remote => false, :flag => true %> -
      +
      + <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count} %> +
      + <% end %> diff --git a/app/views/issues/index.js.erb b/app/views/issues/index.js.erb new file mode 100644 index 000000000..34d2eb760 --- /dev/null +++ b/app/views/issues/index.js.erb @@ -0,0 +1 @@ +$("#issue_list").html("<%= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>"); \ No newline at end of file From 457b86a861743830373f602d8705f794796cd874 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 21 Apr 2015 10:14:46 +0800 Subject: [PATCH 11/28] =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_new_versions.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index 326b56f1d..e52984d15 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -22,15 +22,15 @@ <%= 'shared' if version.project != @project %> <%= link_to_version version %> - <%= format_date(version.effective_date) %> + <%= format_date(version.effective_date) %> <%=h version.description %> <%= l("version_status_#{version.status}") %> <%=h format_version_sharing(version.sharing) %> - + <%= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki', :action => 'show', :project_id => version.project, - :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> + :id => Wiki.titleize(version.wiki_page_title)},:class=>"c_blue02") || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> From dd25cdc065519aff0ff55e0061df8516c7f167c3 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 21 Apr 2015 14:19:50 +0800 Subject: [PATCH 12/28] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=B8=89=E7=A7=8D=E7=B1=BB=E5=9E=8B=E6=9C=AF=E8=AF=AD?= =?UTF-8?q?=202=E3=80=81=E6=9C=AA=E7=99=BB=E5=BD=95=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E7=BC=BA=E9=99=B7=E6=8F=90=E4=BA=A4bug=203=E3=80=81wi?= =?UTF-8?q?dth=E6=9E=9C=E6=96=AD=E7=A9=BA=E7=99=BD=E5=A4=84=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E8=BF=9B=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 11 ++++++----- app/views/layouts/base_projects.html.erb | 6 +++--- config/locales/projects/zh.yml | 6 +++--- public/stylesheets/project.css | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index d68e1fc7d..bed1e3d77 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -113,12 +113,13 @@
      <%= render :partial => 'edit' %>
      + +

      + + <%= l(:button_submit) %> + <% end %> - -

      - - <%= l(:button_submit) %> - + <%#= submit_tag l(:button_submit) %> <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%>
      diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index ca9f43d53..b825800e1 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -225,9 +225,9 @@

      请选择项目类型：

        -
      • id="development_group"/>
        • -
      • id="research_group"/>
        • -
      • id="friend_organization"/>
        • +
      • id="development_group"/>
        • +
      • id="research_group"/>
        • +
      • id="friend_organization"/>
      确定 diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 3c4d4a97c..49fe0e19a 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -55,9 +55,9 @@ zh: label_apply_project_waiting: 已处理申请，请等待管理员审核 label_unapply_project: 取消申请 lable_sure_exit_project: 是否确认退出该项目 - label_friend_organization: 朋友圈 - label_research_group: 科研组 - label_development_team: 开发组 + label_friend_organization: 圈子模式 + label_research_group: 研讨模式 + label_development_team: 开发模式 label_member: 成员 project_module_attachments: 资源 diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 75caa9c14..c2eb127c9 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -72,7 +72,7 @@ a:hover.problem_pic{border:1px solid #64bdd9;} a.problem_name{ color:#ff5722; } a:hover.problem_name{ color:#d33503;} a.problem_tit{ color:#0781b4; max-width:430px; font-weight:bold; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} -a.problem_tit02{ color:#0781b4; font-weight:bold;width:400px; } +a.problem_tit02{ color:#0781b4; font-weight:bold;max-width:400px;} a:hover.problem_tit,a:hover.problem_tit02{ color:#09658c; } .problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;} a.pro_mes{ float:left; color:#a0a0a0; display:block; width:100px; height:20px; } From b6f34045db23568ff2a9f8884bd05504f4145e05 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 21 Apr 2015 14:40:12 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=EF=BC=9A=E7=BC=BA=E9=99=B7=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=AC=AC=E4=B8=80=E6=9D=A1=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E4=B8=AD=E4=BC=9A=E6=98=BE=E7=A4=BA=E9=99=84=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/issues_helper.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 9c4fab9de..b72a191db 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -340,17 +340,18 @@ module IssuesHelper if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key) # Link to the attachment if it has not been removed if options[:token].nil? - value = link_to_attachment(atta, :download => true, :only_path => options[:only_path], :class=> "info_foot_num c_blue") + value = atta.filename else - value = link_to_attachment(atta, :download => true, :only_path => options[:only_path], :token => options[:token], :class=> "info_foot_num c_blue") - end - if options[:only_path] != false && atta.is_text? - value += link_to( - image_tag('magnifier.png'), - :controller => 'attachments', :action => 'show', - :id => atta, :filename => atta.filename - ) + value = atta.filename end + # 放大镜搜索功能 + # if options[:only_path] != false && atta.is_text? + # value += link_to( + # image_tag('magnifier.png'), + # :controller => 'attachments', :action => 'show', + # :id => atta, :filename => atta.filename + # ) + # end else value = content_tag("i", h(value)) if value end From 2521e802bff21350a8fba6e675b8d3867b7b6f06 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 21 Apr 2015 14:48:49 +0800 Subject: [PATCH 14/28] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=92=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index f20ce9b12..ac5a46bfe 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -59,9 +59,8 @@
      <% end %> -

      <%= l(:label_issues_sum) %>： - <%= @project.issues.count %> <%= l(:lable_issues_undo) %> - <%= @project.issues.where('status_id in (1,2,4,6)').count %> +

      <%= l(:label_issues_sum) %>：<%= @project.issues.count %> + <%= l(:lable_issues_undo) %>：<%= @project.issues.where('status_id in (1,2,4,6)').count %>

      From c510f14edb7e25b41963e3765c8ee07f77802528 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 21 Apr 2015 15:10:05 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=A2=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=BB=BA=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/versions/index.html.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb index be4fb27ef..cccc53726 100644 --- a/app/views/versions/index.html.erb +++ b/app/views/versions/index.html.erb @@ -1,9 +1,10 @@

      <%= l(:label_roadmap) %>

      - - - +
      + <%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'orange_u_btn fl' if User.current.allowed_to?(:manage_versions, @project) %> +
      +