From a8a87d27eb09b75e329d2b6a6d8b0710e80d8cc5 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 28 Oct 2015 09:56:50 +0100 Subject: [PATCH] CSS: Rename remove-comment to remove-action refs #5543 --- .../views/scripts/partials/comment/comment-detail.phtml | 2 +- .../views/scripts/partials/downtime/downtime-header.phtml | 2 +- .../views/scripts/show/components/acknowledgement.phtml | 2 +- .../application/views/scripts/show/components/comments.phtml | 2 +- .../application/views/scripts/show/components/downtime.phtml | 2 +- public/css/icinga/main.less | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml index 291aec4b6..2d4f32792 100644 --- a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml +++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml @@ -41,7 +41,7 @@ setAttrib('class', $deleteButton->getAttrib('class') . ' remove-comment'); + $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action'); $deleteButton->populate( array( 'comment_id' => $comment->id, diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml index eadc9f5fb..8b1a941a3 100644 --- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml +++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml @@ -54,7 +54,7 @@ setAttrib('class', $deleteButton->getAttrib('class') . ' remove-comment'); + $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action'); $deleteButton->populate( array( 'downtime_id' => $downtime->id, diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml index d80f33c27..cb3166b0a 100644 --- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml +++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml @@ -39,7 +39,7 @@ $acknowledgement = $object->acknowledgement; setAttrib('class', $removeAckForm->getAttrib('class') . ' remove-comment'); + $removeAckForm->setAttrib('class', $removeAckForm->getAttrib('class') . ' remove-action'); echo $removeAckForm; ?> diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml index d91e7ae72..84fdf904f 100644 --- a/modules/monitoring/application/views/scripts/show/components/comments.phtml +++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml @@ -55,7 +55,7 @@ if (empty($object->comments) && ! $addLink) { setAttrib('class', $deleteButton->getAttrib('class') . ' remove-comment'); + $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action'); $deleteButton->populate( array( 'comment_id' => $comment->id, diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml index d909eeca5..209e5f700 100644 --- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml +++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml @@ -85,7 +85,7 @@ if (empty($object->comments) && ! $addLink) { setAttrib('class', $deleteButton->getAttrib('class') . ' remove-comment'); + $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action'); $deleteButton->populate( array( 'downtime_id' => $downtime->id, diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less index 8c116b609..233702b13 100644 --- a/public/css/icinga/main.less +++ b/public/css/icinga/main.less @@ -86,7 +86,7 @@ a:hover > .icon-cancel { &:hover { background-color: @gray-lightest; - > .comment-meta > .meta-icons > .remove-comment { + > .comment-meta > .meta-icons > .remove-action { display: block; } } @@ -95,7 +95,7 @@ a:hover > .icon-cancel { margin-top: 0; } - > .comment-meta > .meta-icons > .remove-comment { + > .comment-meta > .meta-icons > .remove-action { display: none; } }