Merge branch 'dai_ao' into develop

app/views/users/user_issues.html.erb

@@ -4,7 +4,7 @@
 
 <script xmlns="http://www.w3.org/1999/html">
     function add_style(){
-        $("#proeject_id").val("来源")
+       // $("#proeject_id").val("来源");
         if($("select[id='tracker_id']").val() != 0){
             $("#tracker_id").addClass('issues_filter_active');
         }
@@ -173,7 +173,7 @@
 <!--缺陷列表开始-->
 <div id="myissues_con" class="myissues_con mb10">
 <div class="myissues_head mb5">
-  <h2 class="ml15">我的缺陷</h2>
+  <h2 class="ml15">我的Issue</h2>
 </div>
 <div class="clear mb5">
   <div class="issues_statistics fl">
@@ -225,9 +225,9 @@
       </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;"}
+                  { :onchange => "remote_function();add_style();",:id => "proeject_id", :name => "project_id", :class => "fl", :style=>"width: 80px; margin-right:20px;"}
       )%>
-     <select  placeholder=" 发布人" class="fl my_issues_filter" disabled="disabled" style="width:70px;padding-left:20px;">
+     <select  placeholder=" 发布人" class="fl my_issues_filter" disabled="disabled" style="padding:0px;width: 50px;margin-right: 15px;">
         <option value="0" selected="selected">发布人</option>
       </select>
       <%= select( :issue, :user_id, [[@user.show_name, @user.id]].unshift(["发布人",0]),
@@ -236,29 +236,29 @@
           )
       %>
 
-      <select  placeholder=" 类型" class="fl my_issues_filter" disabled="disabled" style="width:50px">
+      <select  placeholder=" 类型" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin:0px;width:35px; margin-right:10px;">
         <option value="0" selected="selected">类型</option>
       </select>
-     <select  placeholder=" 指派给" class="fl my_issues_filter" disabled="disabled" style="width:70px;padding-left:20px;">
+     <select  placeholder=" 指派给" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin-right: 15px;">
         <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;">
+      <select  placeholder=" 优先度" class="fl my_issues_filter"  disabled="disabled" style="padding:0px; margin:0px">
         <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;">
+      <select  placeholder=" 里程碑" class="fl my_issues_filter" disabled="disabled" style="padding:0px;margin-left: 20px; margin-right: 10px">
         <option value="0" selected="selected">里程碑</option>
       </select>
-      <select  placeholder=" 状态" class="fl my_issues_filter" disabled="disabled" style="width:50px">
+      <select  placeholder=" 状态" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin-right:10px;width:35px;">
         <option value="0" selected="selected">状态</option>
       </select>
-      <select  placeholder=" 完成度" class="fl my_issues_filter" disabled="disabled" style="width:60px">
+      <select  placeholder=" 完成度" class="fl my_issues_filter" disabled="disabled" style="padding:0px; margin:0px">
         <option value="0" selected="selected">完成度</option>
       </select>
-      <select  placeholder=" 排序" class="fl my_issues_filter" disabled="disabled" style="width:50px;visibility:hidden;">
+      <select  placeholder=" 排序" class="fl my_issues_filter" disabled="disabled" style="width:50px;visibility:hidden;margin-left: 0px;margin-right: 0px;">
         <option value="0" selected="selected">排序</option>
       </select>
     </div>

public/stylesheets/css/common.css

@@ -763,7 +763,7 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
 .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;}
+.issues_form_filter select.my_issues_filter{ background:none; width:50px; margin-left: 10px;margin-right: 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; }