diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 9d734db37..b522a09d6 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -83,6 +83,10 @@ class IssuesController < ApplicationController
                               :limit => @limit)
       @issue_count_by_group = @query.issue_count_by_group
 
+
+
+
+
       respond_to do |format|
         format.html { render :template => 'issues/index', :layout =>  @project_base_tag }#by young
         format.api  {
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index cdeb17e54..44496c3d7 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -34,6 +34,7 @@ class MessagesController < ApplicationController
 
   # Show a topic and its replies
   def show
+    @isReply = true
     page = params[:page]
     # Find the page of the requested reply
     if params[:r] && page.nil?
@@ -103,6 +104,7 @@ class MessagesController < ApplicationController
 
   # Edit a message
   def edit
+    @isReply = false
     if @project
       (render_403; return false) unless @message.editable_by?(User.current)
     else
@@ -123,7 +125,6 @@ class MessagesController < ApplicationController
         }
       end
     end
-
   end
 
   # Delete a messages
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 91da700a1..14814ed32 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -37,14 +37,39 @@ class MyController < ApplicationController
                    }.freeze
 
   def index
+
     page
     render :action => 'page'
-  end
+ end
 
   # Show user's page
   def page
     @user = User.current
+    @Issues= Issue.visible.open.
+        where(:assigned_to_id => ([User.current.id] + User.current.group_ids))
+    @limit = 10
+    @feedback_count = @Issues.count
+    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    @offset ||= @feedback_pages.offset
+    @curse_attachments = @Issues[@offset, @limit]
+
+    @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
+  end
+
+  def page2
+    @limit = 10
+    @user = User.current
+    @Issues= Issue.visible.open.
+        where(:assigned_to_id => ([User.current.id] + User.current.group_ids))
+    @feedback_count = @Issues.count
+    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    @offset ||= @feedback_pages.offset
+    @curse_attachments = @Issues[@offset, @limit]
+    @state = false
     @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
+    respond_to do |format|
+      format.js
+    end
   end
 
   # Edit user's account
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 9437889b2..e564bc940 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -148,7 +148,8 @@ class NewsController < ApplicationController
       flash[:notice] = l(:notice_successful_update)
       redirect_to news_path(@news)
     else
-      render :action => 'edit'
+      #flash[:error] = l(:notice_successful_update)
+      redirect_to news_path(@news)
     end
   end
 
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1893224f8..ee42c2c6a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -407,7 +407,7 @@ class ProjectsController < ApplicationController
     @page = @page.to_i
     # Find the page of the requested reply
     @jours = @project.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
-    @limit =  3
+    @limit =  10
 
     offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
     page = 1 + offset / @limit
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index e31bb2738..2d03b2112 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -99,7 +99,7 @@ class WordsController < ApplicationController
     @project = Project.find params[:project_id]
     # Find the page of the requested reply
     @jours = @project.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
-    @limit =  3
+    @limit =  10
 
     offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
     page = 1 + offset / @limit
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index aad350d22..e08e50e80 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -441,7 +441,7 @@ module CoursesHelper
   def homework_user_of_homework homework,is_teacher
     homework_users = ""
     homework.users.each do |user|
-      homework_users = homework_users + (is_teacher ? user.realname : user.name)
+      homework_users = homework_users + (is_teacher ? (user.firstname + user.lastname) : user.login)
       if user != homework.users.last
         homework_users = homework_users + "、"
       end
diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 0677d324b..e5fbd3f82 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -1,6 +1,7 @@
-<span id="attachments_fields">
+<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| %>
+  <% if isReply  %>
+  <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
@@ -10,6 +11,18 @@
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>
+  <% else %>
+  <% container.attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
+                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
+  <% end %>
 <% end %>
 </span>
 <script type='text/javascript'>
diff --git a/app/views/attachments/file.html.erb b/app/views/attachments/file.html.erb
index 57393b81e..37db6f2bc 100644
--- a/app/views/attachments/file.html.erb
+++ b/app/views/attachments/file.html.erb
@@ -4,8 +4,16 @@
 <p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
    <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
 <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
-   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
-
+   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
+   <span class="size">
+     <% if @attachment!=nil&&@attachment.container_type == 'Document' %>
+          <%=    link = link_to(l(:button_add), {:controller => 'code_review',
+                                          :action => 'assign', :action_type => 'attachment',
+                                          :id=>@attachment.project,
+                                          :change_id => '', :attachment_id => @attachment.id,
+                                         }, :class => 'icon icon-add') %>
+        <% end %>
+   </span></p>
 </div>
 &nbsp;
 <%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
diff --git a/app/views/bids/_homework_form.html.erb b/app/views/bids/_homework_form.html.erb
index f7c753b45..463b2b621 100644
--- a/app/views/bids/_homework_form.html.erb
+++ b/app/views/bids/_homework_form.html.erb
@@ -26,9 +26,9 @@
 <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT  %></p>
 
 <p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
-<!-- <p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, 
+<!-- <p><%#= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe,
 	:onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_credit)+"','"+l(:label_bids_new_content)+"')" %>
-	<%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
+	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p> -->
 <p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;" %><%= calendar_for('bid_deadline')%>
 </p>
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 6797bc9eb..6d3a2adcc 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -28,13 +28,15 @@
 		<tr>
 			<td style="vertical-align: top;width: 70px" >
               <table style="text-align: center;width: 100%;table-layout: fixed">
+                <% user_name = is_teacher ? (homework.user.firstname + homework.user.lastname) : homework.user.login %>
                 <tr>
-                  <td title="<%= homework.user.name  %>"><%= image_tag(url_to_avatar(homework.user), :class => "avatar")%></td>
+                  <td title="<%= user_name  %>"><%= image_tag(url_to_avatar(homework.user), :class => "avatar")%></td>
                 </tr>
                 <tr>
-                  <td title="<%= homework.user.name  %>">
+
+                  <td title="<%= user_name  %>">
                     <p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><strong>
-                      <%= link_to (is_teacher ? homework.user.realname : homework.user ), user_path(homework.user),{:style => "color:#727272"} %>
+                      <%= link_to user_name, user_path(homework.user),{:style => "color:#727272"} %>
                     </strong></p>
                   </td>
                 </tr>
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 25d35d407..ca33b7516 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -63,7 +63,9 @@
               <td>
                 <table width="640px" border="0">
                   <tr>
-                    <td valign="top" width="500px" class=" <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), board_message_path(@board, topic) %></td>
+                    <td valign="top" width="500px" class=" <%= topic.sticky? ? 'sticky' : '' %>
+                    <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject.truncate(40,ommision:'...')), board_message_path(@board, topic),title: topic.subject.to_s %>
+                    </td>
                     <td align="right" rowspan="3"><table class="borad-count"><tr><td align="center" class="borad-count-digit"><%=link_to (topic.replies_count), board_message_path(@board, topic) %></td></tr>
                       <tr><td align="center">回答</td></tr>
                     </table></td>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 1327f13e9..ef1afd27e 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -71,7 +71,9 @@
               <td>
                 <table width="640px" border="0">
                   <tr>
-                    <td valign="top" width="500px" class=" <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), board_message_path(@board, topic) %></td>
+                    <td valign="top" width="500px" class=" <%= topic.sticky? ? 'sticky' : '' %>
+                    <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject.truncate(40,ommision:'...')), board_message_path(@board, topic),title:topic.subject.to_s %>
+                    </td>
                     <td align="right" rowspan="3">
                       <table class="borad-count">
                         <tr>
diff --git a/app/views/common/_file.html.erb b/app/views/common/_file.html.erb
index 22126b949..d4c0875c2 100644
--- a/app/views/common/_file.html.erb
+++ b/app/views/common/_file.html.erb
@@ -1,14 +1,14 @@
 <div class="autoscroll">
-<table class="filecontent syntaxhl">
+<table class="filecontent syntaxhl" >
 <tbody>
 <% line_num = 1 %>
 <% syntax_highlight_lines(filename, Redmine::CodesetUtil.to_utf8_by_setting(content)).each do |line| %>
   <tr>
-    <th class="line-num" id="L<%= line_num %>">
-      <a href="#L<%= line_num %>"><%= line_num %></a>
+    <th class="line-num" id="L<%= line_num %>" style="vertical-align: top;">
+      <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
     </th>
     <td class="line-code">
-      <pre><%= line.html_safe %></pre>
+      <pre style="width:880px;word-wrap: break-word; word-break: normal; "><%= line.html_safe %></pre>
     </td>
   </tr>
   <% line_num += 1 %>
diff --git a/app/views/contestnotifications/_news.html.erb b/app/views/contestnotifications/_news.html.erb
index 301a193d8..fbac2557f 100644
--- a/app/views/contestnotifications/_news.html.erb
+++ b/app/views/contestnotifications/_news.html.erb
@@ -1,9 +1,9 @@
-<!--<p><%= link_to_project(news.project) + ': ' unless @project %>
-<table><tr><td><img src="/images/new/news.png" width="40" height="40"/></td><td><%= link_to h(news.title), news_path(news) %>
-<%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
+<!--<p><%#= link_to_project(news.project) + ': ' unless @project %>
+<table><tr><td><img src="/images/new/news.png" width="40" height="40"/></td><td><%#= link_to h(news.title), news_path(news) %>
+<%#= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
 
- <% unless news.summary.blank? %></td><td><span class="fontligher"><%=h news.summary %></span><% end %></td>
-<td><span class="author"><%= authoring news.created_on, news.author %></span></td></tr></table></p>-->
+ <%# unless news.summary.blank? %></td><td><span class="fontligher"><%#=h news.summary %></span><% end %></td>
+<td><span class="author"><%#= authoring news.created_on, news.author %></span></td></tr></table></p>-->
 
 <table width="660px" border="0" align="center">
   <tr>
diff --git a/app/views/courses/_homework_form.html.erb b/app/views/courses/_homework_form.html.erb
index 41c059603..bfecb5304 100644
--- a/app/views/courses/_homework_form.html.erb
+++ b/app/views/courses/_homework_form.html.erb
@@ -30,7 +30,7 @@
 	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p> -->
 <% time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d') %>
-<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}") %><%= calendar_for('bid_deadline')%>
+<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}",:readonly => "readonly") %><%= calendar_for('bid_deadline')%>
 </p>
 <p><%= f.select :is_evaluation, is_evaluation_option %>
 </p>
diff --git a/app/views/files/_show_all_attachment.html.erb b/app/views/files/_show_all_attachment.html.erb
index 043fe1183..f865235ae 100644
--- a/app/views/files/_show_all_attachment.html.erb
+++ b/app/views/files/_show_all_attachment.html.erb
@@ -3,7 +3,8 @@
 <% attachmenttypes = @project.attachmenttypes %>
 <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
 <% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
-<table class="list files" id="ver-zebra">
+<div class="autoscroll">
+<table class="list files" id="ver-zebra"  style="width: 100%;table-layout: fixed">
   <colgroup>
     <col class="vzebra-odd"/>
     <col class="vzebra-even"/>
@@ -40,17 +41,17 @@
           <%next%>
           <%end%>
           <tr class="file <%= cycle("odd", "odd") %>">
-            <td class="filename" style="font-size: 13px;  "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="filename" style="font-size: 13px;  "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
             <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
-            <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-            <td class="attach_type">
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="filesize"><%= number_to_human_size(file.filesize) %></td>
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="attach_type">
               <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName %></span>
               <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
                 <%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes, :attachment => file, :contentype => selContentType} %>
               </span>
             </td>
-            <td class="content_type"><%= file.show_suffix_type %></td>
-            <td class="field_file_dense">
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="content_type"><%= file.show_suffix_type %></td>
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="field_file_dense">
               <span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
               &nbsp;
       <span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
@@ -58,9 +59,9 @@
                                                                       :attachment => file} %>
         </span>
             </td>
-            <td class="downloads"><%= file.downloads %></td>
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="downloads"><%= file.downloads %></td>
             <!-- <td class="digest" width="300px"><%= file.description %></td> -->
-            <td align="center">
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center">
               <%= link_to(image_tag('delete.png'), attachment_path(file),
                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
             </td>
@@ -83,7 +84,7 @@
 
   </tbody>
 </table>
-
+ </div>
 <!--分页-->
 <div class="pagination" style="float:left;">
   <ul>
diff --git a/app/views/memos/_form.html.erb b/app/views/memos/_form.html.erb
index d4b517048..116f97149 100644
--- a/app/views/memos/_form.html.erb
+++ b/app/views/memos/_form.html.erb
@@ -2,12 +2,12 @@
 <!--[form:project]-->
 <p><%= l(:label_homeworks_form_new_description) %></p>
     <!-- % unless @memo.parent_id %>
-      <% if @memo.safe_attribute? 'sticky' %>
-       <%= f.check_box :sticky %> <lable><%= l(:label_board_sticky) %></lable>
-      <% end %>
-      <% if @memo.safe_attribute? 'locked' %>
-       <%= f.check_box :locked %> <%= label_tag 'memo_locked', l(:label_board_locked) %>
-      <% end %>
-    <% end % -->
+      <%# if @memo.safe_attribute? 'sticky' %>
+       <%#= f.check_box :sticky %> <lable><%= l(:label_board_sticky) %></lable>
+      <%# end %>
+      <%# if @memo.safe_attribute? 'locked' %>
+       <%#= f.check_box :locked %> <%#= label_tag 'memo_locked', l(:label_board_locked) %>
+      <%# end %>
+    <%# end %> -->
 <p><%= f.text_field :content, :required => true, :size => 60, :style => "width:150px;" %></p>
 <p><%= hidden_field_tag 'subject', ||=@memo.subject %>
\ No newline at end of file
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 5b8b629d4..7844cc6ec 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -75,14 +75,14 @@
                 l(:button_edit),
                 {:action => 'edit', :id => @topic},
                 :class => 'icon icon-edit'
-        ) if @message.editable_by?(User.current) %>
+        ) if @message.course_editable_by?(User.current) %>
     <%= link_to(
                 l(:button_delete),
                 {:action => 'destroy', :id => @topic},
                 :method => :post,
                 :data => {:confirm => l(:text_are_you_sure)},
                 :class => 'icon icon-del'
-        ) if @message.destroyable_by?(User.current) %>
+        ) if @message.course_destroyable_by?(User.current) %>
   </div>
 
   <div class="lz-left">
@@ -96,9 +96,9 @@
   <div class="memo-section">
     <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>">
       <% if @project %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, project_boards_path(@topic.project) %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
       <% elsif @course %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, course_boards_path(@topic.course) %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %>
       <% end %>
     </div>
     <div class="memo-content">
@@ -109,14 +109,8 @@
     </div>
     <div class="memo-timestamp">
       <div style="float: left"><%= authoring @topic.created_on, @topic.author %></div>
-
-
       <div style="float: right"><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></div>
     </div>
-
-
-
-
   </div>
   <br />
 </div>
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 4208d3061..1e74cbf48 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -42,7 +42,7 @@
 <!--[eoform:message]-->
 
 <p><%= l(:label_attachment_plural) %><br />
-<%= render :partial => 'attachments/form', :locals => {:container => @message} %></p>
+<%= render :partial => 'attachments/form', :locals => {:container => @message,:isReply => @isReply} %></p>
 </div>
 
 
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index ad91c72f8..7f88816f5 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -95,11 +95,11 @@
     </p>
   </div>
   <div class="memo-section" style="width: 100%;word-break: break-all;">
-    <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>">
+    <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 83%;word-break: break-all;">
       <% if @project %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, project_boards_path(@topic.project) %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
       <% elsif @course %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, course_boards_path(@topic.course) %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %>
       <% end %>
     </div>
     <div class="memo-content">
@@ -179,9 +179,6 @@
     </div>
 <% end %>
 
-
-
-
 <% if !@topic.locked? && authorize_for('messages', 'reply') %>
     <div id="reply" style="display:none;">
       <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
diff --git a/app/views/my/blocks/_assiagn_issue.html.erb b/app/views/my/blocks/_assiagn_issue.html.erb
new file mode 100644
index 000000000..6e7df84fd
--- /dev/null
+++ b/app/views/my/blocks/_assiagn_issue.html.erb
@@ -0,0 +1,26 @@
+<% assigned_issues = issuesassignedtome_items %>
+<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
+<% if assigned_issues.length > 0 %>
+    <!--分页-->
+    <!--
+    <div class="pagination" style="float:left;">
+      <ul>
+        <%#= pagination_links_full(@feedback_pages,@feedback_count, :per_page_links => false){|text, parameters, options|
+          link_to text, my_page2_path(parameters.merge(:q => params[:q])) }%>
+        <%#= pagination_links_full @feedback_pages %>
+      </ul>
+    </div>
+     -->
+<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
+                                                       :action => 'index',
+                                                       :set_filter => 1,
+                                                       :assigned_to_id => 'me',
+                                                       :sort => 'priority:desc,updated_on:desc' %></p>
+<% end %>
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom,
+                            {:controller => 'issues', :action => 'index', :set_filter => 1,
+                             :assigned_to_id => 'me', :format => 'atom', :key => User.current.rss_key},
+                            {:title => l(:label_assigned_to_me_issues)}) %>
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/my/blocks/_issuesassignedtome.html.erb b/app/views/my/blocks/_issuesassignedtome.html.erb
index 02d8c9aa6..0b20dd4e5 100644
--- a/app/views/my/blocks/_issuesassignedtome.html.erb
+++ b/app/views/my/blocks/_issuesassignedtome.html.erb
@@ -1,18 +1,4 @@
 <h3><%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)})%>)</h3>
-
-<% assigned_issues = issuesassignedtome_items %>
-<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
-<% if assigned_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
-                                                       :action => 'index',
-                                                       :set_filter => 1,
-                                                       :assigned_to_id => 'me',
-                                                       :sort => 'priority:desc,updated_on:desc' %></p>
-<% end %>
-
-<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom,
-                            {:controller => 'issues', :action => 'index', :set_filter => 1,
-                             :assigned_to_id => 'me', :format => 'atom', :key => User.current.rss_key},
-                            {:title => l(:label_assigned_to_me_issues)}) %>
-<% end %>
+   <div id="asdsadwsc">
+     <%= render :partial => "my/blocks/assiagn_issue" %>
+    </div>
\ No newline at end of file
diff --git a/app/views/my/page.js.erb b/app/views/my/page.js.erb
new file mode 100644
index 000000000..d3f47a8e1
--- /dev/null
+++ b/app/views/my/page.js.erb
@@ -0,0 +1 @@
+$("#asdsadwsc").html("<%= escape_javascript(render :partial => 'my/blocks/assiagn_issue') %>");
\ No newline at end of file
diff --git a/app/views/my/page2.js.erb b/app/views/my/page2.js.erb
new file mode 100644
index 000000000..d3f47a8e1
--- /dev/null
+++ b/app/views/my/page2.js.erb
@@ -0,0 +1 @@
+$("#asdsadwsc").html("<%= escape_javascript(render :partial => 'my/blocks/assiagn_issue') %>");
\ No newline at end of file
diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index ad2c7835c..7ce42439a 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -1,12 +1,13 @@
 <%= error_messages_for @news %>
 <div class="add_frame_header" >
-  <% str = l(:bale_news_notice)%>
-  <%= str %>
+  <%= is_new ? l(:bale_news_notice):l(:bale_edit_notice)%>
 </div>
 <div class="box tabular">
-  <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
+  <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:468px;", :onblur => "regexTitle();" %></p>
+  <P><span id="title_notice_span">(60个字符以内)</span></P>
   <!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
-  <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
+  <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:470px;", :onblur => "regexDescription();" %></p>
+  <P><span id="description_notice_span"></span></P>
   <p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
 </div>
 
diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index 5104cd851..fdf12c06d 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -3,6 +3,59 @@
    label_tips = l(:label_course_news)
 %>
 
+<script type="text/javascript">
+    function regexTitle()
+    {
+        var name = $("#news_title").val();
+        if(name.length ==0)
+        {
+            $("#title_notice_span").text("标题不能为空");
+            $("#title_notice_span").css('color','#ff0000');
+            $("#title_notice_span").focus();
+            return false;
+        }
+        else if(name.length <= 60)
+        {
+            $("#title_notice_span").text("填写正确");
+            $("#title_notice_span").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#title_notice_span").text("标题超过60个字符");
+            $("#title_notice_span").css('color','#ff0000');
+            $("#title_notice_span").focus();
+            return false;
+        }
+    }
+
+    function regexDescription()
+    {
+        var name = $("#news_description").val();
+        if(name.length ==0)
+        {
+            $("#description_notice_span").text("描述不能为空");
+            $("#description_notice_span").css('color','#ff0000');
+            $("#description_notice_span").focus();
+            return false;
+        }
+        else
+        {
+            $("#description_notice_span").text("填写正确");
+            $("#description_notice_span").css('color','#008000');
+            return true;
+        }
+    }
+
+    function submitNews()
+    {
+        if(regexTitle() && regexDescription())
+        {
+            $("#news-form").submit();
+        }
+    }
+</script>
+
 <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
 	<%= label_tips %>
 </span>
@@ -15,8 +68,9 @@
     <div id="add-news" class="add_frame" style="display:none;">
       <%= labelled_form_for @news, :url => course_news_index_path(@course),
                             :html => {:id => 'news-form', :multipart => true} do |f| %>
-          <%= render :partial => 'news/course_form', :locals => {:f => f} %>
-          <%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  --> |
+          <%= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %>
+          <%#= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  -->
+          <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :class => 'whiteButton m3p10' %>|
           <%= preview_link preview_news_path(:course_id => @course), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
           |
           <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 727c9eb7a..b86cea93f 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -1,3 +1,56 @@
+<script type="text/javascript">
+    function regexTitle()
+    {
+        var name = $("#news_title").val();
+        if(name.length ==0)
+        {
+            $("#title_notice_span").text("标题不能为空");
+            $("#title_notice_span").css('color','#ff0000');
+            $("#title_notice_span").focus();
+            return false;
+        }
+        else if(name.length <= 60)
+        {
+            $("#title_notice_span").text("填写正确");
+            $("#title_notice_span").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#title_notice_span").text("标题超过60个字符");
+            $("#title_notice_span").css('color','#ff0000');
+            $("#title_notice_span").focus();
+            return false;
+        }
+    }
+
+    function regexDescription()
+    {
+        var name = $("#news_description").val();
+        if(name.length ==0)
+        {
+            $("#description_notice_span").text("描述不能为空");
+            $("#description_notice_span").css('color','#ff0000');
+            $("#description_notice_span").focus();
+            return false;
+        }
+        else
+        {
+            $("#description_notice_span").text("填写正确");
+            $("#description_notice_span").css('color','#008000');
+            return true;
+        }
+    }
+
+    function submitNews()
+    {
+        if(regexTitle() && regexDescription())
+        {
+            $("#news-form").submit();
+        }
+    }
+</script>
+
 <div class="contextual">
   <%= watcher_link(@news, User.current) %>
   <%= link_to(l(:button_edit),
@@ -14,10 +67,11 @@
     <div id="edit-news" style="display:none;">
       <%= labelled_form_for :news, @news, :url => news_path(@news),
                             :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
-          <%= render :partial => 'course_form', :locals => { :f => f } %>
-          <%= submit_tag l(:button_save) %>
-          <%= preview_link preview_news_path(:course_id => @course, :id => @news), 'news-form',target='preview',{:class => ''} %> |
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
+          <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %>
+          <%#= submit_tag l(:button_save) %>
+          <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:class => 'whiteButton m3p10' %>
+          <%= preview_link preview_news_path(:course_id => @course, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %> |
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 20f64dc3f..b70d73eb6 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -129,7 +129,7 @@
                             <tr>
                               <% if e.user == User.current %>
                                   <td colspan="2" valign="top">
-                                    <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.identifier)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
+                                    <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
                                   </td>
                               <% else %>
                                   <td colspan="2" valign="top">
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index 22ff5a280..d6337e1d0 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -2,7 +2,7 @@
 <div id='leave-message'>
 	<%= render :partial => 'words/new', :locals => {:user => @user, :sta => @state} %>
 </div>
-<div style="border-bottom: 1px dashed rgb(204, 204, 204);font-size: 14px; font-family: 微软雅黑; padding-bottom: 10px; font-weight: bold; color:#807a76">
+<div style="border-bottom: 1px dashed rgb(204, 204, 204);font-size: 14px; font-family: '微软雅黑'; padding-bottom: 10px; font-weight: bold; color:#807a76">
 <%= l(:label_newfeedback_message) %>（<%= @feedback_count%>）
 </div>
 
diff --git a/app/views/words/_new.html.erb b/app/views/words/_new.html.erb
index aa2001028..bc4d19225 100644
--- a/app/views/words/_new.html.erb
+++ b/app/views/words/_new.html.erb
@@ -72,7 +72,7 @@
 <table border="0" width="525px" align="center">
 	<tr>
 		<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-						   <%= submit_tag l(:button_clear), :name => nil, :class => "enterprise", :onclick => "clearMessage('new_form_user_message');",  :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
+						   <%= submit_tag l(:button_cancel), :name => nil, :class => "enterprise", :onclick => "clearMessage('new_form_user_message');",  :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
 	</tr>
 </table>
 <% else %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 367624f89..602e7a659 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1782,6 +1782,7 @@ en:
   label_no_file_uploaded: No file uploaded
   label_forum_new: New forum
   label_memo_new_from_forum: Release memo
+  bale_edit_notice: Edit
 
   label_user_grade: Individual score
   label_active_homework: homework
@@ -1797,6 +1798,8 @@ en:
   label_record: 湘ICP备09019772
   label_check_comment: Check comment
   label_notification: Notification
+
+
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index d17f4c3bd..4f0744d86 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -707,6 +707,7 @@ zh:
   label_news: 新闻
   label_news_new: 添加新闻
   bale_news_notice: 添加通知 #huang
+  bale_edit_notice: 修改通知
   label_news_notice: 发布课程通知
   label_news_plural: 新闻
   label_news_latest: 最近的新闻
@@ -1640,7 +1641,7 @@ zh:
   label_call_bonus: 奖金
   label_bids_form_new_description: 企业可以在此发布一个软件开发任务或者一个技术方案需求：（1）获得价廉物美的解决方案；（2）发现对此项任务有贡献的大学生，获得可以招聘的人才。
   label_bids_form_contest_new_description: 企业或者高校可以在此发布一个竞赛。
-  label_homeworks_form_new_description: 发布一个作业，作业提交方式可以是附件或者项目形式，在作业类型里面设置。
+  label_homeworks_form_new_description: 发布一个作业，作业提交方式可以是附件或者项目形式。
   label_fork_form_new_description: 该需求将作为某课程的作业被发布，作业提交方式可以使附件或者项目形式，在作业类型里面设置。
   label_bids_new_money: 输入奖励金额，如 500,2.5等
   label_bids_new_credit: 输入该作业对应课程的学分，如 3,2.5等
diff --git a/config/routes.rb b/config/routes.rb
index f93318c7d..ed9001ee2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -275,6 +275,8 @@ RedmineApp::Application.routes.draw do
   match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
   match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
 
+  get 'my/page2', :to => 'my#page2',  :as => "my_page2"
+
   resources :users
   match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => :put, :as => 'user_membership'
   match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete