Skip to content

Normalize confirm remove #5429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Normalize confirm remove #5429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b59e69
Normalize use of "Confirm Removal" in forms that confirm removal
martialblog Oct 2, 2025
26f476e
Normalize use of removal icons
martialblog Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion application/controllers/DashboardController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ public function removeDashletAction()
}
return true;
});
$form->setTitle($this->translate('Remove Dashlet From Dashboard'));
$form->setRedirectUrl('dashboard/settings');
$form->handleRequest();
$this->view->pane = $pane;
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/GroupController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function showAction()
'class' => 'link-button spinner',
'value' => 'btn_submit',
'decorators' => array('ViewHelper'),
'label' => $this->view->icon('trash'),
'label' => $this->view->icon('cancel'),
'title' => $this->translate('Remove this member')
));
$this->view->removeForm = $removeForm;
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/NavigationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public function sharedAction()
'class' => 'link-button spinner',
'value' => 'btn_submit',
'decorators' => array('ViewHelper'),
'label' => $this->view->icon('trash'),
'label' => $this->view->icon('cancel'),
'title' => $this->translate('Unshare this navigation item')
));

Expand Down
2 changes: 1 addition & 1 deletion application/controllers/RoleController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function removeAction()
$role = new RoleForm();
$role->setRedirectUrl('__CLOSE__');
$role->setRepository(new RolesConfig());
$role->setSubmitLabel($this->translate('Remove Role'));
$role->setSubmitLabel($this->translate('Confirm Removal'));
$role->remove($name);

try {
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/UserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public function showAction()
'class' => 'link-button spinner',
'value' => 'btn_submit',
'decorators' => array('ViewHelper'),
'label' => $this->view->icon('trash'),
'label' => $this->view->icon('cancel'),
'title' => $this->translate('Cancel this membership')
));
$this->view->removeForm = $removeForm;
Expand Down
2 changes: 1 addition & 1 deletion application/forms/Announcement/AnnouncementForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ protected function createUpdateElements(array $formData)
protected function createDeleteElements(array $formData)
{
$this->setTitle(sprintf($this->translate('Remove announcement %s?'), $this->getIdentifier()));
$this->setSubmitLabel($this->translate('Yes'));
$this->setSubmitLabel($this->translate('Confirm Removal'));
$this->setAttrib('class', 'icinga-controls');
}

Expand Down
2 changes: 1 addition & 1 deletion application/forms/Config/User/UserForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function getValues($suppressArrayNotation = false)
protected function createDeleteElements(array $formData)
{
$this->setTitle(sprintf($this->translate('Remove user %s?'), $this->getIdentifier()));
$this->setSubmitLabel($this->translate('Yes'));
$this->setSubmitLabel($this->translate('Confirm Removal'));
$this->setAttrib('class', 'icinga-controls');
}

Expand Down
2 changes: 1 addition & 1 deletion application/forms/Config/UserGroup/UserGroupForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected function createDeleteElements(array $formData)
'Note that all users that are currently a member of this group will'
. ' have their membership cleared automatically.'
));
$this->setSubmitLabel($this->translate('Yes'));
$this->setSubmitLabel($this->translate('Confirm Removal'));
$this->setAttrib('class', 'icinga-form icinga-controls');
}

Expand Down
6 changes: 4 additions & 2 deletions application/views/scripts/dashboard/settings.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
'dashboard/remove-pane',
array('pane' => $pane->getName()),
array(
'icon' => 'trash',
'icon' => 'cancel',
'class' => 'action-link',
'title' => sprintf($this->translate('Remove pane %s'), $pane->getName())
)
); ?>
Expand Down Expand Up @@ -77,7 +78,8 @@
'dashboard/remove-dashlet',
array('pane' => $pane->getName(), 'dashlet' => $dashlet->getName()),
array(
'icon' => 'trash',
'icon' => 'cancel',
'class' => 'action-link',
'title' => sprintf($this->translate('Remove dashlet %s from pane %s'), $dashlet->getTitle(), $pane->getTitle())
)
); ?>
Expand Down
Loading