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

app/views/issues/add_journal.js.erb

@@ -1,8 +1,13 @@
-<% if @issue_id %> //issue详情中回复
+<% if @issue_id %> //issue详情中回复
-    <%= render "jounal_refresh" %>
+<%= render "jounal_refresh" %>
-<%else%>
+<%else%>
-    $("#div_user_issue_reply_<%=@user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
+<% if params[:is_project] %>
-    sd_create_editor_from_data(<%= @user_activity_id %>, null, "100%", "UserActivity");
+$("#div_user_issue_reply_<%=@user_activity_id %>").html("<%= escape_javascript(render :partial => 'projects/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
-//init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", 'UserActivity');
+<% else %>
-   // sd_create_editor_from_data(<%#= @issue.id%>, null, "100%");
+$("#div_user_issue_reply_<%=@user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
-<%end %>
+<% end %>
+
+sd_create_editor_from_data(<%= @user_activity_id %>, null, "100%", "UserActivity");
+//init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", 'UserActivity');
+// sd_create_editor_from_data(<%#= @issue.id%>, null, "100%");
+<%end %>

app/views/issues/delete_journal.js.erb

@@ -1,6 +1,10 @@
-<% if @user_activity_id %>
+<% if @user_activity_id %>
-$("#div_user_issue_reply_<%=@user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
+<% if params[:id_project] %>
-sd_create_editor_from_data(<%= @user_activity_id%>, null, "100%","<%=@issue.class.name%>");
+$("#div_user_issue_reply_<%=@user_activity_id%>").html("<%= escape_javascript(render :partial => 'projects/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
-<% else %>
+<% else %>
-    <%= render "jounal_refresh" %>
+$("#div_user_issue_reply_<%=@user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
+<% end %>
+sd_create_editor_from_data(<%= @user_activity_id%>, null, "100%","<%=@issue.class.name%>");
+<% else %>
+<%= render "jounal_refresh" %>
 <% end %>

app/views/projects/_act_issues.html.erb

@@ -76,7 +76,7 @@
               <% end %>
           <% end %>
           <div class="cl"></div>
-          <div class="mt10" style="font-weight:normal;">
+          <div class="mb10" style="font-weight:normal;">
             <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
           </div>
         </div>

app/views/projects/_project_issue_detail.html.erb

@@ -48,7 +48,7 @@
           <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;"}
+                      {:onchange=>"remote_function('#issue_query_form_#{activity.id}');",:id=>"status_id",:name=>"status_id",:class=>"w130 undis issueEdit",:style=>"white-space:nowrap; overflow:hidden;"}
               )
           %>
         </li>
@@ -62,7 +62,7 @@
         <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;"}) %>
+                      {:onchange=>"remote_function('#issue_query_assign_form_#{activity.id}');", :id =>"assigned_to_id", :name => "assigned_to_id",:class=>"w130 undis issueEdit"}) %>
         </li>
     <% end %>
     <div class="cl"></div>
@@ -75,7 +75,7 @@
           <span class="proInfoP"><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"}) %>
+                      {:onchange=>"remote_function('#issue_query_prior_form_#{activity.id}');",:id=>"priority_id",:name=>"priority_id",:class=>"w130 undis issueEdit"}) %>
         </li>
     <% end %>
     <div class="cl"></div>
@@ -85,7 +85,7 @@
           <span class="proInfoP" style="width:130px;"><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"}) %>
+                      {:onchange=>"remote_function('#issue_query_done_form_#{activity.id}');",:id=>"done_ratio",:name=>"done_ratio",:class=>"w130 undis issueEdit"}) %>
     <% end %>
     </li>
 

app/views/projects/_project_issue_reply.html.erb

@@ -43,7 +43,7 @@
                         <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},
+                                        {:controller => 'users', :action => 'reply_to', :reply_id => comment.id, :type => 'Issue', :user_activity_id => user_activity_id, :activity_id => activity.id, :is_project => true},
                                         :remote => true,
                                         :method => 'get',
                                         :title => l(:button_reply)) %>
@@ -51,7 +51,7 @@
                         </span>
                       <%= link_to(
                                   l(:button_delete),
-                                  {:controller => 'issues',:action => 'delete_journal', :id => activity.id,:journal_id=>comment.id, :user_activity_id => user_activity_id},
+                                  {:controller => 'issues',:action => 'delete_journal', :id => activity.id,:journal_id=>comment.id, :user_activity_id => user_activity_id, :is_project => true},
                                   :method => 'get',
                                   :confirm => l(:text_are_you_sure),
                                   :remote=>true,
@@ -81,7 +81,7 @@
     <div class="reply-content 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| %>
+            <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id, :user_activity_id => user_activity_id, :is_project => true),: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>

app/views/projects/_reply_to.html.erb

@@ -0,0 +1,38 @@
+<div class="<%= User.current.logged? ? 'orig_reply_box' : 'orig_reply_box2' %> borderBottomNone" id="reply_to_message_<%= reply.id%>">
+  <% if User.current.logged? %>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+      <div class="orig_textarea mb10 fl">
+        <div nhname='new_message_<%= reply.id%>'>
+          <% if @type == 'Message' %>
+              <%= form_for('new_form',:url => {:controller => 'messages', :action => 'reply', :id => reply.id, :board_id => reply.board.id}, :method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'is_course', params[:is_course], :value => @is_course %>
+                  <%= hidden_field_tag 'is_board', params[:is_board], :value => @is_board %>
+                  <%= hidden_field_tag 'parent_id', params[:parent_id], :value => reply.id %>
+                  <%= hidden_field_tag 'activity_id',params[:activity_id],:value =>@activity_id %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
+                  <div nhname='toolbar_container_<%= reply.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="content"></textarea>
+                  <a id="new_message_submit_btn_<%= reply.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_<%= reply.id%>'></p>
+              <% end%>
+          <% elsif @type == 'Issue' %>
+              <%= form_for('new_form',:url => add_reply_issue_path(reply.issue.id),:method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'journal_id',params[:journal_id],:value =>reply.id %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
+                  <div nhname='toolbar_container_<%= reply.id%>' ></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="content"></textarea>
+                  <a id="new_message_submit_btn_<%= reply.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_<%= reply.id%>' class="fl"></p>
+              <% end %>
+
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </div>
+  <% else %>
+      <%= render :partial => "users/show_unlogged_reply" %>
+  <% end %>
+  <div class="cl"></div>
+</div>

app/views/users/reply_to.js.erb

@@ -1,10 +1,14 @@
-if($("#reply_message_<%= @reply.id%>").length > 0) {
+if($("#reply_message_<%= @reply.id%>").length > 0) {
-    $("#reply_message_<%= @reply.id%>").replaceWith("<%= escape_javascript(render :partial => 'users/reply_to', :locals => {:reply => @reply}) %>");
+    <% if params[:is_project] %>
-    $("#reply_iconup_<%=@reply.id %>").show();
+    $("#reply_message_<%= @reply.id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/reply_to', :locals => {:reply => @reply}) %>");
-    $(function(){
+    <% else %>
-        sd_create_editor_from_data(<%= @reply.id%>,null,"100%", "<%=@reply.class.to_s%>");
+    $("#reply_message_<%= @reply.id%>").replaceWith("<%= escape_javascript(render :partial => 'users/reply_to', :locals => {:reply => @reply}) %>");
-    });
+    <% end %>
-}else if($("#reply_to_message_<%= @reply.id%>").length >0) {
+    $("#reply_iconup_<%=@reply.id %>").show();
-    $("#reply_to_message_<%= @reply.id%>").replaceWith("<p id='reply_message_<%= @reply.id%>'></p>");
+    $(function(){
-    $("#reply_iconup_<%=@reply.id %>").hide();
+        sd_create_editor_from_data(<%= @reply.id%>,null,"100%", "<%=@reply.class.to_s%>");
+    });
+}else if($("#reply_to_message_<%= @reply.id%>").length >0) {
+    $("#reply_to_message_<%= @reply.id%>").replaceWith("<p id='reply_message_<%= @reply.id%>'></p>");
+    $("#reply_iconup_<%=@reply.id %>").hide();
 }

public/stylesheets/css/common.css

@@ -234,6 +234,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .w108 {width:108px;}
 .w125{width:125px;}
 .w128{ width:128px;}
+.w130{ width:130px;}
 .w140{ width:140px;}
 .w150{ width:150px;}
 .w170{width:170px;}

public/stylesheets/css/public.css

@@ -1156,7 +1156,7 @@ input.new_loggin_input{
     margin-top:250px;
 }
 /*未登录回复提示*/
-.visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+.visitor-box {height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
 
 /* 个人资料修改弹框 */
 .winbox{