新版项目issue模块

app/views/attachments/_activity_attach.html.erb

@@ -1,3 +1,4 @@
+
 <% if activity.attachments.any? %>
     <% activity.attachments.each do |attachment| %>
         <div class="break_word">

app/views/projects/_act_issues.html.erb

@@ -3,7 +3,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="content-big">
           <div class="homepagePostTo break_word" style="width:880px">
@@ -84,7 +84,7 @@
           <% if User.current.member_of?(activity.project) && !activity.nil? && !activity.status.nil? %>
               <% unless params[:action] == "index" %>
                   <div id="div_user_issue_detail_<%=activity.id %>">
-                    <%= render :partial => 'users/project_issue_detail', :locals => {:activity => activity} %>
+                    <%= render :partial => 'projects/project_issue_detail', :locals => {:activity => activity} %>
                   </div>
               <% end %>
           <% end %>
@@ -96,7 +96,7 @@
         <div class="cl"></div>
       </div>
       <div id="div_user_issue_reply_<%=user_activity_id%>">
-        <%= render :partial => 'users/project_issue_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %>
+        <%= render :partial => 'projects/project_issue_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %>
       </div>
     </div>
     <script type="text/javascript">

app/views/projects/_project_issue_comments_reply.html.erb

@@ -0,0 +1,8 @@
+<div class="orig_cont clearfix">
+  <% unless comment.parent.nil? %>
+      <div>
+        <%=render :partial => 'projects/project_issue_comments_reply', :locals => {:comment => comment.parent} %>
+      </div>
+  <% end %>
+  <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => comment} %>
+</div>

app/views/projects/_project_issue_comments_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_issue_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? %>
+    <% parents_rely = [] %>
+    <% parents_rely = get_reply_parents parents_rely, comment %>
+    <% length = parents_rely.length %>
+    <div id="comment_reply_<%=comment.id %>">
+      <% if length <= 3 %>
+          <%=render :partial => 'projects/project_issue_comments_reply', :locals => {:comment => comment.parent} %>
+      <% else %>
+          <div class="orig_cont clearfix">
+            <div class="orig_cont clearfix">
+              <div>
+                <%=render :partial => 'projects/project_issue_comments_reply', :locals => {:comment => parents_rely[length - 1]} %>
+              </div>
+              <%=render :partial => 'projects/project_issue_comments_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 => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[0]} %>
+          </div>
+      <% end %>
+    </div>
+<% end %>

app/views/projects/_project_issue_detail.html.erb

@@ -0,0 +1,116 @@
+<script>
+    $(document).ready(function(){
+        $(".pro_info_p,.proInfoP").mouseover(function(){
+            $(this).children(".pic_edit2").css("display","inline-block");
+        });
+        $(".pro_info_p,.proInfoP").mouseout(function(){
+            $(this).children(".pic_edit2").css("display","none");
+        });
+        $(".pic_edit2").click(function(){
+            $(this).parent().hide();
+            $(this).parent().next().show();
+        });
+        $(".issueEdit").blur(function(){
+            $(this).hide();
+            $(this).prev().show();
+            var editValue = $(this).children("option:selected").text();
+            $(this).prev().children(":first").text(editValue);
+        });
+        function stopPropagation(e) {
+            if (e.stopPropagation)
+                e.stopPropagation();
+            else
+                e.cancelBubble = true;
+        };
+        $(document).bind('click',function(){
+            $('.issueEdit').css('display','none');
+            $('.proInfoP,.pro_info_p').show();
+        });
+        $('.issueEdit,.pic_edit2').bind('click',function(e){
+            stopPropagation(e);
+        });
+    });
+    function remote_function(id) {
+        $(id).submit();
+    }
+</script>
+<div class="cl"></div>
+<div class="proInfoBox2 mb10 mt10">
+  <ul class="fl">
+    <%#= labelled_fields_for :issue, @issue do |f| %>
+    <%#= f.select :status_id, ([["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0])),
+                     {:include_blank => false, :selected => @status_id ? @status_id : 0 },
+                     {:onchange=>"remote_function('#issue_query_form_#{activity.id}');",:id=>"status_id",:name=>"status_id",:class=>"w70 undis issueEdit"} %>
+    <%# end %>
+    <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "status"},:remote=>'true', :method => :put, :id=>"issue_query_form_#{activity.id}", :class => 'query_form') do %>
+        <li>
+          <p class="label03">&nbsp;状态&nbsp;&nbsp;:&nbsp;</p>
+          <p class="proInfoP"><span><%= activity.status.name %></span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a></p>
+          <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
+                      {:include_blank => false, :selected => @status_id ? @status_id : 0 },
+                      {:onchange=>"remote_function('#issue_query_form_#{activity.id}');",:id=>"status_id",:name=>"status_id",:class=>"w70 undis issueEdit",:style=>"white-space:nowrap; overflow:hidden;"}
+              )
+          %>
+        </li>
+    <% end %>
+    <div class="cl"></div>
+    <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "assigned"},:remote=>'true', :method => :put, :id=>"issue_query_assign_form_#{activity.id}", :class => 'query_form') do %>
+        <li>
+          <p class="label03">&nbsp;指派&nbsp;&nbsp;:&nbsp;</p>
+      <span class="pro_info_p" style="width:130px;">
+        <%= link_to activity.try(:assigned_to).show_name, user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %>
+        <a href="javascript:void(0)" class="pic_edit2 ml5" style="vertical-align:top;"></a></span>
+          <%= select( :issue, :user_id, principals_options_for_isuue_list(activity.project),
+                      { :include_blank => false,:selected => @assign_to_id ? @assign_to_id : 0},
+                      {:onchange=>"remote_function('#issue_query_assign_form_#{activity.id}');", :id =>"assigned_to_id", :name => "assigned_to_id",:class=>"undis issueEdit", :style => "width:130px;"}) %>
+        </li>
+    <% end %>
+    <div class="cl"></div>
+  </ul>
+
+  <ul class="fl">
+    <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "prior"},:remote=>'true', :method => :put, :id=>"issue_query_prior_form_#{activity.id}", :class => 'query_form') do %>
+        <li>
+          <p class="label03">&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p>
+          <span class="proInfoP" style="width:70px;"><span><%= activity.priority.name %></span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a> </span>
+          <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
+                      {:include_blank => false,:selected=>@priority_id ?  @priority_id : 0},
+                      {:onchange=>"remote_function('#issue_query_prior_form_#{activity.id}');",:id=>"priority_id",:name=>"priority_id",:class=>"w70 undis issueEdit"}) %>
+        </li>
+    <% end %>
+    <div class="cl"></div>
+    <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "ratio"},:remote=>'true', :method => :put, :id=>"issue_query_done_form_#{activity.id}", :class => 'query_form') do %>
+        <li>
+          <p class="label03">&nbsp;完成度&nbsp;&nbsp;:&nbsp;</p>
+          <span class="proInfoP" style="width:70px;"><span><%= activity.done_ratio %>%</span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a> </span>
+          <%= select( :issue,:done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }),
+                      {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0},
+                      {:onchange=>"remote_function('#issue_query_done_form_#{activity.id}');",:id=>"done_ratio",:name=>"done_ratio",:class=>"w70 undis issueEdit"}) %>
+    <% end %>
+    </li>
+
+    <div class="cl"></div>
+  </ul>
+  <ul class="fl ">
+    <li>
+      <p class="label03" style="width:50px;">&nbsp;开始&nbsp;&nbsp;:&nbsp;</p>
+      <p class="proInfoP" style="width:70px;"><span><%= format_date(activity.start_date) %></span></p>
+    </li>
+    <div class="cl"></div>
+    <li>
+      <p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p>
+      <span class="proInfoP" style="width:70px;"><%= l_hours(activity.estimated_hours) %></span> </li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="fl ml20">
+    <li>
+      <p class="label03">&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p>
+      <span class="proInfoP" style="width:100px;"><span><%= format_date(activity.due_date)? format_date(activity.due_date) : "--" %></span></span> </li>
+    <div class="cl"></div>
+    <li>
+      <p class="label03">&nbsp;<%=l(:milestone)%>&nbsp;&nbsp;:&nbsp;</p>
+      <span class="proInfoP" style="width:100px;"><%= (activity.fixed_version ? link_to_user_version(activity.fixed_version) : "--") %> </span> </li>
+    <div class="cl"></div>
+  </ul>
+  <!--pro_info_box end-->
+</div>

app/views/projects/_project_issue_reply.html.erb

@@ -0,0 +1,101 @@
+<% count = activity.journals.count %>
+<div class="homepagePostReply">
+  <%= render :partial => 'projects/project_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+
+  <% comments = activity.journals.includes(:user, :details).reorder("created_on desc").limit(3) %>
+  <% if count > 0 %>
+      <div class="" id="reply_div_<%= user_activity_id %>">
+        <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_issue_contents', :locals => {:comment => comment}%>
+
+                  <% if !comment.content_detail.blank? || comment.class == Journal %>
+                      <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                        <% if comment.class == Journal %>
+                            <% if comment.details.any? %>
+                                <% details_to_strings(comment.details).each do |string| %>
+                                    <p><%= string %></p>
+                                <% end %>
+                            <% end %>
+                            <P><%= comment.notes.html_safe %></P>
+                        <% else %>
+                            <%= comment.content_detail.html_safe %>
+                        <% end %>
+                      </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>
+
+                        <span style="position: relative" class="fr mr20">
+                            <%= link_to(
+                                        l(:button_reply),
+                                        {:controller => 'users', :action => 'reply_to', :reply_id => comment.id, :type => 'Issue', :user_activity_id => user_activity_id, :activity_id => activity.id},
+                                        :remote => true,
+                                        :method => 'get',
+                                        :title => l(:button_reply)) %>
+                          <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                        </span>
+                      <%= link_to(
+                                  l(:button_delete),
+                                  {:controller => 'issues',:action => 'delete_journal', :id => activity.id,:journal_id=>comment.id, :user_activity_id => user_activity_id},
+                                  :method => 'get',
+                                  :confirm => l(:text_are_you_sure),
+                                  :remote=>true,
+                                  :id => "delete_reply_#{activity.id}_#{comment.id}",
+                                  :class => 'fr mr20 undis',
+                                  :title => l(:button_delete)
+                          ) if comment.user_id == User.current.id %>
+
+                </span>
+                          <div class="cl"></div>
+                        </div>
+                      </div>
+                      <p id="reply_message_<%= comment.id%>"></p>
+                  <% end %>
+                </div>
+                <div class="cl"></div>
+              </li>
+          <% end %>
+        </ul>
+
+        <%#= render :partial => 'users/news_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Issue', :activity_id => activity.id} %>
+      </div>
+  <% end %>
+
+  <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+    <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+    <div class="homepagePostReplyInputContainer mb10">
+      <% if User.current.logged? %>
+          <div nhname='new_message_<%= user_activity_id %>' style="display:none;">
+            <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id, :user_activity_id => user_activity_id),:method => "post", :remote => true) do |f| %>
+                <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+                <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                <div class="cl"></div>
+                <p nhname='contentmsg_<%= user_activity_id%>'></p>
+            <% end%>
+          </div>
+      <% else %>
+          <%= render :partial => "projects/show_unlogged" %>
+      <% end %>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+  </div>
+
+</div>

app/views/projects/_project_reply_banner.html.erb

@@ -0,0 +1,32 @@
+<div class="homepagePostReplyBanner" id="reply_banner_<%=user_activity_id %>">
+  <div class="homepagePostReplyBannerCount">
+    <span>回复</span>
+    <span  class="reply_iconup" > ︿</span>
+    <span class="mr15"><%= count>0 ? "（#{count}）" : "" %></span><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+        </span>
+  </div>
+  <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+  <%if count>3 %>
+      <div class="homepagePostReplyBannerMore">
+        <% if activity.class.to_s == 'HomeworkCommon' %>
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply_homework('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'HomeworkCommon',<%=activity.id %>,<%=hw_status %>,<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+        <% elsif activity.class.to_s == 'Message' %>
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_message_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=is_course %>,<%=is_board %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+        <% elsif activity.class.to_s == 'BlogComment' %>
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_blog_comment_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=homepage %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+        <% else %>
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_all_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+        <% end %>
+      </div>
+  <% end %>
+</div>

app/views/projects/_show_unlogged.html.erb

@@ -0,0 +1,4 @@
+<div class="visitor-box fontGrey2">
+  <a href='<%= signin_url_without_domain %>' class='linkBlue' target='_Blank' >登录</a>后可添加回复
+  <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
+</div>