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

app/controllers/organizations_controller.rb

@@ -56,6 +56,7 @@ class OrganizationsController < ApplicationController
     @organization.description = params[:organization][:description]
     @organization.is_public = params[:organization][:is_public]
     @organization.allow_guest_download = params[:organization][:allow_guest_download] == '1' ? 1 : 0
+    @organization.show_mode = params[:show_mode]
     @organization.creator_id = User.current.id
     member = OrgMember.new(:user_id => User.current.id)
 
@@ -120,6 +121,7 @@ class OrganizationsController < ApplicationController
     # @organization.domain = params[:organization][:domain]
     @organization.is_public = params[:organization][:is_public] == 'on' ? 1 : 0
     @organization.allow_guest_download = params[:organization][:allow_guest_download] == 'on' ? 1 : 0
+    @organization.show_mode = params[:show_mode]
     #@organization.name = params[:organization][:name]
     @organization.save
      respond_to do |format|

app/views/organizations/new.html.erb

@@ -28,6 +28,13 @@
                              value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}" %>
           </p>
         </li>
+        <!--<li class=" mb5 ml45">-->
+          <!--<span style="margin-left:10px;" >显示模式&nbsp;&nbsp;&nbsp;&nbsp;: </span>-->
+          <!--<input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:2px;" checked />-->
+          <!--<label for="show_mode_ordinary">社区模式一</label>-->
+          <!--<input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" />-->
+          <!--<label for="show_mode_special">社区模式二</label>-->
+        <!--</li>-->
         <li class=" mb5 ml80">
           <label >公开&nbsp;&nbsp;：</label>
           <input id="organization_is_public" name="organization[is_public]" onclick="disable_down($(this), $('#organization_alow_download'), $('#allow_down_hint'));" type="checkbox" value="1" checked="checked">

app/views/organizations/setting.html.erb

@@ -72,6 +72,13 @@
           <!--class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 -->
         </div>
         <div class="cl"></div>
+        <!--<div class="orgRow mb10 mt5">-->
+          <!--<span style="margin-left:10px;" >显示模式&nbsp;: </span>-->
+          <!--<input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:5px;" <%= @organization.show_mode == 0 ? "checked" : "" %> />-->
+          <!--<label for="show_mode_ordinary">社区模式一</label>-->
+          <!--<input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" <%= @organization.show_mode == 1 ? "checked" : "" %> />-->
+          <!--<label for="show_mode_special">社区模式二</label>-->
+        <!--</div>-->
         <div class="orgRow mb10 mt5"><span style="margin-left:38px;" >公开&nbsp;: </span>
           <input type="checkbox" id="is_public" onclick="disable_down($(this), $('#allow_download'),$('#allow_down_hint'));"  name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
         </div>

app/views/users/_course_file_form.html.erb

@@ -0,0 +1,26 @@
+<%= form_tag add_exist_file_to_course_user_path(user),:remote=>true,:id=>'course_list_form' do %>
+    <div>
+      <%= hidden_field_tag(:send_id, send_id) %>
+      <%= hidden_field_tag(:send_ids, send_ids) %>
+      <div class="courseReferContainer">
+        <% if !courses.empty?  %>
+            <% courses.each do |course| %>
+                <ul class="courseSend">
+                  <li class="" style="display:inline-block">
+                    <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+                  </li>
+                  <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
+                </ul>
+            <% end %>
+        <% end %>
+      </div>
+    </div>
+    <div>
+      <div class="courseSendSubmit">
+        <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+        <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+      </div>
+      <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
+    </div>
+    <div class="cl"></div>
+<% end %>

app/views/users/_course_message_form.html.erb

@@ -0,0 +1,26 @@
+<%= form_tag share_message_to_course_user_path(user), :remote => true, :id => 'course_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !courses.empty? %>
+        <% courses.each do |course| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= truncate(course.name, :lendght => 25) + '['+course.time.to_s+course.term + ']' %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel">
+    <a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
+</div>
+<div class="cl"></div>

app/views/users/_course_news_form.html.erb

@@ -0,0 +1,26 @@
+<%= form_tag share_news_to_course_user_path(user), :remote => true, :id => 'course_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !courses.empty? %>
+        <% courses.each do |course| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= truncate(course.name, :lendght => 25) + '['+course.time.to_s+course.term + ']' %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a>
+  </div>
+</div>
+<div class="cl"></div>

app/views/users/_org_file_form.html.erb

@@ -0,0 +1,32 @@
+<%= form_tag add_exist_file_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="sectionWrap fl mr15">
+
+      <ul class="fontGrey3 sectionContent">
+        <% unless orgs.empty? %>
+            <% orgs.each do |org|%>
+                <li>
+                  <label>
+                    <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id)%>')" class="mt3 fl mr5" />
+                    <span><%= org.name%></span></label>
+                </li>
+            <%end%>
+        <%end%>
+      </ul>
+    </div>
+    <div class="columnWrap">
+      <ul class="columnContent">
+        <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
+      </ul>
+    </div>
+    <div class="cl"></div>
+    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
+    <div class="courseSendSubmit mr15">
+      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
+    </div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
+    </div>
+    <div class="cl"></div>
+<%end %>

app/views/users/_org_message_form.html.erb

@@ -0,0 +1,31 @@
+<%= form_tag share_message_to_org_user_path(user), :remote => true, :id => 'orgs_list_form' do %>
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="sectionWrap fl mr15">
+      <ul class="fontGrey3 sectionContent">
+        <% unless orgs.empty? %>
+            <% orgs.each do |org| %>
+                <li>
+                  <label>
+                    <input type="radio" name="org_id" value="<%= org.id %>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id,:send_type => params[:send_type])%>')" class="mt3 fl mr5"/>
+                    <span><%= org.name %></span></label>
+                </li>
+            <% end %>
+        <% end %>
+      </ul>
+    </div>
+    <div class="columnWrap">
+      <ul class="columnContent">
+        <%= render :partial => 'users/org_resources_subfield', :locals => {:subfield => nil} %>
+      </ul>
+    </div>
+    <div class="cl"></div>
+    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
+    <div class="courseSendSubmit mr15">
+      <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();', :onclick => "check_des(event);" %>
+    </div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
+    </div>
+    <div class="cl"></div>
+<% end %>

app/views/users/_org_news_form.html.erb

@@ -0,0 +1,32 @@
+<%= form_tag share_news_to_org_user_path(user), :remote => true, :id => 'orgs_list_form' do %>
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="sectionWrap fl mr15">
+
+      <ul class="fontGrey3 sectionContent">
+        <% unless orgs.empty? %>
+            <% orgs.each do |org| %>
+                <li>
+                  <label>
+                    <input type="radio" name="org_id" value="<%= org.id %>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id,:send_type => params[:send_type])%>')" class="mt3 fl mr5"/>
+                    <span><%= org.name %></span></label>
+                </li>
+            <% end %>
+        <% end %>
+      </ul>
+    </div>
+    <div class="columnWrap">
+      <ul class="columnContent">
+        <%= render :partial => 'users/org_resources_subfield', :locals => {:subfield => nil} %>
+      </ul>
+    </div>
+    <div class="cl"></div>
+    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
+    <div class="courseSendSubmit mr15">
+      <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();', :onclick => "check_des(event);" %>
+    </div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
+    </div>
+    <div class="cl"></div>
+<% end %>

app/views/users/_project_file_form.html.erb

@@ -0,0 +1,25 @@
+<%= form_tag add_exist_file_to_project_user_path(user), :remote => true, :id => 'projects_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !projects.empty? %>
+        <% projects.each do |project| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= project.name %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+</div>
+<div class="cl"></div>

app/views/users/_project_message_form.html.erb

@@ -0,0 +1,25 @@
+<%= form_tag share_message_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !projects.empty?  %>
+        <% projects.each do |project| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="project_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= project.name%></li>
+            </ul>
+        <% end %>
+        </div>
+        </div>
+        <div>
+          <div class="courseSendSubmit">
+            <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+            <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+          </div>
+          <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+        </div>
+        <div class="cl"></div>
+    <% end %>

app/views/users/_project_news_form.html.erb

@@ -0,0 +1,25 @@
+<%= form_tag share_news_to_project_user_path(user), :remote => true, :id => 'projects_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !projects.empty? %>
+        <% projects.each do |project| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="project_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= project.name %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+</div>
+<div class="cl"></div>

app/views/users/_resource_share_for_orgs.html.erb

@@ -18,42 +18,6 @@
   <% end %>
     <div class="cl"></div>
 </div>
-<%= form_tag add_exist_file_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-  <div class="sectionWrap fl mr15">
-
-    <ul class="fontGrey3 sectionContent">
-      <% unless @orgs.empty? %>
-          <% @orgs.each do |org|%>
-              <li>
-                <label>
-                  <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id)%>')" class="mt3 fl mr5" />
-                  <span><%= org.name%></span></label>
-              </li>
-          <%end%>
-      <%end%>
-    </ul>
-  </div>
-  <div class="columnWrap">
-    <ul class="columnContent">
-      <!--<span class="fontBlue pl10">请在左侧选择要转发的位置</span>-->
-      <!--<li style="background-color:#f1f1f1; color:#555555; padding-top:2px; padding-bottom:2px;">请选择栏目：</li>-->
-     <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
-      <!--<li>-->
-        <!--<label>-->
-          <!--<input type="radio" name="sendColumn" class="mt3 fl mr5" />-->
-          <!--<span>动态</span></label>-->
-      <!--</li>-->
-    </ul>
-  </div>
-  <div class="cl"></div>
-  <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
-  <div class="courseSendSubmit mr15">
-    <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
-  </div>
-  <div class="courseSendCancel">
-    <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
-  </div>
-  <div class="cl"></div>
- <%end %>
+<div id="org_file_form">
+  <%= render :partial => 'users/org_file_form', :locals => {:user => user, :orgs => @orgs, :send_id => send_id, :send_ids => send_ids} %>
+</div>

app/views/users/_resource_share_for_project_popup.html.erb

@@ -24,31 +24,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag add_exist_file_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
-  <div>
-
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-    <% if !projects.empty?  %>
-        <% projects.each do |project| %>
-        <ul class="courseSend">
-          <li class="" style="display:inline-block">
-            <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
-          </li>
-          <li class="sendCourseName"><%= project.name%></li>
-        </ul>
-        <% end %>
-    </div>
+  <div id="project_file_form">
+    <%= render :partial => 'users/project_file_form', :locals => {:user => user, :projects => projects, :send_id => send_id, :send_ids => send_ids} %>
   </div>
-  <div>
-    <div class="courseSendSubmit">
-      <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-    </div>
-    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-  </div>
-  <div class="cl"></div>
-    <% end %>
 </div>
 

app/views/users/_resource_share_popup.html.erb

@@ -26,31 +26,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag add_exist_file_to_course_user_path(user),:remote=>true,:id=>'course_list_form' %>
-      <div>
-
-        <%= hidden_field_tag(:send_id, send_id) %>
-        <%= hidden_field_tag(:send_ids, send_ids) %>
-        <div class="courseReferContainer">
-        <% if !courses.empty?  %>
-            <% courses.each do |course| %>
-            <ul class="courseSend">
-              <li class="" style="display:inline-block">
-                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-              </li>
-              <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
-            </ul>
-            <% end %>
-          </div>
-      </div>
-      <div>
-        <div class="courseSendSubmit">
-          <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-          <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-        </div>
-        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
-      </div>
-      <div class="cl"></div>
-  <% end %>
+  <div id="course_file_form">
+    <%= render :partial => "users/course_file_form", :locals => {:user => user, :send_id => send_id, :send_ids => send_ids, :courses => courses} %>
+  </div>
 </div>
 

app/views/users/_share_message_to_course.html.erb

@@ -26,31 +26,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag share_message_to_course_user_path(user),:remote=>true,:id=>'course_list_form' %>
-  <div>
-
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-      <% if !courses.empty?  %>
-          <% courses.each do |course| %>
-              <ul class="courseSend">
-                <li class="" style="display:inline-block">
-                  <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-                </li>
-                <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
-              </ul>
-          <% end %>
-          </div>
-          </div>
-          <div>
-            <div class="courseSendSubmit">
-              <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-              <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-            </div>
-            <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-      </div>
+  <div id="course_message_form">
+    <%= render :partial => 'users/course_message_form', :locals => {:user => user, :courses => courses, :send_id => send_id, :send_ids => send_ids} %>
+  </div>
+</div>
 

app/views/users/_share_message_to_org.html.erb

@@ -18,42 +18,6 @@
   <% end %>
   <div class="cl"></div>
 </div>
-<%= form_tag share_message_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="sectionWrap fl mr15">
-
-      <ul class="fontGrey3 sectionContent">
-        <% unless @orgs.empty? %>
-            <% @orgs.each do |org|%>
-                <li>
-                  <label>
-                    <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id,:send_type => params[:send_type])%>')" class="mt3 fl mr5" />
-                    <span><%= org.name%></span></label>
-                </li>
-            <%end%>
-        <%end%>
-      </ul>
-    </div>
-    <div class="columnWrap">
-      <ul class="columnContent">
-        <!--<span class="fontBlue pl10">请在左侧选择要转发的位置</span>-->
-        <!--<li style="background-color:#f1f1f1; color:#555555; padding-top:2px; padding-bottom:2px;">请选择栏目：</li>-->
-        <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
-        <!--<li>-->
-        <!--<label>-->
-        <!--<input type="radio" name="sendColumn" class="mt3 fl mr5" />-->
-        <!--<span>动态</span></label>-->
-        <!--</li>-->
-      </ul>
-    </div>
-    <div class="cl"></div>
-    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
-    <div class="courseSendSubmit mr15">
-      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
-    </div>
-    <div class="courseSendCancel">
-      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
-    </div>
-    <div class="cl"></div>
-<%end %>
+<div id="org_message_form">
+  <%= render :partial => 'users/org_message_form',:locals => {:user => user, :orgs => @orgs, :send_id => send_id, :send_ids => send_ids} %>
+</div>

app/views/users/_share_message_to_project.html.erb

@@ -24,30 +24,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag share_message_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
-  <div>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-      <% if !projects.empty?  %>
-          <% projects.each do |project| %>
-              <ul class="courseSend">
-                <li class="" style="display:inline-block">
-                  <input name="project_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
-                </li>
-                <li class="sendCourseName"><%= project.name%></li>
-              </ul>
-          <% end %>
-          </div>
-          </div>
-          <div>
-            <div class="courseSendSubmit">
-              <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-              <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-            </div>
-            <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-      </div>
+  <div id="project_message_form">
+    <%= render :partial => 'users/project_message_form', :locals => {:projects => projects, :user => user, :send_id => send_id, :send_ids => send_ids} %>
+  </div>
+</div>
 

app/views/users/_share_news_to_course.html.erb

@@ -26,31 +26,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag share_news_to_course_user_path(user),:remote=>true,:id=>'course_list_form' %>
-  <div>
-
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-      <% if !courses.empty?  %>
-          <% courses.each do |course| %>
-              <ul class="courseSend">
-                <li class="" style="display:inline-block">
-                  <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-                </li>
-                <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
-              </ul>
-          <% end %>
-          </div>
-          </div>
-          <div>
-            <div class="courseSendSubmit">
-              <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-              <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-            </div>
-            <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-      </div>
+  <div id="course_news_form">
+    <%= render :partial => 'users/course_news_form',:locals => {:user => user, :courses => courses, :send_id => send_id, :send_ids => send_ids} %>
+  </div>
+</div>
 

app/views/users/_share_news_to_org.html.erb

@@ -18,42 +18,6 @@
   <% end %>
   <div class="cl"></div>
 </div>
-<%= form_tag share_news_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="sectionWrap fl mr15">
-
-      <ul class="fontGrey3 sectionContent">
-        <% unless @orgs.empty? %>
-            <% @orgs.each do |org|%>
-                <li>
-                  <label>
-                    <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id,:send_type => params[:send_type])%>')" class="mt3 fl mr5" />
-                    <span><%= org.name%></span></label>
-                </li>
-            <%end%>
-        <%end%>
-      </ul>
-    </div>
-    <div class="columnWrap">
-      <ul class="columnContent">
-        <!--<span class="fontBlue pl10">请在左侧选择要转发的位置</span>-->
-        <!--<li style="background-color:#f1f1f1; color:#555555; padding-top:2px; padding-bottom:2px;">请选择栏目：</li>-->
-        <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
-        <!--<li>-->
-        <!--<label>-->
-        <!--<input type="radio" name="sendColumn" class="mt3 fl mr5" />-->
-        <!--<span>动态</span></label>-->
-        <!--</li>-->
-      </ul>
-    </div>
-    <div class="cl"></div>
-    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
-    <div class="courseSendSubmit mr15">
-      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
-    </div>
-    <div class="courseSendCancel">
-      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
-    </div>
-    <div class="cl"></div>
-<%end %>
+<div id="org_news_form">
+  <%= render :partial => 'users/org_news_form', :locals => {:orgs => @orgs, :user => user,:send_id => send_id, :send_ids => send_ids} %>
+</div>

app/views/users/_share_news_to_project.html.erb

@@ -24,31 +24,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag share_news_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
-  <div>
-
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-      <% if !projects.empty?  %>
-          <% projects.each do |project| %>
-              <ul class="courseSend">
-                <li class="" style="display:inline-block">
-                  <input name="project_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
-                </li>
-                <li class="sendCourseName"><%= project.name%></li>
-              </ul>
-          <% end %>
-          </div>
-          </div>
-          <div>
-            <div class="courseSendSubmit">
-              <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-              <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-            </div>
-            <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-      </div>
+  <div id="project_news_form">
+    <%= render :partial => 'users/project_news_form', :locals => {:user => user, :projects => projects, :send_id => send_id, :send_ids => send_ids} %>
+  </div>
+</div>
 

app/views/users/search_user_course.js.erb

@@ -9,18 +9,28 @@
 //$("#upload_box").css('left','').css('top','');
 //$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 //$("#upload_box").css('display','block');
-<% if params[:send_type].present? && params[:send_type] == 'news' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
-<% elsif params[:send_type] == 'file' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
-<% elsif params[:send_type] == 'message' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+<% if params[:is_observe].nil? %>
+    <% if params[:send_type].present? && params[:send_type] == 'news' %>
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+    <% elsif params[:send_type] == 'file' %>
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+    <% elsif params[:send_type] == 'message' %>
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+    <% end %>
+    showModal('ajax-modal', '452px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+    $('#ajax-modal').parent().css("top","50%").css("left","50%");
+    $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
+    $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    var val =  $("#search_course_input").val();
+    $("#search_course_input").val("").focus().val(val);
+<% else %>
+    <% if params[:send_type] == 'news' %>
+        $("#course_news_form").html("<%= escape_javascript(render :partial => 'users/course_news_form', :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>")
+    <% elsif params[:send_type] == 'file' %>
+        $("#course_file_form").html("<%= escape_javascript(render :partial => 'users/course_file_form', :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% elsif params[:send_type] == 'message' %>
+        $("#course_message_form").html("<%= escape_javascript(render :partial => 'users/course_message_form', :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% end %>
 <% end %>
-showModal('ajax-modal', '452px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
-$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-var val =  $("#search_course_input").val();
-$("#search_course_input").val("").focus().val(val);

app/views/users/search_user_org.js.erb

@@ -1,3 +1,4 @@
+<% if params[:is_observe].nil? %>
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% elsif params[:send_type] == 'file' %>
@@ -12,4 +13,13 @@ $('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 var val =  $("#search_org_input").val();
-$("#search_org_input").val("").focus().val(val);
+$("#search_org_input").val("").focus().val(val);
+<% else %>
+    <% if params[:send_type] == 'news' %>
+    $("#org_news_form").html("<%= escape_javascript(render :partial => 'users/org_news_form', :locals => {:orgs => @orgs,:user=> @user,:send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% elsif params[:send_type] == 'file' %>
+    $("#org_file_form").html("<%= escape_javascript(render :partial => 'users/org_file_form', :locals => {:orgs => @orgs,:user=> @user,:send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% elsif params[:send_type] == 'message' %>
+    $("#org_message_form").html("<%= escape_javascript(render :partial => 'users/org_message_form', :locals => {:orgs => @orgs,:user=> @user,:send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% end %>
+<% end %>

app/views/users/search_user_project.js.erb

@@ -1,3 +1,4 @@
+<% if params[:is_observe].nil? %>
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'file' %>
@@ -14,3 +15,12 @@ $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 //$("#search_project_input").focus();
 var val =  $("#search_project_input").val();
 $("#search_project_input").val("").focus().val(val);
+<% else %>
+<% if params[:send_type] == 'news' %>
+$("#project_news_form").html("<%= escape_javascript(render :partial => 'users/project_news_form', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+<% elsif params[:send_type] == 'file' %>
+$("#project_file_form").html("<%= escape_javascript(render :partial => 'users/project_file_form', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+<% elsif params[:send_type] == 'message' %>
+$("#project_message_form").html("<%= escape_javascript(render :partial => 'users/project_message_form', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+<% end %>
+<% end %>

db/migrate/20160328022312_add_coulumn_show_mode_to_organizations.rb

@@ -0,0 +1,5 @@
+class AddCoulumnShowModeToOrganizations < ActiveRecord::Migration
+  def change
+    add_column :organizations, :show_mode, :integer, :default => 0
+  end
+end

db/migrate/20160328022623_set_show_mode_for_organizations.rb

@@ -0,0 +1,12 @@
+class SetShowModeForOrganizations < ActiveRecord::Migration
+  def up
+    Organization.transaction do
+      Organization.all.each do |org|
+        org.update_attribute(:show_mode, 0)
+      end
+    end
+  end
+
+  def down
+  end
+end

public/javascripts/application.js

@@ -1055,7 +1055,7 @@ function observeSearchfieldOnInput(fieldId, url,send_id,send_ids, send_type) {
         $.ajax({
           url: url,
           type: 'get',
-          data: {search: $this.val(),send_id:send_id,send_ids:send_ids, send_type:send_type},
+          data: {search: $this.val(),send_id:send_id,send_ids:send_ids, send_type:send_type, is_observe:true},
           success: function(data){  },
           beforeSend: function(){ $this.addClass('ajax-loading'); },
           complete: function(){ $this.removeClass('ajax-loading'); }
@@ -1065,10 +1065,10 @@ function observeSearchfieldOnInput(fieldId, url,send_id,send_ids, send_type) {
     var reset = function() {
       if (timer) {
         clearInterval(timer);
-        timer = setInterval(check, 300);
+        timer = setInterval(check, 500);
       }
     };
-    var timer = setInterval(check, 300);
+    var timer = setInterval(check, 500);
     $this.bind('keyup click mousemove', reset);
   });
 }