diff --git a/app/views/attachments/_form_project.html.erb b/app/views/attachments/_form_project.html.erb
index a3d30bd45..9778d3242 100644
--- a/app/views/attachments/_form_project.html.erb
+++ b/app/views/attachments/_form_project.html.erb
@@ -1,4 +1,4 @@
-<span id="attachments_fields<%= container.id %>" class="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
@@ -38,12 +38,12 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
   <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-  <%= button_tag "文件浏览", :type=>"button", :onclick=>"file#{container.id}.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+  <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
   <%= file_field_tag 'attachments[dummy][file]',
-                     :id => "file#{container.id}",
+                     :id => '_file',
                      :class => 'file_selector',
                      :multiple => true,
-                     :onchange => "addInputFiles_board(this, '#{container.id}');",
+                     :onchange => 'addInputFiles(this);',
                      :style => 'display:none',
                      :data => {
                              :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
@@ -56,7 +56,7 @@
                              :file_count => l(:label_file_count),
                              :delete_all_files => l(:text_are_you_sure_all)
                      } %>
-  <span id="upload_file_count<%=container.id %>" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+  <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index ce3dd2091..5dde6c460 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -58,18 +58,23 @@
 
               <div class="cl"></div>
 
-              <p  id="contentmessage<%=topic.id %>" class="project_board_content break_word">
-                <%= topic.content %>
-              </p>
-              <% if topic.content.size > 300 %>
-                  <p>
-                    <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+              <script>
+                  $(function(){if($("#contentmessage<%=topic.id %>").height()>55){$("#project_show_<%= topic.id%>").show();}});
+              </script>
+              <div  class="project_board_content break_word" id="content_<%=topic.id%>">
+                <div id="contentmessage<%=topic.id %>" class="upload_img">
+                  <%= topic.content %>
+                </div>
+              </div>
+
+
+              <p style="display: none" id="project_show_<%= topic.id%>">
+                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
 
-                  </p>
-              <% end %>
+              </p>
               <%= link_to_attachments_course topic, :author => false %>
 
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index a20bed3fd..8a9ffd990 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -32,6 +32,7 @@
   <p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
 <% if @topics.any? %>
       		<% @topics.each do |topic| %>
+
           <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
             <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
             <div class="talkmain_txt fl mt5">
@@ -57,19 +58,24 @@
                   <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
               <% end %>
               <div class="cl"></div>
+              <script>
+                  $(function(){if($("#contentmessage<%=topic.id %>").height()>55){$("#project_show_<%= topic.id%>").show();}});
+              </script>
+              <div  class="project_board_content break_word" id="content_<%=topic.id%>">
+                <div id="contentmessage<%=topic.id %>" class="upload_img">
+                  <%= topic.content %>
+                </div>
+              </div>
 
-               <p  id="contentmessage<%=topic.id %>" class="project_board_content break_word">
-                 <%= topic.content %>
-               </p>
-              <% if topic.content.size > 300 %>
-              <p>
-                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+
+              <p style="display: none" id="project_show_<%= topic.id%>">
+                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
 
               </p>
-               <% end %>
+
             <%= link_to_attachments_course topic, :author => false %>
 
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
@@ -177,6 +183,7 @@
                <% end %>
            <% end %>
         </div>
+
        <% end %>
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 9faf07b9a..2e736bdf7 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -24,7 +24,14 @@
 
 <script type="text/javascript">//侧导航
 
-
+window.onload = function () {
+    $("p[aa='bb']").each(function() {
+        alert((this.offsetHeight == '55'));
+        if(this.offsetHeight == '55') {
+            this.next.style.dispaly="block";
+        }
+    })
+}
 
 function show_newtalk()
 {
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index e11e4416b..b2862a634 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -22,14 +22,14 @@
           <% if User.current.logged? %>
               <!--私有项目资源部能引用，不能设置公开私有-->
               <!--公开项目资源可以应用，管理员和资源上传者拥有设置公开私有权限-->
-              <% if project.is_public? %>
+              <%# if project.is_public? %>
                 <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
                 <% if (Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") || file.author_id == User.current.id) && project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project" %>
                     <span id="is_public_<%= file.id %>">
                         <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
                     </span>
                 <% end %>
-              <% end %>
+              <%# end %>
           <% end %>
         </div>
         <div class="cl"></div>
diff --git a/app/views/layouts/_base_development_group.html.erb b/app/views/layouts/_base_development_group.html.erb
index 49719fbd5..6d6e0eed1 100644
--- a/app/views/layouts/_base_development_group.html.erb
+++ b/app/views/layouts/_base_development_group.html.erb
@@ -39,13 +39,21 @@
       </div>
   <% end %>
   <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
-  <% unless @project.hidden_repo || @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
-      <div class="subNav">
-        <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
-        <a  class="subnav_num">(<%= @project.repositories.count %>)</a>
-      </div>
-  <% end %><!--meny end -->
-
+  <% unless @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
+    <% if @project.hidden_repo || !@project.is_public? %>
+        <% if User.current.member_of?(@project) %>
+            <div class="subNav">
+                <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+                <a  class="subnav_num">(<%= @project.repositories.count %>)</a>
+            </div>
+        <% end %>
+    <% else %>
+         <div class="subNav">
+            <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+            <a  class="subnav_num">(<%= @project.repositories.count %>)</a>
+         </div>
+    <% end %>
+  <% end %>
   <!-- more -->
   <div class="subNav subNav_jiantou" onclick="$('#navContent').toggle(500);" id="expand_tools_expand"><%= l(:label_project_more) %></div>
   <ul class="navContent" id="navContent">
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index c2606f791..6e0d74849 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -75,7 +75,7 @@
     <% unless judge_main_repository(@project) %>
         <li>
             <label class="label02"><%=l(:field_repository_is_default)%>：</label>
-            <%= f.check_box :is_default, :label => "" %></p>
+            <%= f.check_box :is_default, :label => "", :no_label => true %></p>
         </li>
     <% end %>
     <li >
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index abc63601e..972606f31 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -40,7 +40,7 @@
               </div>
               <div class="cl"></div>
             </div>
-        <!--jou留言-->
+        <!--缺陷 jou留言 -->
         <% elsif e.forge_act_type == "Journal" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
diff --git a/app/views/projects/show_new.html.erb b/app/views/projects/show_new.html.erb
index caa8bf94a..b80bd0904 100644
--- a/app/views/projects/show_new.html.erb
+++ b/app/views/projects/show_new.html.erb
@@ -1,68 +1,63 @@
 <div class="contextual">
   <% if User.current.allowed_to?(:add_subprojects, @project) %>
-    <%= link_to l(:label_subproject_new), new_project_path(:parent_id => @project), :class => 'icon icon-add' %>
+      <%= link_to l(:label_subproject_new), new_project_path(:parent_id => @project), :class => 'icon icon-add' %>
   <% end %>
   <% if User.current.allowed_to?(:close_project, @project) %>
-    <% if @project.active? %>
-      <%= link_to l(:button_close), close_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock' %>
-    <% else %>
-      <%= link_to l(:button_reopen), reopen_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-unlock' %>
-    <% end %>
+      <% if @project.active? %>
+          <%= link_to l(:button_close), close_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock' %>
+      <% else %>
+          <%= link_to l(:button_reopen), reopen_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-unlock' %>
+      <% end %>
   <% end %>
 </div>
 <h3><%=l(:label_overview)%></h3>
 
 <% unless @project.active? %>
-  <p class="warning"><span class="icon icon-lock"><%= l(:text_project_closed) %></span></p>
+    <p class="warning"><span class="icon icon-lock"><%= l(:text_project_closed) %></span></p>
 <% end %>
 
 <div class="splitcontentleft">
   <% if @project.description.present? %>
-  <div class="wiki">
-    <%= textilizable @project.description %>
-  </div>
+      <div class="wiki">
+        <%= textilizable @project.description %>
+      </div>
   <% end %>
   <ul>
-  <% unless @project.homepage.blank? %>
-    <li><%=l(:field_homepage)%>: <%= link_to h(@project.homepage), @project.homepage %></li>
-  <% end %>
-  <% if @subprojects.any? %>
-    <li><%=l(:label_subproject_plural)%>:
-      <%= @subprojects.collect{|p| link_to p, project_path(p)}.join(", ").html_safe %></li>
-  <% end %>
-  <% @project.visible_custom_field_values.each do |custom_value| %>
-  <% if !custom_value.value.blank? %>
-     <li><%=h custom_value.custom_field.name %>: <%=h show_value(custom_value) %></li>
-  <% end %>
-  <% end %>
+    <% unless @project.homepage.blank? %>
+        <li><%=l(:field_homepage)%>: <%= link_to h(@project.homepage), @project.homepage %></li>
+    <% end %>
+    <% if @subprojects.any? %>
+        <li><%=l(:label_subproject_plural)%>:
+          <%= @subprojects.collect{|p| link_to p, project_path(p)}.join(", ").html_safe %></li>
+    <% end %>
+    <% @project.visible_custom_field_values.each do |custom_value| %>
+        <% if !custom_value.value.blank? %>
+            <li><%=h custom_value.custom_field.name %>: <%=h show_value(custom_value) %></li>
+        <% end %>
+    <% end %>
   </ul>
 
   <% if User.current.allowed_to?(:view_issues, @project) %>
-  <div class="issues box">
-    <h3><%=l(:label_issue_tracking)%></h3>
-    <ul>
-    <% for tracker in @trackers %>
-      <li><%= link_to h(tracker.name), project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %>:
-          <%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
-                                                    :total => @total_issues_by_tracker[tr 
-          	<li><%= l(:default_tracker_bug) %></li>
+      <div class="issues box">
+        <h3><%=l(:label_issue_tracking)%></h3>
+        <ul>
+          <% for tracker in @trackers %>
+              <li><%= link_to h(tracker.name), project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %>:
+                <%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
+                      :total => @total_issues_by_tracker[tracker].to_i) %>
+              </li>
           <% end %>
-          <% if tracker.[4]%>
-          	<li><%= l(:default_tracker_mission) %></li>
-            <% end %>
-      </li>
-    <% end %>
-    </ul>
-    <p>
-      <%= link_to l(:label_issue_view_all), project_issues_path(@project, :set_filter => 1) %>
-      <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
-        | <%= link_to l(:label_calendar), project_calendar_path(@project) %>
-      <% end %>
-      <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
-        | <%= link_to l(:label_gantt), project_gantt_path(@project) %>
-      <% end %>
-    </p>
-  </div>
+        </ul>
+        <p>
+          <%= link_to l(:label_issue_view_all), project_issues_path(@project, :set_filter => 1) %>
+          <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
+              | <%= link_to l(:label_calendar), project_calendar_path(@project) %>
+          <% end %>
+          <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
+              | <%= link_to l(:label_gantt), project_gantt_path(@project) %>
+          <% end %>
+        </p>
+      </div>
   <% end %>
   <%= call_hook(:view_projects_show_left, :project => @project) %>
 </div>
@@ -71,31 +66,31 @@
   <%= render :partial => 'members_box' %>
 
   <% if @news.any? && authorize_for('news', 'index') %>
-  <div class="news box">
-    <h3><%=l(:label_news_latest)%></h3>
-    <%= render :partial => 'news/news', :collection => @news %>
-    <p><%= link_to l(:label_news_view_all), project_news_index_path(@project) %></p>
-  </div>
+      <div class="news box">
+        <h3><%=l(:label_news_latest)%></h3>
+        <%= render :partial => 'news/news', :collection => @news %>
+        <p><%= link_to l(:label_news_view_all), project_news_index_path(@project) %></p>
+      </div>
   <% end %>
   <%= call_hook(:view_projects_show_right, :project => @project) %>
 </div>
 
 <% content_for :sidebar do %>
     <% if @total_hours.present? %>
-    <h3><%= l(:label_spent_time) %></h3>
-    <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
-    <p>
-    <% if User.current.allowed_to?(:log_time, @project) %>
-      <%= link_to l(:button_log_time), new_project_time_entry_path(@project) %> |
-    <% end %>
-    <%= link_to(l(:label_details), project_time_entries_path(@project)) %> |
-    <%= link_to(l(:label_report), report_project_time_entries_path(@project)) %></p>
+        <h3><%= l(:label_spent_time) %></h3>
+        <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
+        <p>
+          <% if User.current.allowed_to?(:log_time, @project) %>
+              <%= link_to l(:button_log_time), new_project_time_entry_path(@project) %> |
+          <% end %>
+          <%= link_to(l(:label_details), project_time_entries_path(@project)) %> |
+          <%= link_to(l(:label_report), report_project_time_entries_path(@project)) %></p>
     <% end %>
     <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
 <% end %>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
+    <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
 
 <% html_title(l(:label_overview)) -%>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 247e65554..1cb5942bf 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -112,8 +112,8 @@
             <%= l(:label_latest_revision_plural) %>
           </h3>
           <%= render :partial => 'revisions',
-                     :locals => {:project => @project, :path => @path,
-                                 :revisions => @changesets, :entry => nil} %>
+                   :locals => {:project => @project, :path => @path,
+                               :revisions => @changesets, :entry => nil} %>
       <% end %>
       <p style="padding-top: 10px;">
         <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css
index 7e0d5cd76..2cc00b4a3 100644
--- a/public/stylesheets/jstoolbar.css
+++ b/public/stylesheets/jstoolbar.css
@@ -3,6 +3,7 @@
 }
 .jstEditor textarea, .jstEditor iframe {
     margin: 0;
+    margin-left: 80px;
 }
 
 .jstHandle {
diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css
index 6020903d3..c7905fb80 100644
--- a/public/stylesheets/leftside.css
+++ b/public/stylesheets/leftside.css
@@ -45,6 +45,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 /*简介*/
 .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;}
 .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;}
+.project_board_content{overflow: hidden;max-height: 55px;word-break: break-all;word-wrap: break-word;}
 .course_description_none{max-height: none;}
 .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;}
 .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}