From b23bb32333454c137a9c097f49a7c9f36e3c568f Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Sat, 17 Apr 2021 23:08:04 +0300 Subject: [PATCH] Issues-559: Fixed popups --- .../controllers/class.discussioncontroller.php | 2 +- .../vanilla/views/discussion/announce.php | 8 ++++---- .../vanilla/views/discussion/delete.php | 16 ++++++++++++++++ .../views/moderation/confirmdiscussionmoves.php | 8 ++++---- 4 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 vanilla/applications/vanilla/views/discussion/delete.php diff --git a/vanilla/applications/vanilla/controllers/class.discussioncontroller.php b/vanilla/applications/vanilla/controllers/class.discussioncontroller.php index 5726ff7..2a63681 100644 --- a/vanilla/applications/vanilla/controllers/class.discussioncontroller.php +++ b/vanilla/applications/vanilla/controllers/class.discussioncontroller.php @@ -774,7 +774,7 @@ public function delete($discussionID, $target = '') { } } - $this->setData('Title', t('Delete Discussion')); + $this->setData('Title', t('Delete')); $this->render(); } diff --git a/vanilla/applications/vanilla/views/discussion/announce.php b/vanilla/applications/vanilla/views/discussion/announce.php index fe481b6..e0fda8e 100644 --- a/vanilla/applications/vanilla/views/discussion/announce.php +++ b/vanilla/applications/vanilla/views/discussion/announce.php @@ -6,16 +6,16 @@ echo $this->Form->open(); echo $this->Form->errors(); -echo '
'.t('Where do you want to announce this discussion?').'
'; +echo '
'.t('Where do you want to announce this discussion?').'
'; -echo '
', $this->Form->radio('Announce', '@'.sprintf(t('In %s.'), $this->data('Category.Name')), ['Value' => '2']), '
'; +echo '
', $this->Form->radio('Announce', '@'.sprintf(t('In %s.'), $this->data('Category.Name')), ['Value' => '2']), '
'; // FIX: https://github.com/topcoder-platform/forums/issues/409 //echo '
', $this->Form->radio('Announce', '@'.sprintf(t('In %s and recent discussions.'), $this->data('Category.Name')), ['Value' => '1']), '
'; -echo '
', $this->Form->radio('Announce', '@'.t("Don't announce."), ['Value' => '0']), '
'; +echo '
', $this->Form->radio('Announce', '@'.t("Don't announce."), ['Value' => '0']), '
'; echo '
'; -echo $this->Form->button('OK'); echo $this->Form->button('Cancel', ['type' => 'button', 'class' => 'Button Close']); +echo $this->Form->button('OK', ['class' => 'Button Primary Action']); echo '
'; echo $this->Form->close(); ?> diff --git a/vanilla/applications/vanilla/views/discussion/delete.php b/vanilla/applications/vanilla/views/discussion/delete.php new file mode 100644 index 0000000..f4e7a8f --- /dev/null +++ b/vanilla/applications/vanilla/views/discussion/delete.php @@ -0,0 +1,16 @@ + + +

data('Title'); ?>

+ +Form->open(); +echo $this->Form->errors(); + +echo '
'.sprintf(t('Are you sure you want to delete this %s?'), t('item')).'
'; + +echo '
'; +echo $this->Form->button('Cancel', ['type' => 'button', 'class' => 'Button Close']); +echo $this->Form->button('Delete', ['class' => 'Button Primary Delete']); +echo '
'; +echo $this->Form->close(); +?> diff --git a/vanilla/applications/vanilla/views/moderation/confirmdiscussionmoves.php b/vanilla/applications/vanilla/views/moderation/confirmdiscussionmoves.php index c03aa32..14db95c 100644 --- a/vanilla/applications/vanilla/views/moderation/confirmdiscussionmoves.php +++ b/vanilla/applications/vanilla/views/moderation/confirmdiscussionmoves.php @@ -1,5 +1,5 @@ -

data('Title'); ?>

+

Form->open(); echo $this->Form->errors(); @@ -20,12 +20,12 @@ t('You are about to move %1$s of the %2$s of the selected discussions.'), $CountAllowed, $CountCheckedDiscussions - ), 'p'); + ), 'p', array('class'=>'P Message') ); } else { echo wrap(sprintf( t('You are about to move %s.'), plural($CountCheckedDiscussions, '%s discussion', '%s discussions') - ), 'p'); + ), 'p',array('class'=>'P Message')); } ?> @@ -51,7 +51,7 @@ '; echo $this->Form->button('Cancel', ['type' => 'button', 'class' => 'Button Close']); -echo $this->Form->button('Move', ['type' => 'submit', 'class' => 'Button Primary Move']); +echo $this->Form->button('Move Discussion', ['type' => 'submit', 'class' => 'Button Primary Move']); echo '
'; echo '
';