start of iteration 2

app/views/elements/_element.html.erb

@@ -1,13 +1,10 @@
-<div id="<%= dom_id element %>" class="mt-4 border-top pt-3">
+<div id="<%= dom_id element %>" class="<%= "mt-5" unless element == element.page.elements.first %>">
   <%= turbo_frame_tag dom_id(element, :frame) do %>
     <div class="d-flex">
       <h2 class="h4">
-          <i class="bi bi-card-checklist">
+          <i class="bi bi-boxes">
           </i>
         <%= element.title %>
-        <div class="badge text-bg-secondary">
-        <%= element.path %>
-      </div>
     </h2>
         <%= link_to [:edit, element], class: "btn btn-link text-secondary" do %>
         <i class="bi bi-pencil">
@@ -16,17 +13,23 @@
       </div>
     <div class="">
       
-      <%= element.description_html %>
+      <%= element.description %>
     </div>
 
   <% end %>
 
-  <% element.success_criteria.each do |sc| %>
-    <%= turbo_frame_tag(dom_id(sc, :frame)) do %>
+  <div id="<%= dom_id(element, :success_criteria_list) %>">
+    <% element.success_criteria.each do |sc| %>
       <%= render sc %>
     <% end %>
-  <% end %>
-  <% if element.success_criteria.none? %>
-    <p><i>Es sind (noch) keine Erfolgskriterien definiert.</i></p>
-  <% end %>
+    <% if element.success_criteria.none? %>
+      <p><i>Es sind (noch) keine Erfolgskriterien definiert.</i></p>
+    <% end %>
+  </div>
+
+  <div class="pt-3">
+    <%= turbo_frame_tag dom_id(element, "new_success_criterion_frame") do %>
+      <%= render partial: "elements/new_success_criterion_button", locals: { element: element } %>
+    <% end %>
+  </div>
 </div>

app/views/elements/_form.html.erb

@@ -1,15 +1,7 @@
-<%= bootstrap_form_with(model: element, data: element.persisted? || { turbo_frame: "_top" }) do |form| %>
-  <%= form.hidden_field :report_id %>
-  <div class="row">
-    <div class="col">
-      <%= form.text_field :path %>
-    </div>
-    <div class="col">
-      <%= form.collection_select(:checklist_id, Checklist.all, :id, :name) %>
-    </div>
-  </div>
+<%= bootstrap_form_with(model: element.persisted? ? element : [:page, element], data: element.persisted? || { turbo_frame: "_top" }) do |form| %>
+  <%= form.hidden_field :page_id %>
   <%= form.text_field :title %>
-  <%= form.rich_text_area :description_html %>
+  <%= form.rich_text_area :description %>
   <%= form.submit class: "btn btn-warning" %>
-  <%= link_to("Abbrechen", element.report, class: "btn btn-outline-secondary") %>
+  <%= link_to("Abbrechen", element.persisted? ? element : element.report, class: "btn btn-outline-secondary") %>
 <% end %>

app/views/elements/_new_success_criterion_button.html.erb

@@ -0,0 +1,3 @@
+<%= link_to "#{tag.i(class: "bi bi-plus-lg")} Neue Checkliste".html_safe, new_from_checklist_element_success_criteria_path(element), class: "btn btn-primary" %>
+
+<%= link_to "#{tag.i(class: "bi bi-plus-lg")} Neues Erfolgskriterium".html_safe, new_element_success_criterion_path(element), class: "btn btn-primary" %>

app/views/elements/create.turbo_stream.erb

@@ -1,2 +1,2 @@
-<%= turbo_stream.update "new_element_frame", partial: "reports/new_element_button", locals: { report: @element.report } %>
+<%= turbo_stream.update "new_element_frame", partial: "pages/new_element_button", locals: { page: @element.page } %>
 <%= turbo_stream.append "element_list", @element %>

app/views/elements/edit.html.erb

@@ -4,13 +4,9 @@
   <div>
     <div class="d-flex">
     <h2 class="h3">
-      <i class="bi bi-card-checklist">
+      <i class="bi bi-boxes">
           </i>
       <%= @element.title %>
-      <div class="badge text-bg-secondary">
-        <%= @element.path %>
-      </div>
-    </h2>
       <%= link_to(tag.i(class: "bi bi-pencil"), @element, class: "btn btn-link text-warning") %>
     </div>
   <%= render "form", element: @element %>
@@ -19,5 +15,5 @@
 
 <div class="action-row">
   <%= link_to t("scaffold.link_show", model: Element.model_name.human), @element %>
-  <%= link_to t("scaffold.link_index", model: Element.model_name.human(count: 2)), elements_path %>
+  <%= link_to t("scaffold.link_index", model: Element.model_name.human(count: 2)), page_elements_path(@element.page) %>
 </div>

app/views/elements/new.html.erb

@@ -2,11 +2,10 @@
 
 <%= turbo_frame_tag "new_element_frame" do %>
   <div class="border border-info p-3">
-    <h2><i class="bi bi-card-checklist me-2"></i>Neues Element</h2>
     <%= render "form", element: @element %>
   </div>
 <% end %>
 
 <div class="action-row">
-  <%= link_to t("scaffold.link_index", model: Element.model_name.human(count: 2)), elements_path %>
+  <%= link_to t("scaffold.link_index", model: Element.model_name.human(count: 2)), page_elements_path %>
 </div>

app/views/elements/show.html.erb

@@ -4,6 +4,6 @@
 
 <div class="action-row">
   <%= link_to t("scaffold.link_edit", model: @element.model_name.human), edit_element_path(@element) %>
-  <%= link_to t("scaffold.link_index", model: @element.model_name.human(count: 2)), elements_path %>
+  <%= link_to t("scaffold.link_index", model: @element.model_name.human(count: 2)), page_elements_path(@element.page) %>
   <%= button_to t("scaffold.link_destroy", model: @element.model_name.human), @element, method: :delete, class: "btn btn-outline-danger" %>
 </div>