Merge branch 'develop' of gitlab.ruhr-uni-bochum.de:FDM/rdm-system/rdms into develop

hyrax/app/forms/hyrax/crc_dataset_form.rb

@@ -27,16 +27,13 @@ module Hyrax
       :coverage,
       :approval_number,
       :extra_information,
-      :modality,
       :complex_date,
-      :subject,
       :publisher,
       :language,
       :complex_funding_reference,
       :description,
       :keyword,
       :resource_type,
-      :doi,
       :complex_relation,
       :software_version,
     ]
@@ -57,7 +54,6 @@ module Hyrax
         :coverage,
         :approval_number,
         :extra_information,
-        :modality
       ]
     end
 

hyrax/app/views/hyrax/crc_datasets/complex_modalities/_form.html.erb

@@ -36,11 +36,6 @@
                   </ul>
                 </div>
               </div>
-              <div class="base-terms float-right">
-                <ul class="listing" aria-live="polite">
-                  <%= f.submit class: "btn btn-primary"%>
-                </ul>
-              </div>
             </div>
           </div>
           <div role="tabpanel" class="tab-pane" id="files">
@@ -51,5 +46,12 @@
         </div>
       </div>
     </div>
+    <div class="col-xs-12 col-sm-8">
+      <div class="base-terms float-right">
+        <ul class="listing" aria-live="polite">
+          <%= f.submit class: "btn btn-primary"%>
+        </ul>
+      </div>
+    </div>
   </div>
 <% end %>
\ No newline at end of file

hyrax/app/views/hyrax/crc_datasets/complex_sessions/_form.html.erb

@@ -36,11 +36,6 @@
                   </ul>
                 </div>
               </div>
-              <div class="base-terms float-right">
-                <ul class="listing" aria-live="polite">
-                  <%= f.submit class: "btn btn-primary"%>
-                </ul>
-              </div>
             </div>
           </div>
           <div role="tabpanel" class="tab-pane" id="files">
@@ -51,5 +46,12 @@
         </div>
       </div>
     </div>
+    <div class="col-xs-12 col-sm-8">
+      <div class="base-terms float-right">
+        <ul class="listing" aria-live="polite">
+          <%= f.submit class: "btn btn-primary"%>
+        </ul>
+      </div>
+    </div>
   </div>
 <% end %>
\ No newline at end of file

hyrax/app/views/hyrax/crc_datasets/complex_subjects/_form.html.erb

@@ -57,11 +57,6 @@
                   </ul>
                 </div>
               </div>
-              <div class="base-terms float-right">
-                <ul class="listing" aria-live="polite">
-                  <%= f.submit class: "btn btn-primary"%>
-                </ul>
-              </div>
             </div>
           </div>
           <div role="tabpanel" class="tab-pane" id="files">
@@ -72,5 +67,12 @@
         </div>
       </div>
     </div>
+    <div class="col-xs-12 col-sm-8">
+      <div class="base-terms float-right">
+        <ul class="listing" aria-live="polite">
+          <%= f.submit class: "btn btn-primary"%>
+        </ul>
+      </div>
+    </div>
   </div>
 <% end %>
\ No newline at end of file