diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 383da0bbe..67355fdfa 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -57,6 +57,7 @@ class BoardsController < ApplicationController
 
   def show  
     respond_to do |format|
+      format.js
       format.html {
         sort_init 'updated_on', 'desc'
         sort_update 'created_on' => "#{Message.table_name}.created_on",
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 932ffaa7a..545d61155 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -61,6 +61,10 @@ class DocumentsController < ApplicationController
     if @project.project_type ==1
           render :action => 'show', :layout => 'base_courses'
     end
+    respond_to do |format|
+      format.html
+      format.api
+    end
   end
 
   def new
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 56f760e13..8421e9be1 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -148,7 +148,11 @@ class FilesController < ApplicationController
 
       show_attachments @containers
 
-      render :layout => !request.xhr?
+
+      respond_to do |format|
+        format.html
+        format.js
+      end
     elsif params[:course_id]
       @isproject = false
 
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index c0d83fdcd..4e3c28468 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -90,6 +90,7 @@ class IssuesController < ApplicationController
 
 
       respond_to do |format|
+        format.js
         format.html { render :template => 'issues/index', :layout =>  @project_base_tag }#by young
         format.api  {
           Issue.load_visible_relations(@issues) if include_in_api_response?('relations')
@@ -103,6 +104,7 @@ class IssuesController < ApplicationController
         format.html { render(:template => 'issues/index', :layout =>  @project_base_tag) }#by young
         format.any(:atom, :csv, :pdf) { render(:nothing => true) }
         format.api { render_validation_errors(@query) }
+        format.js
       end
     end
   rescue ActiveRecord::RecordNotFound
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 02bfc9e19..c67b5197b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -278,7 +278,7 @@ class ProjectsController < ApplicationController
                                                    :with_subprojects => @with_subprojects,
                                                    :author => @author)
     @activity.scope_select {|t| !has["show_#{t}"].nil?}
-
+    
     # 根据私密性，取出符合条件的所有数据
     if User.current.member_of?(@project) || User.current.admin?
       events = @activity.events(@date_from, @date_to)
@@ -286,7 +286,6 @@ class ProjectsController < ApplicationController
       events = @activity.events(@date_from, @date_to, :is_public => 1)
     end
 
-
     @offset, @limit = api_offset_and_limit({:limit => 10})
     @events_count = events.count
     @events_pages = Paginator.new @events_count, @limit, params['page']
@@ -295,11 +294,14 @@ class ProjectsController < ApplicationController
     events = events.slice(@offset,@limit)
     # 按天分组
     @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
-
+    # 获取讨论区总数
+    boards = @project.boards.includes(:last_message => :author).all
+    @topic_count = @project.boards.count
     # 根据对应的请求，返回对应的数据
     respond_to do |format|
       format.html
       format.api
+      format.js
     end
   end
 
@@ -311,6 +313,20 @@ class ProjectsController < ApplicationController
     @wiki ||= @project.wiki
   end
 
+
+  #发送邮件邀请新用户
+  def invite_members_by_mail
+
+  end
+
+  # 邀请Trustie注册用户
+  def invite_members_had_loged
+    @member ||= @project.members.new
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def edit
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5579fe79b..dbe292f76 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -48,7 +48,7 @@ module ApplicationHelper
   def authorize_for(controller, action)
     User.current.allowed_to?({:controller => controller, :action => action}, @project)
   end
-
+  
   # add by nwb
   def authorize_for_course(controller, action)
     User.current.allowed_to?({:controller => controller, :action => action}, @course)
diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index 842e1f1b7..f47ced545 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -283,6 +283,6 @@ module WatchersHelper
 
     def exit_project_link(project)
       link_to(l(:label_exit_project),exit_cur_project_path(project.id),
-        :remote => true, :confirm => l(:lable_sure_exit_project) )
+        :remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px;margin-right:10px;height:20px;text-aligh:center;" )
     end
   end
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 1a5cbd2fa..97ed903d9 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -9,9 +9,7 @@
 </script>
 <div id="add-message" class="add_frame" style="display:none;">
   <% if User.current.logged? %>
-      <h3>
-        <%= link_to h(@board.name), project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %>
-      </h3>
+                           s
       <div class="add_frame_header">
         <%= l(:label_message_new) %>
       </div>
@@ -27,8 +25,8 @@
 </div>
 
 <!--display the board-->
-<div class="borad-title">
-  <%= h @board.name %>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= h @board.name %></h2>
 </div>
 
 <% if !User.current.logged? %>
diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index dae061251..39cab4a53 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -1,4 +1,6 @@
-<h3><%= @query.new_record? ? l(:label_calendar) : h(@query.name) %></h3>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= @query.new_record? ? l(:label_calendar) : h(@query.name) %></h2>
+</div>
 
 <%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project},
              :method => :get, :id => 'query_form') do %>
diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb
index f7f76a812..e0c39eb33 100644
--- a/app/views/documents/index.html.erb
+++ b/app/views/documents/index.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2"><%=l(:label_document_plural)%></h2>
+</div>
 <div class="contextual">
   <!--Moved by young-->
   <%= l(:label_documents_sort) %>
@@ -8,24 +11,22 @@
   |
   <!--Ended by young-->
   <%= link_to l(:label_document_new), new_project_document_path(@project), :class => 'icon icon-add',
-      :onclick => 'showAndScrollTo("add-document", "document_title"); return false;' if User.current.allowed_to?(:add_documents, @project) %>
+              :onclick => 'showAndScrollTo("add-document", "document_title"); return false;' if User.current.allowed_to?(:add_documents, @project) %>
 </div>
 
 <div id="add-document" style="display:none;">
-    <h3>
-      <%=l(:label_document_new)%>
-    </h3>
-    <%= labelled_form_for @document, :url => project_documents_path(@project), :html => {:multipart => true} do |f| %>
-        <%= render :partial => 'form', :locals => {:f => f} %>
-        <p>
-          <%= submit_tag l(:button_create) %>
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#add-document").hide(); return false;' %>
-        </p>
-    <% end %>
+  <h3>
+    <%=l(:label_document_new)%>
+  </h3>
+  <%= labelled_form_for @document, :url => project_documents_path(@project), :html => {:multipart => true} do |f| %>
+      <%= render :partial => 'form', :locals => {:f => f} %>
+      <p>
+        <%= submit_tag l(:button_create) %>
+        <%= link_to l(:button_cancel), "#", :onclick => '$("#add-document").hide(); return false;' %>
+      </p>
+  <% end %>
 </div>
 
-<h3><%=l(:label_document_plural)%></h3>
-
 <% if @grouped.empty? %>
     <p class="nodata">
       <%= l(:label_no_data) %>
diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb
index 45f54ad9b..5632c9d63 100644
--- a/app/views/documents/show.html.erb
+++ b/app/views/documents/show.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2"><%=h @document.title %></h2>
+</div>
 <div class="frame-wiki">
 
 <div class="contextual">
@@ -9,7 +12,6 @@
 <% end %>
 </div>
 
-<h2 style="word-wrap: break-word; word-break: normal;"><%=h @document.title %></h2>
 
 <p><em><%#=h @document.category.name %><br />
 <%= format_date @document.created_on %></em></p>
diff --git a/app/views/files/_newfile_index.html.erb b/app/views/files/_newfile_index.html.erb
new file mode 100644
index 000000000..5ffaacae4
--- /dev/null
+++ b/app/views/files/_newfile_index.html.erb
@@ -0,0 +1,250 @@
+<!-- <h3> --><!-- %=l(:label_attachment_plural)%></h3 -->
+<div id="resource_list">
+  <% if @isproject %>
+      <%= render :partial => 'project_file', locals: {project: @project} %>
+  <% else %>
+      <%= render :partial => 'course_file', locals: {course: @course} %>
+  <% end %>
+</div>
+
+<script type='text/javascript'>
+    var slideHeight = 29;
+    function readmore(aNode) {
+        // console.log(aNode)
+        // var $td_tags_area = $(aNode).parent().parent();
+        var $td_tags_area = $(aNode).parent().parent().parent().parent();
+        var $tags_area = $td_tags_area.find('.tags_area')
+        var $tags_gradint = $td_tags_area.find('.tags_gradint')
+        var $read_more = $td_tags_area.find('.read-more')
+        var $read_more_a = $td_tags_area.find('.read-more a')
+        var $tags = $td_tags_area.find('#tags')
+        var $icona = $td_tags_area.find('.tags_icona')
+
+        var slideHeight = 13; //px
+        var defHeight = $tags.height();
+
+        var curHeight = $tags_area.height();
+        if (curHeight == slideHeight) {
+            $tags_area.animate({
+                height: defHeight
+            }, 'normal');
+            $read_more_a.html('隐藏');
+            $icona.html('<%=image_tag "/images/sidebar/minus.png"%>')
+            $tags_gradint.fadeOut();
+        } else {
+            $tags_area.animate({
+                height: slideHeight
+            }, 'normal');
+            $read_more_a.html('更多');
+            $icona.html('<%=image_tag "/images/sidebar/add.png"%>')
+            $tags_gradint.fadeIn();
+        }
+        ;
+
+    }
+    $(function () {
+        var slideHeight = 20; //px
+        var defHeight = $('.tags_area').height();
+        if (defHeight >= slideHeight) {
+            $('.tags_area').css('height', slideHeight + 'px');
+        }
+        ;
+    });
+
+    function eval_ajax(xhr, textStatus) {
+        if (textStatus == 'success') {
+            eval(xhr.responseText);
+        } else if (textStatus == 'error') {
+            alert('error');
+        }
+    }
+
+
+    function attachment_contenttypes_searchex(value) {
+        <% if  @project%>
+        $.ajax({
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
+            type: "POST",
+            data: {
+                type: $('#attachment_browse').val(),
+                contentType: encodeURIComponent(value)
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+
+
+    function attachtype_edit(value) {
+        <% if  @project%>
+        $.ajax({
+
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
+            type: "POST",
+            data: {
+                type: $('#attachment_browse').val(),
+                contentType: encodeURIComponent(value)
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+    function attachmenttypes_searchex(value) {
+        <% if  @project%>
+        $.ajax({
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
+            type: "POST",
+            data: {
+                type: encodeURIComponent(value),
+                contentType: $('#attach_sufix_browse').val()
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+    function course_attachmenttypes_searchex(value) {
+        <% if  @course%>
+        $.ajax({
+            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+            type: "POST",
+            data: {
+                type: encodeURIComponent(value),
+                contentType: $('#attach_sufix_browse').val()
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+    function course_attachment_contenttypes_searchex(value) {
+        <% if  @course%>
+        $.ajax({
+
+            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+            type: "POST",
+            data: {
+                type: $('#attachment_browse').val(),
+                contentType: encodeURIComponent(value)
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+    function course_attachtype_edit(value) {
+        <% if  @course%>
+        $.ajax({
+            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+            type: "POST",
+            data: {
+                type: $('#attachment_browse').val(),
+                contentType: encodeURIComponent(value)
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+    function attachmenttypes_change(id, type) {
+        <% if  @project%>
+        $.ajax({
+            url: '<%=updateType_attachments_path%>',
+            type: "POST",
+            data: {
+                attachmentid: encodeURIComponent(id),
+                newtype: encodeURIComponent(type)
+            }
+
+        }).complete(function (xhr, textStatus) {
+
+                    if (textStatus == 'success') {
+                        $.ajax({
+                            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
+                            type: "POST",
+                            data: {
+                                type: $('#attachment_browse').val(),
+                                contentType: $('#attach_sufix_browse').val()
+                            }
+                        }).error(function () {
+                                    alert('error');
+                                });
+                    } else if (textStatus == 'error') {
+                        alert('An error has occurred');
+                    }
+                });
+        <%end%>
+
+    }
+
+    function course_attachmenttypes_change(id, type) {
+        <% if  @course%>
+        $.ajax({
+            url: '<%=updateType_attachments_path%>',
+            type: "POST",
+            data: {
+                attachmentid: encodeURIComponent(id),
+                newtype: encodeURIComponent(type)
+            }
+
+        }).complete(function (xhr, textStatus) {
+
+                    if (textStatus == 'success') {
+                        $.ajax({
+                            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+                            type: "POST",
+                            data: {
+                                type: $('#attachment_browse').val(),
+                                contentType: $('#attach_sufix_browse').val()
+                            }
+                        }).error(function () {
+                                    alert('error');
+                                });
+                    } else if (textStatus == 'error') {
+                        alert('An error has occurred');
+                    }
+                });
+        <%end%>
+
+    }
+
+    // 编辑文件密级
+    function file_dense_edit(id, type) {
+        $.ajax({
+            url: '<%=updateFileDense_attachments_path%>',
+            type: "POST",
+            remote:"true",
+            data: {
+                attachmentid: encodeURIComponent(id),
+                newtype: encodeURIComponent(type)
+            }
+
+        }).complete(function (xhr, textStatus) {
+                });
+
+    }
+
+</script>
+
+
+<script type='text/javascript'>
+    function tagAddClick(divid, objId, objTag) {
+        alert("OK");
+        $.ajax({
+            type: "POST",
+            url: '/users/tag_saveEx',
+            data: {
+                tagname: $('tag_name').value,
+                obj_id: encodeURIComponent(objId),
+                obj_flag: encodeURIComponent(objTag)
+            },
+            success: function (data, textStatus) {
+                alert("OK");
+                $(divid).empty();
+                $(divid).html('123');
+                $("#" + divid + " #name").val("");
+            }
+        })
+    }
+</script>
diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb
index e2f928332..e204030f1 100644
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@@ -1,11 +1,8 @@
-
 <% attachmenttypes = @project.attachmenttypes %>
 <% sufixtypes = @project.contenttypes %>
-
-<span class="borad-title">
-  <%= (@project.project_type == 1) ? t(:label_user_course) : t(:label_project) %>
-  资源共享区
-</span>
+<div class="project_r_h">
+  <h2 class="project_h2">资源共享区</h2>
+</div>
 
 <div class="content-title-top">
   <%#= link_to(l(:label_attachment_new), 'javascript:void(0);', :onclick=>"$('#file_buttons').slideToggle();", :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index fe04c4e3f..39bc8b52e 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -1,250 +1 @@
-<!-- <h3> --><!-- %=l(:label_attachment_plural)%></h3 -->
-<div id="resource_list">
-<% if @isproject %>
-    <%= render :partial => 'project_file', locals: {project: @project} %>
-<% else %>
-    <%= render :partial => 'course_file', locals: {course: @course} %>
-<% end %>
-</div>
-
-<script type='text/javascript'>
-    var slideHeight = 29;
-    function readmore(aNode) {
-        // console.log(aNode)
-        // var $td_tags_area = $(aNode).parent().parent();
-        var $td_tags_area = $(aNode).parent().parent().parent().parent();
-        var $tags_area = $td_tags_area.find('.tags_area')
-        var $tags_gradint = $td_tags_area.find('.tags_gradint')
-        var $read_more = $td_tags_area.find('.read-more')
-        var $read_more_a = $td_tags_area.find('.read-more a')
-        var $tags = $td_tags_area.find('#tags')
-        var $icona = $td_tags_area.find('.tags_icona')
-
-        var slideHeight = 13; //px
-        var defHeight = $tags.height();
-
-        var curHeight = $tags_area.height();
-        if (curHeight == slideHeight) {
-            $tags_area.animate({
-                height: defHeight
-            }, 'normal');
-            $read_more_a.html('隐藏');
-            $icona.html('<%=image_tag "/images/sidebar/minus.png"%>')
-            $tags_gradint.fadeOut();
-        } else {
-            $tags_area.animate({
-                height: slideHeight
-            }, 'normal');
-            $read_more_a.html('更多');
-            $icona.html('<%=image_tag "/images/sidebar/add.png"%>')
-            $tags_gradint.fadeIn();
-        }
-        ;
-
-    }
-    $(function () {
-        var slideHeight = 20; //px
-        var defHeight = $('.tags_area').height();
-        if (defHeight >= slideHeight) {
-            $('.tags_area').css('height', slideHeight + 'px');
-        }
-        ;
-    });
-
-    function eval_ajax(xhr, textStatus) {
-        if (textStatus == 'success') {
-            eval(xhr.responseText);
-        } else if (textStatus == 'error') {
-            alert('error');
-        }
-    }
-
-
-    function attachment_contenttypes_searchex(value) {
-        <% if  @project%>
-        $.ajax({
-            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
-            type: "POST",
-            data: {
-                type: $('#attachment_browse').val(),
-                contentType: encodeURIComponent(value)
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-
-
-
-    function attachtype_edit(value) {
-        <% if  @project%>
-        $.ajax({
-
-            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
-            type: "POST",
-            data: {
-                type: $('#attachment_browse').val(),
-                contentType: encodeURIComponent(value)
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-
-    function attachmenttypes_searchex(value) {
-        <% if  @project%>
-        $.ajax({
-            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
-            type: "POST",
-            data: {
-                type: encodeURIComponent(value),
-                contentType: $('#attach_sufix_browse').val()
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-
-    function course_attachmenttypes_searchex(value) {
-        <% if  @course%>
-        $.ajax({
-            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
-            type: "POST",
-            data: {
-                type: encodeURIComponent(value),
-                contentType: $('#attach_sufix_browse').val()
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-
-    function course_attachment_contenttypes_searchex(value) {
-        <% if  @course%>
-        $.ajax({
-
-            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
-            type: "POST",
-            data: {
-                type: $('#attachment_browse').val(),
-                contentType: encodeURIComponent(value)
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-    function course_attachtype_edit(value) {
-        <% if  @course%>
-        $.ajax({
-            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
-            type: "POST",
-            data: {
-                type: $('#attachment_browse').val(),
-                contentType: encodeURIComponent(value)
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-
-    function attachmenttypes_change(id, type) {
-        <% if  @project%>
-        $.ajax({
-            url: '<%=updateType_attachments_path%>',
-            type: "POST",
-            data: {
-                attachmentid: encodeURIComponent(id),
-                newtype: encodeURIComponent(type)
-            }
-
-        }).complete(function (xhr, textStatus) {
-
-                    if (textStatus == 'success') {
-                        $.ajax({
-                            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
-                            type: "POST",
-                            data: {
-                                type: $('#attachment_browse').val(),
-                                contentType: $('#attach_sufix_browse').val()
-                            }
-                        }).error(function () {
-                                    alert('error');
-                                });
-                    } else if (textStatus == 'error') {
-                        alert('An error has occurred');
-                    }
-                });
-        <%end%>
-
-    }
-
-    function course_attachmenttypes_change(id, type) {
-        <% if  @course%>
-        $.ajax({
-            url: '<%=updateType_attachments_path%>',
-            type: "POST",
-            data: {
-                attachmentid: encodeURIComponent(id),
-                newtype: encodeURIComponent(type)
-            }
-
-        }).complete(function (xhr, textStatus) {
-
-                    if (textStatus == 'success') {
-                        $.ajax({
-                            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
-                            type: "POST",
-                            data: {
-                                type: $('#attachment_browse').val(),
-                                contentType: $('#attach_sufix_browse').val()
-                            }
-                        }).error(function () {
-                                    alert('error');
-                                });
-                    } else if (textStatus == 'error') {
-                        alert('An error has occurred');
-                    }
-                });
-        <%end%>
-
-    }
-
-    // 编辑文件密级
-    function file_dense_edit(id, type) {
-        $.ajax({
-            url: '<%=updateFileDense_attachments_path%>',
-            type: "POST",
-            remote:"true",
-            data: {
-                attachmentid: encodeURIComponent(id),
-                newtype: encodeURIComponent(type)
-            }
-
-        }).complete(function (xhr, textStatus) {
-                });
-
-    }
-
-</script>
-
-
-<script type='text/javascript'>
-    function tagAddClick(divid, objId, objTag) {
-        alert("OK");
-        $.ajax({
-            type: "POST",
-            url: '/users/tag_saveEx',
-            data: {
-                tagname: $('tag_name').value,
-                obj_id: encodeURIComponent(objId),
-                obj_flag: encodeURIComponent(objTag)
-            },
-            success: function (data, textStatus) {
-                alert("OK");
-                $(divid).empty();
-                $(divid).html('123');
-                $("#" + divid + " #name").val("");
-            }
-        })
-    }
-</script>
+<%= render :partial => 'files/newfile_index' %>
\ No newline at end of file
diff --git a/app/views/files/index.js.erb b/app/views/files/index.js.erb
new file mode 100644
index 000000000..59bc2407f
--- /dev/null
+++ b/app/views/files/index.js.erb
@@ -0,0 +1,2 @@
+alert("eeee");
+$('#content').html('<%= escape_javascript(render :partial => 'issues/newissue_index') %>');
diff --git a/app/views/files/new.html.erb b/app/views/files/new.html.erb
index 8fd99b195..be9bcd722 100644
--- a/app/views/files/new.html.erb
+++ b/app/views/files/new.html.erb
@@ -1,4 +1,6 @@
-<h3><%=l(:label_attachment_new)%></h3>
+<div class="project_r_h">
+  <h2 class="project_h2"><%=l(:label_attachment_new)%></h2>
+</div>
 
 <%= error_messages_for 'attachment' %>
 <%= form_tag(project_files_path(@project), :multipart => true, :class => "tabular") do %>
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index 6ec189256..2808a99cc 100644
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -1,5 +1,7 @@
-<% @gantt.view = self %>
-<h3><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h3>
+<div class="project_r_h">
+  <h2 class="project_h2"><% @gantt.view = self %>
+    <%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
+</div>
 
 <%= form_tag({:controller => 'gantts', :action => 'show',
              :project_id => @project, :month => params[:month],
diff --git a/app/views/issues/_newissue_index.html.erb b/app/views/issues/_newissue_index.html.erb
new file mode 100644
index 000000000..f0b7c0108
--- /dev/null
+++ b/app/views/issues/_newissue_index.html.erb
@@ -0,0 +1,137 @@
+<div class="project_r_h">
+  <h2 class="project_h2">问题跟踪</h2>
+</div>
+<div class="problem_top">
+  <% if @project.enabled_modules.where("name = 'issue_tracking'").count > 0 %>
+      <span>
+        <%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new,
+                    :html => {:accesskey => Redmine::AccessKeys.key_for(:new_issue)}, :class => 'icon icon-add' %>
+        <%= link_to l(:label_query), '#', :class => 'icon icon-help',
+                    :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
+      </span>
+  <% end %>
+  <span class="problem_p fr">问题总数：<span>100</span> 未解决：<span>20</span></span>
+</div>
+<div class="contextual">
+  <% if !@query.new_record? && @query.editable_by?(User.current) %>
+      <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
+      <%= delete_link query_path(@query) %>
+  <% end %>
+</div>
+
+<% 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' %>
+
+      <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);">
+              <%= l(:label_issue_query_condition) %>
+            </legend>
+            <div style="<%= @query.new_record? ? "" : "display: none;" %>">
+              <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+            </div>
+          </fieldset>
+          <!--
+          <fieldset class="collapsible collapsed">
+            <legend onclick="toggleFieldset(this);">
+              <%= l(:label_options) %>
+            </legend>
+            <div style="display: none;">
+              <table>
+                <tr>
+                  <td><%= l(:field_column_names) %></td>
+                  <td><%= render_query_columns_selection(@query) %></td>
+                </tr>
+                <tr>
+                  <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>
+                </tr>
+                <tr>
+                  <td><%= l(:button_show) %></td>
+                  <td><%= available_block_columns_tags(@query) %></td>
+                </tr>
+              </table>
+            </div>
+          </fieldset>
+           -->
+          <div class="buttons hide-when-print">
+            <%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
+            <%= link_to l(:label_issue_cancel_query), {:set_filter => 1, :project_id => @project}, :class => 'icon icon-reload' %>
+          </div>
+        </div>
+      </div>
+  <% end %>
+</div>
+
+<%= error_messages_for 'query' %>
+
+<% if @query.valid? %>
+    <% if @issues.empty? %>
+        <p class="nodata">
+          <%= l(:label_no_data) %>
+        </p>
+    <% else %>
+        <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
+        <div class="pagination">
+          <ul><%= pagination_links_full @issue_pages, @issue_count %></ul>
+        </div>
+    <% end %>
+    <div style="float: right; padding-top: 30px">
+      <% other_formats_links do |f| %>
+          <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
+          <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
+          <%= f.link_to 'PDF', :url => params %>
+      <% 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 %>
+          <p>
+            <label>
+              <%= radio_button_tag 'columns', 'all' %>
+              <%= l(:description_all_columns) %>
+            </label>
+          </p>
+
+          <p>
+            <label>
+              <%= check_box_tag 'description', '1', @query.has_column?(:description) %>
+              <%= l(:field_description) %>
+            </label>
+          </p>
+
+          <p class="buttons">
+            <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
+            <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
+          </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 %>
+
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom,
+                                {:query_id => @query, :format => 'atom',
+                                 :page => nil, :key => User.current.rss_key},
+                                :title => l(:label_issue_plural)) %>
+    <%= auto_discovery_link_tag(:atom,
+                                {:controller => 'journals', :action => 'index',
+                                 :query_id => @query, :format => 'atom',
+                                 :page => nil, :key => User.current.rss_key},
+                                :title => l(:label_changes_details)) %>
+<% end %>
+
+<%= context_menu issues_context_menu_path %>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 219a0f641..b3750a770 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,135 +1 @@
-<div class="content-title-top">
-  <% if @project.enabled_modules.where("name = 'issue_tracking'").count > 0 %>
-      <div>
-        <%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new,
-                    :html => {:accesskey => Redmine::AccessKeys.key_for(:new_issue)}, :class => 'icon icon-add' %>
-
-        <%= link_to l(:label_query), '#', :class => 'icon icon-help',
-                    :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
-      </div>
-  <% end %>
-</div>
-
-<div class="contextual">
-  <% if !@query.new_record? && @query.editable_by?(User.current) %>
-      <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
-      <%= delete_link query_path(@query) %>
-  <% end %>
-</div>
-
-<% 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' %>
-
-      <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);">
-              <%= l(:label_issue_query_condition) %>
-            </legend>
-            <div style="<%= @query.new_record? ? "" : "display: none;" %>">
-              <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-            </div>
-          </fieldset>
-          <!--
-          <fieldset class="collapsible collapsed">
-            <legend onclick="toggleFieldset(this);">
-              <%= l(:label_options) %>
-            </legend>
-            <div style="display: none;">
-              <table>
-                <tr>
-                  <td><%= l(:field_column_names) %></td>
-                  <td><%= render_query_columns_selection(@query) %></td>
-                </tr>
-                <tr>
-                  <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>
-                </tr>
-                <tr>
-                  <td><%= l(:button_show) %></td>
-                  <td><%= available_block_columns_tags(@query) %></td>
-                </tr>
-              </table>
-            </div>
-          </fieldset>
-           -->
-          <div class="buttons hide-when-print">
-            <%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
-            <%= link_to l(:label_issue_cancel_query), {:set_filter => 1, :project_id => @project}, :class => 'icon icon-reload' %>
-          </div>
-        </div>
-      </div>
-  <% end %>
-</div>
-
-<%= error_messages_for 'query' %>
-
-<% if @query.valid? %>
-    <% if @issues.empty? %>
-        <p class="nodata">
-          <%= l(:label_no_data) %>
-        </p>
-    <% else %>
-        <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
-        <div class="pagination">
-          <ul><%= pagination_links_full @issue_pages, @issue_count %></ul>
-        </div>
-    <% end %>
-    <div style="float: right; padding-top: 30px">
-      <% other_formats_links do |f| %>
-          <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
-          <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
-          <%= f.link_to 'PDF', :url => params %>
-      <% 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 %>
-          <p>
-            <label>
-              <%= radio_button_tag 'columns', 'all' %>
-              <%= l(:description_all_columns) %>
-            </label>
-          </p>
-
-          <p>
-            <label>
-              <%= check_box_tag 'description', '1', @query.has_column?(:description) %>
-              <%= l(:field_description) %>
-            </label>
-          </p>
-
-          <p class="buttons">
-            <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
-            <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
-          </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 %>
-
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom,
-                                {:query_id => @query, :format => 'atom',
-                                 :page => nil, :key => User.current.rss_key},
-                                :title => l(:label_issue_plural)) %>
-    <%= auto_discovery_link_tag(:atom,
-                                {:controller => 'journals', :action => 'index',
-                                 :query_id => @query, :format => 'atom',
-                                 :page => nil, :key => User.current.rss_key},
-                                :title => l(:label_changes_details)) %>
-<% end %>
-
-<%= context_menu issues_context_menu_path %>
+<%= render :partial => 'issues/newissue_index' %>
\ No newline at end of file
diff --git a/app/views/issues/index.js.erb b/app/views/issues/index.js.erb
new file mode 100644
index 000000000..866882053
--- /dev/null
+++ b/app/views/issues/index.js.erb
@@ -0,0 +1 @@
+$('#content').html('<%= escape_javascript(render :partial => 'issues/newissue_index') %>');
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 05ec50c11..51ebd139e 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2">问题跟踪</h2>
+</div>
 <%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
 
 <%= labelled_form_for @issue, :url => project_issues_path(@project),
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 204dd519a..47ba63ebf 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,5 +1,6 @@
-<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
-
+<div class="project_r_h">
+  <h2 class="project_h2">问题跟踪</h2>
+</div>
 <% html_title "#{@issue.tracker.name} #{@issue.source_from}: #{@issue.subject}" %>
 
 <%= render :partial => 'action_menu' %>
diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index c4479b43a..2444af68c 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -1,32 +1,30 @@
 <style type="text/css">
-	#scrollsidebar{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+	#scrollsidebar{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#F6F7F8; font-style:normal;}
     #scrollsidebar div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ }
     #scrollsidebar div,img,tr,td,table{ border:0;}
     #scrollsidebar ol,ul,li{ list-style-type:none}
     #scrollsidebar .cl{ clear:both; overflow:hidden; }
     #scrollsidebar a{ text-decoration:none;}
 
-html{ overflow-x:hidden;}
-.custom_service p img {display: inline; margin-top:-5px; vertical-align:middle;}
-.scrollsidebar{position:absolute; z-index:999; top:150px;background:none !important;}
-.side_content{width:154px; height:auto; overflow:hidden; float:left; }
-.side_content .side_list {width:154px;overflow:hidden;}
-.show_btn{ width:0; height:112px; overflow:hidden; margin-top:50px; float:left; cursor:pointer;}
-.show_btn span { display:none;}
-.close_btn{width:24px;height:24px;cursor:pointer;}
-.side_title,.side_bottom,.close_btn,.show_btn {background:url(/images/sidebar_bg.png) no-repeat;}
-.side_title {height:46px;}
-.side_bottom { height:8px;}
-.side_center {font-family:Verdana, Geneva, sans-serif; padding:5px 12px; font-size:12px;}
-.close_btn { float:right; display:block; width:21px; height:16px; margin:16px 10px 0 0; _margin:16px 5px 0 0;}
-.close_btn span { display:none;}
-.side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
-.msgserver { margin:10px 0 4px 4px;}
-.msgserver a { background:url(/images/sidebar_bg.png) no-repeat -119px -115px; padding-left:22px;}
-.opnionText{ width:120px; height:180px; border-color:#cecece; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; color:#999; padding:3px;}
-a.opnionButton{ display:block; font-weight: bold; margin:-25px auto 0; text-align:center;}
-a:hover.opnionButton{ text-decoration:underline;}
-
+    html{ overflow-x:hidden;}
+    .scrollsidebar{ position:absolute;top:1px; right:1px; background:none; }
+    .side_content{width:154px; height:auto; overflow:hidden; float:left; }
+    .side_content .side_list {width:154px;overflow:hidden;}
+    .show_btn{ width:0; height:112px; overflow:hidden; float:left; cursor:pointer;}
+    .show_btn span { display:none;}
+    .close_btn{width:24px;height:24px;cursor:pointer;}
+    .side_title,.side_bottom,.close_btn,.show_btn {background:url(/images/sidebar_bg.png) no-repeat; }
+    .side_title {height:35px;}
+    .side_bottom { height:8px;}
+    .side_center {font-family:Verdana, Geneva, sans-serif; padding:0px 12px; font-size:12px;}
+    .close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;}
+    .close_btn span { display:none;}
+    .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
+    .msgserver { margin:2px 0px 0px 4px; padding-top: 0px}
+    .msgserver a { background:url(/images/sidebar_bg.png) no-repeat -119px -115px; padding-left:22px;}
+    .opnionText{ width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;}
+    .opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;}
+    .opnionButton:hover{background: #0fa9bb; }
 
 /* blue skin as the default skin */
 .side_title {background-position:-195px 0;}
@@ -87,21 +85,6 @@ a:hover.opnionButton{ text-decoration:underline;}
 				show_btn.css('width', 25);
 
 			}
-			//???????
-			if(options.skin) thisBox.addClass('side_'+options.skin);
-
-
-			//????scroll???
-			$(window).bind("scroll",function(){
-				var offsetTop = defaultTop + $(window).scrollTop() + "px";
-	            thisBox.animate({
-	                top: offsetTop
-	            },
-	            {
-	                duration: options.durationTime,
-	                queue: false    //???????????????????
-	            });
-			});
 			//close???
 			closeBtn.bind("click",function(){
 				sideContent.animate({width: '0px'},"fast");
@@ -186,14 +169,12 @@ function cookieget(n)
          		    <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
           			<%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
 		  			 <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
-          			<a href="javascript:void(0);" class="opnionButton" style=" color:#fd6e2a;" id="" onclick="f_submit();">提&nbsp;&nbsp;交</a>          			
+          			<a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();">提&nbsp;&nbsp;交</a>
 				  <% end %>   			   			                
                 </div>                               
                 <div class="msgserver">
-                    <p>
-                   	<a href="http://user.trustie.net/users/12/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>黄井泉</a></br>
+                   	<a href="http://user.trustie.net/users/12/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>黄井泉</a>
                     <a href="http://user.trustie.net/users/34/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
-                    </p>
                 </div>
             </div>
             <div class="side_bottom"></div>
diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb
index 1674cc43d..0c4e54317 100644
--- a/app/views/layouts/_join_exit_project.html.erb
+++ b/app/views/layouts/_join_exit_project.html.erb
@@ -1,22 +1,16 @@
-<div style="margin-left: 20px;">
-
+<div class="pr_info_join fl">
+   <!--关注项目-->
   <% if ( !(User.current.member_of? @project) && User.current.login?) %>   <!--added by linchun-->
-      <span class="icon-fav icon"></span><%= watcher_link(@project, User.current) %>
+      <span><%= watcher_link(@project, User.current) %></span>
   <% end %>
-</div>
-<!--添加项目申请-->
-<div style="margin-left: 20px;">
+  <!--加入项目 -->
   <% if ( !(User.current.member_of? @project) && User.current.login?) %>
-      <span class="icon-fav icon"></span>
       <%= applied_link(@project, User.current) %>
   <% end %>
-</div>
-
-<!--添加退出项目-->
-<div style="margin-left: 20px;">
-  <% if ((User.current.member_of? @project) && 
-    User.current.login? && 
-    Member.where(:user_id => User.current.id, :project_id=>@project.id).first.roles.first.to_s != "Manager") %>
+  <!--退出项目-->
+  <% if ((User.current.member_of? @project) &&
+          User.current.login? &&
+          Member.where(:user_id => User.current.id, :project_id=>@project.id).first.roles.first.to_s != "Manager") %>
       <%= exit_project_link(@project) %>
   <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index b8cc2ddc9..2bc86d1ca 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -1,6 +1,5 @@
-
 <% @nav_dispaly_project_label = 1
-   @nav_dispaly_forum_label = 1 %>
+@nav_dispaly_forum_label = 1 %>
 <%#@nav_dispaly_project_label = 1 %>
 <!DOCTYPE html>
 <html lang="en">
@@ -24,172 +23,171 @@
 	<body class="<%= h body_css_classes %>">
 		<div id="wrapper">
 			<div id="wrapper2">
-				<div id="wrapper3">					
-					<%=render :partial => 'layouts/base_header'%>
+				<div id="wrapper3">
+					<%= render :partial => 'layouts/base_header'%>
 					<div id="main">
-						<div class="top-content">							
+						<div class="top-content">
 							<table>
 								<tr>
-									<td class="info_font" style="width: 240px;" rowspan="2">
-                                      <a href="http://<%= Setting.host_name%>" style="color: #15bccf;">
-                                        软件项目托管社区
-                                      </a>
-									</td>
-									<td style="width: 430px; color: #15bccf">
-                                      <strong><%= l(:label_user_location) %> : </strong>
-                                    </td>
+									<td class="info_font" style="width: 240px;" rowspan="2"><a href="http://<%= Setting.host_name%>" style="color: #15bccf;"> 软件项目托管社区 </a></td>
+									<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 									<td rowspan="2" width="250px">
-										<div class="top-content-search">
-                                            <script type="text/javascript">
-                                              function regexName()
-                                              {
-                                                  var name = $.trim($("#name").val());
-                                                  if(name.length == 0)
-                                                  {
-                                                      $("#project_name_span").text("<%= l(:label_search_conditions_not_null) %>");
-                                                      $("#project_name_span").css('color','#ff0000');
-                                                      $("#project_name_span").focus();
-                                                      return false;
-                                                  }
-                                                  else
-                                                  {
-                                                      $("#project_name_span").text("");
-                                                      return true;
-                                                  }
-                                              }
+									<div class="top-content-search">
+										<script type="text/javascript">
+																						function regexName()
+											{
+											var name = $.trim($("#name").val());
+											if(name.length == 0)
+											{
+											$("#project_name_span").text("<%= l(:label_search_conditions_not_null) %>
+												");
+												$("#project_name_span").css('color','#ff0000');
+												$("#project_name_span").focus();
+												return false;
+												}
+												else
+												{
+												$("#project_name_span").text("");
+												return true;
+												}
+												}
 
-                                              function submitSerch()
-                                              {
-                                                  if(regexName()){$("#project_search_form").submit();}
-                                              }
-                                            </script>
-											<%= form_tag(projects_search_path, :method => :get, :id => "project_search_form") do %>
-                                                <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();", :style => "float:left" %>
-                                                <%= hidden_field_tag 'project_type', params[:project_type] %>
-                                                <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-                                                <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
-                                                    <%= l(:label_search)%>
-                                                </a>
-                                                <br />
-                                                <span id="project_name_span" style="float: left"></span>
-											<% end %>
-										</div>
-									</td>
+												function submitSerch()
+												{
+												if(regexName()){$("#project_search_form").submit();}
+												}
+										</script>
+										<%= form_tag(projects_search_path, :method => :get, :id => "project_search_form") do %>
+										<%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();", :style => "float:left" %>
+										<%= hidden_field_tag 'project_type', params[:project_type] %>
+										<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+										<a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" > <%= l(:label_search)%> </a>
+										<br />
+										<span id="project_name_span" style="float: left"></span>
+										<% end %>
+									</div></td>
 								</tr>
 								<tr>
 									<td>
-                                      <p class="top-content-list">
-                                        <%=link_to l(:label_home),home_path %> >
-                                        <%=link_to @project, project_path(@project) %>
-                                      </p>
-                                    </td>
+									<p class="top-content-list">
+										<%= link_to l(:label_home),home_path %> >
+										<%= link_to @project, project_path(@project) %>
+									</p></td>
 								</tr>
-							</table>							
+							</table>
 						</div>
+						<!-- 左边侧栏内容 -->
 						<div id="sidebar">
-							<div class="spaceleft">
-								<div class="inf_user_image">
-									<% @project = Project.find_by_id(@project.id)%>
-									<table>
-										<tr>
-											<td>
-                                              <%= image_tag(url_to_avatar(@project), :class => 'avatar2') %>
-                                            </td>
-											<td>
-												<div class="info-course">
-													<%= link_to @project.name, project_path(@project)%>
-												</div>
-												<div>
-													
-													<% if @project.project_type == 0 %>
-														<%= l(:label_project_grade)%> : 
-														<%= link_to(format("%.2f" ,project_scores(@project)  ).to_i,  {:controller => 'projects',
-                                                                   :action => 'show_projects_score',
-                                                                   :remote => true,
-                                                                   :id => @project.id
-                                                                   }, :style => "color: #EC6300;")%>
-	    											<% end %>
-												<!-- end -->
-												</div>
-                                              <div id="join_exit_project_div">
-                                                <%= render 'layouts/join_exit_project' %>
-                                              </div>
-											</td>
-										</tr>
-									</table>												
-								</div>
+							<script type="text/javascript">
+								$(function() {
+									$(".subNav").click(function() {
+										$(this).toggleClass("currentDd").siblings(".subNav").removeClass("currentDd")
+										$(this).toggleClass("currentDt").siblings(".subNav").removeClass("currentDt")
 
-								<div class="user_fans">
-									<table width="240" border="0">
-										<tr align="center" width="80px">
-											<% files_count = @project.attachments.count %>
-											<% @project.versions.each do |version| %>
-											<% files_count += version.attachments.count %>
-											<% end %>
-											<td class="font_index">
-                                              <%=link_to "#{@project.members.count}", project_member_path(@project) %>
-                                            </td>
-											<td class="font_index">
-                                              <%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %>
-                                            </td>
-                                            <!-- 项目sidebar栏显示问题数目为项目总问题数排除已关闭和已解决的项目问题数，即排除3（已解决），5（已关闭）的 项目问题数  !-->
-											<td class="font_index">
-                                              <%=link_to "#{@project.issues.where('status_id in (1,2,4,6)').count}", project_issues_path(@project) %>
-                                            </td>
-										</tr>
-										<tr class="font_aram">
-											<td align="center" width="70px">
-                                              <%= l(:label_member) %>
-                                            </td>
-											<td align="center" width="100px">
-                                              <%= l(:label_user_watchered) %>
-                                            </td>
-											<td align="center" width="70px">
-                                              <%= l(:label_project_issues) %>
-                                            </td>
-											<!-- <td align="center" width="58px"><%#= l(:label_attachment) %></td> -->
-										</tr>
-									</table>
-									<div class="user_underline"></div>
-								</div>
-								<div class="inf_user_context">
-									<div class="font_title_left">
-										<%= l(:label_project_overview) %>
+										// 修改数字控制速度， slideUp(500)控制卷起速度
+										$(this).next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
+									})
+								})
+							</script>
+							<div class="project_left">
+								<div class="project_info">
+									<div class="pr_info_logo fl mr10 mb5">
+										<%= image_tag(url_to_avatar(@project), :style => 'width:61px; height:61px;') %>
 									</div>
-									<div style="padding-bottom: 8px">
-										<div class="font_lighter_sidebar" style="word-break:break-all;word-wrap: break-word;">
-											<%= textilizable @project.description %>
-										</div>
-										<div class="created_on_project">
-                                          <strong style="color: #15bccf">
-                                            <%= l(:label_create_time) %>：
-                                          </strong>
-                                          <%= format_time(@project.created_on) %>
-										</div>
+									<div class="pr_info_id fl mb5">
+										ID:<%= @project.id %>
 									</div>
-									<div class="user_underline"></div>
-								</div>
-								<!--tags-->
-								<div class="user_fans">
-									<!-- added by william -for tag -->
-									<div class="user_tags">
-										<div id="tags">
-											<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
-										</div>
+									<!--关注、申请加入/退出项目-->
+									<div id="join_exit_project_div">
+										<%= render 'layouts/join_exit_project' %>
 									</div>
+									<!-- 项目得分 -->
+									<div class="cl"></div>
+									<div class="pr_info_name><%= link_to @project.name, project_path(@project) %><span class="img_private ">私有</span></div>
+									<div class="cl"></div>
+									<div class="pr_info_score">
+										<% if @project.project_type == 0 %>
+											<%= l(:label_project_grade)%> :
+											<%= link_to(format("%.2f" ,project_scores(@project)  ).to_i,  {:controller => 'projects',
+																										      :action => 'show_projects_score',
+																										      :remote => true,
+																										      :id => @project.id },
+									                                                                          :style => "color: #EC6300;")%>
+										<% end %>
+									</div>
+									<div class="pr_info_foot">
+										<%= l(:label_member) %>（<a class="info_foot_num" href="#" target="_blank"><%= link_to "#{@project.members.count}", project_member_path(@project) %></a>）
+										<span>| </span><%= l(:label_user_watchered) %>（<a class="info_foot_num" href="#" target="_blank"><%= link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %></a>）
+										<span>| </span><%= l(:project_module_attachments) %>（<a class="info_foot_num" href="#" target="_blank"><%= link_to "#{@project.attachments.count}", project_files_path(@project) %></a>）</div>
+										<div class="cl"></div>
+									</div><!--项目信息 end-->
+
+									<div class="subNavBox">
+										<div class="subNav currentDd currentDt subNav_jiantou">邀请</div>
+											<ul class="navContent " style="display:block; padding-left: 0px; margin-top:0px;">
+												<li><a href="#">发送邮件邀请新用户</a></li>
+												<li><a href="#">邀请Trustie注册用户</a></li>
+											</ul>
+										<div class="subNav">
+											<%= link_to "动态", {:controller => 'projects', :action => 'show', :id => @project.id},	
+															    :remote => "true",
+																:style => "color:#3CA5C6" %>
+										</div>
+										<div class="subNav">
+											<%= link_to "问题跟踪", project_issues_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.issues.count %>)</span>
+											<span>
+                                              <% if User.current.logged? &&  User.current.member_of?(@project) %>
+                                                <%= link_to "+发布问题", new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %></span>
+                                              <% end %>
+										</div>
+										<div class="subNav">
+											<%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %>
+											<span  class="subnav_num">(<%= @project.boards.first.topics.count %>)</span>
+                                            <% if User.current.logged? &&  User.current.member_of?(@project) %>
+											    <%= link_to "+发贴", new_board_message_path(@project.boards.first, @project), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
+										    <% end %>
+                                        </div>
+										<div class="subNav">
+											<%= link_to "资源库", project_files_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.attachments.count  %>)</span>
+                                            <% if User.current.logged? &&  User.current.member_of?(@project) %>
+                                                <%= link_to "+上传资源", new_project_file_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
+										    <% end %>
+                                        </div>
+										<div class="subNav">
+											<%= link_to "版本库", {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
+											<span  class="subnav_num">(<%= @project.repositories.count %>)</span>
+                                            <% if User.current.logged? &&  User.current.member_of?(@project) %>
+											    <%= link_to "+创建版本库",  new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
+                                            <% end %>
+										</div>
+
+										<div class="subNav subNav_jiantou">更多</div>
+										<ul class="navContent" style="padding-left: 0px">
+											<%= render 'projects/tools_expand' %>
+										</ul>
+									</div><!--项目侧导航 end-->
+									<div class="cl"></div>
+									<div class="project_intro">
+										<h4 class="project_h4">项目简介：</h4><%= @project.description %>
+										<div class="lg-foot">
+											展开更多信息 <span class="g-arr-down"><img src="/images/new_project/jiantou.jpg" width="12" height="6" /></span>
+										</div>
+									</div><!--项目简介 end-->
+									<div class="project_Label">
+										<h4 class="project_h4">标签:</h4>
+										<div class="tag_h" >
+											<div class="user_tags">
+												<div id="tags">
+													<%= render :partial => 'tags/project_tag', :locals => {:obj => @project,:object_flag => "2"}%>
+												</div>
+											</div>
+										</div>
+										<div class="cl"></div>
+									</div><!--项目标签 end-->
 								</div>
-								<!--tool-->
-								<div class="user_underline"></div>
-								<div class="tool">
-									<%= render 'projects/tools_expand' %>
-								</div>
-								<div class="user_underline"></div>
 							</div>
-						</div>
 						<div id="content">
-							<div class="tabs_new">
-                              <%= render_main_menu(@project) %>
-							</div>
+
 							<%= render_flash_messages %>
 							<%= yield %>
 							<%= call_hook :view_layouts_base_content %>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 636aadf43..97f75fda4 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -17,7 +17,7 @@
 
 <!-- <p style="margin-left:-10px;"><%#= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p> -->  <!-- by huang -->
 <p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></em></p>
-<p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :hidden_repo, :style => "margin-left:10px;" %></em></p>
+<p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.hidden_field :hidden_repo, :style => "margin-left:10px;" %></em></p>
 <!--
 <p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;">
   <%#= f.check_box :dts_test, :style => "margin-left:10px;" %>
diff --git a/app/views/projects/_newproject_show.html.erb b/app/views/projects/_newproject_show.html.erb
new file mode 100644
index 000000000..6d785ce6b
--- /dev/null
+++ b/app/views/projects/_newproject_show.html.erb
@@ -0,0 +1,107 @@
+<div class="project_r_h">
+  <h2 class="project_h2">动态</h2>
+</div>
+<% if @events_by_day.size >0 %>
+    <div class="content-title-top-avtive">
+      <p class="subtitle">
+        <% # 暂时隐藏时间的显示%>
+        <%#= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
+      </p>
+
+      <% @events_by_day.keys.sort.reverse.each do |day| %>
+          <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
+              <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
+                <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+                  <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
+                </div>
+                <div class="activity-content" style="padding:5px 5px 5px 70px;margin-top:10px;">
+                  <strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong>
+                    <span class="activity-title font_lighter">
+                      <% if @canShowRealName %>
+                      <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
+                          (<%= link_to_user(e.event_author, @canShowRealName) if e.respond_to?(:event_author) %>)
+                      <% else %>
+                      <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
+                      <% end %>
+                      <%= l(:label_new_activity) %>
+                    </span>
+                  <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
+
+                  <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
+                    <%= textAreailizable e,:event_description %>
+                    <%#= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %>
+                  </div>
+                  <div class="activity_status" style="position:relative; padding-top: 3px;">
+                    <span class="font_lighter"> <%= l :label_activity_time %>
+                      ：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span>
+                    <% if e.event_type == "issue" %>
+                        <div class="" style="display:inline-block;position:absolute; right:2%;">
+                          <span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span>
+                        </div>
+                    <% end %>
+                  </div>
+                </div>
+              </div>
+
+          <% end %>
+      <% end -%>
+      <% if (@events_pages.page == @events_pages.last_page) %>
+          <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
+            <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+              <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
+            </div>
+            <div class="activity-content" style="padding:5px 5px 5px 70px;">
+      <span class="activity-title font_lighter">
+              <% if @canShowRealName %>
+                  (<%= link_to_user(@user, @canShowRealName) %>
+            )
+              <% else %>
+                  <%= link_to_user(@user) %>
+              <% end %>
+        <%#= l(:label_new_activity) %>
+      </span>
+              <%= l(:label_user_create_project) %> <%= link_to @project.name %>
+              <strong> !</strong>
+              <div class="activity_description info-break" style="font-size: 13px;">
+              </div>
+              <div class="activity_status" style="position:relative; padding-top: 3px;">
+                <span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
+              </div>
+            </div>
+          </div>
+      <% end %>
+    </div>
+<% else %>
+    <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
+      <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
+        <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
+      </div>
+      <div class="activity-content" style="padding:5px 5px 5px 70px;">
+      <span class="activity-title font_lighter">
+              <% if @canShowRealName %>
+                  (<%= link_to_user(@user, @canShowRealName) %>
+            )
+              <% else %>
+                  <%= link_to_user(@user) %>
+              <% end %>
+        <%#= l(:label_new_activity) %>
+      </span>
+        <%= l(:label_user_create_project) %> <%= link_to @project.name %>
+        <strong> !</strong>
+        <div class="activity_description info-break" style="font-size: 13px;">
+        </div>
+        <div class="activity_status" style="position:relative; padding-top: 3px;">
+          <span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
+        </div>
+      </div>
+    </div>
+<% end %>
+
+
+<div class="pagination">
+  <ul>
+    <%= pagination_links_full @events_pages %>
+  </ul>
+</div>
+<% html_title(l(:label_overview)) -%>
+
diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb
index c6cd24e21..aaf48f0ec 100644
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@@ -1,39 +1,27 @@
-<div class="font_title_left">
-  <%= l(:label_project_tool)%>
-</div>
+<li>
+    <% if User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project) %>
+        <%= link_to l(:label_settings), settings_project_path(@project) %>
+    <% end %>
+</li>
+<li>
+	<%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
+</li>
+<li>
+	<%= link_to l(:project_module_code_review), {controller: 'code_review', action: 'index', id: @project.id} %>
+</li>
+<li>
+	<%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
+</li>
+<li>
+	<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
+</li>
+<li>
+	<%= link_to l(:project_module_documents), project_documents_path(@project) %>
+</li>
+<li>
+	<%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
+</li>
+<li>
+	<%= link_to l(:label_module_share) ,share_show_path(@project) %>
+</li>
 
-<div class="tools ">
-  <ul><h3>项目交流</h3>
-    <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%></li>
-    <% if @project.enabled_modules.where("name = 'files'").count > 0 %>
-        <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_files) ,project_files_path(@project) %></li>
-    <% end %>
-    <% if @project.enabled_modules.where("name = 'wiki'").count > 0 %>
-        <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_wiki), project_wiki_path(@project) %></li>
-    <% end %>
-    <% if @project.enabled_modules.where("name = 'code_review'").count > 0 %>
-        <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_code_review), {controller: 'code_review', action: 'index', id: @project.id} %></li>
-    <% end %>
-  </ul>
-  <ul><h3>进度跟踪</h3>
-    <% if @project.enabled_modules.where("name = 'calendar'").count > 0 %>
-        <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_calendar),project_calendar_path(@project) %></li>
-    <% end %>
-
-    <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %></li>
-    <% if @project.enabled_modules.where("name = 'gantt'").count > 0 %>
-        <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %></li>
-    <% end %>
-
-  </ul>
-  <ul><h3>其他工具</h3>
-    <% if @project.enabled_modules.where(" name = 'dts'").count > 0 %>
-        <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:label_module_share) ,share_show_path(@project) %></li>
-    <% end %>
-    <% if @project.enabled_modules.where(" name = 'documents'").count > 0 %>
-      <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_documents), project_documents_path(@project) %></li>
-    <% end %>
-    <li></li>
-  </ul>
-
-</div>
diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb
index 3c26d74dc..2f9e9b866 100644
--- a/app/views/projects/feedback.html.erb
+++ b/app/views/projects/feedback.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2">用户反馈</h2>
+</div>
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 <%= stylesheet_link_tag  'css', :media => 'all' %>
 
diff --git a/app/views/projects/member.html.erb b/app/views/projects/member.html.erb
index aca6f0b5a..c47ba7ebc 100644
--- a/app/views/projects/member.html.erb
+++ b/app/views/projects/member.html.erb
@@ -1,8 +1,5 @@
-
-        <div class="member_header">
-	<p>
-		<%= @subPage_title %>
-	</p>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= @subPage_title %></h2>
 </div>
 <div class="member_content">
 	<%= error_messages_for 'member' %>
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index b68fcb5bc..03fc77a8b 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -2,9 +2,9 @@
    @nav_dispaly_forum_label = 1 %>
 
 <%= labelled_form_for @project do |f| %>
-  <h3><%=l(:label_project_new)%></h3>
+  <div class="project_new"><%=l(:label_project_new)%><span class="description"> <%=raw l(:label_project_new_description)%></span>
   <div class="box tabular" >
-    <p style="font-weight: bold; color: rgb(237,137,36)"> <%=raw l(:label_project_new_description)%> </p>
+    
     <%= render :partial => 'form', :locals => { :f => f } %>
     <span style="padding-left: 60px">
     <%= submit_tag l(:button_create), :class => "enterprise"%>
diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb
index 6682ced76..a5ecac20a 100644
--- a/app/views/projects/settings.html.erb
+++ b/app/views/projects/settings.html.erb
@@ -1,4 +1,6 @@
-<h3><%=l(:label_settings)%></h3>
+<div class="project_r_h">
+  <h2 class="project_h2"><%=l(:label_settings)%></h2>
+</div>
 <% if @project.project_type == 1 %>
 	<%= render_tabs course_settings_tabs %>
 <% else %>
diff --git a/app/views/projects/share.html.erb b/app/views/projects/share.html.erb
index 81a157a42..356ba8183 100644
--- a/app/views/projects/share.html.erb
+++ b/app/views/projects/share.html.erb
@@ -1,5 +1,7 @@
 <!-- <h3>测试结果</h3> -->
-
+<div class="project_r_h">
+  <h2 class="project_h2">DTS测试</h2>
+</div>
 <p  id="stcloud" style="padding-bottom: 5px">
 	<a href="http://www.trustie.net/webdts/" style="float:right" target="_blank"><strong>进入测试平台</strong></a>
 </p>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 7a06c57cd..e6af375ff 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,104 +1 @@
-<% if @events_by_day.size >0 %>
-    <div class="content-title-top-avtive">
-      <p class="subtitle">
-        <% # 暂时隐藏时间的显示%>
-        <%#= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
-      </p>
-
-      <% @events_by_day.keys.sort.reverse.each do |day| %>
-          <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
-              <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
-                <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
-                  <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
-                </div>
-                <div class="activity-content" style="padding:5px 5px 5px 70px;">
-                  <strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong>
-                    <span class="activity-title font_lighter">
-                      <% if @canShowRealName %>
-                      <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
-                          (<%= link_to_user(e.event_author, @canShowRealName) if e.respond_to?(:event_author) %>)
-                      <% else %>
-                      <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
-                      <% end %>
-                      <%= l(:label_new_activity) %>
-                    </span>
-                  <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
-
-                  <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
-                    <%= textAreailizable e,:event_description %>
-                    <%#= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %>
-                  </div>
-                  <div class="activity_status" style="position:relative; padding-top: 3px;">
-                    <span class="font_lighter"> <%= l :label_activity_time %>
-                      ：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span>
-                    <% if e.event_type == "issue" %>
-                        <div class="" style="display:inline-block;position:absolute; right:2%;">
-                          <span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span>
-                        </div>
-                    <% end %>
-                  </div>
-                </div>
-              </div>
-
-          <% end %>
-      <% end -%>
-      <% if (@events_pages.page == @events_pages.last_page) %>
-          <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
-            <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
-              <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
-            </div>
-            <div class="activity-content" style="padding:5px 5px 5px 70px;">
-      <span class="activity-title font_lighter">
-              <% if @canShowRealName %>
-                  (<%= link_to_user(@user, @canShowRealName) %>
-            )
-              <% else %>
-                  <%= link_to_user(@user) %>
-              <% end %>
-        <%#= l(:label_new_activity) %>
-      </span>
-              <%= l(:label_user_create_project) %> <%= link_to @project.name %>
-              <strong> !</strong>
-              <div class="activity_description info-break" style="font-size: 13px;">
-              </div>
-              <div class="activity_status" style="position:relative; padding-top: 3px;">
-                <span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
-              </div>
-            </div>
-          </div>
-      <% end %>
-    </div>
-<% else %>
-    <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
-      <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
-        <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
-      </div>
-      <div class="activity-content" style="padding:5px 5px 5px 70px;">
-      <span class="activity-title font_lighter">
-              <% if @canShowRealName %>
-                  (<%= link_to_user(@user, @canShowRealName) %>
-            )
-              <% else %>
-                  <%= link_to_user(@user) %>
-              <% end %>
-        <%#= l(:label_new_activity) %>
-      </span>
-        <%= l(:label_user_create_project) %> <%= link_to @project.name %>
-        <strong> !</strong>
-        <div class="activity_description info-break" style="font-size: 13px;">
-        </div>
-        <div class="activity_status" style="position:relative; padding-top: 3px;">
-          <span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
-        </div>
-      </div>
-    </div>
-<% end %>
-
-
-<div class="pagination">
-  <ul>
-    <%= pagination_links_full @events_pages %>
-  </ul>
-</div>
-<% html_title(l(:label_overview)) -%>
-
+<%= render :partial => 'projects/newproject_show' %>
\ No newline at end of file
diff --git a/app/views/projects/show.js.erb b/app/views/projects/show.js.erb
new file mode 100644
index 000000000..f90718834
--- /dev/null
+++ b/app/views/projects/show.js.erb
@@ -0,0 +1 @@
+$('#content').html('<%= escape_javascript(render :partial => 'projects/newproject_show') %>');
diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb
index b85705de8..1acefe092 100644
--- a/app/views/projects/watcherlist.html.erb
+++ b/app/views/projects/watcherlist.html.erb
@@ -1,5 +1,7 @@
 <!--add by huang-->
-<h3><%= l(:label_user_watcher)%></h3>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_user_watcher)%></h2>
+</div>
 <div class="inf_user_image">
 	<% for user in @project.watcher_users %>   <!-- @project.watcher_users.count -->
 	<ul class="list_watch">
diff --git a/app/views/repositories/new.html.erb b/app/views/repositories/new.html.erb
index 4127458b3..ee20f0366 100644
--- a/app/views/repositories/new.html.erb
+++ b/app/views/repositories/new.html.erb
@@ -1,4 +1,6 @@
-<h3><%= l(:label_repository_new) %></h3>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_repository_new_repos) %></h2>
+</div>
 <script type="text/javascript">
   //var re=new RegExp(strRegex);
   function createVersion(){
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 570f87064..427ecddc1 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -1,5 +1,7 @@
 <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
-
+<div class="project_r_h">
+  <h2 class="project_h2">版本库</h2>
+</div>
 <div class="contextual" style="padding-right: 10px;">
   <%= render :partial => 'navigation' %>
 </div>
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index 1da8c87d6..c8b592cd1 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -1,39 +1,42 @@
+<div class="project_r_h">
+  <h2 class="project_h2">Wiki</h2>
+</div>
 <div class="contextual">
-    <% if @editable %>
-    <% if @content.current_version? %>
-      <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
-      <%= watcher_link(@page, User.current) %>
-      <%#= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
-      <%#= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
-      <%#= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') %>
-      <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, :class => 'icon icon-del') %>
-    <% else %>
-      <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') %>
-    <% end %>
-    <% end %>
-    <%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
+  <% if @editable %>
+      <% if @content.current_version? %>
+          <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
+          <%= watcher_link(@page, User.current) %>
+          <%#= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
+          <%#= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
+          <%#= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') %>
+          <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, :class => 'icon icon-del') %>
+      <% else %>
+          <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') %>
+      <% end %>
+  <% end %>
+  <%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
 </div>
 <%= wiki_page_breadcrumb(@page) %>
 <% unless @content.current_version? %>
     <p>
-        <%= link_to(("\xc2\xab " + l(:label_previous)),
-                    :action => 'show', :id => @page.title, :project_id => @page.project,
-                    :version => @content.previous.version) + " - " if @content.previous %>
-        <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
-        <%= '('.html_safe + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff',
-                          :id => @page.title, :project_id => @page.project,
-                          :version => @content.version) + ')'.html_safe if @content.previous %> -
-        <%= link_to((l(:label_next) + " \xc2\xbb"), :action => 'show',
-                    :id => @page.title, :project_id => @page.project,
-                    :version => @content.next.version) + " - " if @content.next %>
-        <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => nil) %>
-        <br />
-        <em>
-          <%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous)%>,
-          <%= format_time(@content.updated_on) %>
-        </em>
-        <br />
-        <%=h @content.comments %>
+      <%= link_to(("\xc2\xab " + l(:label_previous)),
+                  :action => 'show', :id => @page.title, :project_id => @page.project,
+                  :version => @content.previous.version) + " - " if @content.previous %>
+      <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
+      <%= '('.html_safe + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff',
+                                  :id => @page.title, :project_id => @page.project,
+                                  :version => @content.version) + ')'.html_safe if @content.previous %> -
+      <%= link_to((l(:label_next) + " \xc2\xbb"), :action => 'show',
+                  :id => @page.title, :project_id => @page.project,
+                  :version => @content.next.version) + " - " if @content.next %>
+      <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => nil) %>
+      <br />
+      <em>
+        <%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous)%>,
+        <%= format_time(@content.updated_on) %>
+      </em>
+      <br />
+      <%=h @content.comments %>
     </p>
     <hr />
 <% end %>
@@ -41,31 +44,31 @@
 <%= link_to_attachments @page %>
 <% if @editable && authorize_for('wiki', 'add_attachment') %>
     <div id="wiki_add_attachment">
-    <p>
-      <%= link_to l(:label_attachment_new), {}, :onclick => "$('#add_attachment_form').show(); return false;",
-                  :id => 'attach_files_link' %></p>
+      <p>
+        <%= link_to l(:label_attachment_new), {}, :onclick => "$('#add_attachment_form').show(); return false;",
+                    :id => 'attach_files_link' %></p>
       <%= form_tag({:controller => 'wiki', :action => 'add_attachment',
-                      :project_id => @project, :id => @page.title},
-                     :multipart => true, :id => "add_attachment_form",
-                     :style => "display:none;") do %>
-        <div class="box">
-          <p>
-            <%= render :partial => 'attachments/form' %>
-          </p>
-        </div>
-        <%= submit_tag l(:button_add) %>
-        <%= link_to l(:button_cancel), {}, :onclick => "$('#add_attachment_form').hide(); return false;" %>
+                    :project_id => @project, :id => @page.title},
+                   :multipart => true, :id => "add_attachment_form",
+                   :style => "display:none;") do %>
+          <div class="box">
+            <p>
+              <%= render :partial => 'attachments/form' %>
+            </p>
+          </div>
+          <%= submit_tag l(:button_add) %>
+          <%= link_to l(:button_cancel), {}, :onclick => "$('#add_attachment_form').hide(); return false;" %>
       <% end %>
     </div>
 <% end %>
 
 <% other_formats_links do |f| %>
-  <%= f.link_to 'PDF', :url => {:id => @page.title, :version => params[:version]} %>
-  <%= f.link_to 'HTML', :url => {:id => @page.title, :version => params[:version]} %>
-  <%= f.link_to 'TXT', :url => {:id => @page.title, :version => params[:version]} %>
+    <%= f.link_to 'PDF', :url => {:id => @page.title, :version => params[:version]} %>
+    <%= f.link_to 'HTML', :url => {:id => @page.title, :version => params[:version]} %>
+    <%= f.link_to 'TXT', :url => {:id => @page.title, :version => params[:version]} %>
 <% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
 <% content_for :sidebar do %>
-  <%= render :partial => 'sidebar' %>
+    <%= render :partial => 'sidebar' %>
 <% end %>
 <% html_title @page.pretty_title %>
 
diff --git a/app/views/words/_new.html.erb b/app/views/words/_new.html.erb
index 70a1a5f27..4a76856f2 100644
--- a/app/views/words/_new.html.erb
+++ b/app/views/words/_new.html.erb
@@ -47,11 +47,12 @@
     </div>
 
     <% if User.current.logged? %>
+          <% if @user.safe_attribute?  'user_message' %>
       <%= f.text_area 'user_message', :rows => 3, :cols => 65,
                               :placeholder => "#{l(:label_leave_a_message)}",
                               :style => "resize: none;  width: 98%",
-                              :class => 'noline',:maxlength => 250%>
-
+                              :class => 'noline'%>
+       <% end %>
       <%= f.text_field :reference_user_id, :style=>"display:none"%>
       <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%>
     <% else %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index d5c56fe13..61d88e76f 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -515,6 +515,7 @@ zh:
   project_module_news: 新闻
   project_module_documents: 文档
   project_module_files: 作品下载
+  project_module_attachments: 资源
   project_module_wiki: Wiki
   project_module_repository: 版本库
   project_module_boards: 讨论区
@@ -2319,7 +2320,7 @@ zh:
 
    
   #   项目托管平台 >新建项目
-  label_project_new_description: '项目可以是软件开发项目，也可以是协作研究项目。'
+  label_project_new_description: '（项目为您和您的团队提供一个面向分布式协作的专有空间，可以设置为公开或私有。）'
   field_name: 名称
   field_description: 描述
   field_identifier: 标识
diff --git a/plugins/redmine_code_review/app/views/code_review/index.html.erb b/plugins/redmine_code_review/app/views/code_review/index.html.erb
index 35f4256b2..ee1d7df9d 100644
--- a/plugins/redmine_code_review/app/views/code_review/index.html.erb
+++ b/plugins/redmine_code_review/app/views/code_review/index.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2">代码审查</h2>
+</div>
 <%
 # Code Review plugin for Redmine
 # Copyright (C) 2009-2012  Haruyuki Iida
@@ -24,9 +27,6 @@ function change_option(flag) {
 }
 </script>
 <div id="code_review_list">
-  <h2>
-    <%=h l(:code_reviews) %>
-  </h2>
 
   <% if @all_review_count > 0 %>
     <p>
diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png
index e41ea789d..cc57f3870 100644
Binary files a/public/images/sidebar_bg.png and b/public/images/sidebar_bg.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index cbd383151..73cfdf762 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -7,7 +7,125 @@ h2, .wiki h1 {font-size: 20px;}
 h3, .wiki h2 {font-size: 15px; padding-left: 5px}
 h4, .wiki h3 {font-size: 13px;}
 h4 {border-bottom: 1px dotted #bbb;}
-/*huang*/
+
+/*20150203项目界面优化样式  By: huangjignquan*/
+.project_new{font-size: 15px; padding: 5px;}
+.project_new .description{font-size: 12px; color: #ff7450; margin-bottom: 2px;}
+
+/*20150205新的项目界面  By: huangjingquan*/
+ol,ul,li{ list-style-type:none}
+.cl{ clear:both; overflow:hidden; }
+a{ text-decoration:none; }
+.ml10{ margin-left:10px;}
+.ml20{ margin-left:20px;}
+.mr10{ margin-right:10px;}
+.mb5{ margin-bottom:5px;}
+.mb10{ margin-bottom:10px;}
+.fl{ float: left;}
+.fr{ float:right;}
+.project_h4{ font-size:14px; color:#3b3b3b;}
+
+
+.project_content{ width:940px; margin:10px auto;}
+.project_left{  float:left;}
+.project_right{ width:670px; float:left;background:#fff; padding:10px;}
+/*项目信息*/
+.project_info{ background:#fff; padding:10px 8px 0px 10px; width:222px;}
+.pr_info_id{ width:137px; color:#5a5a5a; font-size:14px;}
+.pr_info_join{}
+.pr_info_join a{  color:#fff; display:block; padding:0 5px; margin-right:10px; float:left; height:22px; background:#64bdd9; text-align:center; }
+.pr_info_join a:hover{ background:#41a8c8;}
+.pr_info_name{ color:#3e4040; font-size:14px;  line-height:1.5;}
+.pr_info_name a:hover{ color:#3ca5c6;}
+.pr_info_score{ font-size:14px; color:#3e4040; }
+.pr_info_score a{ color:#ff7143;}
+.pr_info_score a:hover{ color:#64bdd9;}
+.img_private{ background:url(../images/new_project/img_project.png) 0 0 no-repeat; width:32px; height:16px; color:#fff; font-size:12px; padding-left:7px;  }
+a.info_foot_num{ font-weight: bold; color:#3ca5c6;  }
+.pr_info_foot{ color:#7f7f7f; margin-top:5px; font-size:12px }
+a:hover.info_foot_num{  color:#2390b2;}
+
+/*左侧导航*/
+.subNavBox{width:222px; background:#fff;margin:10px 10px 0 0;}
+.subNav{border-bottom:solid 1px #e5e3da;cursor:pointer;font-weight:bold;font-size:14px;color:#3ca5c6;line-height:28px;padding-left:10px;background-color:#fff;}
+.subNav_jiantou{background:url(../images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;}
+.subNav_jiantou:hover{color:#0781b4;  }
+.currentDd{color:#0781b4; }
+.currentDt{background-color:#fff; }
+.navContent{display: none;border-bottom:solid 1px #e5e3da; }
+.navContent li a{display:block;width:240px;heigh:28px;text-align:center;font-size:12px;line-height:28px;color:#333}
+.navContent li a:hover{color:#fff;background-color:#b3e0ee}
+.subnav_num{ font-weight:normal; color:#ff7143; font-size:12px;}
+a.subnav_green{ background:#28be6c; color:#fff; font-size:12px; font-weight:normal;height:20px; padding:0px 5px; text-align:center; margin-top:5px; margin-left:82px;}
+a.ml95{ margin-left:97px; float: right;}
+a.ml105{ margin-left:120px;}
+a:hover.subnav_green{ background:#14ad5a;}
+
+/*简介*/
+.project_intro{ width:220px; padding:10px; background:#fff; padding-top:5px; color:#6d6d6d;}
+.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;}
+.lg-foot:hover{ color:#787b7e;}
+/*右侧内容--动态*/
+
+.project_r_h{ height:40px; background:#eaeaea;}
+.project_h2{ background:#64bdd9; color:#fff; height:30px; width:90px; text-align:center; font-weight:normal; padding-top:3px; font-size:16px; padding-top:9px;}
+.project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
+.project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}
+a.more{ float:right; font-size:12px; font-weight:normal; color:#a9a9a9; margin-top:3px;}
+a:hover.more{ color:#64bdd9;}
+.project_box_ul{ padding:0 10px;}
+.project_box_list{ padding:10px 0; border-bottom:1px dashed #e2e1e1; padding-left:30px; color:#6f6c6c;}
+.img_problem{ background:url(../images/img_project.png) 0 -20px no-repeat;}
+.img_talk{ background:url(../images/img_project.png) 0 -62px no-repeat;}
+.img_ziyuan{ background:url(../images/img_project.png) 0 -115px no-repeat;}
+.img_edition{ background:url(../images/img_project.png) 0 -167px no-repeat;}
+.project_name{ color:#058c42;}
+.project_name:hover{ color:#016f33;}
+.project_txt{ color:#0781b4; width:445px; display:block; float:left;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.project_txt02{ color:#0781b4; width:618px; display:block; float:left;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.project_txt:hover{ color:#066e9a;}
+.noline{ border-bottom:none;}
+
+/*弹框*/
+.floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;}
+.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
+.box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
+/*邮件邀请*/
+.box_main{ width:345px; margin:0 auto;}
+.box_h3{ color:#15bccf; text-align:center; font-size:16px;}
+.box_p{ color:#404040; margin-bottom:5px;}
+.fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}
+.icon_addm{ background:url(../images/img_floatbox.png) 0 -33px no-repeat; width:16px; height:16px; display:block;  margin:5px 0 0 5px;}
+.icon_addm:hover{background:url(../images/img_floatbox.png) 0 -61px no-repeat; }
+.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px  no-repeat;width:16px; height:16px; display:block;  margin:5px 0 0 5px}
+.icon_removem:hover{background:url(../images/img_floatbox.png) -22px -61px  no-repeat;}
+.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;}
+.btn_free:hover{ background:#d63502;}
+/*成员邀请*/
+.invi_search{ width:230px; margin:0 auto;}
+.invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
+.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
+.invi_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;}
+/*问题跟踪*/
+.problem_top{ margin:10px 0 ;}
+.problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
+.problem_search_btn{ background:#64bdd9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;}
+.problem_search_btn:hover{ background:#3da1c1; border:1px solid #3da1c1;}
+.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; width:60px; height:22px; text-align:center; padding-top:2px;}
+.problem_new_btn:hover{ background:#ff7143; color:#fff;}
+.problem_p{ color:#535252; margin-right: 8px;}
+.problem_p span{ color:#ff3e00;}
+.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
+
+
+/****标签(和资源库的tag样式一致)***/
+.project_Label{ width:220px; padding:10px; background:#fff; margin-top:0px;  padding-top:5px;}
+a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
+.submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat  0 0;width:42px; margin-top:2px; margin-left:3px; }
+.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
+.re_tag{ width: auto; padding:0 5px; height:22px; border:1px solid #f8df8c; background:#fffce6; margin-right:10px; }
+.re_tag a{ color:#0d90c3;}
+.tag_h span,.tag_h a{ margin-bottom:0px;}
 /*企业版样式*/
 .content_syqy{ width:940px; height:400px; border:1px;}
 .content_syqy .list{ font-size:14px; font-weight:normal; margin-left:10px; font-weight:bold; padding-top:10px}
@@ -51,7 +169,7 @@ a.syqy_wenzi{ padding-bottom:10px; border:1px  solid red;}
 	width: 940px;
 	line-height: 1.2em;
 	padding-top: 6px;
-	margin-bottom: 10px;
+
 }
 
 div.position-f{
@@ -850,10 +968,7 @@ ul.user_course_sort li{list-style-type:none;
 }
 
 .user_tags{
-	padding-top: 5px;
-	padding-bottom: 5px;
-	padding-left: 12px;	
-	padding-right: 12px;
+	padding:0px;
 }
 
 .tool{
@@ -1690,7 +1805,7 @@ div.issue table.attributes td {width:28%;}
 #issue_tree td.checkbox, #relations td.checkbox {display:none;}
 #relations td.buttons {padding:0;}
 
-fieldset.collapsible { border-width: 1px 0 0 0; font-size: 0.9em; }
+fieldset.collapsible { border-width: 1px 0 0 0; font-size: 0.9em; margin-top: 5px; }
 fieldset.collapsible>legend { padding-left: 16px; background:url(../images/arrow_collapsed.png) no-repeat 0% 40%; cursor:pointer; }
 fieldset.collapsible.collapsed>legend { background-image: url(../images/arrow_expanded.png); }
 
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 31746802e..88506989c 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -28,16 +28,16 @@
 /*by young*/
 
 #header > h1 {
-  /*background: url(../images/logo.gif) no-repeat 40px 45%;*/	
+  /*background: url(../images/logo.gif) no-repeat 40px 45%;*/
   padding: 28px 130px;
 }
 /*end*/
 
-@media only screen and (-webkit-min-device-pixel-ratio: 2), 
+@media only screen and (-webkit-min-device-pixel-ratio: 2),
 only screen and (min-device-pixel-ratio: 2) {
   #header > h1 {
     /*background-image:ol url(../images/logo-2x.png);*/
-    background-size: 43px 30px; 
+    background-size: 43px 30px;
   }
 }
 #body
@@ -372,7 +372,7 @@ color: #000000;
 }
 
 #top-menu ul
-{	
+{
   margin-left: 0px;  /*add by huang*/
   padding-right: 1px;
 }
@@ -382,7 +382,7 @@ color: #000000;
   /*by young*/
   padding-top: 10px;
   color:#fff;
-  font-weight: bold;	
+  font-weight: bold;
   line-height:21px;
   margin-right:1px
 }
@@ -407,7 +407,7 @@ color: #000000;
 }
 
 #content,#main.nosidebar #content
-{  
+{
   /*by young*/
   /*	background:#fff; /*主题框架背景yanse*/
   /*	border-right:1px solid #bbb;
@@ -423,14 +423,14 @@ color: #000000;
 {
   width:693px;
   float:right;
-  background-color: #FFFFFF;	
+  background-color: #FFFFFF;
 }
 
 #content_tag
 {
   width:640px;
   float:right;
-  background-color: #FFFFFF;	
+  background-color: #FFFFFF;
 }
 
 #content .wiki img
@@ -451,10 +451,10 @@ color: #000000;
 {
   width:240px;
   height: auto;
-  background:#fff; 
+  background:#fff;
   margin-bottom: 30px;
   border-right:1px solid #f0c082;
-  overflow:auto;    
+  overflow:auto;
   -moz-box-shadow:#C6E9F1 1px 1px 2px;
   -webkit-box-shadow:2px 2px 0px -2px #C6E9F1;
 }
@@ -479,7 +479,7 @@ color: #000000;
   font-weight:600
 }
 
-/*end*/ 
+/*end*/
 
 #sidebar
 {
@@ -624,38 +624,38 @@ padding:4px 8px 4px;8*/
 /*by young*/
 #top-menu li a.home:before {
   font-family: Fontawesome;
-  /*	content: "\f015 ";*/	
+  /*	content: "\f015 ";*/
 }
 #top-menu li a.my-page:before {
   font-family: Fontawesome;
-  /*	content: "\f0c9 ";*/	
+  /*	content: "\f0c9 ";*/
 
 }
 
 #top-menu li a.projects:before {
   font-family: Fontawesome;
 
-  content: "\f0c2 ";	
+  content: "\f0c2 ";
 
-  /*	content: "\f0c2 ";*/	
+  /*	content: "\f0c2 ";*/
 
 }
 
 #top-menu li a.administration:before {
   font-family: Fontawesome;
 
-  content: "\f11b ";	
+  content: "\f11b ";
 
-  /*	content: "\f11b ";*/	
+  /*	content: "\f11b ";*/
 
 }
 
 #top-menu li a.help:before {
   font-family: Fontawesome;
 
-  content: "\f0e9 ";	
+  content: "\f0e9 ";
 
-  /*	content: "\f0e9 ";*/	
+  /*	content: "\f0e9 ";*/
 
 }
 
@@ -776,7 +776,7 @@ tr.priority-4 a
 
 tr.odd.priority-4 td,tr.even.priority-4 td
 {
-  border-color:#ffb4b4 
+  border-color:#ffb4b4
 }
 
 tr.odd.priority-3,table.list tbody tr.odd.priority-3:hover
@@ -990,7 +990,7 @@ html > body #content
   /*min-height:auto !important;*/
 }
 
-pre,code,.line-code 
+pre,code,.line-code
 {
   font-family:'Source Code Pro'
 }
@@ -1033,7 +1033,7 @@ pre,code,.line-code
 
 /*
  * Added by Nie guanghui.
- * 
+ *
  * Designed for project#index.
  */
 
@@ -1276,10 +1276,10 @@ div.project-block img.avatar2 {
 
 /*
  * Added by Nie.
- * 
- * 
+ *
+ *
  * Designed for user#index.
- */	
+ */
 
 div.well {
   color: black;
@@ -1428,7 +1428,7 @@ div.pagination_new {
   font-size: 10px;
 }
 
-div.pagination_new ul { 
+div.pagination_new ul {
   border-radius: 2px 2px 2px 2px;
   box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.05);
   list-style: disc outside none;
@@ -1567,7 +1567,7 @@ div.autoscroll li.id  a {
 
 div.autoscroll li.subject {
   margin:0px 60px 0px 0px;
-  font-size: 13px; 
+  font-size: 13px;
   line-height: 1.3;
   word-wrap: break-word;
 }
@@ -1699,8 +1699,8 @@ input.enterprise[type="button"] {
   font-size: 12px;
   color: #fff;
   padding: 0px;
-  background: #15bccf; 
-  border: 1px solid #15bccf;       
+  background: #15bccf;
+  border: 1px solid #15bccf;
 }
 input.enterprise[type="submit"] {
   padding-bottom: 5px;
@@ -1710,8 +1710,8 @@ input.enterprise[type="submit"] {
   font-size: 12px;
   color: #fff;
   padding: 0px;
-  background: #15bccf; 
-  border: 1px solid #15bccf; 
+  background: #15bccf;
+  border: 1px solid #15bccf;
 
 }
 /*end*/
@@ -1768,13 +1768,13 @@ a.bid_user {
 
 a.bid_course{
   vertical-align:middle;
-  alignment-adjust:middle;	
+  alignment-adjust:middle;
   color: #FFFFFF;
   /*width: 60px;*/
   border-radius: 3px;
   background-color: #15bccf;
-  margin-left: 10px;	
-  font-size: 12px;	
+  margin-left: 10px;
+  font-size: 12px;
 }
 
 a.bids_user {
@@ -1834,8 +1834,8 @@ div.tableline{
   background-color: #ACAEB1;
 }
 
-/* 统一按钮风格 
- * 
+/* 统一按钮风格
+ *
  * @2013-09-27
  /*added by bai*/
  input[type="submit"], .button_submit {
@@ -1846,7 +1846,7 @@ div.tableline{
    font-size: 12px;
    color: #fff;
    padding: 3px 9px;
-   background: #15bccf; 
+   background: #15bccf;
    border-radius: 4px;
    border: 1px solid #15bccf;
    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
@@ -1866,9 +1866,9 @@ div.tableline{
    font-size: 12px;
    color: #fff;
    padding: 0px;
-   background: #15bccf; 
-   border: 1px solid #15bccf; 
- }	
+   background: #15bccf;
+   border: 1px solid #15bccf;
+ }
 
  #button_width_auto {
    padding-bottom: 5px;
@@ -1878,7 +1878,7 @@ div.tableline{
    font-size: 12px;
    color: #fff;
    padding: 0px;
-   background: #15bccf; 
+   background: #15bccf;
    border-radius: 4px;
    border: 1px solid #15bccf;
    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
@@ -1891,8 +1891,8 @@ div.tableline{
  /*added by bai*/
  a.font-user-color{
    color: #FFFFFF;
-   width:90px; 
-   background-color: #15BCCF; 
+   width:90px;
+   background-color: #15BCCF;
    padding: 0px;
    margin: 0px;
    border-radius:5px;
@@ -1903,8 +1903,8 @@ div.tableline{
 
  a.font-user-after-color{
    color: #FFFFFF;
-   width:90px; 
-   background-color: #15BCCF; 
+   width:90px;
+   background-color: #15BCCF;
    border-radius:5px;
    margin-left:13px;
    height:25px;
@@ -2072,7 +2072,7 @@ span.time{
 }
 
 .message-notes{
-  max-width: 80%; 
+  max-width: 80%;
   word-wrap: break-word;
 }
 
@@ -2082,8 +2082,8 @@ ul.messages-for-user-reply li {
 }
 
 .respond-form{
-  display: none; 
-  width: 87%; 
+  display: none;
+  width: 87%;
   margin: auto;
   clear: both;
 }
@@ -2118,14 +2118,14 @@ ul.messages-for-user-reply li {
 
 .bonus {
   color: #ed8924;
-  font-size: 13px; 
+  font-size: 13px;
 }
 
 .bid_description {
-  width: 90%; 
-  float: left; 
-  margin: 0; 
-  padding: 0; 
+  width: 90%;
+  float: left;
+  margin: 0;
+  padding: 0;
 }
 
 #loggedas ul{
@@ -2145,7 +2145,7 @@ ul.messages-for-user-reply li {
   cursor: pointer;
 }
 #loggedas ul:first-child {
-  border-top: 1px solid #12A7B8;	
+  border-top: 1px solid #12A7B8;
 }
 #loggedas li.last_child {