Merge branch 'dai_ao' into develop
This commit is contained in:
commit
cd32353d91
|
|
@ -769,6 +769,14 @@ class ProjectsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
#配置成员弹框
|
||||
def delete_member_pop
|
||||
@member = Member.find(params[:member].to_i)
|
||||
respond_to do |format|
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
def close
|
||||
@project.close
|
||||
redirect_to project_url(@project)
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ class QualityAnalysisController < ApplicationController
|
|||
layout "base_projects"
|
||||
include ApplicationHelper
|
||||
include QualityAnalysisHelper
|
||||
require 'jenkins_api_client'
|
||||
require 'nokogiri'
|
||||
require 'json'
|
||||
require 'open-uri'
|
||||
# require 'jenkins_api_client'
|
||||
# require 'nokogiri'
|
||||
# require 'json'
|
||||
# require 'open-uri'
|
||||
|
||||
def show
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class UsersController < ApplicationController
|
|||
:activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
|
||||
:user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
|
||||
:user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course,:user_courselist,:user_projectlist,:sort_syllabus_list,
|
||||
:sort_project_list,:my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks, :cancel_or_collect,:expand_courses,:homepage]
|
||||
:sort_project_list,:my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks, :cancel_or_collect,:expand_courses,:homepage, :user_issues]
|
||||
before_filter :auth_user_extension, only: :show
|
||||
#before_filter :rest_user_score, only: :show
|
||||
#before_filter :select_entry, only: :user_projects
|
||||
|
|
@ -86,6 +86,60 @@ class UsersController < ApplicationController
|
|||
helper :issues
|
||||
include UsersHelper
|
||||
|
||||
# 获取我的任务
|
||||
# order 排序条件
|
||||
# subject 主题：搜索用（注意：搜索和列表调用同一方法，通过参数或者remote区分）
|
||||
def user_issues
|
||||
@subject = params[:subject]
|
||||
# author_id = params[:author_id]
|
||||
params[:assigned_to_id].to_i == 0 ? @assigned_to = nil : @assigned_to = params[:assigned_to_id].to_i
|
||||
params[:author_id].to_i == 0 ? author_id = nil : author_id = params[:author_id].to_i
|
||||
params[:project_id].to_i == 0 ? @project_id = nil : @project_id = params[:project_id]
|
||||
if @project_id.nil?
|
||||
if @assigned_to.nil?
|
||||
if author_id.nil?
|
||||
@issues = Issue.where("(author_id =? or assigned_to_id =? ) and subject like ?",
|
||||
@user.id , @user.id, "%#{@subject}%").order('updated_on desc')
|
||||
else
|
||||
@issues = Issue.where("author_id =? and subject like ?",
|
||||
author_id , "%#{@subject}%").order('updated_on desc')
|
||||
end
|
||||
else
|
||||
@issues = Issue.where("assigned_to_id =? and subject like ?", @assigned_to, "%#{@subject}%").order('updated_on desc')
|
||||
end
|
||||
|
||||
else
|
||||
if @assigned_to.nil?
|
||||
if author_id.nil?
|
||||
@issues = Issue.where("(author_id =? or assigned_to_id =? ) and project_id=? and subject like ?",
|
||||
(author_id ? author_id : @user.id) , @user.id, @project_id, "%#{@subject}%").order('updated_on desc')
|
||||
else
|
||||
@issues = Issue.where("author_id =? and project_id=? and subject like ?",
|
||||
author_id , @project_id, "%#{@subject}%").order('updated_on desc')
|
||||
end
|
||||
else
|
||||
@issues = Issue.where("assigned_to_id =? and project_id=? and subject like ?",
|
||||
@assigned_to, @project_id, "%#{@subject}%").order('updated_on desc')
|
||||
end
|
||||
end
|
||||
@issues_filter = Issue.where("author_id =? or assigned_to_id =?", (author_id ? author_id : @user.id) , @user).order('updated_on desc')
|
||||
@issues_assigned_count = Issue.where("assigned_to_id =? and subject like ?", @user.id, "%#{@subject}%").count
|
||||
@issues_author_count = Issue.where("author_id =? and subject like ?", @user.id, "%#{@subject}%").count
|
||||
@issue_open_count = Issue.where(" (author_id =? or assigned_to_id =?) and status_id in (1,2,3,4,6)", (author_id ? author_id : @user.id) , @user).count
|
||||
@issue_close_count = Issue.where("(author_id =? or assigned_to_id =?) and status_id = 5", (author_id ? author_id : @user.id) , @user.id).count
|
||||
@issue_count = @issues.count
|
||||
@limit = 10
|
||||
@is_remote = true
|
||||
@issue_pages = Paginator.new @issue_count, @limit, params['page'] || 1
|
||||
@offset ||= @issue_pages.offset
|
||||
@issues = paginateHelper @issues, @limit
|
||||
respond_to do |format|
|
||||
format.html{render :layout => 'static_base'}
|
||||
format.api
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
#展开所有回复
|
||||
def show_all_replies
|
||||
case params[:type]
|
||||
|
|
|
|||
|
|
@ -29,6 +29,30 @@ module UsersHelper
|
|||
["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", '3']], selected.to_s)
|
||||
end
|
||||
|
||||
def issue_list(issues, &block)
|
||||
ancestors = []
|
||||
issues.each do |issue|
|
||||
while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
|
||||
ancestors.pop
|
||||
end
|
||||
yield issue, ancestors.size
|
||||
ancestors << issue unless issue.leaf?
|
||||
end
|
||||
end
|
||||
|
||||
# 我的issue 来源
|
||||
def options_for_issue_project_list( issues )
|
||||
issues = issues.group_by{|issue| issue.project_id}
|
||||
issues.map{ |issue| [Project.find(issue[0]).name, issue[0]]}.unshift(["来源", 0])
|
||||
end
|
||||
|
||||
# 我的issue指派给我
|
||||
def options_for_my_issue_list(issues)
|
||||
# issues = issues.group_by{|issue| issue.assigned_to_id }
|
||||
# issues.map{ |issue| [User.find(issue[0]).show_name, issue[0]]}.unshift(["指派给", 0])
|
||||
|
||||
end
|
||||
|
||||
def get_resource_type type
|
||||
case type
|
||||
when 'Course'
|
||||
|
|
|
|||
|
|
@ -323,6 +323,7 @@ class User < Principal
|
|||
|
||||
# id 转换成 登录名
|
||||
# 如果是整数就去ID，否则就取login
|
||||
# 含有特殊符号的则显示ID
|
||||
def to_param
|
||||
(self.login.to_i.to_s == self.login || self.login.include?(".") || self.login.include?("%") || self.login.include?("?")) ? id : login
|
||||
end
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
<% end %>
|
||||
<!--<a href="javascript:void(0);" class="sy_btn_blue mr5 fr"> 保存并继续</a>-->
|
||||
<!--<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="sy_btn_blue mr5 fr" id="issue_confirm"> 保存</a>-->
|
||||
<input onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="sy_btn_blue fr mr5" id="issue_confirm" style="width: 28px;color: #FFF" value="保存">
|
||||
<input onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="sy_btn_blue fr mr5" onfocus="this.blur()" id="issue_confirm" style="width: 28px;color: #FFF" value="保存">
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="fl pro_new_conbox_right ml10 mb10">
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
{:onchange => "change_milestone_tip();", :class => "w150"} %>
|
||||
</li>
|
||||
<li class=" clear" id="milestone_option_tips">
|
||||
<%= @issue.fixed_version.nil? ? "无里程碑" : "已指派里程碑" %>
|
||||
<%= @issue.fixed_version.nil? ? "未选择里程碑" : "已选择里程碑" %>
|
||||
<% if params[:action] == "new" %>
|
||||
<%= link_to "", new_project_version_path(@project, :is_issue => true, :issue_project_id => @project.id), :class => "pic_add mt5 ml5 fr", :remote => true %>
|
||||
<% end %>
|
||||
|
|
@ -147,9 +147,9 @@
|
|||
}
|
||||
function change_milestone_tip(version_id){
|
||||
if( document.getElementById('issue_fixed_version_id').options[document.getElementById('issue_fixed_version_id').selectedIndex].value == 0 ){
|
||||
$('#milestone_option_tips').html("未指派里程碑")}
|
||||
$('#milestone_option_tips').html("未选择里程碑")}
|
||||
else{
|
||||
$('#milestone_option_tips').html("已指派里程碑")
|
||||
$('#milestone_option_tips').html("已选择里程碑")
|
||||
};
|
||||
}
|
||||
function issue_start_date_change(){
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<span class="issues_nav_tag ml5" ><%= @issues_filter_assign_count %><%= @project.issues.where(:assigned_to_id => User.current.id ).visible.all.count %></span>
|
||||
<span class="issues_nav_tag ml5" ><%= @project.issues.where(:assigned_to_id => User.current.id ).visible.all.count %></span>
|
||||
|
|
@ -18,6 +18,7 @@
|
|||
<div class="mt10 mb10" id =issue_show_total"">
|
||||
<div class="banner-big f16 fontGrey3">
|
||||
问题跟踪
|
||||
<a href="<%= new_project_issue_path(@project)%>" class="sy_btn_green fr" >新建</a>
|
||||
</div>
|
||||
|
||||
<div class="resources mt10" style="float:left;">
|
||||
|
|
|
|||
|
|
@ -204,9 +204,9 @@
|
|||
<li id="user_08" class="user_icons_addproject">
|
||||
<%= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :style => "font-size:14px;" %>
|
||||
</li>
|
||||
<!--<li id="user_09" class="user_icons_myissues">-->
|
||||
<!--<a href="#user_09" >我的任务</a>-->
|
||||
<!--</li>-->
|
||||
<li id="user_09" class="user_icons_myissues">
|
||||
<%= link_to "我的Issue", user_issues_user_path(@user), :style => "font-size:14px;" %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<ul class="users_accordion mb10">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
<div style="width:460px;">
|
||||
<div class="sy_popup_top">
|
||||
<h3 class="fl">提示</h3>
|
||||
<a href="javascript:void(0);" class="sy_icons_close fr" onclick="hideModal()"></a>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<div class="sy_popup_con" style="width:380px;">
|
||||
<ul class="sy_popup_add center" >
|
||||
<%=l(:label_delete_confirm) %>
|
||||
<%# if member.deletable? %>
|
||||
<%#= !User.current.admin? && member.include?(User.current) ? l(:text_own_membership_for_project_confirmation) : l(:label_delete_confirm) %>
|
||||
<%# end %>
|
||||
<li class="mt10">
|
||||
<label class="mr27"> </label>
|
||||
<a href="javascript:void(0);" class="sy_btn_grey fl " onclick="hideModal()">取 消</a>
|
||||
<!-- <a href="<%#= {:controller => 'repositories', :action => 'forked'} %>" class="sy_btn_blue fl ml20" onclick="hideModal();">确 定</a>-->
|
||||
<%= link_to "确 定", membership_path(member), :method => "delete", :class => "sy_btn_blue fl ml20", :onclick => "hideModal();" %>
|
||||
<div class="cl"></div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
var htmlvalue = "<%= escape_javascript(render :partial => 'projects/delete_member_pop', :locals => { :member => @member }) %>";
|
||||
pop_box_new(htmlvalue,320,316);
|
||||
|
|
@ -102,11 +102,14 @@
|
|||
<th>
|
||||
<% unless member.user_id == @project.user_id %>
|
||||
<a href="javascript:void(0);" class=" sy_btn_blue mr5 " onclick="$('#members-<%= member.id%>-roles-form').show();$('#members_<%= member.id %>_role_show').hide();">编辑</a>
|
||||
<%= delete_link membership_path(member),
|
||||
<%#= delete_link membership_path(member),
|
||||
:remote => true,
|
||||
:class => "sy_btn_grey mr5",
|
||||
:data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %>
|
||||
<% if member.deletable? %>
|
||||
<%= link_to "删除", { :controller => 'projects', :action => 'delete_member_pop', :member => member }, :remote => true, :class => "sy_btn_grey mr5"%>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</th>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,44 @@
|
|||
// $("#ajax-indicator span").text("载入中...");
|
||||
$("#ajax-indicator").show();
|
||||
</script>
|
||||
<div class="quality_info mb10">
|
||||
<h2><a href="javascript:history.go(-1)" class="fl linkBlue2 mr5" >
|
||||
<span class="new_roadmap_icons_back mr5"></span>
|
||||
返回</a> <span class="fl mr5">|</span> <span class="fl">分析结果</span>
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<div class="container-big mb10">
|
||||
<table>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>名称</td>
|
||||
<td>分支</td>
|
||||
<td>语言</td>
|
||||
<td>路径</td>
|
||||
<td>时间</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tbody>
|
||||
<% if @quality_analyses && @quality_analyses.count > 0 %>
|
||||
<% @quality_analyses.each do |qa| %>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td><%= qa.branch %></td>
|
||||
<td><%= qa.language %></td>
|
||||
<td><%= qa.path %></td>
|
||||
<td><%= format_time(qa.created_at) %></td>
|
||||
<td><%=link_to "删除", delete_project_quality_analysi_path(qa, :project_id => @project.id), :method => "delete", :confirm => "删除会一并删除分析结果，确定删除吗？", :class => "fontBlue2" %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% else %>
|
||||
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="container-big mb10">
|
||||
<div class="project_r_h" style="width:970px;">
|
||||
<h2 class="project_h2">分析结果</h2>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
<% issue_list(issues) do |issue| -%>
|
||||
<script>
|
||||
$(function () {
|
||||
sd_create_editor_from_data(<%= issue.id%>, null, "100%", "<%= issue.class.name %>");
|
||||
});
|
||||
</script>
|
||||
<%= render :partial => 'users/my_issue_list', :locals => {:activity => issue, :user_activity_id => issue.id} %>
|
||||
<% end %>
|
||||
|
||||
<div style="text-align:left;">
|
||||
<div style="width:auto; display:inline-block;">
|
||||
<ul>
|
||||
<a href="javascript:void(0)" class="hw_btn_blue ml10 mt10 mb10" style="visibility:hidden;" alt="导出EXCEL">导出EXCEL</a>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<div class="pages fr" style="width:auto; display:inline-block;margin-top:10px">
|
||||
<ul id="issue_list_pagination" class="fr">
|
||||
<%= pagination_links_full @issue_pages, @issue_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
|
||||
</ul>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<span class="issues_nav_tag ml5" ><%= @issues_assigned_count %></span>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<span class="issues_nav_tag ml5" ><%= @issue_count %></span>
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
<% unless activity.author.nil? %>
|
||||
<div class="issues_list_box clear" id="user_activity_<%= user_activity_id%>">
|
||||
<div class="issues_ciricons fl ">
|
||||
<% if activity.status_id.to_i == 5 %>
|
||||
<span class="issues_ciricons_02"></span>
|
||||
<% else %>
|
||||
<span class="issues_ciricons_01"></span>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class=" fl ml5">
|
||||
<div class="issues_list_titlebox clear">
|
||||
<a href="<%= issue_path(activity) %>" class="issues_list_title fl" target="_blank" title="<%= activity.subject.to_s %>"><%= activity.subject.to_s %></a>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<div class="issues_list_small">
|
||||
<%# 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 %>
|
||||
<!--p class="fl ml10"> <span class="mr5"><%#=format_time(activity.created_on) %></span>发布</p-->
|
||||
<p class="fl issues_list_name" ><span class="mr5"><%= format_time(activity.created_on) %> </span>发布</p>
|
||||
<p class="fl ml10"> <span class="mr5"><%= format_time(activity.updated_on) %> </span>更新</p>
|
||||
</div>
|
||||
</div>
|
||||
<ul class="issues_list_txt fr">
|
||||
<li class=" c_grey issues_list_max mr5">
|
||||
<%= Project.find(activity.project_id).name %>
|
||||
</li>
|
||||
<li class="c_grey">
|
||||
<% if activity.try(:author).try(:realname) == ' ' %>
|
||||
<%= link_to activity.try(:author), user_path(activity.author_id)%>
|
||||
<% else %>
|
||||
<%= link_to activity.try(:author).try(:realname), user_path(activity.author_id)%>
|
||||
<% end %>
|
||||
</li>
|
||||
<li class="issues_list_min c_grey">
|
||||
<% case activity.tracker_id %>
|
||||
<% when 1%>
|
||||
缺陷
|
||||
<% when 2%>
|
||||
功能
|
||||
<% when 3%>
|
||||
支持
|
||||
<% when 4%>
|
||||
任务
|
||||
<% when 5%>
|
||||
周报
|
||||
<% end %>
|
||||
</li>
|
||||
<li class="c_grey">
|
||||
<% if !activity.assigned_to_id.nil? && activity.assigned_to_id != 0 %>
|
||||
<% if activity.try(:assigned_to).try(:realname).empty? %>
|
||||
<%= link_to activity.assigned_to, user_path(activity.assigned_to_id)%>
|
||||
<% else %>
|
||||
<%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id)%>
|
||||
<% end %>
|
||||
<% end %></li>
|
||||
<li class="issues_list_min c_grey">
|
||||
<%= activity.priority.name %>
|
||||
</li>
|
||||
|
||||
<li class="c_grey issues_list_max" title="<%= activity.fixed_version %>"><%= activity.fixed_version %></li>
|
||||
<li class="issues_list_min c_grey mr5" ><%= activity.status.name %></li>
|
||||
<li class="<%= (activity.done_ratio == 100 ? 'c_green issues_list_min mr5' : 'c_red issues_list_min mr5') %>"><%= activity.done_ratio %>%</li>
|
||||
<li class="issues_list_min">
|
||||
<% if activity.journals.count > 0 %>
|
||||
<span class="issues_icons_mes fl mr5 mt12"></span>
|
||||
<span class="fl mr5"><%= activity.journals.count %></span>
|
||||
<% end %>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<script>
|
||||
$(".issues_list_box").mouseover(function(){
|
||||
var iconOrder;
|
||||
var iconSize = $(this).children().eq(2).children().eq(7).children().size();
|
||||
if(iconSize > 1){
|
||||
iconOrder = 2;
|
||||
} else{
|
||||
iconOrder = 0;
|
||||
}
|
||||
$(this).children().eq(2).children().eq(7).children().eq(iconOrder).show();
|
||||
});
|
||||
$(".issues_list_box").mouseout(function(){
|
||||
var iconOrder;
|
||||
var iconSize = $(this).children().eq(2).children().eq(7).children().size();
|
||||
if(iconSize > 1){
|
||||
iconOrder = 2;
|
||||
} else{
|
||||
iconOrder = 0;
|
||||
}
|
||||
$(this).children().eq(2).children().eq(7).children().eq(iconOrder).hide();
|
||||
});
|
||||
</script>
|
||||
|
||||
|
|
@ -0,0 +1,290 @@
|
|||
<%= content_for(:header_tags) do %>
|
||||
<%= import_ke(enable_at: true,init_activity: true) %>
|
||||
<% end %>
|
||||
|
||||
<script xmlns="http://www.w3.org/1999/html">
|
||||
function add_style(){
|
||||
$("#proeject_id").val("来源")
|
||||
if($("select[id='tracker_id']").val() != 0){
|
||||
$("#tracker_id").addClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='author_id']").val() != 0){
|
||||
$("#author_id").addClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='assigned_to_id']").val() !=0){
|
||||
$("#assigned_to_id").addClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='priority_id']").val() !=0){
|
||||
$("#priority_id").addClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='fixed_version_id']").val() !=0){
|
||||
$("#fixed_version_id").addClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='status_id']").val() != 0 ){
|
||||
$("#status_id").addClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='done_ratio']").val() != -1){
|
||||
$("#done_ratio").addClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='test']").val() != 0 ){
|
||||
$("#test").addClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='tracker_id']").val() == 0){
|
||||
$("#tracker_id").removeClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='author_id']").val() == 0){
|
||||
$("#author_id").removeClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='assigned_to_id']").val() ==0){
|
||||
$("#assigned_to_id").removeClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='priority_id']").val() ==0){
|
||||
$("#priority_id").removeClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='fixed_version_id']").val() ==0){
|
||||
$("#fixed_version_id").removeClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='status_id']").val() == 0 ){
|
||||
$("#status_id").removeClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='done_ratio']").val() == -1){
|
||||
$("#done_ratio").removeClass('issues_filter_active');
|
||||
}
|
||||
if($("select[id='test']").val() == 0 ){
|
||||
$("#test").removeClass('issues_filter_active');
|
||||
}
|
||||
};
|
||||
//issues列表
|
||||
function g(o){
|
||||
return document.getElementById(o);
|
||||
}
|
||||
function HoverLi(n){
|
||||
//如果有N个标签,就将i<=N;
|
||||
for(var i=1;i<=3;i++){
|
||||
g('issues_list_nav_'+i).className='issues_nav_nomal';
|
||||
g('issues_list_content_'+i).className='undis';
|
||||
}
|
||||
g('issues_list_content_'+n).className='dis';
|
||||
g('issues_list_nav_'+n).className='issues_nav_hover';
|
||||
}
|
||||
$(function(){
|
||||
$("#RSide").removeAttr("id");
|
||||
$("#Container").css("width","1000px");
|
||||
$("input[nhname='date_show']").change(function(){
|
||||
if($(this).val()=='创建日期起始' || $(this).val()=='创建日期结束')return;
|
||||
$("input[nhname='date_val']",$(this).parent('div')).val($(this).val());
|
||||
remote_function();
|
||||
});
|
||||
|
||||
});
|
||||
function remote_function() {
|
||||
$("#issue_query_form").submit();
|
||||
}
|
||||
|
||||
function remote_function_export(project_id) {
|
||||
var tracker_id = $("#tracker_id").attr("value");
|
||||
var subject = $("#v_subject").attr("value");
|
||||
var assigned_to_id = $("#assigned_to_id").attr("value");
|
||||
var fixed_version_id = $("#fixed_version_id").attr("value");
|
||||
var status_id = $("#status_id").attr("value");
|
||||
var done_ratio = $("#done_ratio").attr("value");
|
||||
var test = $("#test").attr("value");
|
||||
var author_id = $("#author_id").attr("value");
|
||||
var priority_id = $("#priority_id").attr("value");
|
||||
var issue_create_date_start = $("#issue_date_start_issue_export").attr("value");
|
||||
var issue_create_date_end = $("#issue_date_end_issue_export").attr("value");
|
||||
$("#sendexcel").attr("href","/projects/"+project_id+"/issues.xls?export=true&set_filter=1&tracker_id="+tracker_id+"&assigned_to_id="+assigned_to_id+"&fixed_version_id="+fixed_version_id+"&status_id="+status_id+"&done_ratio="+done_ratio+"&test="+test+"&author_id="+author_id+"&subject="+subject+"&issue_create_date_start="+issue_create_date_start+"&issue_create_date_end="+issue_create_date_end+"&priority_id="+priority_id);
|
||||
///projects/1811/issues.xls?export=true&set_filter=1
|
||||
}
|
||||
function EnterPress(e){
|
||||
var e = e || window.event;
|
||||
if(e.keyCode == 13){
|
||||
remote_function();
|
||||
}
|
||||
}
|
||||
|
||||
// 点击的时候让过滤条件选中assign_to
|
||||
function switch_assign_to(assign) {
|
||||
var assign = "option[value =" + assign + "]";
|
||||
$("#issues_type_2").click(function(){
|
||||
|
||||
});
|
||||
$("select[id='assigned_to_id']").find(assign).attr("selected", "selected");
|
||||
$("select[id='author_id']").val('');
|
||||
$("select[id='priority_id']").val('');
|
||||
$("select[id='tracker_id']").val('');
|
||||
$("select[id='fixed_version_id']").val('');
|
||||
$("select[id='status_id']").val('');
|
||||
$("select[id='done_ratio']").val('');
|
||||
$("select[id='test']").val('');
|
||||
$("#tracker_id").removeClass('issues_filter_active');
|
||||
$("#author_id").removeClass('issues_filter_active');
|
||||
$("#assigned_to_id").addClass('issues_filter_active');
|
||||
$("#priority_id").removeClass('issues_filter_active');
|
||||
$("#fixed_version_id").removeClass('issues_filter_active');
|
||||
$("#status_id").removeClass('issues_filter_active');
|
||||
$("#done_ratio").removeClass('issues_filter_active');
|
||||
$("#test").removeClass('issues_filter_active');
|
||||
remote_function();
|
||||
}
|
||||
|
||||
// 点击的时候让过滤条件选中user_id
|
||||
function createByMe(user_id) {
|
||||
var user = "option[value =" + user_id + "]";
|
||||
$("#createByMe").click(function(){
|
||||
|
||||
});
|
||||
$("select[id='author_id']").find(user).attr("selected", "selected");
|
||||
$("select[id='assigned_to_id']").val('');
|
||||
$("select[id='priority_id']").val('');
|
||||
$("select[id='tracker_id']").val('');
|
||||
$("select[id='fixed_version_id']").val('');
|
||||
$("select[id='status_id']").val('');
|
||||
$("select[id='done_ratio']").val('');
|
||||
$("select[id='test']").val('');
|
||||
$("#tracker_id").removeClass('issues_filter_active');
|
||||
$("#author_id").addClass('issues_filter_active');
|
||||
$("#assigned_to_id").removeClass('issues_filter_active');
|
||||
$("#priority_id").removeClass('issues_filter_active');
|
||||
$("#fixed_version_id").removeClass('issues_filter_active');
|
||||
$("#status_id").removeClass('issues_filter_active');
|
||||
$("#done_ratio").removeClass('issues_filter_active');
|
||||
$("#test").removeClass('issues_filter_active');
|
||||
remote_function();
|
||||
}
|
||||
// 清楚表单所有选项
|
||||
function all_reset_form() {
|
||||
$("#issue_query_form")[0].reset();
|
||||
$("select[id='author_id']").val('');
|
||||
$("select[id='assigned_to_id']").val('');
|
||||
$("input[nhname='date_val']").val('');
|
||||
$("#tracker_id").removeClass('issues_filter_active');
|
||||
$("#author_id").removeClass('issues_filter_active');
|
||||
$("#assigned_to_id").removeClass('issues_filter_active');
|
||||
$("#priority_id").removeClass('issues_filter_active');
|
||||
$("#fixed_version_id").removeClass('issues_filter_active');
|
||||
$("#status_id").removeClass('issues_filter_active');
|
||||
$("#done_ratio").removeClass('issues_filter_active');
|
||||
$("#test").removeClass('issues_filter_active');
|
||||
remote_function();
|
||||
}
|
||||
</script>
|
||||
|
||||
<!--缺陷列表开始-->
|
||||
<div id="myissues_con" class="myissues_con mb10">
|
||||
<div class="myissues_head mb5">
|
||||
<h2 class="ml15">我的缺陷</h2>
|
||||
</div>
|
||||
<div class="clear mb5">
|
||||
<div class="issues_statistics fl">
|
||||
<ul>
|
||||
<li>所有<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issues_filter.count %></a></li>
|
||||
<li>开启<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_open_count %></a></li>
|
||||
<li>关闭<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_close_count %></a></li>
|
||||
</ul>
|
||||
</div><!--issues_statistics end-->
|
||||
|
||||
</div>
|
||||
<%= form_tag( user_issues_user_path(@user), :remote=>'xls', :method => "post", :id=>"issue_query_form", :class => 'query_form') do %>
|
||||
<div class="clear mb10">
|
||||
<div class="hw_search_box fl ">
|
||||
<input class="hw_search-input" placeholder="输入Issue名称进行搜索" type="text" id="v_subject" name="subject" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
|
||||
<a href="javascript:void(0);" class="hw_btn_search" onclick="remote_function();" ></a>
|
||||
</div>
|
||||
<a href="javascript:void(0);" class="sy_btn_grey fl ml5" onclick="all_reset_form();">清除</a>
|
||||
<!-- <div class="issues_filter_data fr">
|
||||
<input type="text" placeholder="开始日期" class="issues_calendar_input fl " ><a href="" class="issues_data_img fl" style="border-right:none;"></a>
|
||||
<input type="text" placeholder="结束日期" class="issues_calendar_input fl " ><a href="" class="issues_data_img fl"></a>
|
||||
</div>-->
|
||||
</div>
|
||||
|
||||
<div class="issues_con_list" style="position: relative;">
|
||||
<ul id="issues_list_nav" >
|
||||
<li id="issues_list_nav_1" class="issues_nav_hover" onclick="HoverLi(1);all_reset_form();">
|
||||
<a href="javascript:void(0);" id="issues_type_1" onclick="all_reset_form();" >搜索结果</a>
|
||||
<span id="issue_filter_all"><%= render :partial => "users/my_issue_filter_all" %></span>
|
||||
</li>
|
||||
<li id="issues_list_nav_2" onclick="HoverLi(2);">
|
||||
<a href="javascript:void(0);" id="issues_type_2" onclick="switch_assign_to(<%= User.current.id %>)">指派给我
|
||||
<span id="issue_assigned_count"><%= render :partial => "users/my_issue_assigned_filter" %></span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="issues_list_nav_3" onclick="HoverLi(3);">
|
||||
<a href="javascript:void(0);" id="issues_type_3" onclick="createByMe(<%= User.current.id %>)">我的发布<span class="issues_nav_tag ml5">
|
||||
<%= @issues_author_count %>
|
||||
</span></a>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
</ul>
|
||||
<div class="issues_filter">
|
||||
<div class="issues_form_filter mt5 mr5">
|
||||
<!-- <select placeholder=" 来源" class="fl mr10" >
|
||||
<option value="0" selected="selected">来源</option>
|
||||
<option value="8166">123</option>
|
||||
<option value="8166">123s</option>
|
||||
</select>-->
|
||||
<%= select( :project, :project_id, options_for_issue_project_list(@issues_filter),
|
||||
{ :include_blank => false,:selected => @project_id ? @project_id : 0 },
|
||||
{ :onchange => "remote_function();add_style();",:id => "proeject_id", :name => "project_id", :class => "fl", :style=>"width:60px;"}
|
||||
)%>
|
||||
<select placeholder=" 发布人" class="fl my_issues_filter" disabled="disabled" style="width:70px;padding-left:20px;">
|
||||
<option value="0" selected="selected">发布人</option>
|
||||
</select>
|
||||
<%= select( :issue, :user_id, [[@user.show_name, @user.id]].unshift(["发布人",0]),
|
||||
{ :include_blank => false,:selected => @author_id ? @author_id : 0},
|
||||
{:onchange => "remote_function();add_style();",:id => "author_id", :name => "author_id", :class => "fl", :style => "visibility:hidden;width: 0px;margin:0px;padding:0px;"}
|
||||
)
|
||||
%>
|
||||
|
||||
<select placeholder=" 类型" class="fl my_issues_filter" disabled="disabled" style="width:50px">
|
||||
<option value="0" selected="selected">类型</option>
|
||||
</select>
|
||||
<select placeholder=" 指派给" class="fl my_issues_filter" disabled="disabled" style="width:70px;padding-left:20px;">
|
||||
<option value="0" selected="selected">指派给</option>
|
||||
</select>
|
||||
<%= select( :issue, :user_id, [[@user.show_name, @user.id]].unshift(["指派给",0]),
|
||||
{ :include_blank => false, :selected => @assigned_to ? @assigned_to : 0},
|
||||
{:onchange=>"remote_function();add_style();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"fl", :style => "visibility:hidden; width:0px;margin:0px;padding:0px;"} )
|
||||
%>
|
||||
<select placeholder=" 优先度" class="fl my_issues_filter" disabled="disabled" style="width:50px;padding-left:5px;padding-right:5px;">
|
||||
<option value="0" selected="selected">优先度</option>
|
||||
</select>
|
||||
<select placeholder=" 里程碑" class="fl my_issues_filter" disabled="disabled" style="width:90px;padding-left:30px;padding-right:20px;">
|
||||
<option value="0" selected="selected">里程碑</option>
|
||||
</select>
|
||||
<select placeholder=" 状态" class="fl my_issues_filter" disabled="disabled" style="width:50px">
|
||||
<option value="0" selected="selected">状态</option>
|
||||
</select>
|
||||
<select placeholder=" 完成度" class="fl my_issues_filter" disabled="disabled" style="width:60px">
|
||||
<option value="0" selected="selected">完成度</option>
|
||||
</select>
|
||||
<select placeholder=" 排序" class="fl my_issues_filter" disabled="disabled" style="width:50px;visibility:hidden;">
|
||||
<option value="0" selected="selected">排序</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<% end %>
|
||||
<% if @issues.empty? %>
|
||||
<p class="nodata mt10"><%= l(:label_no_data) %></p>
|
||||
<% else %>
|
||||
<div id="issue_list">
|
||||
<%= render :partial => 'users/all_issue_list', :locals => {:issues => @issues, :issue_pages => @issue_pages,:issue_count => @issue_count, :subject => @subject } %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div><!--issues_filter end-->
|
||||
<div id="issues_list_content_1">
|
||||
</div><!--issues_list_content_1 end-->
|
||||
<div id="issues_list_content_2" class="undis">
|
||||
</div><!--issues_list_content_2 end-->
|
||||
<div id="issues_list_content_3" class="undis">
|
||||
</div><!--issues_list_content_3 end-->
|
||||
<!--issues_con_list end-->
|
||||
|
||||
|
||||
<!--缺陷列表结束-->
|
||||
|
||||
<!--缺陷列表结束-->
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
$("#issue_filter_all").html("<%= escape_javascript(render :partial => 'users/my_issue_filter_all') %>");
|
||||
$("#issue_list").html("<%= escape_javascript(render :partial => 'users/all_issue_list',:locals => {:issues => @issues, :issue_pages=> @issue_pages, :issue_count => @issue_count })%>");
|
||||
$("#issue_list_pagination").html('<%= pagination_links_full @issue_pages, @issue_count, :issues => @issues, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>');
|
||||
|
|
@ -1020,7 +1020,7 @@ zh:
|
|||
text_wiki_page_destroy_children: 删除子页面及其所有下级页面
|
||||
text_wiki_page_reassign_children: 将子页面的上级页面设置为
|
||||
text_own_membership_delete_confirmation: 你正在删除你现有的某些或全部权限，如果这样做了你可能将会再也无法编辑该课程了。你确定要继续吗？
|
||||
text_own_membership_for_project_confirmation: 你正在删除现有的某些或全部权限，如果这样做了你可能将会再也无法编辑该项目了。你确定要继续吗？
|
||||
text_own_membership_for_project_confirmation: 您正要将自己从项目中删除，如果继续，您将失去编辑该项目的权限。您是否确定要继续
|
||||
text_zoom_in: 放大
|
||||
text_zoom_out: 缩小
|
||||
text_applied_project: "用户 %{id} 申请加入项目 %{project}"
|
||||
|
|
@ -1270,7 +1270,7 @@ zh:
|
|||
|
||||
#added by liuping
|
||||
|
||||
label_delete_confirm: 确认删除？
|
||||
label_delete_confirm: 您是否确认删除？
|
||||
label_tags_bid: 需求名称
|
||||
label_tags_syllabus_name: 课程名称
|
||||
label_tags_course_name: 班级名称
|
||||
|
|
|
|||
|
|
@ -638,6 +638,7 @@ RedmineApp::Application.routes.draw do
|
|||
|
||||
get 'edit_brief_introduction'
|
||||
get "user_resource"
|
||||
match "user_issues", :to => 'users#user_issues', :via => [:get, :post], :as => "user_issues"
|
||||
get "import_resources"
|
||||
get "import_resources_search"
|
||||
post "import_into_container"
|
||||
|
|
@ -796,6 +797,7 @@ RedmineApp::Application.routes.draw do
|
|||
post 'close'
|
||||
post 'reopen'
|
||||
get 'forked_pop'
|
||||
get 'delete_member_pop'
|
||||
get 'search_public_orgs_not_in_project'
|
||||
match 'copy', :via => [:get, :post]
|
||||
match 'set_public_or_private', :via => [:post]
|
||||
|
|
|
|||
|
|
@ -677,3 +677,136 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
|
|||
|
||||
/*禁用*/
|
||||
.disabled {background-color:#f5f5f5;}
|
||||
|
||||
/* 缺陷列表 */
|
||||
.issues_greycirbg_btn{ background-color:#dedede; padding:1px 5px;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; }
|
||||
.issues_greycirbg_btn:hover{background-color:#cbcbcb;}
|
||||
input:focus,select:focus{ border:none;outline:medium;border-right:none;}
|
||||
.issues_con{ width:718px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; }
|
||||
.issues_statistics{ line-height:35px;}
|
||||
.issues_statistics ul li{ float:left; }
|
||||
.issues_statistics ul li a{ font-size:12px; margin:5px; color:#888; }
|
||||
.issues_statistics ul li a.act{}
|
||||
|
||||
|
||||
.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;}
|
||||
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 */
|
||||
.issues_con_list{border:1px solid #c8c8c8; }
|
||||
#issues_list_nav {border-bottom:1px solid #d0d0d0;}
|
||||
#issues_list_nav li {float:left; padding:10px 15px; text-align:center; }
|
||||
#issues_list_nav li a{font-size:12px; color:#444;}
|
||||
.issues_nav_hover{border-bottom:3px solid #3498db; font-weight:bold; }
|
||||
.issues_nav_nomall {border-bottom:none; }
|
||||
.issues_nav_tag{ background-color:#eaeaea; padding:2px 8px;-webkit-border-radius:15px;-moz-border-radius:15px;-o-border-radius:15px;border-radius:15px; font-size:12px;}
|
||||
.undis {display:none;}
|
||||
.dis {display:block;}
|
||||
.issues_form_filter{ position: absolute; top:0; right: 0;}
|
||||
.issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; padding-right:10px;}
|
||||
.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/new_project/arrow.png") no-repeat scroll right center transparent;}
|
||||
.issues_form_filter select.my_issues_filter{ background:none; width:70px; padding-right:10px;padding-left:10px;}
|
||||
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 #c8c8c8;}
|
||||
.issues_list_titlebox{ font-size:14px; font-weight:bold; margin-bottom:8px;}
|
||||
a.issues_list_title{ color:#444; max-width:260px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; }
|
||||
a:hover.issues_list_title{color:#3b94d6;}
|
||||
.issues_list_titlebox span{ font-size: 12px;color: #888; font-weight: normal; }
|
||||
.issues_ciricons_01{ width: 22px; height: 22px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 0 no-repeat;}
|
||||
.issues_ciricons_02{ width: 22px; height: 22px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 -30px no-repeat;}
|
||||
.issues_icons_mes{width: 17px; height: 17px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 -57px no-repeat; }
|
||||
.issues_list_name{ font-size: 12px;}
|
||||
.issues_list_name:hover{ color: #3b94d6;}
|
||||
.issues_list_small{ font-size: 12px; color: #666;}
|
||||
.issues_list_txt li{ height: 50px; line-height: 50px; float: left; font-size: 12px; width: 70px; text-align: center; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;}
|
||||
.issues_list_txt li.issues_list_min{ width: 50px;}
|
||||
|
||||
|
||||
/* 搜索 与课程相同 */
|
||||
.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: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;}
|
||||
/* 翻页 与课程相同*/
|
||||
.pages a{
|
||||
display:block;
|
||||
border:1px solid #d1d1d1;
|
||||
color:#888;
|
||||
float:left;
|
||||
width:30px;
|
||||
text-align:center;
|
||||
padding:3px 0;
|
||||
line-height:1.9;
|
||||
margin-right:5px;
|
||||
}
|
||||
.pages a:hover{
|
||||
background-color:#3b94d6;
|
||||
border:1px solid #3b94d6;
|
||||
color:#fff;
|
||||
}
|
||||
a.pages-big{
|
||||
width:50px;
|
||||
}
|
||||
.pages .active{
|
||||
background-color:#3b94d6;
|
||||
border:1px solid #3b94d6;
|
||||
color:#fff;
|
||||
}
|
||||
.pages{
|
||||
width:330px;
|
||||
|
||||
margin:20px auto 10px;
|
||||
}
|
||||
.sy_corange{ color: #ee4a1f;}
|
||||
.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;}
|
||||
.sy_cgrey{ color: #888;}
|
||||
a.sy_cgrey{ color: #888;}
|
||||
.sy_corange{ color: #ee4a1f;}
|
||||
a.sy_corange{ color: #ee4a1f;}
|
||||
a.sy_cblue{ color: #3b94d6;}
|
||||
/* 新增粉色关注按钮*/
|
||||
a.sy_btn_pink{
|
||||
display: inline-block;
|
||||
color: #fff;
|
||||
background: #ff7d7d;
|
||||
text-align: center;
|
||||
font-size: 12px;
|
||||
padding:0 15px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
-webkit-border-radius:3px;
|
||||
-moz-border-radius:3px;
|
||||
-o-border-radius:3px;
|
||||
border-radius:3px;
|
||||
}
|
||||
a:hover.sy_btn_pink{ background: #e64c4c;}
|
||||
|
||||
/* 我的缺陷列表*/
|
||||
.myissues_con{ width:968px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; margin: 0 auto; }
|
||||
.myissues_head{ width: 100%; height: 40px; line-height: 40px; background: #f4f4f4; }
|
||||
.myissues_head h2{ font-size: 14px;}
|
||||
select.issues_filter_active { font-weight: bold; color: #333;}
|
||||
.issues_form_filter select.issues_filter_select_min02{width:60px; }
|
||||
.issues_form_filter select.issues_filter_select_max{width:90px; }
|
||||
.issues_list_txt li.issues_list_max{ width:90px }
|
||||
.btn_newpro_grey{display: inline-block;color: #7b7b7b; border:1px solid #dbdbdb;background:#fff;text-align: center;font-size: 12px; padding:0 15px; height:24px; line-height: 24px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px;}
|
||||
a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;}
|
||||
|
||||
.my_issues_form_filter{ position: absolute; top:0; right: 0;}
|
||||
.my_issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; text-align:center}
|
||||
.my_issues_form_filter select.issues_filter_select_min{width:50px; }
|
||||
.my_issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none;}
|
||||
|
|
|
|||
|
|
@ -550,7 +550,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
|
|||
|
||||
/* 缺陷列表 */
|
||||
.issues_greycirbg_btn{ background-color:#dedede; padding:1px 5px;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; }
|
||||
.issues_greycirbg_btn:hover{background-color:#cbcbcb;}
|
||||
.issues_greycirbg_btn:hover{ background-color:#cbcbcb; cursor:default; }
|
||||
.issues_con{ width:718px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; }
|
||||
.issues_statistics{ line-height:35px;}
|
||||
.issues_statistics ul li{ float:left; }
|
||||
|
|
@ -832,7 +832,7 @@ a.sy_corange{ color: #ee4a1f;}
|
|||
a.sy_cblue{ color: #3b94d6;}
|
||||
|
||||
/* 我的缺陷列表*/
|
||||
.myissues_con{ width:968px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; }
|
||||
.myissues_con{ width:968px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444;}
|
||||
.myissues_head{ width: 100%; height: 40px; line-height: 40px; background: #f4f4f4; }
|
||||
.myissues_head h2{ font-size: 14px;}
|
||||
select.issues_filter_active { font-weight: bold; color: #333;}
|
||||
|
|
@ -1031,3 +1031,7 @@ a.pro_new_users { max-width:80px; overflow:hidden;overflow:hidden;text-overflow:
|
|||
a:hover.pro_new_users {color: #3b94d6}
|
||||
.pro_new_users img{ width:40px;height:40px; border: 3px solid #fff;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
|
||||
.pro_new_users img:hover{border: 3px solid #e6e6e6;}
|
||||
|
||||
/*质量分析*/
|
||||
.quality_info{ border:1px solid #ddd; background-color:#fff; width: 998px;}
|
||||
.quality_info h2{ background: #fff; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px; border-bottom:1px solid #e5e5e5;}
|
||||
|
|
|
|||
Loading…
Reference in New Issue