Put content inside <content-body:> instead of <content:>

7 files changed, 16 insertions, 12 deletions

diff --git a/app/views/answers/edit.dryml b/app/views/answers/edit.dryml
index 536cdfc..6b80886 100644
--- a/app/views/answers/edit.dryml
+++ b/app/views/answers/edit.dryml
@@ -1,10 +1,10 @@
 <edit-page>
-  <content:>
+  <content-body:>
     <%
       # This form is used to edit various types inheriting Answer
       # but result is always posted to AnswersController#update
       # so action must be specified explicitly
     %>
     <form action="&update_answer_path(this.id)" method="PUT"/>
-  </content:>
+  </content-body:>
 </edit-page>
diff --git a/app/views/answers/my_recruits.dryml b/app/views/answers/my_recruits.dryml
index 6239d38..fe23713 100644
--- a/app/views/answers/my_recruits.dryml
+++ b/app/views/answers/my_recruits.dryml
@@ -1,7 +1,7 @@
 <index-page>
-  <content:>
+  <content-body:>
     <repeat with="&Answer.of_mentored_by(current_user)">
       <card/>
     </repeat>
-  </content:>
+  </content-body:>
 </index-page>
diff --git a/app/views/answers/show.dryml b/app/views/answers/show.dryml
index cfc2c35..7b31b23 100644
--- a/app/views/answers/show.dryml
+++ b/app/views/answers/show.dryml
@@ -1,7 +1,7 @@
 <show-page>
-  <content:>
+  <content-body:>
     <detailed/>
     <collection:comments/>
     <a href="&new_comment_for_answer_path(this.id)" if="&this.owner.mentor_is?(current_user)">Comment this answer</a>
-  </content>
+  </content-body:>
 </show-page>
diff --git a/app/views/question_groups/category.dryml b/app/views/question_groups/category.dryml
index d51fdd8..8ac016b 100644
--- a/app/views/question_groups/category.dryml
+++ b/app/views/question_groups/category.dryml
@@ -1,5 +1,5 @@
 <index-page>
-  <content:>
+  <content-body:>
     <form action="/question_groups/category">
       <%=
         select("id", nil, QuestionCategory.as_select_opts, {:include_blank => false, :selected =>  params['id']._?[0].to_i})
@@ -7,5 +7,5 @@
       <submit label="view in this category"/>
     </form>
     <collection/>
-  </content:>
+  </content-body:>
 </index-page>
diff --git a/app/views/questions/show.dryml b/app/views/questions/show.dryml
index a90366f..2e30578 100644
--- a/app/views/questions/show.dryml
+++ b/app/views/questions/show.dryml
@@ -1,5 +1,5 @@
 <show-page>
-  <content:>
+  <content-body:>
     <detailed show-title/>
     <if test="&this.content.nil?">
       <h2><name/><a action="edit" if="&can_edit?">(Edit)</a></h2>
@@ -26,5 +26,5 @@
       <br/>
       <a href="&answer_path(this.reference_answer)">View reference answer</a>.
     </if>
-  </content:>
+  </content-body:>
 </show-page>
diff --git a/app/views/questions/unanswered_questions.dryml b/app/views/questions/unanswered_questions.dryml
index 31676ff..46fb4e3 100644
--- a/app/views/questions/unanswered_questions.dryml
+++ b/app/views/questions/unanswered_questions.dryml
@@ -1,7 +1,7 @@
 <index-page>
-  <content:>
+  <content-body:>
     <repeat with="&current_user.unanswered_questions">
       <card/>
     </repeat>
-  </content:>
+  </content-body:>
 </index-page>
diff --git a/app/views/users/questions.dryml b/app/views/users/questions.dryml
index bf2d1f3..b8c5850 100644
--- a/app/views/users/questions.dryml
+++ b/app/views/users/questions.dryml
@@ -1,3 +1,7 @@
+<%  # whole <content:> must be replaced here, not just <content-body:>,
+    # because this is User (or Guest) and some parts of <content-body:>
+    # expect this to be collection
+%>
 <index-page>
   <content:>
     <repeat with="&this.all_questions">