diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 9dd0bed8c..58f270332 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -39,7 +39,7 @@ module MembersHelper
end
principals = paginateHelper scope,10
s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals')
- links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
+ links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true){|text, parameters, options|
link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q],:flag => true, :format => 'js')), :remote => true
}
s + content_tag('ul', links,:class => 'wlist', :id => "course_member_pagination_links" )
diff --git a/app/views/issues/_all_list.html.erb b/app/views/issues/_all_list.html.erb
index ece7e436c..a956343f6 100644
--- a/app/views/issues/_all_list.html.erb
+++ b/app/views/issues/_all_list.html.erb
@@ -6,13 +6,19 @@
<%= render :partial => 'issues/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
<% end %>
-
\ No newline at end of file
diff --git a/app/views/issues/_project_issue.html.erb b/app/views/issues/_project_issue.html.erb
index 841e06b1b..934eeb411 100644
--- a/app/views/issues/_project_issue.html.erb
+++ b/app/views/issues/_project_issue.html.erb
@@ -19,7 +19,7 @@
<%#= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "fl issues_list_name" %>
<%# end %>
- <%= format_time(activity.created_on) %> 发布
+ <%= format_time(activity.created_on) %> 发布
<%= format_time(activity.updated_on) %> 更新
@@ -66,13 +66,13 @@
<%= activity.fixed_version %>
<%= activity.status.name%>
- <%= activity.done_ratio %>%
+ <%= activity.done_ratio %>%
- <% if activity.journals.count > 0%>
+ <% if activity.journals.count > 0 %>
<%= activity.journals.count %>
<% end %>
-
+
<%= link_to "", issue_path(activity.id, :edit => 'true'), :class => 'sy_icons_edit fl mt15', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project) %>
<% if !defined?(project_id) && !defined?(user_id) %>
<%= link_to "", issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'sy_icons_del fl mt15' if User.current.allowed_to?(:delete_issues, activity.project) %>
@@ -90,23 +90,23 @@
diff --git a/app/views/issues/_statistics.html.erb b/app/views/issues/_statistics.html.erb
index d849fe725..a015a12fd 100644
--- a/app/views/issues/_statistics.html.erb
+++ b/app/views/issues/_statistics.html.erb
@@ -2,15 +2,26 @@
issue统计
-
-
-
- - 所有<%= @issues_filter.count %>
- - 开启<%= @issue_open_count %>
- - 关闭<%= @issue_close_count %>
+
+
+
+
+ -
+ <%= link_to "所有#{@issues_filter.count}".html_safe, "", :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_1" %>
+
+ -
+ <%= link_to "打开#{@issue_open_count}".html_safe, "", :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_2" %>
+
+ -
+ <%= link_to "锁定#{@issue_close_count}".html_safe, "", :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_3" %>
+
-
新建
+
新建
@@ -147,5 +158,22 @@
$("#result_open").hide();
$("#result_close").show();
}
-
+ //issues列表
+ function g(o){
+ return document.getElementById(o);
+ }
+ function HoverLi(n){
+//如果有N个标签,就将i<=N;
+ for(var i=1;i<=3;i++){
+ g('new_roadmap_nav_'+i).className='new_roadmap_nav_nomal';
+ g('new_roadmap_type_'+i).className='new_roadmap_type_nomal';
+ g('new_roadmap_num_'+i).className='new_roadmap_nav_tagnomal';
+ g('new_roadmap_content_'+i).className='undis';
+ }
+ g('new_roadmap_nav_'+n).className='new_roadmap_nav_hover';
+ g('new_roadmap_type_'+n).className='new_roadmap_type_hover';
+ g('new_roadmap_num_'+n).className='new_roadmap_nav_taghover';
+ g('new_roadmap_content_'+n).className='dis';
+ }
+
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 4e43514e8..7a899f87b 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -223,7 +223,7 @@
- 清除
+ 清除
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index edff9c451..0da2cf817 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -95,7 +95,7 @@
) do |f| %>
<%= select( :membership, :roles, [["管理人员",3],["开发人员",4],["报告人员",5]],
{ :include_blank => false, :selected => member.roles[0].id ? member.roles[0].id : 0 },
- { :onchange=>"remote_function('#members-#{member.id}-roles-form');", :id =>"membership[role_ids][]", :name => "membership[role_ids][]", :style => "border:1px solid #e5e5e5;"}) %>
+ { :onblur => "remote_function('#members-#{member.id}-roles-form');", :id =>"membership[role_ids][]", :name => "membership[role_ids][]", :style => "border:1px solid #e5e5e5;"}) %>
<% end %>
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index f50cd379f..3a585afa1 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -571,7 +571,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
.issues_form_filter select{ width:84px; height:35px; font-size:14px; border:1px solid #c8c8c8; border-right:none; background-color:#fff; margin-bottom: 10px; color: #888;}
.issues_form_filter input{ height:33px;width:91px; border:1px solid #c8c8c8;background-color:#fff;}
.issues_form_filter select:focus,.issues_form_filter input:focus{border:1px solid #c8c8c8; border-right:none;}
-.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("/images/project/arrow.png") no-repeat scroll right center transparent;}
+.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("/images/new_project/arrow.png") no-repeat scroll right center transparent;}
.issues_form_filter select:focus {outline:none; border:none;}
input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
.issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background: url("/images/public_icon.png") -29px 9px no-repeat; }
@@ -592,7 +592,7 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
.issues_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("/images/public_icon.png") -29px 9px no-repeat; }
-.issues_list_box{ padding:15px; padding-right: 0px; border-bottom:1px dashed #e5e3da;}
+.issues_list_box{ padding:15px; padding-right: 0px; border-bottom:1px dashed #e5e3da; position: relative;}
.issues_list_titlebox{ font-size:14px; font-weight:bold; margin-bottom:8px;}
a.issues_list_title{ color:#444; max-width:300px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; }
a:hover.issues_list_title{color:#3b94d6;}
@@ -741,7 +741,7 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
.issues_form_filter select{ width:84px; height:35px; font-size:14px; border:1px solid #c8c8c8; border-right:none; background-color:#fff; margin-bottom: 10px; color: #888;}
.issues_form_filter input{ height:33px;width:91px; border:1px solid #c8c8c8;background-color:#fff;}
.issues_form_filter select:focus,.issues_form_filter input:focus{border:1px solid #c8c8c8; border-right:none;}
-.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("../images/project/arrow.png") no-repeat scroll right center transparent;}
+.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("/images/new_project/arrow.png") no-repeat scroll right center transparent;}
input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
.issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background:url("/images/public_icon.png") -29px 9px no-repeat; }
/* 缺陷Tab */
@@ -759,7 +759,7 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
.issues_form_filter select.issues_filter_select_min{width:50px; }
.issues_form_filter select:focus,.issues_form_filter input:focus{border:none; }
.issues_filter_data input{height:28px;width:91px; border:1px solid #c8c8c8;background-color:#fff;}
-.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("../images/project/arrow.png") no-repeat scroll right center transparent;}
+.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("/images/new_project/arrow.png") no-repeat scroll right center transparent;}
input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
.issues_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("/images/public_icon.png") -27px 7px no-repeat; }
@@ -781,14 +781,14 @@ a:hover.issues_list_title{color:#3b94d6;}
/* 搜索 与课程相同 */
.hw_search_box{ position:relative; }
.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;}
-.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(../images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;}
+.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(/images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;}
.hw_search_box a:hover.hw_btn_search{background:url(../images/hw/icons_hw.png) -40px -57px no-repeat;}
.hw_files_icon{display:block; width:17px; height:14px; background:url(../images/hw/icons_hw.png) 0 -135px no-repeat;}
/* 编辑删除 与课程相同 */
-.sy_icons_edit{ display: inline-block; padding:9px;background:url(../images/sy/sy_icons02.png) 0 1px no-repeat; }
-.sy_icons_del{ padding:9px;background:url(../images/sy/sy_icons02.png) 0 -21px no-repeat;}
-.sy_icons_edit:hover{ background:url(../images/sy/sy_icons02.png) -20px 1px no-repeat; }
-.sy_icons_del:hover{ background:url(../images/sy/sy_icons02.png) -20px -21px no-repeat;}
+.sy_icons_edit{ display: inline-block; padding:9px;background:url(/images/sy/sy_icons02.png) 0 1px no-repeat; }
+.sy_icons_del{ padding:9px;background:url(/images/sy/sy_icons02.png) 0 -21px no-repeat;}
+.sy_icons_edit:hover{ background:url(/images/sy/sy_icons02.png) -20px 1px no-repeat; }
+.sy_icons_del:hover{ background:url(/images/sy/sy_icons02.png) -20px -21px no-repeat;}
/* 翻页 与课程相同*/
.pages a{
display:block;