Skip to content

Commit

Permalink
Move package edit action close to the target
Browse files Browse the repository at this point in the history
Following the conventions used for editing the details of a kiwi image, we're
moving the "Edit Package" button close to the edited details.
  • Loading branch information
danidoni committed Mar 16, 2021
1 parent ac32cef commit 33700de
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 27 deletions.
1 change: 1 addition & 0 deletions src/api/app/assets/stylesheets/webui/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
@import 'notification_toolbar';
@import 'sidebar-collapsible';
@import 'user_profile_redesign/user_profile';
@import 'in_place_editing';

html {
overflow-y: scroll !important;
Expand Down
3 changes: 3 additions & 0 deletions src/api/app/assets/stylesheets/webui/in_place_editing.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.in-place-editing .hidden {
display: none;
}
22 changes: 21 additions & 1 deletion src/api/app/views/webui/package/_basic_info.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
.basic-info.in-place-editing.mb-3
.editing-form.hidden
= render partial: 'webui/package/edit', locals: { package: package, project: package.project }

.basic-info.mb-3
%h3#package-title
= package.title.presence || package.name
- if package.url.present?
Expand All @@ -8,3 +11,20 @@
%i No description set
- else
= render partial: 'webui/shared/collapsible_text', locals: { text: package.description }

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

:javascript
$('#toggle-in-place-editing').on('click', function () {
$('.in-place-editing .basic-info').toggle();
$('.in-place-editing .editing-form').toggle();
return false;
});
$('#cancel-in-place-editing').on('click', function () {
$('.in-place-editing .basic-info').toggle();
$('.in-place-editing .editing-form').toggle();
return false;
});
2 changes: 1 addition & 1 deletion src/api/app/views/webui/package/_edit.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
= form.label(:description, 'Description:')
= form.text_area(:description, rows: 8, class: 'form-control')
.form-group.text-right
= link_to 'Cancel', package_show_path(project, package), class: 'cancel btn btn-outline-danger px-4', remote: true
= button_tag('Cancel', id: 'cancel-in-place-editing', class: 'cancel btn btn-outline-danger px-4')
= submit_tag('Update', class: 'btn btn-primary px-4')
1 change: 0 additions & 1 deletion src/api/app/views/webui/package/_show_actions.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
= render partial: 'webui/package/show_actions/submit_package', locals: { package: package, project: project,
revision: revision }
- if User.possibly_nobody.can_modify?(package)
= render partial: 'webui/package/actions/edit_package', locals: { project: project, package: package }
= render partial: 'webui/package/show_actions/delete_package'

- if package.kiwi_image? && policy(package).update?
Expand Down

This file was deleted.

10 changes: 0 additions & 10 deletions src/api/app/views/webui/package/edit.js.erb

This file was deleted.

3 changes: 2 additions & 1 deletion src/api/app/views/webui/package/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
.card-body
.row
.col-md-8
= render partial: 'basic_info', locals: { package: @package }
.in-place-editing
= render partial: 'basic_info', locals: { package: @package, project: @project }
.col-md-4
= render partial: 'side_links', locals: { devel_package: @package.develpackage,
failures: @failures,
Expand Down
8 changes: 0 additions & 8 deletions src/api/app/views/webui/package/show.js.erb

This file was deleted.

3 changes: 2 additions & 1 deletion src/api/app/views/webui/package/update.js.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ resetFormValidation();
opacity: 0.25
}, 400, function() {
scrollToInPlace();
$('.in-place-editing').html("#{escape_javascript(render(partial: 'webui/package/basic_info', locals: { package: @package }))}");
$('.in-place-editing').html("#{escape_javascript(render(partial: 'webui/package/basic_info',
locals: { package: @package, project: @project }))}");
setCollapsible();
$('.in-place-editing').animate({ opacity: 1 }, 400, function() {
$('#flash').html("#{escape_javascript(render(layout: false, partial: 'layouts/webui/flash', object: flash))}");
Expand Down

0 comments on commit 33700de

Please sign in to comment.