app/views/dhatu/services/_form.html.erb in dhatu-0.1.19 vs app/views/dhatu/services/_form.html.erb in dhatu-0.1.20

- old
+ new

@@ -11,36 +11,35 @@ <div class="form-inputs m-15"> <%= theme_form_field(@service, :name, required: true, form_style: "top-bottom", html_options: { placeholder: "", "data-id": @service.id.to_s}) %> <div class="row"> - <div class="col-md-4 pr-20"> - <% options = {assoc_collection: Dhatu::Category.filter_by_category_type("Dhatu::Service").published.select("id, name").order("priority ASC, name ASC").all, editable: true, assoc_display_method: :name} %> + <div class="col-md-3 pr-20"> + <% options = {assoc_collection: Dhatu::Category.filter_by_category_type("Dhatu::Service").published.select("id, name").order("priority ASC, name ASC").all, editable: true, assoc_display_method: :name, include_blank: true} %> <%= theme_form_assoc_group(@service, :category_id, label: "Choose Category", form_style: "top-bottom", **options) %> </div> - <div class="col-md-4 pl-20"> - <%= theme_form_field(@service, :meta_description, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %> + <div class="col-md-3 pr-20"> + <%= theme_form_field(@service, :price, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %> </div> - <div class="col-md-4 pl-20"> - <% if @service.new_record? || @current_user.super_admin? %> - <%= theme_form_field(@service, :permalink, form_style: "top-bottom", html_options: { placeholder: ""}) %> - <% else %> - <%= theme_form_field(@service, :permalink, form_style: "top-bottom", html_options: { placeholder: "", readonly: true}) %> - <% end %> + <div class="col-md-3 pl-20"> + <%= theme_form_field(@service, :duration, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %> </div> </div> + <%= theme_form_field(@service, :short_description, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %> + <%= theme_form_field(@service, :description, required: true, html_options: {type: :textarea, class: "form-control wysihtml5", "data-stylesheet-url": "assets/wysiwyg-color.css"}, form_style: "top-bottom") %> <div class="row"> - <div class="col-md-4 pr-20"> - <%= theme_form_field(@service, :price, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %> - </div> - <div class="col-md-4 pl-20"> - <%= theme_form_field(@service, :duration, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %> - </div> - <div class="col-md-4 pl-20"> + <div class="col-md-3 pr-20"> <%= theme_form_field(@service, :priority, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %> + </div> + <div class="col-md-3 pl-20"> + <% if @service.new_record? || @current_user.super_admin? %> + <%= theme_form_field(@service, :permalink, form_style: "top-bottom", html_options: { placeholder: ""}) %> + <% else %> + <%= theme_form_field(@service, :permalink, form_style: "top-bottom", html_options: { placeholder: "", readonly: true}) %> + <% end %> </div> </div> </div>