Merge pull request #99 from realstorypro/update-scope

re-shuffling the top menu + minor bugfix
leouofa · Jul 24, 2023 · 34d2e48 · 34d2e48
2 parents 28bd7e8 + 3524b56
commit 34d2e48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
@@ -6,7 +6,7 @@ def index
     @tags = Kaminari.paginate_array(grouped_tags.to_a).page(params[:page])
     @total_tags = Tag.all.count
 
-    @excluded_tags = applicationcontroller.helpers.s('excluded_tags')
+    @excluded_tags = ApplicationController.helpers.s('excluded_tags')
     return if @excluded_tags.blank?
 
     @excluded_tags

diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -85,28 +85,28 @@ html lang="en"
                         | All
 
 
-                  = link_to imaginations_path, class: "item #{menu_active?(imaginations_path)}"
-                    =r ux.icon 'image'
-                    | Imaginations
                   =r ux.div 'item'
                   =r ux.menu class: 'right', only: :mobile
                     =r ux.item class: 'hamburger', action: 'click->sidenav#toggle'
                       =r ux.icon 'large sidebar'
 
                   =r ux.menu class: 'right inverted', only: :desktop, controller: 'dropdown'
                     =r ux.item class: 'dropdown', ui: :on
-                      =r ux.icon 'signal'
-                      | Stats
+                      =r ux.icon 'water'
+                      | Flow
                       =r ux.icon 'dropdown'
                       =r ux.menu
+                        = link_to imaginations_path, class: "item"
+                          | Imaginations
+                        =r ux.divider
                         = link_to feeds_path, class: "item"
                           | Feeds
                         =r ux.divider
                         = link_to tags_path, class: "item"
                           | Tags
 
                     = link_to settings_path, class: "item #{menu_active?(settings_path)}"
-                      =r ux.icon 'wrench'
+                      =r ux.icon 'tools'
                       | Settings