-
Notifications
You must be signed in to change notification settings - Fork 434
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Design of the page has been changed: - Show repositories in a nicer way, using the space more efficiently - Integrated expert mode in the page. - Integrate addition of additional paths the page. TODO: - Add DoD Repository - Add from a distribution page - Tests - Order of repository path - Improve Javascript - Remove repository path Co-authored-by: Ana María Martínez Gómez <ammartinez@suse.de>
- Loading branch information
Showing
11 changed files
with
298 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
src/api/app/views/webui2/webui/repositories/_add_repository_from_project_modal.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
.modal.fade#add-repository-from-project{ tabindex: -1, role: 'dialog', aria: { labelledby: 'add_repo_from_project', hidden: 'true' } } | ||
.modal-dialog.modal-dialog-centered{ role: 'document' } | ||
.modal-content | ||
= form_tag(action: :create, project: project) do | ||
.modal-header | ||
%h5.modal-title Add Repository to #{project} | ||
.modal-body | ||
.form-group | ||
= label_tag :project do | ||
%strong Project: | ||
.input-group | ||
.input-group-prepend | ||
%span.input-group-text.project-search-icon | ||
%i.fa.fa-search | ||
%i.fas.fa-spinner.fa-spin.d-none | ||
= text_field_tag 'target_project', '', id: 'target_project', | ||
class: 'form-control', | ||
required: true, | ||
placeholder: 'Type to autocomplete...', | ||
data: { 'ajaxurl': url_for(controller: 'project', action: 'autocomplete_projects') } | ||
.form-group | ||
= label_tag :repositories do | ||
%strong Repositories: | ||
= select_tag 'target_repo', options_for_select(['']), id: 'target_repo', | ||
required: true, | ||
disabled: true, | ||
class: 'custom-select', | ||
data: { 'ajaxurl': url_for(controller: :project, | ||
action: :autocomplete_repositories) } | ||
.form-group | ||
= label_tag :name do | ||
%strong Name: | ||
= text_field_tag :repository, '', size: 60, disabled: false, required: true, class: 'form-control', id: 'repo_name' | ||
.form-group | ||
= label_tag :architectures, class: 'w-100' do | ||
%strong Architectures: | ||
- Architecture.available.each do |architecture| | ||
.custom-control.custom-checkbox.custom-control-inline | ||
= check_box_tag 'architectures[]', architecture.name, true, id: "architecture_#{architecture.name}", class: 'custom-control-input' | ||
= label_tag :architecture, architecture.name, class: 'custom-control-label', for: "architecture_#{architecture.name}" | ||
|
||
.modal-footer | ||
= render partial: 'webui2/shared/dialog_action_buttons' | ||
|
||
= content_for :ready_function do | ||
repositoriesSetupAutocomplete('#add-repository-from-project'); |
37 changes: 37 additions & 0 deletions
37
src/api/app/views/webui2/webui/repositories/_add_repository_path_modal.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
.modal.fade{ id: "add-repository-path-#{repository.id}", tabindex: -1, role: 'dialog', aria: { labelledby: 'add_repository_path', hidden: 'true' } } | ||
.modal-dialog.modal-dialog-centered{ role: 'document' } | ||
.modal-content | ||
= form_tag(action: :create, project: project) do | ||
.modal-header | ||
%h5.modal-title Add additional path to #{repository} | ||
.modal-body | ||
.form-group | ||
= label_tag :project do | ||
%strong Project: | ||
.input-group | ||
.input-group-prepend | ||
%span.input-group-text.project-search-icon | ||
%i.fa.fa-search | ||
%i.fas.fa-spinner.fa-spin.d-none | ||
= text_field_tag 'target_project', '', id: 'target_project', | ||
class: 'form-control', | ||
required: true, | ||
placeholder: 'Type to autocomplete...', | ||
data: { 'ajaxurl': url_for(controller: 'project', action: 'autocomplete_projects') } | ||
.form-group | ||
= label_tag :repositories do | ||
%strong Repositories: | ||
= select_tag 'target_repo', options_for_select(['']), id: 'target_repo', | ||
required: true, | ||
disabled: true, | ||
class: 'custom-select', | ||
data: { 'ajaxurl': url_for(controller: :project, | ||
action: :autocomplete_repositories) } | ||
= hidden_field_tag :repository, repository | ||
|
||
.modal-footer | ||
= render partial: 'webui2/shared/dialog_action_buttons' | ||
|
||
= content_for :ready_function do | ||
repositoriesSetupAutocomplete("#add-repository-path-#{repository.id}"); | ||
|
13 changes: 13 additions & 0 deletions
13
src/api/app/views/webui2/webui/repositories/_delete_repository_modal.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
.modal.fade{ id: "delete-repository-#{repository.id}", tabindex: -1, role: 'dialog', aria: { labelledby: 'delete-repository-label', hidden: true } } | ||
.modal-dialog.modal-dialog-centered{ role: 'document' } | ||
.modal-content | ||
.modal-header | ||
%h5.modal-title | ||
Delete repository? | ||
.modal-body | ||
%p Please confirm deletion of '#{repository}' repository | ||
= form_tag(destroy_repository_path(project: project, target: repository.name), method: :post) do | ||
.modal-footer | ||
%a.btn.btn-sm.btn-outline-secondary.px-4{ data: { dismiss: 'modal' } } | ||
Cancel | ||
= submit_tag('Delete', class: 'btn btn-sm btn-danger px-4') |
21 changes: 21 additions & 0 deletions
21
src/api/app/views/webui2/webui/repositories/_edit_repository_modal.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
.modal.fade{ id: "edit-repository-#{repository.id}", tabindex: -1, role: 'dialog', aria: { labelledby: "edit-#{repository.id}", hidden: 'true' } } | ||
.modal-dialog.modal-dialog-centered{ role: 'document' } | ||
.modal-content | ||
= form_tag({ action: :update }, id: "update_target_form-#{valid_xml_id(repository)}") do | ||
.modal-header | ||
%h5.modal-title{ id: "edit-#{repository.id}" } Edit #{repository} | ||
.modal-body | ||
.form-group | ||
= label_tag :architectures, class: 'w-100' do | ||
%strong Architectures: | ||
- Architecture.available.each do |architecture| | ||
.custom-control.custom-checkbox.custom-control-inline | ||
= check_box_tag "arch[#{architecture}]", '', repository.architectures.include?(architecture), | ||
class: 'custom-control-input', | ||
id: "#{repository.id}-architecture-#{architecture}" | ||
= label_tag :architecture, architecture, class: 'custom-control-label', for: "#{repository.id}-architecture-#{architecture}" | ||
= hidden_field_tag :project, project | ||
= hidden_field_tag :repo, repository | ||
|
||
.modal-footer | ||
= render partial: 'webui2/shared/dialog_action_buttons' |
43 changes: 43 additions & 0 deletions
43
src/api/app/views/webui2/webui/repositories/_repository_card_content.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
.card-body | ||
- if repository.path_elements.present? | ||
Repository paths: | ||
%ul.list-unstyled.ml-3 | ||
- repository.path_elements.each do |path| | ||
%li | ||
%small.font-weight-bold | ||
- if path.link.project == 'deleted' | ||
%i.fas.fa-exclamation-circle.text-warning | ||
Target repository has been removed | ||
- else | ||
#{path.link.project}/#{path.link.name} | ||
.card-footer.text-center | ||
.row | ||
- if User.current.can_modify?(project) && !repository.is_dod_repository? | ||
.col | ||
= link_to('#', title: 'Edit Repository', | ||
data: { toggle: 'modal', target: "#edit-repository-#{repository.id}" }) do | ||
%i.fas.fa-edit.text-secondary | ||
.col | ||
= link_to('#', title: 'Add Repository Path', | ||
data: { toggle: 'modal', target: "#add-repository-path-#{repository.id}" }) do | ||
%i.fas.fa-plus-circle.text-primary | ||
.col | ||
- url = "#{download_url}/#{project.to_s.gsub(/:/, ':/')}/#{repository}" | ||
= link_to(url, title: 'Download Repository') do | ||
%i.fas.fa-download.text-secondary | ||
|
||
- if User.current.can_modify?(project) | ||
.col | ||
= link_to('#', title: 'Delete Repository', | ||
data: { toggle: 'modal', target: "#delete-repository-#{repository.id}" }) do | ||
%i.fas.fa-times-circle.text-danger | ||
- elsif !User.current.is_nobody? | ||
.col | ||
= link_to('#', title: 'Request Delete Repository', | ||
data: { toggle: 'modal', target: "#request-delete-repository-#{repository.id}" }) do | ||
%i.fas.fa-user-times.text-danger | ||
|
||
= render partial: 'edit_repository_modal', locals: { repository: repository, project: project } | ||
= render partial: 'add_repository_path_modal', locals: { repository: repository, project: project } | ||
= render partial: 'delete_repository_modal', locals: { repository: repository, project: project } | ||
= render partial: 'request_delete_repository_modal', locals: { repository: repository, project: project } |
10 changes: 10 additions & 0 deletions
10
src/api/app/views/webui2/webui/repositories/_repository_entry.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
.col-12.col-md-6.col-lg-4 | ||
.card.mb-3 | ||
.card-header | ||
= link_to(repository, project_repository_state_path(project: project, repository: repository.name), class: 'font-weight-bold') | ||
.small | ||
- if repository.architectures.size.zero? | ||
No architecture selected | ||
- else | ||
#{repository.architectures.pluck(:name).join(', ')} | ||
= render partial: 'repository_card_content', locals: { project: project, repository: repository, download_url: download_url } |
17 changes: 17 additions & 0 deletions
17
src/api/app/views/webui2/webui/repositories/_request_delete_repository_modal.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
.modal.fade{ id: "request-delete-repository-#{repository.id}", tabindex: -1, role: 'dialog', | ||
aria: { labelledby: 'request-delete-repository-label', hidden: true } } | ||
.modal-dialog.modal-dialog-centered{ role: 'document' } | ||
.modal-content | ||
.modal-header | ||
%h5.modal-title | ||
Do you really want to request the deletion of repository #{repository} | ||
.modal-body | ||
%p Please confirm deletion of '#{repository}' repository | ||
= form_tag(project_remove_target_request_path(project: project, target: repository), method: :post) do | ||
= hidden_field_tag :project, project | ||
= hidden_field_tag :repository, repository | ||
.form-group | ||
= label_tag :description | ||
= text_area_tag :description, '', row: 3, class: 'form-control' | ||
.modal-footer | ||
= render partial: 'webui2/shared/dialog_action_buttons' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters