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

app/views/issues/_form.html.erb

@@ -1,10 +1,11 @@
+<script src="/jquery.min.js"></script>
 <script type="text/javascript">
-  window.onready = function()
+  $(document).ready(function(){
-  {
       $("#issue_project_id").css("width","100%");
       $("#issue_project_id").css("overflow ","hidden");
+      $("#issue_description").css("margin-left ","80px");
       //issue_project_id
-  }
+  });
 </script>
 
 
@@ -65,11 +66,10 @@
         <%= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
         <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
           <%= f.text_area :description,
-
+                         :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
-                        :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
+                         :accesskey => accesskey(:edit),
-                        :accesskey => accesskey(:edit),
+                         :class => "w583",
-                        :class => "w583",
+                         :no_label => true %>
-                        :no_label => true %>
         <% end %>
 
         <%= wikitoolbar_for 'issue_description' %>

app/views/issues/index.html.erb

@@ -20,11 +20,9 @@
 <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
 <div style="clear:right; ">
   <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get, :id => 'query_form', :class => 'query_form') do %>
-      <%= hidden_field_tag 'set_filter', '1' %>
+     <%= hidden_field_tag 'set_filter', '1' %>
-
+     <div id="custom_query" class="custom_query" style="display: <%= !params[:utf8].blank? ? 'block' : 'none' %>;">
-      <div id="custom_query" class="custom_query" style="display: <%= !params[:utf8].blank? ? 'block' : 'none' %>;">
         <span>---<%= l :label_query_new %>---</span>
-
         <div id="query_form_content" class="hide-when-print">
           <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
             <legend onclick="toggleFieldset(this);">
@@ -34,24 +32,24 @@
               <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
             </div>
           </fieldset>
-          <!--
+          <!-- 选项，暂不需要
           <fieldset class="collapsible collapsed">
             <legend onclick="toggleFieldset(this);">
-              <%= l(:label_options) %>
+              <%#= l(:label_options) %>
             </legend>
             <div style="display: none;">
               <table>
                 <tr>
-                  <td><%= l(:field_column_names) %></td>
+                  <td><%#= l(:field_column_names) %></td>
-                  <td><%= render_query_columns_selection(@query) %></td>
+                  <td><%#= render_query_columns_selection(@query) %></td>
                 </tr>
                 <tr>
-                  <td><label for='group_by'><%= l(:field_group_by) %></label></td>
+                  <td><label for='group_by'><%#= l(:field_group_by) %></label></td>
-                  <td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
+                  <td><%#= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
                 </tr>
                 <tr>
-                  <td><%= l(:button_show) %></td>
+                  <td><%#= l(:button_show) %></td>
-                  <td><%= available_block_columns_tags(@query) %></td>
+                  <td><%#= available_block_columns_tags(@query) %></td>
                 </tr>
               </table>
             </div>
@@ -80,6 +78,7 @@
           </ul>
 
     <% end %>
+
     <div style="float: left; padding-top: 30px">
       <% other_formats_links do |f| %>
           <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
@@ -88,7 +87,6 @@
       <% end %>
     </div>
 
-
     <div id="csv-export-options" style="display:none;">
       <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
       <%= form_tag(params.merge({:format => 'csv', :page => nil}), :method => :get, :id => 'csv-export-form') do %>
@@ -112,11 +110,8 @@
           </p>
       <% end %>
     </div>
-
 <% end %>
-
 <%= call_hook(:view_issues_index_bottom, {:issues => @issues, :project => @project, :query => @query}) %>
-
 <% content_for :sidebar do %>
     <%= render :partial => 'issues/sidebar' %>
 <% end %>