Skip to content

Commit

Permalink
Wrap Left Navigation items text into span tag
Browse files Browse the repository at this point in the history
The commit wraps text for items in the Left Nav menu into span tag and
adds an appropriate class for the items, so that it allows to find the
text using CSS selectors and thus allows to manipulate with the text.

Also, the commit adds title attribute for the links in Left Navigation
menu. That is needed for the case when sidebar is collapsed to show
tooltip while hovering over the items.
  • Loading branch information
Oleksandr Orlov committed Oct 14, 2020
1 parent 6fb107a commit eacc0e9
Show file tree
Hide file tree
Showing 34 changed files with 114 additions and 110 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
%h5.text-light{ class: navigation == :left ? 'pl-2 pt-4' : 'pt-2' }
Actions on this page
%ul.ml-auto.pt-0.text-nowrap.menu-options{ class: navigation == :left ? 'nav flex-column' : 'navbar-nav' }
.section-delimiter
%h5.text-light{ class: navigation == :left ? 'pl-2' : 'pt-2' }
%span.section-name Actions on this page
%ul.ml-auto.pt-0.text-nowrap.menu-options.mb-5{ class: navigation == :left ? 'nav flex-column' : 'navbar-nav' }
= yield :actions
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
%h5.pt-2.pl-2.text-light
Places
%span.section-name Places

%ul.nav.flex-column.ml-auto.pt-0.text-nowrap.menu-options
%li.nav-item
= link_to(projects_path, class: 'nav-link') do
= link_to(projects_path, class: 'nav-link', title: 'All Projects') do
%i.fas.fa-list.fa-lg.mr-2
All Projects
%span.nav-item-name All Projects
- unless @spider_bot
%li.nav-item
= link_to(monitor_path, class: 'nav-link') do
= link_to(monitor_path, class: 'nav-link', title: 'Status Monitor') do
%i.fas.fa-heartbeat.fa-lg.mr-2
Status Monitor
%span.nav-item-name Status Monitor
36 changes: 18 additions & 18 deletions src/api/app/views/layouts/webui/responsive_ux/_places.html.haml
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
%h5.pt-2.text-light{ class: navigation == :left ? 'pl-2' : '' }
Places
%span.section-name Places

%ul.ml-auto.pt-0.text-nowrap.menu-options{ class: navigation == :left ? 'nav flex-column' : 'navbar-nav' }
%ul.ml-auto.pt-0.text-nowrap.menu-options.mb-4{ class: navigation == :left ? 'nav flex-column' : 'navbar-nav' }
- if User.session
- if navigation != :left
%li.nav-item
= link_to(user_path(User.session!), id: 'link-to-user-home', class: 'nav-link') do
= image_tag_for(User.session, size: 23, custom_class: 'rounded-circle bg-light mr-2')
Profile
%li.nav-item
= link_to(my_tasks_path, class: 'nav-link', alt: 'Tasks') do
= link_to(my_tasks_path, class: 'nav-link', title: 'Tasks') do
%i.fas.fa-tasks.fa-lg.mr-2
Tasks
%span.nav-item-name Tasks
%li.nav-item
- if User.session!.home_project
= link_to(project_show_path(User.session!.home_project), class: 'nav-link') do
= link_to(project_show_path(User.session!.home_project), class: 'nav-link', title: 'Your Home Project') do
%i.fas.fa-cubes.fa-lg.mr-2
Your Home Project
%span.nav-item-name Your Home Project
- else
= link_to(new_project_path(name: User.session!.home_project_name), class: 'nav-link') do
= link_to(new_project_path(name: User.session!.home_project_name), class: 'nav-link', title: 'Create Your Home Project') do
%i.fas.fa-cubes.fa-lg.mr-2
Create Your Home Project
%span.nav-item-name Create Your Home Project
%li.nav-item
= link_to(projects_path, class: 'nav-link') do
= link_to(projects_path, class: 'nav-link', title: 'All Projects') do
%i.fas.fa-list.fa-lg.mr-2
All Projects
%span.nav-item-name All Projects
%li.nav-item
= link_to(monitor_path, class: 'nav-link') do
= link_to(monitor_path, class: 'nav-link', title: 'Status Monitor') do
%i.fas.fa-heartbeat.fa-lg.mr-2
Status Monitor
%span.nav-item-name Status Monitor
- if User.admin_session?
%li.nav-item
= link_to(configuration_path, class: 'nav-link', title: 'Configure this instance') do
= link_to(configuration_path, class: 'nav-link', title: 'Configuration') do
%i.fas.fa-cogs.mr-2
Configuration
%span.nav-item-name Configuration
- if navigation != :left
%li.nav-item
= link_to(session_path, method: :delete, id: 'logout-link', class: 'nav-link') do
%i.fas.fa-sign-out-alt.fa-lg.mr-2
Logout
- else
%li.nav-item
= link_to(projects_path, class: 'nav-link') do
= link_to(projects_path, class: 'nav-link', title: 'All Projects') do
%i.fas.fa-list.fa-lg.mr-2
All Projects
%span.nav-item-name All Projects
- unless @spider_bot
%li.nav-item
= link_to(monitor_path, class: 'nav-link') do
= link_to(monitor_path, class: 'nav-link', title: 'Status Monitor') do
%i.fas.fa-heartbeat.fa-lg.mr-2
Status Monitor
%span.nav-item-name Status Monitor
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
%li.nav-item
= link_to(new_attribs_path(project: project.name, package: package), title: 'Add Attribute', class: 'nav-link') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Add Attribute
%span.nav-item-name Add Attribute
8 changes: 4 additions & 4 deletions src/api/app/views/webui/groups/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
- if feature_enabled?(:responsive_ux)
- content_for :actions do
%li.nav-item
= link_to(group_new_path, class: 'nav-link') do
= link_to(group_new_path, class: 'nav-link', title: 'Create Group') do
%i.fas.fa-lg.mr-2.fa-plus-circle
Create Group
%span.nav-item-name Create Group
- else
.pt-4
= link_to(group_new_path) do
= link_to(group_new_path, title: 'Create Group') do
%i.fas.fa-plus-circle.text-primary
Create Group
%span.nav-item-name Create Group

- content_for :ready_function do
initializeDataTable('#manage-groups-table', { columnDefs: [{ orderable: false, searchable: false, targets: -1 }] });
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
- content_for :actions do
- if policy(StatusMessage.new).create?
%li.nav-item
= link_to(new_status_message_path, class: 'nav-link') do
= link_to(new_status_message_path, class: 'nav-link', title: 'Create Status Message') do
%i.fas.fa-plus-square.fa-lg.mr-2
Create Status Message
%span.nav-item-name Create Status Message
%li.nav-item
= link_to(new_project_path, class: 'nav-link') do
= link_to(new_project_path, class: 'nav-link', title: 'Create Project') do
%i.fas.fa-plus-square.fa-lg.mr-2
Create Project
%span.nav-item-name Create Project
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to(edit_package_path(project, package), class: 'nav-link', remote: true) do
%i.fas.fa-edit.fa-lg.mr-1
Edit Package
= link_to(edit_package_path(project, package), class: 'nav-link', remote: true, title: 'Edit Package') do
%i.fas.fa-edit.fa-lg.mr-2
%span.nav-item-name Edit Package
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%li.nav-item
= link_to(new_package_branches_path(project: project, package_name: package, revision: revision),
class: 'nav-link') do
class: 'nav-link', title: 'Branch Package') do
%i.fas.fa-code-branch.fa-lg.mr-2
Branch Package
%span.nav-item-name Branch Package
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to(bugzilla_url(bugowners_mail, "#{project_name}/#{package_name}: Bug"), class: 'nav-link') do
%i.fas.fa-bug.fa-lg.mr-1
Report Bug
= link_to(bugzilla_url(bugowners_mail, "#{project_name}/#{package_name}: Bug"), class: 'nav-link', title: 'Report Bug') do
%i.fas.fa-bug.fa-lg.mr-2
%span.nav-item-name Report Bug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to(cloud_upload_index_path, id: 'cloud-upload', class: 'nav-link') do
= link_to(cloud_upload_index_path, id: 'cloud-upload', class: 'nav-link', title: 'Cloud Upload') do
%i.fas.fa-cloud-upload-alt.fa-lg.mr-2
Cloud Upload
%span.nav-item-name Cloud Upload
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to('#', class: 'nav-link', data: { toggle: 'modal', target: '#delete-modal' }) do
= link_to('#', class: 'nav-link', data: { toggle: 'modal', target: '#delete-modal' }, title: 'Delete Package') do
%i.fas.fa-times-circle.fa-lg.mr-2
Delete package
%span.nav-item-name Delete Package
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to(new_project_package_deletion_path(project, package), class: 'nav-link') do
= link_to(new_project_package_deletion_path(project, package), class: 'nav-link', title: 'Request Deletion') do
%i.fas.fa-times-circle.fa-lg.mr-2
Request Deletion
%span.nav-item-name Request Deletion
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
%li.nav-item
= link_to(new_project_package_devel_project_change_path(package.project, package), class: 'nav-link') do
= link_to(new_project_package_devel_project_change_path(package.project, package), class: 'nav-link',
title: 'Request Devel Project Change') do
%i.fas.fa-exchange-alt.fa-lg.mr-2
Request Devel Project Change
%span.nav-item-name Request Devel Project Change
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to(new_project_package_role_addition_path(project, package), class: 'nav-link') do
= link_to(new_project_package_role_addition_path(project, package), class: 'nav-link', title: 'Request Role Addition') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Request Role Addition
%span.nav-item-name Request Role Addition
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
%li.nav-item
= link_to(new_project_package_submission_path(project, package, revision: revision), class: 'nav-link') do
= link_to(new_project_package_submission_path(project, package, revision: revision), class: 'nav-link',
title: 'Submit Package') do
%i.fas.fa-share-square.fa-lg.mr-2
Submit Package
%span.nav-item-name Submit Package
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
%li.nav-item
= link_to(package_trigger_services_path(package: package, project: project), method: :post, class: 'nav-link') do
= link_to(package_trigger_services_path(package: package, project: project), method: :post, class: 'nav-link',
title: 'Trigger Services') do
%i.fas.fa-project-diagram.fa-lg.mr-2
Trigger services
%span.nav-item-name Trigger Services
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to(import_kiwi_image_path(package_id), id: 'edit-kiwi', class: 'nav-link') do
= link_to(import_kiwi_image_path(package_id), id: 'edit-kiwi', class: 'nav-link', title: 'View Image') do
%i.fas.fa-compact-disc.fa-lg.mr-2
View Image
%span.nav-item-name View Image
8 changes: 4 additions & 4 deletions src/api/app/views/webui/project/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
- if feature_enabled?(:responsive_ux)
- content_for :actions do
%li.nav-item
= link_to(new_project_path, class: 'nav-link') do
= link_to(new_project_path, class: 'nav-link', title: 'Create Project') do
%i.fas.fa-lg.mr-2.fa-plus-circle
Create Project
%span.nav-item-name Create Project
- else
%li.list-inline-item
= link_to(new_project_path) do
= link_to(new_project_path, title: 'Create Project') do
%i.fas.fa-plus-circle.text-primary
Create Project
%span.nav-item-name Create Project

%table.responsive.table.table-sm.table-bordered.table-hover.w-100#projects-datatable{ data: { source: projects_path(format: :json),
all: 'false' } }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
= render partial: 'webui/project/responsive_ux/show_actions/gpg_key_ssl_certificate', locals: { project: project }

%li.nav-item
= link_to(image_templates_path, class: 'nav-link') do
= link_to(image_templates_path, class: 'nav-link', title: 'New Image') do
%i.fas.fa-compact-disc.fa-lg.mr-2
New Image
%span.nav-item-name New Image
- if User.possibly_nobody.can_modify?(project) && show_package_actions?
%li.nav-item
= link_to(new_package_path(project), class: 'nav-link') do
= link_to(new_package_path(project), class: 'nav-link', title: 'Create Package') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Create Package
%span.nav-item-name Create Package
%li.nav-item
= link_to(project_new_packages_branch_path(project), class: 'nav-link') do
= link_to(project_new_packages_branch_path(project), class: 'nav-link', title: 'Branch Package') do
%i.fas.fa-code-branch.fa-lg.mr-2
Branch Package
%span.nav-item-name Branch Package
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- content_for :actions do
- if User.possibly_nobody.can_modify?(project)
= link_to(new_project_path(namespace: project), class: 'nav-link') do
= link_to(new_project_path(namespace: project), class: 'nav-link', title: 'Create Subproject') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Create Subproject
%span.nav-item-name Create Subproject
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to('#', class: 'nav-link', data: { toggle: 'modal', target: '#delete-project-modal' }) do
= link_to('#', class: 'nav-link', data: { toggle: 'modal', target: '#delete-project-modal' }, title: 'Delete Project') do
%i.fas.fa-times-circle.fa-lg.mr-2
Delete Project
%span.nav-item-name Delete Project
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to(edit_project_path(project), class: 'nav-link', remote: true) do
%i.fas.fa-edit.fa-lg.mr-1
Edit Project
= link_to(edit_project_path(project), class: 'nav-link', remote: true, title: 'Edit Project') do
%i.fas.fa-edit.fa-lg.mr-2
%span.nav-item-name Edit Project
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to(keys_and_certificates_path(project), class: 'nav-link') do
= link_to(keys_and_certificates_path(project), class: 'nav-link', title: 'GPG Key / SSL Certificate') do
%i.fas.fa-key.fa-lg.mr-2
Show GPG Key / SSL Certificate
%span.nav-item-name GPG Key / SSL Certificate
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- unless has_patchinfo
%li.nav-item
= link_to(patchinfo_path(project: project), method: :post, class: 'nav-link') do
= link_to(patchinfo_path(project: project), method: :post, class: 'nav-link', title: 'Create Patchinfo') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Create Patchinfo
%span.nav-item-name Create Patchinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to(bugzilla_url(bugowners_mail, "#{project}: Bug"), class: 'nav-link') do
= link_to(bugzilla_url(bugowners_mail, "#{project}: Bug"), class: 'nav-link', title: 'Report Bug') do
%i.fas.fa-bug.fa-lg.mr-2
Report Bug
%span.nav-item-name Report Bug
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
%li.nav-item
= link_to(new_project_role_addition_path(project), class: 'nav-link') do
= link_to(new_project_role_addition_path(project), class: 'nav-link', title: 'Request Role Addition') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Request Role Addition
%span.nav-item-name Request Role Addition
%li.nav-item
= link_to(new_project_deletion_path(project), class: 'nav-link') do
= link_to(new_project_deletion_path(project), class: 'nav-link', title: 'Request Deletion') do
%i.fas.fa-times-circle.fa-lg.mr-2
Request Deletion
%span.nav-item-name Request Deletion
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to(project_release_request_path(@project), class: 'nav-link') do
= link_to(project_release_request_path(@project), class: 'nav-link', title: 'Request to Release') do
%i.fas.fa-share-square.fa-lg.mr-2
Request to Release
%span.nav-item-name Request to Release
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- if !project.is_maintenance_incident? && release_targets.present?
%li.nav-item
= link_to(new_project_maintenance_incident_request_path(project), class: 'nav-link') do
= link_to(new_project_maintenance_incident_request_path(project), class: 'nav-link', title: 'Submit as Update') do
%i.fas.fa-share-square.fa-lg.mr-2
Submit as Update
%span.nav-item-name Submit as Update
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%li.nav-item
= link_to('#', class: 'nav-link', data: { toggle: 'modal', target: '#unlock-project-modal' }) do
= link_to('#', class: 'nav-link', data: { toggle: 'modal', target: '#unlock-project-modal' }, title: 'Unlock Project') do
%i.fas.fa-unlock.fa-lg.mr-2
Unlock Project
%span.nav-item-name Unlock Project
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
- content_for :actions do
- if user_can_modify
%li.nav-item
= link_to(repositories_distributions_path(project: project), class: 'nav-link') do
= link_to(repositories_distributions_path(project: project), class: 'nav-link', title: 'Add from a Distribution') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Add from a Distribution
%span.nav-item-name Add from a Distribution

%li.nav-item
= link_to('#', data: { toggle: 'modal', target: '#add-repository-from-project' }, class: 'nav-link') do
= link_to('#', data: { toggle: 'modal', target: '#add-repository-from-project' }, class: 'nav-link', title: 'Add from a Project') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Add from a Project
%span.nav-item-name Add from a Project

- if User.admin_session?
%li.nav-item
= link_to('#', data: { toggle: 'modal', target: '#add-dod-repository-modal' }, class: 'nav-link') do
= link_to('#', data: { toggle: 'modal', target: '#add-dod-repository-modal' }, class: 'nav-link', title: 'Add DoD Repository') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Add DoD Repository
%span.nav-item-name Add DoD Repository
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
- content_for :actions do
%li.nav-item
= link_to('#', data: { toggle: 'modal', target: '#add-user-role-modal' }, id: 'add-user', class: 'nav-link') do
= link_to('#', data: { toggle: 'modal', target: '#add-user-role-modal' }, id: 'add-user', class: 'nav-link', title: 'Add User') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Add User
%span.nav-item-name Add User
%li.nav-item
= link_to('#', data: { toggle: 'modal', target: '#add-group-role-modal' }, id: 'add-group', class: 'nav-link') do
= link_to('#', data: { toggle: 'modal', target: '#add-group-role-modal' }, id: 'add-group', class: 'nav-link', title: 'Add Group') do
%i.fas.fa-plus-circle.fa-lg.mr-2
Add Group
%span.nav-item-name Add Group
4 changes: 2 additions & 2 deletions src/api/app/views/webui/staging/workflows/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
%li.nav-item
= link_to(edit_staging_workflow_path(@staging_workflow.project), title: 'Edit Staging', class: 'nav-link') do
%i.fas.fa-edit.fa-lg.mr-2
Edit Staging
%span.nav-item-name Edit Staging
- else
= link_to(edit_staging_workflow_path(@staging_workflow.project), title: 'Edit Staging') do
%i.fas.fa-edit.fa-xs.text-info
Expand All @@ -23,7 +23,7 @@
%li.nav-item
= link_to('#', title: 'Delete Staging', data: { toggle: 'modal', target: '#delete-staging-workflow' }, class: 'nav-link') do
%i.fas.fa-lg.mr-2.fa-times-circle
Delete Staging
%span.nav-item-name Delete Staging
- else
= link_to('#', title: 'Delete Staging', data: { toggle: 'modal', target: '#delete-staging-workflow' }) do
%i.fas.fa-times-circle.fa-xs.text-danger
Expand Down
Loading

0 comments on commit eacc0e9

Please sign in to comment.