lucene icons added, styling fixed

app/views/devise/sessions/new.slim

@@ -44,7 +44,7 @@ hr
     .cell.small-4
       h4.text-center Debian staff login
       p.text-center
-        = link_to (fa_icon 'key', text: 'Login via Salsa'), user_salsa_omniauth_authorize_path, class: 'button primary large', method: :post
+        = link_to (icon('key-round'), text: 'Login via Salsa'), user_salsa_omniauth_authorize_path, class: 'button primary large', method: :post
     .cell.small-4
       h4.text-center Admin login
       p.text-center

app/views/my/_menu.slim

@@ -1,19 +1,23 @@
 .menu-centered
-  ul.menu.icon-top
+  ul.menu.icons.icon-top
     li class=('active' if action_name=='profile')
       = link_to my_profile_path
-        = fa_icon 'user-o 2x', text: 'Myself'
+        = icon ('user')
+        ' Myself
     li class=('active' if action_name=='screenshots')
       = link_to my_screenshots_path
-        = fa_icon 'camera 2x', text: 'Screenshots'
+        = icon 'camera'
+        'Screenshots
     - if can?(:approve, Screenshot)
       li class=('active' if action_name=='moderate_list')
         = link_to moderate_list_path
-          = fa_icon 'check 2x', text: 'Moderate'
+          = icon 'check'
+          'Moderate
     - if can? :view, Log
       li class=('active' if action_name=='logs')
         = link_to logs_path
-          = fa_icon 'book 2x', text: 'Logs'
+          = icon 'book'
+          'Logs
         
     // Add link if user has uploaded screenshots
     / - if @current_users_screenshots and @current_users_screenshots.any?
@@ -22,6 +26,9 @@
     /       = fa_icon 'image 2x', text: 'My uploads'
     /         ' My uploads
 
-    li
-      = link_to destroy_user_session_path, data: { turbo_method: :delete }
-        = fa_icon 'lock 2x', text: 'Logout'
+    / BUG: DELETE method is not used
+    - if current_user
+      li
+        = link_to destroy_user_session_path, data: { turbo_method: :delete }
+          = icon 'lock'
+          'Logout

app/views/packages/_admin_buttons.slim

@@ -11,33 +11,33 @@
     a.button.small.bordered.radius.warning[
       href=hide_screenshot_path(screenshot.id)
       onclick="return confirm('Really hide the screenshot from public view?');"
-      ] #{fa_icon 'eye-slash'} Hide
+      ] #{icon('eye-off', class: 'icon')} Hide
 
   - if screenshot.hidden && screenshot.approved && can?(:unhide, screenshot)
     a.button.small.bordered.radius.warning[
       href=unhide_screenshot_path(screenshot.id)
-      ] #{fa_icon 'eye'} Un-Hide
+      ] #{icon('eye', class: 'icon')} Un-Hide
 
   - if can?(:destroy, screenshot)
     a.button.small.bordered.radius.alert[
       href=delete_screenshot_path(screenshot.id)
       onclick="return confirm('Really delete the screenshot?');"
-      ] #{fa_icon 'trash'} Delete
+      ] #{icon('trash-2', class: 'icon')} Delete
 
   / a.button.small.bordered.radius.secondary[
   /   href='#'
-  /   ] #{fa_icon 'edit'} Edit caption
+  /   ] #{icon('fa-solid', 'edit')} Edit caption
 
   / a.button.small.bordered.radius.secondary[
   /   href='#'
-  /   ] #{fa_icon 'star'} Make primary
+  /   ] #{icon('fa-solid', 'star')} Make primary
 
   - unless screenshot.approved
     - if can?(:approve, screenshot)
       a.button.small.success[
         href=approve_screenshot_path(screenshot.id)
         method='post'
-        ] #{fa_icon 'check'} Approve
+        ] #{icon('check')} Approve
 
     / Display additional information to admins
     / p Status: #{screenshot.adminstatus}

app/views/packages/_details_rightbox.slim

@@ -3,7 +3,7 @@
 .bigpanel.sticky data-sticky=true data-anchor="metadata"
   // long description
   p.subtitle
-    = fa_icon 'info-circle'
+    = icon('info')
     '  Description
   - if pkg.long_description.present?
     = render(partial: 'long_description', locals: {text: pkg.long_description})
@@ -14,13 +14,15 @@
 
   // upload new screenshots
   p.subtitle
-    = fa_icon 'upload'
+    = icon('upload')
     '  Upload more screenshots
     p
       ' Please help extend the collection of screenshots.
       ' Just make a screenshot and upload it here. You don't
       ' need to register or anything.
-    a.button.small.expand.uploadbutton href=upload_path(pkg.name) Upload a screenshot
+    a.button.expand.uploadbutton href=upload_path(pkg.name)
+      = icon('upload', class: 'icon')
+      ' Upload a screenshot
 
     p
       em Hint: upload an image here from your clipboard with Ctrl-V
@@ -29,7 +31,7 @@
   - if pkg.homepage.present?
     hr
     p.subtitle
-      = fa_icon 'home'
+      = icon('house')
       '  Homepage
     p
       = link_to pkg.homepage, pkg.homepage, target: '_blank'
@@ -37,18 +39,11 @@
   // APT package download link
   hr
   p.subtitle
-    = fa_icon 'download'
+    = icon('download')
     '  Install this software package
-    p
-      ' If the package is available for the distribution you are
-      ' currently using on your computer then install the software
-      ' by clicking on…
-    a.button.small.secondary href="apt:#{pkg.name}" Install #{pkg.name}
-
-  // statistics
-  / hr
+    p'fa-solid', 
   / p.subtitle
-  /   = fa_icon 'bar-chart'
+  /   = icon('fa-solid', 'bar-chart')
   /   '  Statistics
   / p
   /   - if pkg.visits > 0

app/views/packages/upload.slim

@@ -16,13 +16,13 @@ h1 = "Upload screenshots for #{@package.name}"
             input.hidden-inputfile type="file" name="file[]" id="file" multiple=true
             label for="file"
               a.button id="file-select-button"
-                = fa_stacked_icon "image", base: "circle-thin"
+                = icon('image-up', class: ['icon'])
                 span id="file-label"
                   '  Upload screenshots
 
           .small-6.cell
             button.button type="submit" id="file-submit"
-              = fa_stacked_icon "upload", base: "circle-thin"
+              = icon('play', class: ['size-1'])
               '  Start upload
 
     / - if @package.screenshots.any?