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

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

Conflicts:
	app/views/poll/_show_mulit.html.erb
This commit is contained in:
cxt 2016-10-27 15:39:26 +08:00
parent 2bd044bea7 437512a6d8
commit df4bb86cdd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/poll/_show_mulit.html.erb
View File

@ -3,17 +3,17 @@
<%= render :partial => "poll_tool_bar", :locals => {:type => 'mulit', :poll_question => poll_question}%> <%= render :partial => "poll_tool_bar", :locals => {:type => 'mulit', :poll_question => poll_question}%>
</div> </div>
<div class="poll-content"> <div class="poll-content">
<div class="testEditTitle"> <div class="testEditTitle" style="padding-top:0;">
<span class="formatContainer m_w500"><%= poll_question.question_title %></span> <span class="formatContainer m_w500"><%= poll_question.question_title %></span>
<span class="fontBlue">[多行主观题]</span> <span class="fontBlue">[多行主观题]</span>
</div> </div>
<a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a> <a class="poll-edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
<div class="cl"></div> <div class="cl"></div>
<% poll_question.poll_answers.reorder("answer_position").each_with_index do |poll_answer, i| %> <% poll_question.poll_answers.reorder("answer_position").each_with_index do |poll_answer, i| %>
<div class="ml40 mb10"> <div class="ml20 mb10">
<p class="mb10"><%= i + 1 %>.<%= poll_answer.answer_text%></p> <p class="mb10"><%= i + 1 %>.<%= poll_answer.answer_text%></p>
<input type="text" class="questionnaire-input" name="<%= poll_question %>" style="width:652px;" /> <input type="text" class="questionnaire-input" name="<%= poll_question %>" style="width:620px;" />
</div> </div>
<% end %> <% end %>
</div> </div>