From 70f93741d65b7c66a677f3650100faace107cc47 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 18 Dec 2015 14:38:04 +0800
Subject: [PATCH] =?UTF-8?q?issue=E5=9B=BE=E6=A0=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/issues/_detail.html.erb | 15 ++++++++++++++-
app/views/users/_project_issue.html.erb | 14 +++++++++++++-
db/schema.rb | 2 +-
public/stylesheets/courses.css | 7 +++++++
public/stylesheets/new_user.css | 8 +++++++-
public/stylesheets/project.css | 9 ++++++++-
6 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/app/views/issues/_detail.html.erb b/app/views/issues/_detail.html.erb
index b175bd417..664dcfa75 100644
--- a/app/views/issues/_detail.html.erb
+++ b/app/views/issues/_detail.html.erb
@@ -3,7 +3,20 @@
<%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
-
<%= @issue.subject %>
+
+ <% case @issue.tracker_id %>
+ <% when 1%>
+
+ <% when 2%>
+
+ <% when 3%>
+
+ <% when 4%>
+
+ <% when 5%>
+
+ <% end %>
+ <%= @issue.subject %>
<%= get_issue_priority(@issue.priority_id)[1] %>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 88b880ada..7767fedc7 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -13,7 +13,19 @@
<%= link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
- <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>
+ <% case activity.tracker_id %>
+ <% when 1%>
+
+ <% when 2%>
+
+ <% when 3%>
+
+ <% when 4%>
+
+ <% when 5%>
+
+ <% end %>
+ <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey ml5" %>
<%= get_issue_priority(activity.priority_id)[1] %>
diff --git a/db/schema.rb b/db/schema.rb
index c0d4da2f8..9c7702aa2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20151217051447) do
+ActiveRecord::Schema.define(:version => 20151218022014) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 6a6c3a7e7..463fc710a 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1231,3 +1231,10 @@ div.disable_link {background-color: #c1c1c1 !important;}
/*新课程资源库*/
.reCon{ margin:5px; width:710px;}
.reTop{width:710px; height:40px; background:#eaeaea; padding:5px;}
+
+/*问题状态图片*/
+.issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:18px; height:21px;}
+.duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:18px; height:21px;}
+.support{ background:url(../images/public_icon.png) -66px -45px no-repeat; width:18px; height:21px;}
+.function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
+.weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:18px; height:21px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index bf69e4bb7..9b6f4f9fe 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1383,6 +1383,12 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
.mr150 {margin-right:150px;}
/* @功能 定义 */
span.at {color:#269ac9;}
-=======
+
.relatePInfo {position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
+/*问题状态图片*/
+.issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:18px; height:21px;}
+.duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:18px; height:21px;}
+.support{ background:url(../images/public_icon.png) -66px -45px no-repeat; width:18px; height:21px;}
+.function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
+.weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:18px; height:21px;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 1663df30f..f9c9c6c86 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1084,4 +1084,11 @@ a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-l
a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
.ReplyToMessageInputContainer {width: 582px;float: left;}
-.ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
\ No newline at end of file
+.ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
+
+/*问题状态图片*/
+.issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:18px; height:21px;}
+.duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:18px; height:21px;}
+.support{ background:url(../images/public_icon.png) -66px -45px no-repeat; width:18px; height:21px;}
+.function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
+.weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:18px; height:21px;}
\ No newline at end of file