diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index ecfb097e9..6c11199fb 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -31,6 +31,7 @@ module MembersHelper
     }
 
     s + content_tag('div', content_tag('ul', links), :class => 'pagination_new')
+
   end
 
   # add by nwb
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index 8e9e6bbb9..17b68c3f6 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -12,6 +12,8 @@ module TagsHelper
       @obj = Issue.find_by_id(obj_id)
     when '4'
       @obj = Bid.find_by_id(obj_id)
+      when '5'
+        @obj = Forum.find_by_id(obj_id)
     when '6'
       @obj = Attachment.find_by_id(obj_id)
     when '7'
@@ -44,6 +46,8 @@ module TagsHelper
       if user.id == obj_id
         @result = true
       end
+      when '5'
+        @result = is_forum_manager?(user.id,obj_id)
     when '7'
       if user.id == obj_id
         @result = true
@@ -56,6 +60,17 @@ module TagsHelper
 
 end
 
+# 判断用户是否是贴吧的管理员
+# add by chenmin
+def is_forum_manager?(user_id,forum_id)
+  @result = false
+  @user_id = Forum.find(forum_id).creator_id;
+  if @user_id == user.id
+    @result = true
+  end
+  return @result
+end
+
 def tagname_val
   ("#tag_name_name").value
 end
\ No newline at end of file
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 3002cb769..1327f13e9 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -53,7 +53,7 @@
     </span>
   <% end %>
 </div>
-<div style="padding-top: 10px">
+<div style="width: 100%;word-break: break-all;">
   <% if @topics.any? %>
       <!-- <table class="list messages">
   <thead><tr>
diff --git a/app/views/contests/show_contest.html.erb b/app/views/contests/show_contest.html.erb
index c379bc668..91279b7bb 100644
--- a/app/views/contests/show_contest.html.erb
+++ b/app/views/contests/show_contest.html.erb
@@ -6,7 +6,7 @@
 		<p>		
 			<strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @contest.budget%></span></strong>
 		</p>		
-		<div class="bid_description">
+		<div class="bid_description" style="width: 100%;word-break:break-all;">
 			<%= @contest.description %>
 			<!-- <%# if @contest.attachments.any?%>
 				<%# options = {:author => true} %>
diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb
index 79db56aab..23a0caabd 100644
--- a/app/views/courses/_course_form.html.erb
+++ b/app/views/courses/_course_form.html.erb
@@ -14,6 +14,16 @@
     }
 </script>
 
+<script  type="text/javascript">
+    function check(){
+        var regex=/^\d*$/;
+        if (!regex.test($("#class_period").val())){
+            alert("学时只能为整数");
+        }
+        }
+    }
+</script>
+
 
 
 <% object = [] %>
@@ -67,11 +77,11 @@
     -->
     <% unless @course.nil?%>
         <p><table><tr><td><span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %><span class="required"> *&nbsp;&nbsp;</span></span>
-  <span class="info" style="width: 10px"><%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时" %></span> <span>&nbsp;<strong><%= l(:label_class_hour)%></strong></span>
+  <span class="info" style="width: 10px;"><%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时",:maxlength=>5 %></span> <span>&nbsp;<strong><%= l(:label_class_hour)%></strong></span>
 </td></tr></table></p>
     <% else %>
         <p><table><tr><td><span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %><span class="required"> *&nbsp;&nbsp;</span></span>
-  <span class="info" style="width: 10px"><%= text_field_tag :class_period, nil, :placeholder => "在此输入课时" %></span><strong><%= l(:label_class_hour)%></strong>
+  <span class="info" style="width: 10px;"><%= text_field_tag :class_period, nil, :placeholder => "在此输入课时",:maxlength=>5 %></span><strong><%= l(:label_class_hour)%></strong>
 </td></tr></table></p>
     <% end %>
 
diff --git a/app/views/members/autocomplete.js.erb b/app/views/members/autocomplete.js.erb
index e7a52f7f3..5ef01c04d 100644
--- a/app/views/members/autocomplete.js.erb
+++ b/app/views/members/autocomplete.js.erb
@@ -3,3 +3,14 @@ $('#principals_for_new_member').html('<%= escape_javascript(render_principals_fo
  <% elsif @course%>
  $('#principals_for_new_member').html('<%= escape_javascript(render_principals_for_new_course_members(@course)) %>');
  <%end%>
+ var collection=$("#principals_for_new_member").children("#principals").children("label");
+ collection.css("text-overflow","ellipsis");
+ collection.css("white-space","nowrap");
+ collection.css("width","200px");
+ collection.css("overflow","hidden");
+ for(i=0;i<collection.length;i++){    //增加悬浮显示
+     var label=collection[i];
+     var text=$(label).text();
+     $(label).attr("title",text);
+ }
+
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 0c0c21b91..bb879e213 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -93,7 +93,7 @@
       <%= link_to @topic.author, user_path(@topic.author) %>
     </p>
   </div>
-  <div class="memo-section">
+  <div class="memo-section" style="width: 100%;word-break: break-all;">
     <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) %>
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index ab046bcb6..c1d63d03b 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -130,3 +130,17 @@
       <% end %>
   <% end %>
 </div>
+<script type="text/javascript">
+    $(document).ready(function () {
+        var collection=$("#principals_for_new_member").children("#principals").children("label");
+        collection.css("text-overflow","ellipsis");
+        collection.css("white-space","nowrap");
+        collection.css("width","200px");
+        collection.css("overflow","hidden");
+        for(i=0;i<collection.length;i++){    //增加悬浮显示
+            var label=collection[i];
+            var text=$(label).text();
+            $(label).attr("title",text);
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 5713e9a2e..adee55564 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -70,7 +70,14 @@
                                              :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 
 	         <% end %>
+            <% when '5' %>
+          <% if Forum.find(params[:id]) %>
+	          <% if Forum.find(params[:id]).creator_id == User.current.id %>
+	         <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
+                                            :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 
+	         <% end %>
+                   <% end %>
 	    <% when '6' %>
 		    <%# if (User.current.logged? &&
                     User.current.admin?