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

app/views/attachments/_form.html.erb

@@ -49,7 +49,7 @@
   <span class="add_attachment" style="font-weight:normal;">
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-    <%= button_tag "文件浏览", :class => 'sub_btn', :type => "button", :onclick => "_file.click()", :onmouseover => 'this.focus()', :style => ie8? ? 'display:none' : '' %>
+    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
     <%= file_field_tag 'attachments[dummy][file]',
                        :id => '_file',
                        :class => 'file_selector',

app/views/issues/_action_menu.html.erb

@@ -4,7 +4,7 @@
 <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
 
 <% if (@issue.author == User.current)  || (User.current.admin?) %>
-    <%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? %>
+    <%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("all_attributes", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? %>
 <% else %>
     <%= link_to l(:label_user_newfeedback), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? %>
 <% end %>

app/views/issues/_edit.html.erb

@@ -3,11 +3,11 @@
     <%= render :partial => 'conflict' if @conflict %>
     <!--编辑的整个属性-->
     <% if @edit_allowed || !@allowed_statuses.empty? %>
-        <div id="all_attributes">
+        <div id="all_attributes" style="display:none;">
             <%= render :partial => 'form', :locals => {:f => f} %>
         </div>
     <% end %><!--end-->
-
+    <div class="ping_C mb10"> </div>
     <!--<fieldset><legend><%#= l(:field_notes) %></legend>-->
     <!--回复框-->
     <% if @journals.present? %>

app/views/issues/_form.html.erb

@@ -91,7 +91,6 @@
       <%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
     </li>
     <div class="cl"></div>
-    <div class="cl"></div>
     <div id="attributes">
       <%= render :partial => 'issues/attributes' %>
     </div>
@@ -108,9 +107,9 @@
           </span>
     <%= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture')  }')" %>
     <div class="cl"></div>
-    <span id="watchers_inputs">
+      <span id="watchers_inputs">
           <%= watchers_checkboxes(@issue, @available_watchers) %>
-          </span>
+      </span>
     <div class="cl"></div>
     </div>
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>

app/views/issues/new.html.erb

@@ -10,36 +10,6 @@
     <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" placeholder="搜索添加跟踪者">
-          <span class="search_for_watchers">
-          <%= link_to "",
-                      {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
-                      :remote => true,
-                      :method => 'get',
-                      :class => "pic_sch mt5 ml5" %>
-          </span>
-          </div>
-          <%= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture')  }')" %>
-          <div class="cl"></div>
-          <span id="watchers_inputs">
-          <%= watchers_checkboxes(@issue, @available_watchers) %>
-          </span>
-
-          <div class="cl"></div>
-          <div id="watchers_inputs">
-          </div>
-          <div class="cl"></div>
-          <div class="cl"></div>
-      <% end %>
-      <a href="#" class="blue_btn fl ml80" onclick="$('#issue-form').submit();">
-        <%= l(:button_create) %>
-      </a>
-      <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>
-    </div>
     <!--<%= javascript_tag "$('#issue_subject').focus();" %>-->
 <% end %>
 

app/views/layouts/base_projects.html.erb

@@ -99,8 +99,8 @@
                 <a href="#" onclick="submitSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >
                   <%= l(:label_search)%>
                 </a>
-                <br />
+                <div class="cl"></div>
-                <span id="project_name_span" style="float: left"></span>
+                <span id="project_name_span" class="fl"></span>
             <% end %>
           </div>
         </div><!--TopBar end-->
@@ -185,7 +185,7 @@
                         </div>
                     </div>
                     <div class="lg-foot" id="lg-foot" onclick="show_more_msg();">
-                        <%= l(:label_expend_information)%>
+                        <label id="expend_more_information"  value="<%= l(:label_expend_information)%>"><%= l(:label_expend_information)%></label>
                         <span class="g-arr-down">
                             <img src="/images/jiantou.jpg" width="12" height="6" />
                         </span>

public/javascripts/project.js

@@ -1,8 +1,8 @@
 //验证搜索时输入字
-function regexName() {
+function regexName(content) {
     var name = $.trim($("#name").val());
     if (name.length == 0) {
-        $("#project_name_span").text("<%= l(:label_search_conditions_not_null) %>");
+        $("#project_name_span").text(content);
         $("#project_name_span").css('color', '#ff0000');
         $("#project_name_span").focus();
         return false;
@@ -13,6 +13,12 @@ function regexName() {
     }
 }
 
+function submitSerch(content)
+{
+    if(regexName(content)){$("#project_search_form").submit();}
+}
+
+
 // 项目描述超过展开
 //$(function(){
 //    $(".subNav").click(function(){
@@ -29,8 +35,21 @@ function expand_tools_expand()
 }
 
 // 描述显示更多信息
-function show_more_msg()
+function show_more_msg(){
-{$("#course_description").toggleClass("course_description_none");}
+ $("#course_description").toggleClass("course_description_none");
+ var information = $("#expend_more_information");
+ var val = information.attr("value");
+    if (val=="展开更多信息" )
+    {
+        $("#expend_more_information").text("收起描述信息");
+        information.attr("value","收起描述信息");
+    }
+    else
+    {
+        $("#expend_more_information").text("展开更多信息");
+        information.attr("value","展开更多信息");
+    }
+}
 
 ///////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////项目讨论区
@@ -202,3 +221,11 @@ $(document).ready(function(){
 //      $(".jstEditor").css("margin-left ","80px");
     //issue_project_id
 });
+
+function showAndScrollTo(id, focus) {
+    $('#'+id).show();
+    if (focus !== null) {
+        $('#'+focus).focus();
+    }
+    $('html, body').animate({scrollTop: $('#'+id).offset().top}, 400);
+}

public/stylesheets/project.css

@@ -203,7 +203,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_hovertab    {   color:#656767; font-weight:bold; border-bottom:3px solid #15bccf; }
 .ping_dis{display:block; }
 .ping_undis{display:none;}
-.ping_C{border-bottom:1px dashed #CCC; padding:10px 0 0px;}
+.ping_C{border-bottom:1px dashed #CCC; padding:10px 0 10px;}
 .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;}
 .ping_dispic a:hover{border:1px solid #15bccf;}
 .ping_discon{ float:left; width:610px; margin-left:10px; }
@@ -328,7 +328,7 @@ a:hover.st_add{ color:#ff8e15;}
 .newpro_box ul li{ }
 .newpro_box input{  height:26px; float:left; margin-bottom:10px;}
 .newpro_box textarea{  height:150px; float:left; margin-bottom:10px;}
-.newpro_box select{ height:26px; float:left; margin-bottom:10px;}
+.newpro_box select{ height:29px; float:left; margin-bottom:10px;}
 .label{ width:80px; text-align:right; font-size:14 background-image: url(../images/true.png); }
 .icon-reload  { background-image: url(../images/reload.png); }
 .icon {