From b300c85227df4f84e625a4a0ded73865dd75b032 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 23 Sep 2016 09:05:26 +0800 Subject: [PATCH] =?UTF-8?q?issue=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_all_list.html.erb | 16 ++ app/views/issues/_project_issue.html.erb | 36 +++ app/views/issues/index.html.erb | 193 +++++++++++++ public/images/new_project/arrow.png | Bin 0 -> 17087 bytes public/images/new_project/icons_issue.png | Bin 0 -> 201838 bytes public/images/new_project/logo_pro.jpg | Bin 0 -> 48425 bytes public/stylesheets/css/project.css | 320 ++++++++++++++++++++++ 7 files changed, 565 insertions(+) create mode 100644 app/views/issues/_all_list.html.erb create mode 100644 app/views/issues/_project_issue.html.erb create mode 100644 public/images/new_project/arrow.png create mode 100644 public/images/new_project/icons_issue.png create mode 100644 public/images/new_project/logo_pro.jpg diff --git a/app/views/issues/_all_list.html.erb b/app/views/issues/_all_list.html.erb new file mode 100644 index 000000000..afd630b2c --- /dev/null +++ b/app/views/issues/_all_list.html.erb @@ -0,0 +1,16 @@ +<% issue_list(issues) do |issue, level| -%> + + <%= render :partial => 'issues/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %> +<% end %> +
+
+ +
+
+
diff --git a/app/views/issues/_project_issue.html.erb b/app/views/issues/_project_issue.html.erb new file mode 100644 index 000000000..683b512f0 --- /dev/null +++ b/app/views/issues/_project_issue.html.erb @@ -0,0 +1,36 @@ +<% unless activity.author.nil? %> +
+
+ <% if activity.status_id.to_i == 5 %> + + <% else %> + + <% end %> +
+
+
+ <%= activity.subject.to_s %> + + 3 +
+
+
+ <% if activity.try(:author).try(:realname) == ' ' %> + <%= link_to activity.try(:author), user_path(activity.author_id), :class => "fl issues_list_name" %> + <% else %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "fl issues_list_name" %> + <% end %> +

2016-05-15发布

+
+
+ +
+<% end %> + diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index c704f9847..13ea19882 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -1,8 +1,201 @@ + + + + + 缺陷列表及头部 + + + + + + +
+
+
+ +
+
+ +

邀请码
Y7AUZ

+
+
+

尹刚/Trustie Forge

私有 +
+

+ 项目评分：123 + 浏览：123 + 关注：123 + 成员：123 +

+
+ 关注 +
+
+
+
+ + + +
+ + +
+
+ 新 增 +
+ +
+ 导出EXCEL +
+
+
+ + +
+ 清除 +
+ + +
+
+ + +
+ +
+
+ + <%= select( :issue, :user_id, principals_options_for_isuue_list(@project), + { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0 + }, + {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"fl"} + ) + %> + + <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]), + { :include_blank => false,:selected=>@status_id ? @status_id : 0 + }, + {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"fl issues_filter_select_min"} + ) + %> + + +
+
+
+
+ <%= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %> +
+ +
+ ddd + +
+
+ + ddd +
+
+ +
+ +
+ + + + + + + + + + + + + <%= content_for(:header_tags) do %> <%= import_ke(enable_at: true,init_activity: true) %> <% end %>