Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

app/views/projects/_act_messages.html.erb

@@ -2,7 +2,7 @@
   <div class="pr">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
-      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+      <%#= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="ontent-big">
       <div class="homepagePostTo break_word">
@@ -37,7 +37,7 @@
       <% else %>
           <% content = activity.parent.content%>
       <% end %>
-      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+      <%=render :partial =>"projects/project_intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
@@ -87,12 +87,12 @@
   <%# allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %>
   <%# count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %>
+    <%= render :partial => 'projects/project_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %>
 
     <% comments = all_replies[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%>
+          <%= render :partial => 'projects/project_message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%>
         </div>
     <% end %>
 
@@ -113,7 +113,7 @@
                   <% end%>
                 </div>
             <% else %>
-                <%= render :partial => "users/show_unlogged" %>
+                <%= render :partial => "projects/show_unlogged" %>
             <% end %>
             <div class="cl"></div>
           </div>

app/views/projects/_project_activities.html.erb

@@ -45,7 +45,7 @@
             <%= render :partial => 'projects/act_messages', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :is_course => 1, :is_board => 0} %>
             <!--Attachment   -->
         <% when "Attachment" %>
-            <%= render :partial => 'users/project_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
+            <%= render :partial => 'projects/project_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
         <% when "Commit" %>
             <%= render :partial => 'projects/project_commit', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :identifier => get_rep_identifier_by_project(@project) } %>
         <% end %>

app/views/projects/_project_attachment.html.erb

@@ -0,0 +1,26 @@
+<div class="container-big mt10">
+  <div class="pr">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%#= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+    </div>
+    <div class="content-big">
+      <div class="homepagePostTo break_word">
+        <%= link_to activity.try(:author).show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+        TO
+        <%= link_to activity.project.name.to_s+" | 项目资源", project_files_path(activity.course), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word" >
+        <%= link_to activity.filename, project_files_path(activity.course), :class => "postGrey" %>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostDeadline mr15">
+          文件大小：
+          <%= number_to_human_size activity.filesize%>
+        </div>
+        <div class="homepagePostDeadline">上传时间：<%= format_time(activity.created_on) %></div>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/projects/_project_comment_reply_detail.html.erb

@@ -0,0 +1,20 @@
+<div class="orig_user fl">
+  <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
+</div>
+<div class="orig_right fl">
+  <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
+  <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
+  <div class="orig_content ">
+    <% if comment.class == Journal %>
+        <% if comment.details.any? %>
+            <% details_to_strings(comment.details).each do |string| %>
+                <p><%= string %></p>
+            <% end %>
+        <% end %>
+        <P><%= comment.content_detail.html_safe %></P>
+    <% else %>
+        <%= comment.content_detail.html_safe %>
+    <% end %>
+  </div>
+</div>
+<div class="cl"></div>

app/views/projects/_project_create.html.erb

@@ -4,15 +4,10 @@
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %>
-      <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word" style="width:620px">
-        <% if user.try(:realname) == ' ' %>
+        <%= link_to user.show_name, user_path(user), :class => "newsBlue mr15" %>
-            <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %>
-        <% end %>
         TO
         <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
       </div>
@@ -22,23 +17,7 @@
       <div class="homepagePostDate">
         创建时间：<%= format_time(project.created_on) %>
       </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>
-<script type="text/javascript">
-    $(function(){
-        user_card_show_hide();
-    });
-</script>

app/views/projects/_project_intro_content.html.erb

@@ -0,0 +1,19 @@
+<div class="homepagePostIntro break_word upload_img  maxh360 table_maxWidth " id="activity_description_<%= user_activity_id%>">
+  <div id="intro_content_<%= user_activity_id%>">
+    <%= content.to_s.html_safe %>
+  </div>
+</div>
+<script type="text/javascript">
+    $(function(){
+        $("#intro_content_<%= user_activity_id%> p,#intro_content_<%= user_activity_id%> span,#intro_content_<%= user_activity_id%> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
+        autoUrl('intro_content_<%= user_activity_id%>');
+        description_show_hide(<%=user_activity_id %>);
+    });
+</script>

app/views/projects/_project_journal_comment_reply.html.erb

@@ -0,0 +1,8 @@
+<div class="orig_cont clearfix">
+  <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
+      <div>
+        <%=render :partial => 'projects/project_journal_comment_reply', :locals => {:comment => comment.parent} %>
+      </div>
+  <% end %>
+  <%=render :partial => 'projects/project_comment_reply_detail', :locals => {:comment => comment} %>
+</div>

app/views/projects/_project_message_contents.html.erb

@@ -0,0 +1,29 @@
+<div class="homepagePostReplyPublisher">
+  <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+  <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
+</div>
+<% if !comment.parent.nil? && !comment.parent.parent.nil? %>
+    <% parents_rely = [] %>
+    <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
+    <% length = parents_rely.length %>
+    <div id="comment_reply_<%=comment.id %>">
+      <% if length <= 3 %>
+          <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
+      <% else %>
+          <div class="orig_cont clearfix">
+            <div class="orig_cont clearfix">
+              <div>
+                <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+              </div>
+              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+            </div>
+            <div class="orig_cont_hide clearfix">
+              <span class="orig_icon" >&darr; </span>
+              <span class="orig_icon" style="display:none;" > &uarr;</span>
+              <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
+            </div>
+            <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+          </div>
+      <% end %>
+    </div>
+<% end %>

app/views/projects/_project_message_replies.html.erb

@@ -0,0 +1,62 @@
+<ul>
+  <% comments.each do |comment| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
+          });
+      </script>
+      <li class="homepagePostReplyContainer" nhname="reply_rec">
+        <div class="homepagePostReplyPortrait">
+          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
+        </div>
+        <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=activity_id %>_<%=comment.id %>').show();" onmouseout="$('#delete_reply_<%=activity_id %>_<%=comment.id %>').hide();">
+          <%= render :partial => 'projects/project_message_contents', :locals => {:comment => comment}%>
+
+          <% if !comment.content_detail.blank? %>
+              <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                <%= comment.content_detail.html_safe %>
+              </div>
+              <div class="orig_reply mb10 mt-10">
+                <div class="reply">
+                <span class="reply-right">
+                    <span id="reply_praise_count_<%=comment.id %>">
+                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                    </span>
+
+                  <% topic = comment.root %>
+                  <% if !topic.locked? && authorize_for('messages', 'reply') %>
+                    <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id, :is_course => is_course, :is_board => is_board},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply)) %>
+                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                    </span>
+                    <% end %>
+                  <% if comment.course_destroyable_by?(User.current) || comment.destroyable_by?(User.current) %>
+                      <%= link_to(
+                                  l(:button_delete),
+                                  delete_board_message_path(comment,:board_id =>comment.board.id, :user_activity_id => user_activity_id, :activity_id => activity_id, :is_course => is_course, :is_board => is_board),
+                                  :method => :post,
+                                  :remote => true,
+                                  :id => "delete_reply_#{activity_id}_#{comment.id}",
+                                  :class => 'fr mr20 undis',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) %>
+                    <% end %>
+
+                </span>
+                  <div class="cl"></div>
+                </div>
+              </div>
+              <p id="reply_message_<%= comment.id%>"></p>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>

app/views/users/_message_contents.html.erb

@@ -8,21 +8,21 @@
     <% length = parents_rely.length %>
     <div id="comment_reply_<%=comment.id %>">
       <% if length <= 3 %>
-          <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
+          <%=render :partial => 'projects/project_journal_comment_reply', :locals => {:comment => comment.parent} %>
       <% else %>
           <div class="orig_cont clearfix">
             <div class="orig_cont clearfix">
               <div>
-                <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+                <%=render :partial => 'projects/project_journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
               </div>
-              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+              <%=render :partial => 'projects/project_comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
             </div>
             <div class="orig_cont_hide clearfix">
               <span class="orig_icon" >&darr; </span>
               <span class="orig_icon" style="display:none;" > &uarr;</span>
               <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
             </div>
-            <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+            <%=render :partial => 'projects/project_comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
           </div>
       <% end %>
     </div>