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

app/views/issues/_action_menu.html.erb

@@ -1,5 +1,4 @@
 <!--added by huang-->
-
 <%= watcher_link_issue(@issue, User.current) %>
 <%#= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:add_issues, @project) %>
 <%= 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) %>

app/views/issues/_edit.html.erb

@@ -1,47 +1,58 @@
 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
+    <!--编辑的整个属性-->
     <% if @edit_allowed || !@allowed_statuses.empty? %>
         <div id="all_attributes">
             <%= render :partial => 'form', :locals => {:f => f} %>
-    <% end %>
+        </div>
+    <% end %><!--end-->
 
-    <fieldset><legend><%= l(:field_notes) %></legend>
+    <!--<fieldset><legend><%#= l(:field_notes) %></legend>-->
-    <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :no_label => true %>
+    <!--回复框-->
-    <%= wikitoolbar_for 'issue_notes' %>
+    <% if @journals.present? %>
-
+        <div id="history">
-    <% if @issue.safe_attribute? 'private_notes' %>
+          <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
-    <label for="issue_private_notes"><%= f.check_box :private_notes, :no_label => true %> <%= l(:field_private_notes) %></label>
+        </div>
     <% end %>
+    <%= f.text_area :notes, :style =>"width:99%;", :rows => "5", :no_label => true %>
+
+    <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
+    <!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->
+    <!--<%# end %>-->
 
     <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
-    </fieldset>
+    <!--</fieldset>-->
 
-    <fieldset><legend><%= l(:label_attachment_plural) %></legend>
+    <!--<fieldset><legend><%#= l(:label_attachment_plural) %></legend>-->
-    <p><%= render :partial => 'attachments/form', :locals => {:container => @issue} %></p>
+    <p style="padding-top: 5px;"><%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
-    </fieldset>
+    <!--</fieldset>-->
 
-      <div class="box tabular" >
+    <!--<div class="box tabular" >-->
-    <p id="watchers_form">
+    <!--<p id="watchers_form">-->
-      <label style="font-size: 15px;"><%= l(:label_issue_watchers) %></label>
+      <!--<label style="font-size: 15px;"><%#= l(:label_issue_watchers) %></label>-->
-      <span id="watchers_inputs" style="font-size: 15px;">
+      <!--<span id="watchers_inputs" style="font-size: 15px;">-->
-        <%= watchers_checkboxes(@issue, @available_watchers) %>
+        <!--<%#= watchers_checkboxes(@issue, @available_watchers) %>-->
-      </span>
+      <!--</span>-->
-      <span class="search_for_watchers" style="font-size: 15px;">
+      <!--<span class="search_for_watchers" style="font-size: 15px;">-->
-      <%= link_to l(:label_search_for_watchers),
+      <%#= link_to l(:label_search_for_watchers),
-                  {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
+#                   {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
-                  :remote => true,
+#                   :remote => true,
                   :method => 'get' %>
-      </span>
+      <!--</span>-->
-      </p>
+      <!--</p>-->
-        </div>
+        <!--</div>-->
-    </div>
+    <!--</div>-->
 
     <%= f.hidden_field :lock_version %>
     <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
     <%= hidden_field_tag 'reference_user_id', params[:reference_user_id]%>
-    <%= submit_tag l(:button_submit) %>
+    <a remote="true" href="javascript:void(0)" class="blue_btn fr" onclick="$('#issue-form').submit();">
-    <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' %>
+      <%= l(:button_submit) %>
+    </a>
+    </p>
+    <%#= submit_tag l(:button_submit) %>
+    <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' %>
 <% end %>
 
 <div id="preview" class="wiki"></div>

app/views/issues/show.html.erb

@@ -90,13 +90,14 @@
   <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %></a>
   <div class="cl"></div>
 </div><!--problem_main end-->
-
+<div style="clear: both;"></div>
-<!--留言-->
+    <% if @issue.editable? %>
-  <% if @journals.present? %>
+      <div id="update">
-  <div id="history">
+        <%= render :partial => 'edit' %>
-     <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
       </div>
-<% end %>
+  <% end %>
+<!--留言-->
+
 </div>
 
 <% if @changesets.present? %>
@@ -109,12 +110,7 @@
 <!--<div style="clear: both;"></div>-->
 <!--<%#= render :partial => 'action_menu' %>-->
 
-<div style="clear: both;"></div>
+
-<% if @issue.editable? %>
-  <div id="update">
-    <%= render :partial => 'edit' %>
-  </div>
-<% end %>
 
 <% other_formats_links do |f| %>
   <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>

config/locales/projects/zh.yml

@@ -69,7 +69,7 @@ zh:
 
 
   project_module_boards: 讨论区
-  project_module_boards_post: 发帖新帖
+  project_module_boards_post: 发布新帖
   project_module_files: 资源库 
   project_module_repository: 版本库
   project_module_create_repository: 创建版本库