From a46c41197c1e40006c6a19b4a0e73bc4bc173e46 Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Sat, 8 Apr 2023 04:19:36 +0200 Subject: [PATCH] Add images to session links --- .../images/pictograms/account-plus-outline.svg | 1 + app/assets/images/pictograms/alert-outline.svg | 2 +- .../images/pictograms/check-circle-outline.svg | 2 +- app/assets/images/pictograms/logout.svg | 1 + app/assets/stylesheets/application.css | 7 ++++--- app/helpers/application_helper.rb | 5 +++++ app/views/layouts/application.html.erb | 14 ++++++++------ 7 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 app/assets/images/pictograms/account-plus-outline.svg create mode 100644 app/assets/images/pictograms/logout.svg diff --git a/app/assets/images/pictograms/account-plus-outline.svg b/app/assets/images/pictograms/account-plus-outline.svg new file mode 100644 index 0000000..b71b268 --- /dev/null +++ b/app/assets/images/pictograms/account-plus-outline.svg @@ -0,0 +1 @@ + diff --git a/app/assets/images/pictograms/alert-outline.svg b/app/assets/images/pictograms/alert-outline.svg index 41041d8..673af4c 100644 --- a/app/assets/images/pictograms/alert-outline.svg +++ b/app/assets/images/pictograms/alert-outline.svg @@ -1 +1 @@ - + diff --git a/app/assets/images/pictograms/check-circle-outline.svg b/app/assets/images/pictograms/check-circle-outline.svg index 385f9e2..17f5737 100644 --- a/app/assets/images/pictograms/check-circle-outline.svg +++ b/app/assets/images/pictograms/check-circle-outline.svg @@ -1 +1 @@ - + diff --git a/app/assets/images/pictograms/logout.svg b/app/assets/images/pictograms/logout.svg new file mode 100644 index 0000000..f3ccfd9 --- /dev/null +++ b/app/assets/images/pictograms/logout.svg @@ -0,0 +1 @@ + diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c6e4d7b..ef66568 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -43,6 +43,7 @@ input:focus:not([type=checkbox]) { margin: 0.5em 0; } .application-menu a, input[type=submit] { + align-items: center; border: 1px solid; background-color: #ffffff; border-color: #a0a0a0; @@ -51,15 +52,15 @@ input:focus:not([type=checkbox]) { display: flex; fill: #a0a0a0; float: right; - font-size: 0.8em; + font-size: 0.8rem; font-weight: bold; margin-left: 1em; padding: 0.6em; } .application-menu a svg { - height: 1rem; + height: 1.3rem; padding-right: 0.4rem; - width: 1rem; + width: 1.3rem; } .application-menu a.active, .application-menu a:hover, diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ce69605..64ad301 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -26,6 +26,11 @@ module ApplicationHelper form_for(record, **options, &block) end + def image_link_to(name, image = nil, options = nil, html_options = nil) + name = svg_tag("pictograms/#{image}.svg#icon") + name if image + link_to name, options, html_options + end + def svg_tag(source, options = {}) image_name, id = source.split('#') content_tag :svg, options do diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6b1ad9f..54e7bb0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,13 +12,15 @@
- <%= link_to_if user_signed_in?, t(:sign_out), destroy_user_session_path, - data: { turbo_method: :delete } do %> - <%= link_to svg_tag('pictograms/login.svg#icon')+t(:sign_in), new_user_session_path, - class: class_names(active: current_page?(new_user_session_path))%> + <% if user_signed_in? %> + <%= image_link_to t(:sign_out), "logout", destroy_user_session_path, + data: { turbo_method: :delete } %> + <% else %> + <%= image_link_to t(:sign_in), "login", new_user_session_path, + class: class_names(active: current_page?(new_user_session_path)) %> + <%= image_link_to t(:register), "account-plus-outline", new_user_registration_path, + class: class_names(active: current_page?(new_user_registration_path)) %> <% end %> - - <%= link_to_unless(user_signed_in?, t(:register), new_user_registration_path) { } %>