jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge bug

This commit is contained in:
alan 2016-03-29 12:29:23 +08:00
parent eb1c6ccf85
commit e9069f0225
3 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/views/users/_course_file_form.html.erb
View File

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

62
app/views/users/_org_file_form.html.erb
View File

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

50
app/views/users/_project_file_form.html.erb
View File

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