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

- old
+ new

@@ -2,29 +2,10 @@ <div class="col-md-12"> <div class="tabs-vertical-env"> - <ul id="div_category_types" class="nav tabs-vertical"> - <% @categories.each do |ct| %> - <li class="<%= ct == @category ? 'active' : '' %>"> - <%= link_to ct.name, services_path(ct: ct.id) %> - </li> - <% end %> - </ul> - - <!-- <ul class="nav nav-tabs nav-tabs-justified"> - <%# Dhatu::Service::STATUS.each do |key, value| %> - <li class="<%#= @status == value ? 'active' : '' %>"> - <%#= link_to dhatu.services_path(st: value), "aria-expanded" => "#{ @status == value ? 'true' : 'false' }" do %> - <span class="visible-xs"><i class="fa-gift"></i></span> - <span class="hidden-xs"><%#= key %></span> - <%# end %> - </li> - <%# end %> - </ul> --> - <div class="tab-content"> <div class="tab-pane active"> <div id="div_service_action_buttons"> <div class="row"> @@ -33,9 +14,22 @@ <%= theme_button('Refresh', 'refresh', dhatu.services_path(ct: @category.try(:id)), classes: "pull-left mr-10", btn_type: "white") %> </div> <div class="col-sm-6"> <%= search_form_kuppayam(Dhatu::Service, dhatu.services_path(), text: @filters[:query]) %> + </div> + </div> + <div class="row"> + <div class="col-md-12 visible-sm visible-xs mt-10"> + </div> + <div class="col-md-12"> + <% @filter_ui_settings.each do |filter_name, options| %> + <% if options[:object_filter] == true %> + <%= report_object_filter(filter_name, options) %> + <% else %> + <%= report_filter(filter_name, options) %> + <% end %> + <% end %> </div> </div> </div> <%= clear_tag(10) %>