input search and filters

decidim · Jun 28, 2023 · d94fcad · d94fcad
1 parent 46976f1
commit d94fcad
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 25 deletions.
diff --git a/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_filters.scss b/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_filters.scss
@@ -1,4 +1,4 @@
-.filters__section{
+/* .filters__section{
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
@@ -81,3 +81,4 @@
     }
   }
 }
+ */
diff --git a/decidim-admin/app/packs/stylesheets/decidim/admin/redesigned_application.scss b/decidim-admin/app/packs/stylesheets/decidim/admin/redesigned_application.scss
@@ -28,3 +28,4 @@
 @import "stylesheets/decidim/admin/_redesigned_user-login.scss";
 @import "stylesheets/decidim/admin/_redesigned_cards.scss";
 @import "stylesheets/decidim/admin/_redesigned_logs.scss";
+@import "stylesheets/decidim/admin/_redesigned_filters.scss";
diff --git a/decidim-admin/app/views/decidim/admin/shared/_filters.html.erb b/decidim-admin/app/views/decidim/admin/shared/_filters.html.erb
@@ -1,14 +1,4 @@
 <div class="filters__section">
-  <div class="fcell filter">
-    <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
-      <li>
-        <a href="#" class="dropdown button">
-          <%= t("filter_label", scope: "decidim.admin.filters") %>
-        </a>
-        <%= dropdown_submenu(submenu_options_tree(i18n_ctx)) %>
-      </li>
-    </ul>
-  </div>
   <div class="fcell search">
     <%= search_form_for(query, url: url_for) do |form| %>
       <%= applied_filters_hidden_field_tags %>
@@ -22,19 +12,29 @@
                              scope: "decidim.admin.filters.search_placeholder")
             ) %>
         <div class="input-group-button">
-          <button type="submit" class="button">
-            <%= icon "magnifying-glass", aria_label: t("search_label", scope: "decidim.admin.filters") %>
+          <button type="submit" class="text-secondary">
+            <%= icon "magnifying-glass", aria_label: t("search_label", scope: "decidim.admin.filters"), class: "fill-secondary" %>
           </button>
         </div>
       </div>
     <% end %>
   </div>
+  <div class="fcell">
+    <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
+      <li>
+        <a href="#" class="dropdown button">
+          <%= t("filter_label", scope: "decidim.admin.filters") %>
+        </a>
+        <%= dropdown_submenu(submenu_options_tree(i18n_ctx)) %>
+      </li>
+    </ul>
+  </div>
 </div>
 <div class="card-section fcell grid-x">
   <div class="cell medium-10 filter-status">
     <%= applied_filters_tags(i18n_ctx) %>
   </div>
   <div class="cell auto text-right">
-    <%= admin_filters_pagination %>
+    <%#= admin_filters_pagination %>
   </div>
 </div>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
@@ -106,7 +106,6 @@
           <% end %>
         </tbody>
       </table>
-      <%= paginate @assemblies, theme: "decidim" %>
     </div>
   </div>
 </div>
diff --git a/decidim-assemblies/app/views/layouts/decidim/admin/assemblies.html.erb b/decidim-assemblies/app/views/layouts/decidim/admin/assemblies.html.erb
@@ -32,13 +32,6 @@
                                class: "text-secondary" %>
                  <% end %>
               </li>
-              <li>
-                <% if allowed_to? :manage, :assemblies_type %>
-                  <%= link_to t("menu.assemblies_types", scope: "decidim.admin"),
-                             decidim_admin_assemblies.assemblies_types_path,
-                             class: "text-secondary" %>
-                <% end %>
-              </li>
               <li>
                 <% if allowed_to? :read, :assemblies_setting %>
                   <%= link_to t("menu.assemblies_settings", scope: "decidim.admin"),
@@ -51,10 +44,12 @@
         </div>
       </div>
     </div>
-    <%= sidebar_menu(:admin_assemblies_menu).render %>
+    <%#= sidebar_menu(:admin_assemblies_menu).render %>
   </div>
 
-  <div class="process-content">
-    <%= yield %>
+  <div class="container">
+    <div class="process-content">
+      <%= yield %>
+    </div>
   </div>
 <% end %>