Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_local' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_local

Browse Source
dev_local
huang 6 years ago
parent 148356275f 27bdeb2aa8
commit 594100d6f3
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File

1
app/views/exercise/_choose_shixuns.html.erb
Unescape View File

@ -3,6 +3,7 @@
<div class="task_popup_con"> <div class="task_popup_con">
<%= labelled_form_for @exercise, :url =>{:controller=> 'exercise', :action => 'choose_shixuns', :id => @exercise.id, :is_search => 1}, :html => {:id => 'shixun_search_form'}, :method => "get", :remote => true do |f| %> <%= labelled_form_for @exercise, :url =>{:controller=> 'exercise', :action => 'choose_shixuns', :id => @exercise.id, :is_search => 1}, :html => {:id => 'shixun_search_form'}, :method => "get", :remote => true do |f| %>
<div class="clearfix mb10"> <div class="clearfix mb10">
<span class="fl color-orange-tip mt6">试卷仅支持只有1个关卡的实训题</span>
<div class="task-form-50 edu-position fr" style="padding:0;"> <div class="task-form-50 edu-position fr" style="padding:0;">
<input class="task-form-100 panel-box-sizing" placeholder="输入实训名称的关键字搜索" type="text" name="search"> <input class="task-form-100 panel-box-sizing" placeholder="输入实训名称的关键字搜索" type="text" name="search">
<a href="javascript:void(0);" onclick="$('#shixun_search_form').submit()" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a> <a href="javascript:void(0);" onclick="$('#shixun_search_form').submit()" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>

20
app/views/exercise/_new_shixun_exercise_list.html.erb
Unescape View File

@ -11,7 +11,7 @@
<% @shixuns.each do |shixun| %> <% @shixuns.each do |shixun| %>
<tr> <tr>
<td class="clearfix" style="padding-left: 20px"> <td class="clearfix" style="padding-left: 20px">
<input name="shixun_exercise" type="radio" class="magic-radio" id="shixun_input_<%= shixun.id %>" value="<%= shixun.id %>"> <input name="shixun_exercise" type="checkbox" class="magic-checkbox" id="shixun_input_<%= shixun.id %>" value="<%= shixun.id %>">
<label style="top:2px" for="shixun_input_<%= shixun.id %>"></label> <label style="top:2px" for="shixun_input_<%= shixun.id %>"></label>
<%= link_to shixun.name, shixun_path(shixun), :class => "edu-info-dark task-hide mt3 ml20",:style=> "text-align:left", :target => "_blank" %> <%= link_to shixun.name, shixun_path(shixun), :class => "edu-info-dark task-hide mt3 ml20",:style=> "text-align:left", :target => "_blank" %>
</td> </td>
@ -22,16 +22,16 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<p id="exercise_type_notice" class="color-red none">请至少选择一个实训</p> <p style="height: 20px;line-height: 20px;"><span id="exercise_type_notice" class="color-red none">请至少选择一个实训</span></p>
<div class="clearfix"> <div class="clearfix edu-txt-center mt10">
<div class="clearfix fr mt15"> <div class="inline">
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="new_shixun_exercise();">选择</a> <a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="new_shixun_exercise();">选择</a>
<a href="javascript:void(0);" class="task-btn fr pop_close mr10" onclick="hideModal();">取消</a> <a href="javascript:void(0);" class="task-btn fr pop_close mr10" onclick="hideModal();">取消</a>
</div> </div>
<div class="fl pages_user_show mt10"> <!--<div class="fl pages_user_show mt10">-->
<ul> <!--<ul>-->
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %> <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>-->
</ul> <!--</ul>-->
<div class="cl"></div> <!--<div class="cl"></div>-->
</div> <!--</div>-->
</div> </div>
Write Preview
Loading…
Cancel
Save