Starts to align the Collections form with the Works form, but still l…

…ooking for the HTML that renders the input groups.
samvera-deprecated · May 23, 2016 · 5d2a9ee · 5d2a9ee
1 parent 39c11f8
commit 5d2a9ee
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/app/assets/stylesheets/sufia/_collections.scss b/app/assets/stylesheets/sufia/_collections.scss
@@ -82,3 +82,7 @@ form.per_page {
 .presenter-title {
     padding-left: 20px;
 }
+
+.required {
+  color: $required-color;
+}
diff --git a/app/assets/stylesheets/sufia/_settings.scss b/app/assets/stylesheets/sufia/_settings.scss
@@ -18,8 +18,9 @@ $icon-background-color-hover: $classic-white !default;
 $icon-border-color-hover: $gray-base !default;
 $icon-font-color-hover: $gray-base !default;
 
-// Collection Icon
+// Collection
 $collection-icon-search-lg: 8em !default;
+$required-color: $vermilion !default;
 
 // File Show Page
 $file-show-term-color: $gray-dark !default;

diff --git a/app/forms/sufia/forms/collection_form.rb b/app/forms/sufia/forms/collection_form.rb
@@ -1,8 +1,14 @@
 module Sufia::Forms
   class CollectionForm < CurationConcerns::Forms::CollectionEditForm
+    self.required_fields = [:title]
+
+    # Fields that are required for Collections
+    def primary_terms
+      required_fields
+    end
+
     def rendered_terms
-      [:title,
-       :creator,
+      [:creator,
        :contributor,
        :description,
        :keyword,

diff --git a/app/views/collections/_form.html.erb b/app/views/collections/_form.html.erb
@@ -1,10 +1,16 @@
 <%= simple_form_for @form, html: { class: 'editor' } do |f| %>
   <div id="descriptions_display">
-    <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
-    <% f.object.rendered_terms.each do |term| %>
-      <%= render_edit_field_partial term, f: f %>
-    <% end %>
+    <h2>Descriptions</h2>
+    <p class="required">* indicates required fields</p>
   </div>
+    <div class="base-terms">
+      <% f.object.primary_terms.each do |term| %>
+          <%= render_edit_field_partial(term, f: f) %>
+      <% end %>
+      <% f.object.rendered_terms.each do |term| %>
+          <%= render_edit_field_partial term, f: f %>
+      <% end %>
+    </div>
   <%= hidden_field_tag :type, params[:type] %>
   <% if params[:batch_document_ids].present? %>
     <% params[:batch_document_ids].each do |batch_item| %>