Skip to content

Commit

Permalink
Replace pl with ps
Browse files Browse the repository at this point in the history
  • Loading branch information
hellcp-work committed Jan 5, 2023
1 parent 1fb9622 commit c0c2924
Show file tree
Hide file tree
Showing 32 changed files with 49 additions and 49 deletions.
8 changes: 4 additions & 4 deletions src/api/app/assets/stylesheets/webui/build-results.scss
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
// Build state

.build-state {
@extend .pl-1;
@extend .pl-sm-2;
@extend .ps-1;
@extend .ps-sm-2;
flex-basis: 62%;
}

Expand Down Expand Up @@ -147,8 +147,8 @@
// Repository state

.repository-state {
@extend .pl-1;
@extend .pl-sm-3;
@extend .ps-1;
@extend .ps-sm-3;
@extend .text-nowrap;
flex-basis: 38%;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.build-result.p-1.pl-3.p-sm-2.pl-sm-3.mx-2.mt-2{ class: "#{status_border_color(result_code)}",
.build-result.p-1.ps-3.p-sm-2.ps-sm-3.mx-2.mt-2{ class: "#{status_border_color(result_code)}",
data: { placement: 'auto',
toggle: 'popover',
html: 'true',
Expand Down
6 changes: 3 additions & 3 deletions src/api/app/components/notification_component.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
= render BsRequestStateBadgeComponent.new(bs_request: @notification.notifiable, css_class: 'ms-1')
.col-auto.actions.ms-auto.align-self-end.align-self-md-start
= render NotificationMarkButtonComponent.new(@notification, @selected_filter, params[:page], params[:show_more])
.row.mt-1.pl-sm-4
.row.mt-1.ps-sm-4
.col-auto.pe-0
= render NotificationAvatarsComponent.new(@notification)
.col-auto.pl-xs-2
.col-auto.ps-xs-2
= render NotificationActionDescriptionComponent.new(@notification)
.row.d-none.d-md-block.pl-4
.row.d-none.d-md-block.ps-4
.col
= render NotificationExcerptComponent.new(@notification)
2 changes: 1 addition & 1 deletion src/api/app/views/layouts/webui/_actions.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.section-delimiter
%h5.text-light{ class: navigation == :left ? 'pl-2' : 'pt-2' }
%h5.text-light{ class: navigation == :left ? 'ps-2' : 'pt-2' }
%span.section-name Actions on this page
%ul.ms-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,4 +1,4 @@
%h5.pt-2.pl-2.text-light
%h5.pt-2.ps-2.text-light
%span.section-name Places

%ul.nav.flex-column.ms-auto.pt-0.text-nowrap.menu-options
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/layouts/webui/_places.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%h5.pt-2.text-light{ class: navigation == :left ? 'pl-2' : '' }
%h5.pt-2.text-light{ class: navigation == :left ? 'ps-2' : '' }
%span.section-name Places

%ul.ms-auto.pt-0.text-nowrap.menu-options.mb-4{ class: navigation == :left ? 'nav flex-column' : 'navbar-nav' }
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/groups/new.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.card.mb-3
.card-body
%h3= @pagetitle
.col-lg-6.pl-0
.col-lg-6.ps-0
= form_for(Group.new, url: groups_path, method: :post) do |form|
.mb-3
= form.label(:title)
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/image_templates/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
- first_template ||= template
.d-flex
= image_template_icon(template)
.pl-3
.ps-3
= link_to_if(!remote, title_or_name(template), package_show_path(project: project, package: template))
%small.description.text-muted.d-block= template.description
- if project.packages.empty?
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/package/_basic_info.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

- if policy(package).update?
.pt-4
= link_to('javascript:void(0);', id: 'toggle-in-place-editing', class: 'nav-link pl-0', title: 'Edit') do
= link_to('javascript:void(0);', id: 'toggle-in-place-editing', class: 'nav-link ps-0', title: 'Edit') do
%i.fas.fa-edit
%span.nav-item-name Edit

Expand Down
6 changes: 3 additions & 3 deletions src/api/app/views/webui/package/_buildstatus.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
repository_name = result.repository.tr('.', '_')
expanded = repository_expanded?(collapsed_repositories, repository_name, package_name)
- if result.repository != previous_repo
.d-flex.flex-row.py-1.bg-light.pl-1.pl-sm-2
.d-flex.flex-row.py-1.bg-light.ps-1.ps-sm-2
= link_to(word_break(result.repository, 22),
package_binaries_path(project: project, package: package, repository: result.repository),
title: "Binaries for #{result.repository}")
Expand All @@ -39,7 +39,7 @@
%span.ms-1
= result.architecture
.build-state.toggle-build-info-parent
%i.fa.fa-question-circle.text-info.px-2.pl-lg-1.toggle-build-info{ title: 'Click to keep it open' }
%i.fa.fa-question-circle.text-info.px-2.ps-lg-1.toggle-build-info{ title: 'Click to keep it open' }
= render(BuildresultStatusLinkComponent.new(repository_name: result.repository, architecture_name: result.architecture,
project_name: project.name, package_name: package,
build_status: result.code, build_details: result.details))
Expand All @@ -50,7 +50,7 @@
%div
- if result.is_repository_in_db
= repository_status_icon(status: result.state)
%span.pl-1= repository_info(result.state)
%span.ps-1= repository_info(result.state)
- else
%i.fas.fa-clock.text-warning
This result is outdated
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/package/binaries.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
= repository_status_icon(status: result[:repocode].to_s, html_class: 'fa-xs')
= result[:arch]
- if result[:binaries].empty?
%p.pl-2
%p.ps-2
%i No built binaries
- else
.table-responsive
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/packages/branches/new.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
= form_tag(packages_branches_path) do
%details
%summary More options
.pt-2.pl-2
.pt-2.ps-2
= hidden_field_tag :linked_project, @project.name
= hidden_field_tag :linked_package, @package.name
= render partial: 'webui/shared/package_branch_form', locals: { show_project_field: true,
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/project/_basic_info.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@

- if policy(project).update?
.pt-4
= link_to(edit_project_path(project), class: 'nav-link pl-0', remote: true, title: 'Edit') do
= link_to(edit_project_path(project), class: 'nav-link ps-0', remote: true, title: 'Edit') do
%i.fas.fa-edit.text-secondary
%span.nav-item-name Edit
6 changes: 3 additions & 3 deletions src/api/app/views/webui/project/_buildstatus.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- repository_name = repository.tr('.', '_')
- expanded = repository_expanded?(collapsed_repositories, repository_name)
.d-flex.flex-column
.d-flex.flex-row.py-1.bg-light.pl-1.pl-sm-2
.d-flex.flex-row.py-1.bg-light.ps-1.ps-sm-2
= link_to(word_break(repository, 12),
project_repository_state_path(project: project.name, repository: repository),
title: "Repository #{repository}")
Expand Down Expand Up @@ -51,7 +51,7 @@
.build-state.d-flex.flex-column
- build_result.summary.each do |status_count|
.toggle-build-info-parent.text-nowrap
%i.fa.fa-question-circle.text-info.px-2.pl-lg-1.toggle-build-info{ title: 'Click to keep it open' }
%i.fa.fa-question-circle.text-info.px-2.ps-lg-1.toggle-build-info{ title: 'Click to keep it open' }
= link_to("#{status_count.code}: #{status_count.count}",
{ action: :monitor,
"#{valid_xml_id("repo_#{repository}")}": 1,
Expand All @@ -65,7 +65,7 @@
%p.py-1= Buildresult.status_description(status_count.code)
%div
= repository_status_icon(status: build_result.state)
%span.pl-1= repository_info(build_result.state)
%span.ps-1= repository_info(build_result.state)

:javascript
toggleBuildInfo();
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
= render partial: 'webui/request/beta_show_tabs/ask_for_review', locals: { can_add_reviews: can_add_reviews }

- open_reviews_for_staging_projects.each do |review|
.pl-3
.ps-3
%i.fas.fa-info-circle.text-info
- staging_project = review.project
Is staged in
Expand All @@ -30,11 +30,11 @@
- package_size_limit = 3
- if package_maintainers.size <= package_size_limit
- package_maintainers.pluck(:login).each do |package_maintainer|
.pl-3
.ps-3
= render UserAvatarComponent.new(package_maintainer)
- else
- package_maintainers.take(package_size_limit).pluck(:login).each do |package_maintainer|
.pl-3
.ps-3
= render UserAvatarComponent.new(package_maintainer)
%p.mt-3.ms-3
- modal_id = 'show-package-maintainers-modal'
Expand All @@ -54,11 +54,11 @@
- project_size_limit = 3
- if project_maintainers.size <= project_size_limit
- project_maintainers.pluck(:login).each do |project_maintainer|
.pl-3
.ps-3
= render UserAvatarComponent.new(project_maintainer)
- else
- project_maintainers.take(project_size_limit).pluck(:login).each do |project_maintainer|
.pl-3
.ps-3
= render UserAvatarComponent.new(project_maintainer)
%p.mt-3.ms-3
- modal_id = 'show-project-maintainers-modal'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.d-flex.flex-row.pt-1
.pl-3
.ps-3
- if review.accepted?
%i.fas.fa-sm.fa-check.text-primary.align-middle.pe-1
- if review.declined?
Expand All @@ -9,7 +9,7 @@

= render BsRequestOverviewAvatarsComponent.new(review)

.pl-1
.ps-1
- if review.for_user?
= user_with_realname_and_icon(review.by_user, short: true, no_icon: true)
- elsif review.for_group?
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/search/_results.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
= project_or_package_link(project: project, package: package, short: false, trim_to: nil)
%span.d-none= result.sphinx_attributes
= ": #{result.title}" if result.title.present?
%p.pl-4
%p.ps-4
- if result.description.blank?
= '...'
- else
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/search/_results_issue.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
= project_or_package_link(project: project, package: package, short: false, trim_to: nil)
%span.d-none= result.sphinx_attributes
= ": #{result.title}" if result.title.present?
%p.pl-4
%p.ps-4
- if result.description.blank?
= '...'
- else
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/search/_results_owner.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
= link_to(user_or_group_path(record)) do
= image_tag_for(record, size: 60, custom_class: 'align-self-center shadow-lg border border-secondary rounded border-2')
.col
.card-body.p-0.pl-2
.card-body.p-0.ps-2
%ul.list-unstyled
%li{ title: record.name }
= truncate(record.name, length: 40)
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/search/_search_for.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.mb-3.row.row-cols-auto
- search_for_options = options_for_select([['All', '0'], ['Projects', '1'], ['Packages', '2']], params.fetch(:search_for, '0'))
-# FIXME: The dropdown arrow is a bit far when 'All' is selected
= select_tag('search_for', search_for_options, class: 'form-select border-0 pl-0 w-auto')
= select_tag('search_for', search_for_options, class: 'form-select border-0 ps-0 w-auto')

%button.btn.btn-outline-secondary.ms-2.collapsed{ type: 'button', aria: { controls: 'collapse-1', expanded: 'false' },
'data-toggle' => 'collapse', href: '#advanced-container', role: 'button' }
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/search/owner.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

.mb-3.row.row-cols-auto
- limit_options = options_for_select([['Newest', '1'], ['Oldest', '-1'], ['All', '0']], @owner_limit)
= select_tag('limit', limit_options, class: 'form-select border-0 pl-0 w-auto')
= select_tag('limit', limit_options, class: 'form-select border-0 ps-0 w-auto')
%label#limit-label{ for: 'limit' }
= 'package'.pluralize(@owner_limit.to_i.abs)
-# TODO: Ajaxify this section, so whenever changing the filters above, it fetches and refreshes the results
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/session/new.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.card
.card-body#loginform
.col-lg-6.pl-0
.col-lg-6.ps-0
- if kerberos_mode?
%h3 Kerberos authentication required
%p You are seeing this page, because you are not authenticated in the kerberos realm ('#{CONFIG['kerberos_realm']}').
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/shared/_editor.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.sticky-top.bg-light{ id: "top_#{uid}" }
.card-header
.d-flex.justify-content-between
.btn-group.pl-2
.btn-group.ps-2
%button.btn.btn-secondary{ id: "undo_#{uid}", onclick: "editors[#{uid}].Undo(this);", disabled: true }
%i.fa.fa-undo
Undo
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/staging/projects/_checks.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- if checks.blank? && missing_checks.blank?
None
- else
%ul.pl-0.list-unstyled
%ul.ps-0.list-unstyled
- missing_checks.each do |name|
%li.missing-check
%span
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- if projects.empty?
None
- else
%ul.pl-4
%ul.ps-4
- projects.sort.each do |project|
%li
= render StagingProjectLinkComponent.new(staging_project: project, staging_workflow: staging_workflow)
2 changes: 1 addition & 1 deletion src/api/app/views/webui/staging/workflows/_infos.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
%dl
%dt Managers:
%dd
%ul.pl-2.list-unstyled
%ul.ps-2.list-unstyled
%li= link_to managers.title, group_path(managers)

%dt Empty projects:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- excluded ||= false

%ul.pl-2.list-unstyled
%ul.ps-2.list-unstyled
- if requests.empty?
%li
Empty
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/user/_basic_info.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
.row.mb-3.mb-md-0
.col-4.col-sm-2.col-md-12.text-center
= image_tag_for(user, size: 200)
.col-8.col-sm-10.col-md-12.pl-0.p-md-3
.col-8.col-sm-10.col-md-12.ps-0.p-md-3
%h4#home-realname
= user.realname
%h5.text-muted#home-login
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/users/edit.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.card.mb-3
.card-body
%h3= @pagetitle
.col-md-6.pl-0
.col-md-6.ps-0
= form_for(@displayed_user) do |form|
= form.hidden_field(:login)
.mb-3
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/users/new.html.haml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.card.mb-3
.card-body
.col-lg-6.pl-0
.col-lg-6.ps-0
- if can_register?
%h3= @pagetitle.titleize
= render SignUpComponent.new(create_page: params.key?(:submit_btn_text))
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/users/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
role_titles: @role_titles,
configuration: @configuration,
account_edit_link: @account_edit_link }
.col-12.col-md-8.col-xxl-9.pl-md-0
.col-12.col-md-8.col-xxl-9.ps-md-0
- locals = { involved_items_service: @involved_items_service }
- locals.merge!({ displayed_user: @displayed_user,
activities_per_year: @activities_per_year,
Expand Down
8 changes: 4 additions & 4 deletions src/api/app/views/webui/users/tokens/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,18 @@

.actions
- if policy(@token).edit?
= link_to(edit_token_path(@token), class: 'pl-2', title: 'Edit') do
= link_to(edit_token_path(@token), class: 'ps-2', title: 'Edit') do
%i.fas.fa-edit
%span.nav-item-name Edit
- if policy(@token).webui_trigger?
= link_to(token_trigger_path(@token), class: 'pl-2', title: 'Trigger Token') do
= link_to(token_trigger_path(@token), class: 'ps-2', title: 'Trigger Token') do
%i.fas.fa-project-diagram
%span.nav-item-name Trigger Token
- if @token.type == 'Token::Workflow'
= link_to(token_users_path(@token.id), class: 'pl-2', title: 'Share') do
= link_to(token_users_path(@token.id), class: 'ps-2', title: 'Share') do
%i.fas.fa-users
%span.nav-item-name Share
= link_to(token_workflow_runs_path(@token.id), class: 'pl-2', title: 'Workflow Runs') do
= link_to(token_workflow_runs_path(@token.id), class: 'ps-2', title: 'Workflow Runs') do
%i.fas.fa-book-open
%span.nav-item-name Workflow Runs
-# haml-lint:enable ViewLength

0 comments on commit c0c2924

Please sign in to comment.