Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/helpers/application_helper.rb

@@ -1491,7 +1491,7 @@ module ApplicationHelper
           tags = javascript_tag(
               "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " +
                   "showOn: 'button', buttonImageOnly: true, buttonImage: '" +
-                  path_to_image('/images/calendar.png') +
+                  path_to_image('/images/public_icon.png') +
                   "', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};")
           jquery_locale = l('jquery.locale', :default => current_language.to_s)
           unless jquery_locale == 'en'
@@ -1513,7 +1513,7 @@ module ApplicationHelper
           tags = javascript_tag(
               "var datepickerOptions={dateFormat: 'yy-mm-dd',minDate: new Date(), firstDay: #{start_of_week}, " +
                   "showOn: 'button', buttonImageOnly: true, buttonImage: '" +
-                  path_to_image('/images/calendar.png') +
+                  path_to_image('/images/public_icon.png') +
                   "', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true, onClose: function(dateText, inst) {TimeClose(dateText,inst);}, beforeShow : function(input){TimeBeforeShow(input);} };")
           jquery_locale = l('jquery.locale', :default => current_language.to_s)
           unless jquery_locale == 'en'

app/helpers/watchers_helper.rb

@@ -288,11 +288,23 @@ module WatchersHelper
 
 
 
-
+# 缺陷跟踪者列表复选框生成
   def watchers_checkboxes(object, users, checked=nil)
     if users.nil?
 
     else
+      # tag = check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil
+      # content_tag 'label', "#{tag} #{h(user)}".html_safe,
+      #             :id => "issue_watcher_user_ids_#{user.id}",
+      #             :class => "floating"
+      users.map do |user|
+        c = checked.nil? ? object.watched_by?(user) : checked
+        s = content_tag(:ul,
+                        content_tag(:li, "#{check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil } #{h link_to user.userInfo, user_path( user.id)}".html_safe,
+                        :id=>"issue_watcher_user_ids_#{user.id}",:style=>"float: left;width: 270px;margin: 0px 20px 10px 0px; overflow: hidden; line-height:1.6em;" ),
+                        :class => "mb10 ml80")
+      end.join.html_safe
+
       # scope = users.sort
       # watchers = paginateHelper scope,10
       # s = content_tag('ul', issue_watcher_check_box_tags_ex('issue[watcher_user_ids][]', watchers), :class => 'mb10 ml80')
@@ -300,10 +312,6 @@ module WatchersHelper
       #   link_to text, watchers_autocomplete_for_user_path(@users, parameters.merge(:q => params[:q],:format => 'js',:flag => 'ture')), :remote => true
       # }
       # s + content_tag('ul', links,:class => 'wlist', :style =>"float:left;margin-top:0px;")
-      users.map do |user|
-        c = checked.nil? ? object.watched_by?(user) : checked
-      end.join.html_safe
-      s = content_tag('ul', issue_watcher_check_box_tags_ex('issue[watcher_user_ids][]', users), :class => 'mb10 ml80')
     end
   end
 

app/views/attachments/_form.html.erb

@@ -1,3 +1,4 @@
+<div class="fl">
 <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% container.attachments.each_with_index do |attachment, i| %>
@@ -76,5 +77,5 @@
   <% content_for :header_tags do %>
       <%= javascript_include_tag 'attachments' %>
   <% end %>
-
+</div>
 

app/views/issues/_attributes.html.erb

@@ -140,18 +140,15 @@
         }
         function PrecentChange(obj) {
             var _v = obj;
-          if(_v==100)
+            if (_v == 100) {
-          {
                 //var select=$("select[id='issue_status_id']");
                 $("select[id='issue_status_id']").find("option[value='3']").attr("selected", "selected");
             }
-          else if(_v==0)
+            else if (_v == 0) {
-          {
                 //alert(1);
                 $("select[id='issue_status_id']").find("option[value='1']").attr("selected", "selected");
             }
-          else if(_v!=100&&_v!=0)
+            else if (_v != 100 && _v != 0) {
-          {
                 // alert(2);
                 $("select[id='issue_status_id']").find("option[value='2']").attr("selected", "selected");
             }

app/views/issues/_form.html.erb

@@ -1,16 +1,6 @@
-<script type="text/javascript">
-  $(document).ready(function(){
-      $("#issue_project_id").css("width","100%");
-      $("#issue_project_id").css("overflow ","hidden");
-//      $(".jstEditor").css("margin-left ","80px");
-      //issue_project_id
-  });
-</script>
-
-
-  <div class="newpro_box">
 <%= labelled_fields_for :issue, @issue do |f| %>
     <%= call_hook(:view_issues_form_details_top, {:issue => @issue, :form => f}) %>
+    <div class="newpro_box">
       <ul>
         <li>
           <% if @issue.safe_attribute? 'tracker_id' %>
@@ -25,7 +15,8 @@
         </li>
         <li>
           <% if @issue.safe_attribute? 'is_private' %>
-      <%= f.check_box :is_private, :no_label => true ,:class=> "ml30"%><label class="fl ml5 mt3" for="issue_is_private" id="issue_is_private_label"><%= l(:field_is_private) %></label>
+              <%= f.check_box :is_private, :no_label => true, :class => "ml30" %>
+              <label class="fl ml5 mt3" for="issue_is_private" id="issue_is_private_label"><%= l(:field_is_private) %></label>
           <% end %>
         </li>
         <div class="cl"></div>
@@ -47,7 +38,9 @@
               %>
               <!--Added by young-->
               <%= javascript_tag do %>
-          observeAutocompleteField('issue_subject', '<%= escape_javascript auto_complete_issues_path(:project_id => @project,:scope => (Setting.cross_project_issue_relations? ? 'all' : nil)) %>',
+                  observeAutocompleteField('issue_subject',
+                  '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)) %>
+                  ',
                   { select: function(event, ui) {
                   $('input#issue_subject').val(ui.item.value);
                   }
@@ -75,6 +68,8 @@
           <% end %>
         </li>
         <div class="cl"></div>
+      </ul>
+    </div>
     <li>
       <% if @copy_from && @copy_from.attachments.any? %>
           <p>
@@ -92,15 +87,14 @@
     </li>
     <div class="cl"></div>
     <li>
+      <br>
       <label class="label"><span class="c_red f12">*</span><%= l(:label_attachment_plural) %>：</label>
       <%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
-    <li>
+    </li>
+    <div class="cl"></div>
     <div class="cl"></div>
-  </ul>
-
     <div id="attributes">
       <%= render :partial => 'issues/attributes' %>
     </div>
-</div>
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>

app/views/issues/new.html.erb

@@ -7,14 +7,14 @@
                              :html => {:id => 'issue-form', :multipart => true} do |f| %>
   <%= error_messages_for 'issue' %>
   <%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
-  <div class="newpro_box">
+  <div>
     <%= render :partial => 'issues/form', :locals => {:f => f} %>
   </div>
   <div class="newpro_box02 ">
     <% if @issue.safe_attribute? 'watcher_user_ids' -%>
         <div>
           <label class="label" > <%= l(:label_issue_watchers) %>：</label>
-          <input id="" name="" size="22" class="fl mb10 h26"  type="text" value="搜索添加跟踪者" >
+          <input id="" name="" size="22" class="fl mb10 h26"  type="text" placeholder="搜索添加跟踪者" >
           <span class="search_for_watchers">
           <%= link_to   "",
                       {:controller => 'watchers', :action => 'new', :project_id => @issue.project},

app/views/layouts/base_projects.html.erb

@@ -12,7 +12,7 @@
 		<%= favicon %>
 		<%= javascript_heads %>
 		<%= heads_for_theme %>
-         <%= stylesheet_link_tag 'public', 'pleft', 'project' %>
+         <%= stylesheet_link_tag 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2' %>
          <%= javascript_include_tag 'project', 'header' %>
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->

public/javascripts/project.js

@@ -195,3 +195,10 @@ function news_show_more_des(id)
 {
     $('#news_description_' + id).toggleClass("news_description_none");
 }
+
+$(document).ready(function(){
+    $("#issue_project_id").css("width","100%");
+    $("#issue_project_id").css("overflow ","hidden");
+//      $(".jstEditor").css("margin-left ","80px");
+    //issue_project_id
+});

public/stylesheets/project.css

@@ -227,6 +227,12 @@ blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;}
 .reply_btn:hover{ background:#999; color:#fff; }
 
 #attachments_fields input.description {margin-left:4px; width:100px; }
+#attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}
+#attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
+a.remove-upload:hover {text-decoration:none !important;}
+#attachments_fields input.is_public_checkbox {width:20px;}
+
+
 #attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
 a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
 #attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px;}
@@ -238,7 +244,7 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .reply_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #ccc; color:#999;  border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;}
 .reply_btn:hover{ background:#999; color:#fff; }
 
-#attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
+
 .ui-widget {
     font-family: Verdana, sans-serif;
     font-size: 1.1em;
@@ -401,6 +407,28 @@ a:hover.member_btn{ background:#329cbd;}
 .pro_st_edit_ku{display:none; margin-top:20px;}
 .pro_st_edit_ku ul li{margin-bottom:10px;}
 /*end*/
+
+/*gcm upload file count and deleteall*/
+#upload_file_count #count {color:red; font-size:1.5em;}
+span.add_attachment .remove_all {background:none;background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block;right:10%;text-decoration:none;}
+span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; }
+
+
+/*日历选择图*/
+img.ui-datepicker-trigger {
+  display:block;
+  background:url(/images/public_icon.png) -31px 0 no-repeat;	
+  cursor: pointer;
+  vertical-align: middle;
+  margin-left: 5px;
+  margin-top: 5px;
+  width:16px; 
+  height:15px; 
+  float:left;
+}
+
+
+
 /*用户反馈*/
 .msg_box{ width:670px; height:173px; border-bottom:1px dashed #CCC; padding-top:10px;}
 .msg_box h4{ }