Skip to content

Commit

Permalink
Minor sidebar enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephane Paquet committed Apr 23, 2023
1 parent 60e7461 commit 0de7fba
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion app/views/imports/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- app/views/imports/index.html.erb -->
<%= turbo_frame_tag "settings_main" do %>
<%= render partial: "settings/breadcrumb", locals: { sub1: "Users" } %>
<%= render partial: "settings/breadcrumb", locals: { sub1: "Import" } %>
<div class="mb-6">
<%= link_to new_import_path, class: "text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" do %>
Upload a file
Expand Down
2 changes: 1 addition & 1 deletion app/views/imports/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- app/views/imports/new.html.erb -->
<%= turbo_frame_tag "settings_main" do %>
<%= render partial: "settings/breadcrumb", locals: { sub1: "Users" } %>
<%= render partial: "settings/breadcrumb", locals: { sub1: "Import" } %>
<%= form_with(url: imports_path, local: true) do |form| %>
<div class="mb-2">
<%= form.label :file, class: "block mb-2 text-sm font-medium text-gray-900 dark:text-white" do %>
Expand Down
9 changes: 8 additions & 1 deletion app/views/settings/_sidebar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<path clip-rule="evenodd" fill-rule="evenodd" d="M10 1a4.5 4.5 0 00-4.5 4.5V9H5a2 2 0 00-2 2v6a2 2 0 002 2h10a2 2 0 002-2v-6a2 2 0 00-2-2h-.5V5.5A4.5 4.5 0 0010 1zm3 8V5.5a3 3 0 10-6 0V9h6z"></path>
</svg>
<span class="flex-1 ml-3 whitespace-nowrap">Single Sign On</span>
<span class="inline-flex items-center justify-center px-2 ml-3 text-sm font-medium text-gray-800 bg-gray-200 rounded-full dark:bg-gray-700 dark:text-gray-300">Pro</span>
<% end %>
</li>
<li>
Expand All @@ -29,6 +28,14 @@
</span>
<% end %>
</li>
<li>
<%= link_to imports_path, data: { turbo_frame: :settings_main }, class: "flex items-center p-2 text-base font-normal text-gray-900 transition duration-75 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white group" do %>
<svg class="flex-shrink-0 w-6 h-6 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
<path stroke-linecap="round" stroke-linejoin="round" d="M15 11.25l-3-3m0 0l-3 3m3-3v7.5M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
</svg>
<span class="flex-1 ml-3 whitespace-nowrap">Bulk upload</span>
<% end %>
</li>
<li>
<a href="#" class="flex items-center p-2 text-base font-normal text-gray-900 transition duration-75 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white group">
<svg class="flex-shrink-0 w-6 h-6 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
Expand Down
4 changes: 0 additions & 4 deletions app/views/users/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
<div class="mb-6">
<%= turbo_frame_tag "invite_user", src: new_invite_path %>
</div>
<div class="mb-6">
<h3 class="text-gray-400 text-xl font-light mb-4">Manage via an Excel file</h3>
<%= link_to "Upload .xlsx file", imports_path, class: "text-blue-700 hover:text-white border border-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center mr-2 mb-2 dark:border-blue-500 dark:text-blue-500 dark:hover:text-white dark:hover:bg-blue-500 dark:focus:ring-blue-800" %>
</div>
<div>
<div class="relative overflow-x-auto shadow-md sm:rounded-lg">
<div class="flex items-center justify-between pb-4 bg-white dark:bg-gray-900">
Expand Down

0 comments on commit 0de7fba

Please sign in to comment.