Merge pull request #386 from DigitalCurationCentre/xsrust/bugfixes

Xsrust/bugfixes

Author: vyruss

app/views/annotations/_edit_annotation.html.erb

@@ -4,7 +4,7 @@
 
   <table class="dmp_details_table phase">
     <tr>
-      <td class="first_template"><%= _('Example of Answer')%></td>
+      <td class="first_template"><%= _('example answer')%></td>
       <td>
         <ul>
           <li><%= f.text_area :text, rows: 5 %></li>

app/views/annotations/_show_annotation.html.erb

@@ -2,7 +2,7 @@
 <table class="dmp_details_table phase">
 	<tr>
 		<td class="first_template">
-				<%= _('Example of answer')%>
+				<%= _('Example Answer')%>
 		</td>
 		<td><%= raw annotation.text %></td>
 	</tr>
@@ -11,5 +11,5 @@
 
 <div class="move_2_right">
 	<%= hidden_field_tag :question_id, question.id, class: "question_id" %>
-	<%= link_to _('Edit Example of Answer'), '# ', class: "btn btn-primary edit_form_for_suggested_answer"%>
+	<%= link_to _('Edit Example Answer'), '# ', class: "btn btn-primary edit_form_for_suggested_answer"%>
 </div>

app/views/guidances/_edit_guidance.html.erb

@@ -7,7 +7,7 @@
       <td class="first_template"><%= _('Suggested answer/ Example')%></td>
       <td>
         <ul>
-          <li><%= f.select :is_example, {_('Example of answer') => true, _('Suggested answer') => false} %></li>
+          <li><%= f.select :is_example, {_('Example Answer') => true, _('Suggested answer') => false} %></li>
           <li><%= f.text_area :text, rows: 5 %></li>
         </ul>
       </td>

app/views/phases/_answer_form.html.erb

@@ -37,7 +37,7 @@
           <% if annotation.text.present? %>   <!-- could be present but empty -->
             <div class="suggested-answer-div">
               <span class="suggested-answer-intro">
-                  <%="#{annotation.org.abbreviation} "%> <%=_('Example of answer')%>
+                  <%="#{annotation.org.abbreviation} "%> <%=_('example answer')%>
               </span>
 
               <div class="suggested-answer-border">
@@ -132,7 +132,7 @@
       <% comments = answer.notes.all %> 
       <%= hidden_field_tag :question_id, question_id, class: "question_id" %>
       <ul class="question_right_column_ul">
-      <% annotations = question.annotations.where("type <> ?", Annotation.types[:guidance]) %>
+      <% annotations = question.annotations.where(type: Annotation.types[:guidance]) %>
       <% if annotations.present? || question_guidances[question_id] %>
         <!-- add css to comment div-->
         <% css_style_comment_div = "display: none;"%>

app/views/questions/_preview_question.html.erb

@@ -61,7 +61,7 @@
           <% annotation = question.annotations.where(type: Annotation.types[:example_answer]).order(:created_at).first %>
           <div class="suggested-answer-div">
             <span class="suggested-answer-intro">
-                <%= _('Example of answer')%>
+                <%= _('example answer')%>
             </span>
             <div class="suggested-answer-border">
               <p class="suggested-answer">
@@ -80,7 +80,7 @@
         <% if !annotations.blank? %>
           <div class="suggested-answer-div">
             <span class="suggested-answer-intro">
-                <%= _('Example of answer')%>
+                <%= _('example answer')%>
             </span>
             <div class="suggested-answer-border">
               <p class="suggested-answer">

app/views/questions/_show_question.html.erb

@@ -67,7 +67,7 @@
       <% if example_answer.present?  && example_answer.text.present?  %>
         <tr>
           <td class="first_template">
-            <%= _('Example of answer')%>
+            <%= _('example answer')%>
           </td>
           <td><%= raw example_answer.text %></td>
         </tr>

app/views/templates/_edit_annotations.html.erb

@@ -44,7 +44,7 @@ in the admin interface.
 
     <!-- Suggested answer or Example-->
     <tr>
-      <td class="first_template"><%= _('Example of Answer')%></td>
+      <td class="first_template"><%= _('example answer')%></td>
       <td>
         <div class="div_left_icon">
           <% annotations = question.annotations.where(org_id: current_user.org_id).where(type: Annotation.types[:example_answer]).order(:created_at).first %>