Merge branch 'sw_new_course' into dev_hjq

Conflicts:
	app/controllers/users_controller.rb

app/controllers/users_controller.rb

@@ -449,7 +449,7 @@ class UsersController < ApplicationController
     end
     @jour = paginateHelper jours,10
     @state = false
-    render :layout=>'base_users_new'
+    render :layout=>'new_base_user'
   end
 
   def user_comments
@@ -659,6 +659,8 @@ class UsersController < ApplicationController
     @type = params[:type]
     user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+    course_types = "('Message','News','HomeworkCommon')"
+    project_types = "('Message','Issue')"
     if @type
       case @type
         when "course_homework"
@@ -667,14 +669,16 @@ class UsersController < ApplicationController
           @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('created_at desc').limit(10).offset(@page * 10)
         when "course_message"
           @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+        when "course_poll"
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('created_at desc').limit(10).offset(@page * 10)
         when "project_issue"
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('created_at desc').limit(10).offset(@page * 10)
         when "project_message"
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+        else
+          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
   end
     else
-      course_types = "('Message','News','HomeworkCommon')"
-      project_types = "('Message','Issue')"
       @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
     end
     # @user_activities = paginateHelper @user_activities,500

app/views/account/login.html.erb

@@ -66,7 +66,7 @@
     }
 
     function register(){
-        if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct){
+        if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
             $("#main_reg_form").submit();
         }else{
             $('#user_login').blur();
@@ -242,6 +242,11 @@
             <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户昵称",:class=>'loginSignBox'%>
             <div class="loginSignAlert" id="login_req" style="display: none">用户昵称为2-18个中英文，数字或下划线</div>
           </div>
+              <div class="loginSignOption">
+                <div class="fl mt3 mr5">
+                  <input type="checkbox" id="read_and_confirm"/>
+                </div>
+                我已阅读并接受<a href="javascript:void(0);" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
           <div class="loginUpButton">
             <a href="javascript:void(0);" class="c_white db" onclick="register();">注册</a>
 

app/views/layouts/new_base_user.html.erb

@@ -114,7 +114,8 @@
           </ul>
         </div>
         <div class="homepageLeftMenuBlock">
-          <a href="javascript:void(0);" class="homepageMenuText">留言</a>
+          <!--<a href="javascript:void(0);" class="homepageMenuText">留言</a>-->
+          <%= link_to '留言',feedback_path(@user),:class=>'homepageMenuText'%>
         </div>
       </div>
       <div class="homepageLeftLabelContainer">

app/views/users/_course_homework.html.erb

@@ -1,5 +1,5 @@
 <div class="resources mt15">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
     </div>

app/views/users/_course_message.html.erb

@@ -1,5 +1,5 @@
     <div class="resources mt15">
-      <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+      <div class="homepagePostBrief"> <!--  onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')"-->
         <div class="homepagePostPortrait">
           <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
         </div>
@@ -37,16 +37,16 @@
         </div>
         <div class="cl"></div>
       </div>
-      <div class="homepagePostReply">
+      <!--<div class="homepagePostReply">
         <div class="homepagePostReplyBanner">
           <div class="homepagePostReplyBannerCount">回复（
-             <% if activity.parent_id.nil? %>
-                <%=activity.replies_count %>
-            <% else %>
-                <%=activity.parent.replies_count %>
-            <% end %>
+             <%# if activity.parent_id.nil? %>
+                <%#=activity.replies_count %>
+            <%# else %>
+                <%#=activity.parent.replies_count %>
+            <%# end %>
             ）</div>
-          <div class="homepagePostReplyBannerTime"><%=format_date(activity.updated_on)%></div>
+          <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
           <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
           </div>
         </div>
@@ -61,21 +61,21 @@
           </div>
           <div class="cl"></div>
         </div>
-        <% activity= activity.parent_id.nil? ? activity:activity.parent%>
-        <% activity.children.reorder("created_on desc").each do |reply| unless activity.children.nil?%>
+        <%# activity= activity.parent_id.nil? ? activity:activity.parent%>
+        <%# activity.children.reorder("created_on desc").each do |reply| unless activity.children.nil?%>
         <div class="homepagePostReplyContainer">
           <div class="homepagePostReplyPortrait">
-            <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
+            <%#= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
           </div>
           <div class="homepagePostReplyDes">
             <div class="homepagePostReplyPublisher">
-              <% if reply.try(:author).try(:realname) == ' ' %>
-                  <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-              <% else %>
-                  <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-              <% end %>
-              <%=format_date(reply.created_on)%>
-              <%= link_to(
+              <%# if reply.try(:author).try(:realname) == ' ' %>
+                  <%#= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+              <%# else %>
+                  <%#= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+              <%# end %>
+              <%#=format_date(reply.created_on)%>
+              <%#= link_to(
                           l(:button_delete),
                           {:controller => 'messages', :action => 'destroy',  :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
                           :method => :post,
@@ -83,13 +83,13 @@
                           :title => l(:button_delete),
                           :class => 'replyGrey fr ml10'
                   ) if reply.course_destroyable_by?(User.current) %>
-              <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
+              &lt;!&ndash;<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>&ndash;&gt;
             </div>
-            <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= reply.content.html_safe %>"><%= reply.content.html_safe %></div>
+            <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%#= reply.content.html_safe %>"><%#= reply.content.html_safe %></div>
           </div>
           <div class="cl"></div>
         </div>
-        <% end %>
-        <% end %>
-      </div>
+        <%# end %>
+        <%# end %>
+      </div>-->
     </div>

app/views/users/_course_news.html.erb

@@ -1,5 +1,5 @@
 <div class="resources mt15">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief" >
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
@@ -33,46 +33,49 @@
     </div>
     <div class="cl"></div>
   </div>
-  <div class="homepagePostReply">
+  <!--<div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复（<%=activity.comments_count %>）</div>
+      <div class="homepagePostReplyBannerCount">回复（<%#=activity.comments_count %>）</div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
       </div>
     </div>
-    <div class="homepagePostReplyInputContainer">
-      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
-    </div>
-    <div class="homepagePostReplyInputContainer">
-      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
-      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
-      </div>
-      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
-      </div>
-      <div class="cl"></div>
-    </div>
-    <% activity.comments.reorder("created_on desc").each do |comment| unless activity.comments.nil?%>
+    <%#= render :partial => 'course_news_reply',:locals => { :contest => @contest, :journals => @jour, :state => false}%>
+
+  <div class="homepagePostReplyInputContainer">
+    <%#= form_tag({:controller => 'comments', :action => 'create', :id => activity}, :id => "add_reply_form") do %>
+        <textarea id="new_reply" class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+        <div class="homepagePostReplyCancel">
+          <a href="javascript:void(0);" class="postReplyCancel" onclick="$('#new_reply').value('');">取消</a>
+        </div>
+        <div class="homepagePostReplySubmit">
+          <a href="javascript:void(0);" class="postReplySubmit" onclick="$('#add_reply_form').submit();">发送</a>
+        </div>
+        <div class="cl"></div>
+    <%# end %>
+  </div>
+    <%# activity.comments.reorder("created_on desc").each do |comment| unless activity.comments.nil?%>
             <div class="homepagePostReplyContainer">
               <div class="homepagePostReplyPortrait">
-                <%= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %>
+                <%#= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %>
               </div>
               <div class="homepagePostReplyDes">
                 <div class="homepagePostReplyPublisher">
-                  <% if comment.try(:author).try(:realname) == ' ' %>
-                      <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                  <% else %>
-                      <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                  <% end %>
-                  <%=format_date(comment.created_on)%>
-                  <%= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment},
-                                                   :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
-                  <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
+                  <%# if comment.try(:author).try(:realname) == ' ' %>
+                      <%#= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                  <%# else %>
+                      <%#= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                  <%# end %>
+                  <%#=format_date(comment.created_on)%>
+                  <%#= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment},
+                                                  :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
+                  &lt;!&ndash;<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>&ndash;&gt;
                 </div>
-                <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= comment.comments.html_safe %>"><%= comment.comments.html_safe %></div>
+                <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%#= comment.comments.html_safe %>"><%#= comment.comments.html_safe %></div>
               </div>
               <div class="cl"></div>
             </div>
-    <% end %>
-    <% end %>
-  </div>
+    <%# end %>
+    <%# end %>
+  </div>-->
 </div>

app/views/users/_course_news_reply.html.erb

@@ -0,0 +1,177 @@
+
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+
+<% if @news.commentable? %>
+    <div class="msg_box fl">
+      <h4><%= l(:label_comment_add) %></h4>
+      <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %>
+          <div class="box"  id="news_comment">
+            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+            <%= kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字"%>
+          </div>
+          <p class="mt10">
+            <a href="javascript:void(0)" class="grey_btn fr ml10" onclick="KindEditor.instances[0].html('');">
+              <%= l(:label_cancel_with_space) %>
+            </a>
+            <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+              <%= l(:label_comment_with_space) %>
+            </a>
+          </p>
+      <% end %>
+    </div>
+<% end %>
+
+<div class="homepagePostReplyInputContainer" id='leave-message' nhname="new_message">
+
+  <%= form_for('new_form', :method => :post,
+               :url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%>
+      <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+      <textarea class="homepagePostReplyInput" nhname="new_message_textarea" name="new_form[course_message]" placeholder="请输入回复"></textarea>
+      <p nhname="contentmsg"></p>
+  <% end %>
+  <div class="cl"></div>
+  <div>
+    <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
+    <a href="javascript:void(0)" class="grey_btn fr ml10 mt10" nhname="cancel_btn">取&nbsp;&nbsp;消</a>
+    <a href="javascript:void(0)"  onclick='$("#leave_message_form").submit();' class="blue_btn fr mt10">
+      发送
+    </a>
+  </div>
+</div>
+
+<div class="cl"></div>
+
+<script type="text/javascript">
+    $(function(){
+
+        function init_editor(params){
+            var editor = params.kindutil.create(params.textarea, {
+                resizeType : 1,minWidth:"1px",width:"100%",height:"45px",
+                items:['emoticons'],
+                afterChange:function(){//按键事件
+                    nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+                },
+                afterCreate:function(){
+                    var toolbar = $("div[class='ke-toolbar']",params.div_form);
+                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+                    params.toolbar_container.append(toolbar);
+                }
+            }).loadPlugin('paste');
+            return editor;
+        }
+
+        function nh_check_field(params){
+            var result=true;
+            if(params.content!=undefined){
+                if(params.content.isEmpty()){
+                    result=false;
+                }
+                if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+                    params.textarea.html(params.content.html());
+                    params.content.sync();
+                    if(params.content.isEmpty()){
+                        params.contentmsg.html('内容不能为空');
+                        params.contentmsg.css({color:'#ff0000'});
+                    }else{
+                        params.contentmsg.html('填写正确');
+                        params.contentmsg.css({color:'#008000'});
+                    }
+                    params.contentmsg.show();
+                }
+            }
+            return result;
+        }
+        function init_form(params){
+            params.form.submit(function(){
+                var flag = false;
+                if(params.form.attr('data-remote') != undefined ){
+                    flag = true
+                }
+                var is_checked = nh_check_field({
+                    issubmit:true,
+                    content:params.editor,
+                    contentmsg:params.contentmsg,
+                    textarea:params.textarea
+                });
+                if(is_checked){
+                    if(flag){
+                        return true;
+                    }else{
+                        $(this)[0].submit();
+                        return false;
+                    }
+                }
+                return false;
+            });
+        }
+        function nh_reset_form(params){
+            params.form[0].reset();
+            params.textarea.empty();
+            if(params.editor != undefined){
+                params.editor.html(params.textarea.html());
+            }
+            params.contentmsg.hide();
+        }
+
+        KindEditor.ready(function(K){
+            $("a[nhname='reply_btn']").live('click',function(){
+                var params = {};
+                params.kindutil = K;
+                params.container = $(this).parent('div').parent('div');
+                params.div_form = $(">.respond-form",params.container);
+                params.form = $("form",params.div_form);
+                params.textarea = $("textarea[name='user_notes']",params.div_form);
+                params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
+                params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+                params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
+                if(params.textarea.data('init') == undefined){
+                    params.editor = init_editor(params);
+                    init_form(params);
+                    params.cancel_btn.click(function(){
+                        nh_reset_form(params);
+                    });
+                }
+                params.cancel_btn.click();
+                toggleAndSettingWordsVal(params.div_form, params.textarea);
+                setTimeout(function(){
+                    if(!params.div_form.is(':hidden')){
+                        params.textarea.show();
+                        params.textarea.focus();
+                        params.textarea.hide();
+                    }
+                },300);
+                params.textarea.data('init',1);
+            });
+
+            $("div[nhname='new_message']").each(function(){
+                var params = {};
+                params.kindutil = K;
+                params.div_form = $(this);
+                params.form = $("form",params.div_form);
+                if(params.form==undefined || params.form.length==0){
+                    return;
+                }
+                params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form);
+                params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
+                params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+                if(params.textarea.data('init') == undefined){
+                    params.editor = init_editor(params);
+                    init_form(params);
+                    $("a[nhname='cancel_btn']",params.div_form).click(function(){
+                        nh_reset_form(params);
+                    });
+                    params.textarea.data('init',1);
+                }
+            });
+        });
+    });
+</script>
+
+
+<!--
+<textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+<div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+<div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
+</div>
+<div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
+</div>-->

app/views/users/_course_poll.html.erb

@@ -1,5 +1,5 @@
 <div class="resources mt15">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>

app/views/users/_project_issue.html.erb

@@ -1,6 +1,5 @@
-<% reply_links = authorize_for('issues', 'edit') -%>
 <div class="resources mt15">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
@@ -71,11 +70,11 @@
     </div>
     <div class="cl"></div>
   </div>
-  <div class="homepagePostReply">
+  <!--<div class="homepagePostReply">
 
     <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复（<%=activity.journals.count %>）</div>
-      <div class="homepagePostReplyBannerTime"><%=format_date(activity.updated_on)%></div>
+      <div class="homepagePostReplyBannerCount">回复（<%#=activity.journals.count %>）</div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
       </div>
     </div>
@@ -89,33 +88,33 @@
       <div class="cl"></div>
     </div>
 
-    <% activity.journals.reorder("created_on desc").each do |reply| unless activity.journals.nil?%>
+    <%# activity.journals.reorder("created_on desc").each do |reply| unless activity.journals.nil?%>
             <div class="homepagePostReplyContainer">
               <div class="homepagePostReplyPortrait">
-                <%= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %>
+                <%#= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %>
               </div>
               <div class="homepagePostReplyDes">
                 <div class="homepagePostReplyPublisher">
-                  <% if reply.try(:user).try(:realname) == ' ' %>
-                      <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                  <% else %>
-                      <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                  <% end %>
-                  <%= format_date(reply.created_on) %>
+                  <%# if reply.try(:user).try(:realname) == ' ' %>
+                      <%#= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                  <%# else %>
+                      <%#= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                  <%# end %>
+                  <%#= format_date(reply.created_on) %>
 
-                  <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
+                  #&lt;!&ndash;<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>&ndash;&gt;
                 </div>
-                <% if reply.details.any? %>
-                    <% details_to_strings(reply.details).each do |string| %>
-                        <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%=string %>"><%=string %></div>
-                    <% end %>
-                <% else %>
-                    <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%=reply.notes.html_safe %>"><%=reply.notes.html_safe %></div>
-              <% end %>
+                <%# if reply.details.any? %>
+                    <%# details_to_strings(reply.details).each do |string| %>
+                        <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%#=string %></div>
+                    <%# end %>
+                <%# else %>
+                    <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%#=reply.notes.html_safe %></div>
+              <%# end %>
               </div>
               <div class="cl"></div>
             </div>
-        <% end %>
-    <% end %>
-  </div>
+        <%# end %>
+    <%# end %>
+  </div>-->
 </div>

app/views/users/_project_message.html.erb

@@ -1,96 +1,95 @@
-
-    <div class="resources mt15">
-      <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
-        <div class="homepagePostPortrait">
-          <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
-        </div>
-        <div class="homepagePostDes">
-          <div class="homepagePostTo">
-            <% if activity.try(:author).try(:realname) == ' ' %>
-                <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-            <% else %>
-                <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-            <% end %>
-            TO
-            <%= link_to activity.project.name.to_s+"(项目讨论区)", project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
-            <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
-          </div>
-          <div class="homepagePostTitle">
-            <% if activity.parent_id.nil? %>
-                <%= link_to activity.subject.to_s.html_safe+"(讨论区内容)", project_boards_path(Board.where('id=?',activity.board_id).first.project_id), :class=> "postGrey", :style=>"word-break:break-all" %>
-            <% else %>
-                <%= link_to activity.parent.subject.to_s.html_safe+"(讨论区内容)", project_boards_path(Board.where('id=?',activity.board_id).first.project_id), :class=> "postGrey", :style=>"word-break:break-all"%>
-            <% end %>
-          </div>
-          <div class="homepagePostSubmitContainer">
-            <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
-          </div>
-          <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-                  <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-                  <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
-                </ul>
-              </li>
+<div class="resources mt15">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to activity.project.name.to_s+"(项目讨论区)", project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
+        <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
+      </div>
+      <div class="homepagePostTitle">
+        <% if activity.parent_id.nil? %>
+            <%= link_to activity.subject.to_s.html_safe+"(讨论区内容)", project_boards_path(Board.where('id=?',activity.board_id).first.project_id), :class=> "postGrey", :style=>"word-break:break-all" %>
+        <% else %>
+            <%= link_to activity.parent.subject.to_s.html_safe+"(讨论区内容)", project_boards_path(Board.where('id=?',activity.board_id).first.project_id), :class=> "postGrey", :style=>"word-break:break-all"%>
+        <% end %>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
+      </div>
+      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
             </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <!--<div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复（
+        <%# if activity.parent_id.nil? %>
+            <%#=activity.replies_count %>
+        <%# else %>
+            <%#=activity.parent.replies_count %>
+        <%# end %>）</div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
+      </div>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
+      </div>
+      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <%# activity= activity.parent_id.nil? ? activity:activity.parent%>
+    <%# activity.children.reorder("created_on desc").each do |reply| unless activity.children.nil?%>
+      <div class="homepagePostReplyContainer">
+        <div class="homepagePostReplyPortrait">
+          <%#= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher">
+            <%# if reply.try(:author).try(:realname) == ' ' %>
+                <%#= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+            <%# else %>
+                <%#= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+            <%# end %>
+            <%#= format_date(reply.created_on) %>
+            <%#= link_to(
+                        l(:button_delete),
+                        {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
+                        :method => :post,
+                        :data => {:confirm => l(:text_are_you_sure)},
+                        :title => l(:button_delete),
+                        :class => 'replyGrey fr ml10'
+                ) if reply.course_destroyable_by?(User.current) %>
+           # &lt;!&ndash;<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>&ndash;&gt;
           </div>
+          <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%#= reply.content.html_safe %>"><%#= reply.content.html_safe %></div>
         </div>
         <div class="cl"></div>
       </div>
-      <div class="homepagePostReply">
-        <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（
-            <% if activity.parent_id.nil? %>
-                <%=activity.replies_count %>
-            <% else %>
-                <%=activity.parent.replies_count %>
-            <% end %>）</div>
-          <div class="homepagePostReplyBannerTime"><%=format_date(activity.updated_on)%></div>
-          <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
-          </div>
-        </div>
-        <div class="homepagePostReplyInputContainer">
-          <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
-        </div>
-        <div class="homepagePostReplyInputContainer">
-          <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
-          <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
-          </div>
-          <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
-          </div>
-          <div class="cl"></div>
-        </div>
-        <% activity= activity.parent_id.nil? ? activity:activity.parent%>
-        <% activity.children.reorder("created_on desc").each do |reply| unless activity.children.nil?%>
-          <div class="homepagePostReplyContainer">
-            <div class="homepagePostReplyPortrait">
-              <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
-            </div>
-            <div class="homepagePostReplyDes">
-              <div class="homepagePostReplyPublisher">
-                <% if reply.try(:author).try(:realname) == ' ' %>
-                    <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-                <% else %>
-                    <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-                <% end %>
-                <%= format_date(reply.created_on) %>
-                <%= link_to(
-                            l(:button_delete),
-                            {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
-                            :method => :post,
-                            :data => {:confirm => l(:text_are_you_sure)},
-                            :title => l(:button_delete),
-                            :class => 'replyGrey fr ml10'
-                    ) if reply.course_destroyable_by?(User.current) %>
-                <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
-              </div>
-              <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= reply.content.html_safe %>"><%= reply.content.html_safe %></div>
-            </div>
-            <div class="cl"></div>
-          </div>
-        <% end %>
-        <% end %>
-      </div>
-    </div>
+    <%# end %>
+    <%# end %>
+  </div>-->
+</div>

app/views/users/_user_activities.html.erb

@@ -17,8 +17,8 @@
                     <%#= render :partial => 'course_attachment', :locals => {:activity => act, :user_activity => user_activity} %>
                     <%# when 'JournalsForMessage' %>
                     <%#= render :partial => 'course_journalsformessage', :locals => {:activity => act, :user_activity => user_activity} %>
-                    <%# when 'Poll' %>
-                    <%#= render :partial => 'course_poll', :locals => {:activity => act, :user_activity => user_activity} %>
+                <% when 'Poll' %>
+                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity => user_activity} %>
                 <% end %>
             <% end %>
         <% when 'Project' %>

app/views/users/show.html.erb

@@ -26,22 +26,29 @@
               <li class="f14">课程动态</li>
               <li><%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
                 <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
-              <li><%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+              <li><%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
               <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
-              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+              <li><%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+                <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
               <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
             </ul>
           </li>
           <li>
             <ul class="homepagePostTypeProject fl">
               <li class="f14">项目动态</li>
-              <li><%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
-              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+              <li><%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
               <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
               <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
             </ul>
           </li>
+          <li>
+            <ul class="homepagePostTypeProject fl">
+              <li class="f14">更多</li>
+              <li><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAssignment postTypeGrey"%>
+            </ul>
+          </li>
         </ul>
       </li>
     </ul>

app/views/users/user_newfeedback.html.erb

@@ -1,16 +1,33 @@
-<div class="top_new">
-  <span class="<%= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>
-  <% if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>
-      <a href="<%= url_for(:controller => 'courses', :action => 'new',) %>" class="green_n_btn fr mt2" target="_blank">新建课程</a>
-  <% end %>
-  <div class="cl"></div>
-</div>
+<!--<div class="top_new">-->
+  <!--<span class="<%#= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>-->
+  <!--<%# if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>-->
+      <!--<a href="<%#= url_for(:controller => 'courses', :action => 'new',) %>" class="green_n_btn fr mt2" target="_blank">新建课程</a>-->
+  <!--<%# end %>-->
+  <!--<div class="cl"></div>-->
+<!--</div>-->
+<style type="text/css">
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
 
+    div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
+    div.recall_con{width:570px;}
+    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
+    .fr.cr{ clear: right}
+</style>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %>
-<div id="RSide" class="fl">
+<!--<div id="RSide" class="fl">-->
   <!--<div class="users_r_top">-->
     <!--<h2 class="users_r_h2">用户留言</h2>-->
   <!--</div>-->
+<div class="feedBack">
+<div class="homepageRightBanner">
+  <div class="NewsBannerName">留言</div>
+</div>
   <div class="message_box mb10">
     <div nhname='new_message' style="display:none;">
       <%= form_for('new_form',:url =>  leave_user_message_path(@user.id),:method => "post") do |f|%>

public/stylesheets/new_user.css

@@ -629,6 +629,9 @@ ul.list_watch{
     border-bottom: 1px dashed rgb(204, 204, 204);
 }
 
+/*留言*/
+.feedBack {width:728px; background-color:#ffffff; padding:10px; border:1px solid #dddddd;float: right}
+
 
 /*底部*/
 #Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;}