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

app/views/exercise/_exercise_student.html.erb

@@ -203,7 +203,7 @@
                 <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                   <div class="fl">
                     <%= convert_to_char((index + 1).to_s) %>
-                  </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                  </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                 </label>
               </li>
           <% end %>
@@ -250,7 +250,7 @@
                 <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                   <div class="fl">
                     <%= convert_to_char((index + 1).to_s) %>
-                  </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                  </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                 </label>
               </li>
             <% end %>

app/views/exercise/_exercise_student_result.html.erb

@@ -156,7 +156,7 @@
                 <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                   <div class="fl">
                     <%= convert_to_char((index + 1).to_s) %>
-                  </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                  </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                 </label>
               </li>
             <% end %>
@@ -175,7 +175,7 @@
                 <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                   <div class="fl">
                     <%= convert_to_char((index + 1).to_s) %>
-                  </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                  </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                 </label>
               </li>
             <% end %>

app/views/exercise/_show_MC.html.erb

@@ -23,7 +23,7 @@
           <label class="fl color-grey3" for="sx_<%= exercise_choice.id %>">
             <div class="fl">
               <%= convert_to_char((index+1).to_s)%>
-            </div><pre class="fl ml10"><%= exercise_choice.choice_text%></pre>
+            </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text%></xmp>
           </label>
         </li>
     <% end %>

app/views/exercise/_show_MCQ.html.erb

@@ -23,7 +23,7 @@
           <label class="fl color-grey3" for="dx_<%= exercise_choice.id %>">
             <div class="fl">
               <%= convert_to_char((index+1).to_s)%>
-            </div><pre class="fl ml10"><%= exercise_choice.choice_text%></pre>
+            </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text%></xmp>
           </label>
         </li>
     <% end %>

app/views/exercise/_statistics_result_table.html.erb

@@ -17,9 +17,9 @@
             </li>
             <% exercise_question.exercise_choices.reorder("choice_position").each do |exercise_choice| %>
                 <li class="clearfix">
-                  <p class="pl5 <%= exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s.split('').include?(exercise_choice.choice_position.to_s) ? 'color-light-green' : '' %>">
-                    <%= exercise_choice.choice_text %>
-                  </p>
+                  <div class="width698 fl pl5 <%= exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s.split('').include?(exercise_choice.choice_position.to_s) ? 'color-light-green' : '' %>">
+                    <xmp class="xmplist"><%= exercise_choice.choice_text %></xmp>
+                  </div>
                   <% count = exercise_choice.exercise_answers.where(:user_id => @user_ids).count %>
                   <p class="color-dark-grey"><%= count %></p>
                   <div class="panel-slider-bg mt13 fl">

app/views/exercise/student_exercise_list.html.erb

@@ -271,7 +271,7 @@
                       <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                         <div class="fl">
                           <%= convert_to_char((index + 1).to_s) %>
-                        </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                        </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                       </label>
                     </div>
                   <% end %>
@@ -288,7 +288,7 @@
                       <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                         <div class="fl">
                           <%= convert_to_char((index + 1).to_s) %>
-                        </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                        </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                       </label>
                     </div>
                   <% end %>

config/routes.rb

@@ -2658,6 +2658,7 @@ RedmineApp::Application.routes.draw do ## oauth相关
 
   resource :sso, only: [:show, :create]
 
+  # library
   resources :libraries do
     get :publish_success, on: :collection
   end

public/stylesheets/educoder/edu-all.css

@@ -3414,4 +3414,12 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
 }
 .changebtn{
     width: 127px;font-size: 16px;height: 40px; line-height: 40px;
+}
+
+.xmplist{
+    margin-top:0px !important;
+    margin-bottom:0px !important;
+}
+.width698{
+    width: 698px;
 }