Skip to content

Issues-559: Fixed popups #583

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

Merged
merged 1 commit into from
Apr 17, 2021
Merged

Issues-559: Fixed popups #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion vanilla/applications/vanilla/controllers/class.discussioncontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ public function delete($discussionID, $target = '') {
}
}

$this->setData('Title', t('Delete Discussion'));
$this->setData('Title', t('Delete'));
$this->render();
}

Expand Down
8 changes: 4 additions & 4 deletions vanilla/applications/vanilla/views/discussion/announce.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
echo $this->Form->open();
echo $this->Form->errors();

echo '<div class="P">'.t('Where do you want to announce this discussion?').'</div>';
echo '<div class="P Message">'.t('Where do you want to announce this discussion?').'</div>';

echo '<div class="P">', $this->Form->radio('Announce', '@'.sprintf(t('In <b>%s.</b>'), $this->data('Category.Name')), ['Value' => '2']), '</div>';
echo '<div class="">', $this->Form->radio('Announce', '@'.sprintf(t('In <b>%s.</b>'), $this->data('Category.Name')), ['Value' => '2']), '</div>';
// FIX: https://github.com/topcoder-platform/forums/issues/409
//echo '<div class="P">', $this->Form->radio('Announce', '@'.sprintf(t('In <b>%s</b> and recent discussions.'), $this->data('Category.Name')), ['Value' => '1']), '</div>';
echo '<div class="P">', $this->Form->radio('Announce', '@'.t("Don't announce."), ['Value' => '0']), '</div>';
echo '<div class="">', $this->Form->radio('Announce', '@'.t("Don't announce."), ['Value' => '0']), '</div>';

echo '<div class="Buttons Buttons-Confirm">';
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 '<div>';
echo $this->Form->close();
?>
16 changes: 16 additions & 0 deletions vanilla/applications/vanilla/views/discussion/delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php if (!defined('APPLICATION')) exit(); ?>

<h1><?php echo $this->data('Title'); ?></h1>

<?php
echo $this->Form->open();
echo $this->Form->errors();

echo '<div class="P Message">'.sprintf(t('Are you sure you want to delete this %s?'), t('item')).'</div>';

echo '<div class="Buttons Buttons-Confirm">';
echo $this->Form->button('Cancel', ['type' => 'button', 'class' => 'Button Close']);
echo $this->Form->button('Delete', ['class' => 'Button Primary Delete']);
echo '</div>';
echo $this->Form->close();
?>
8 changes: 4 additions & 4 deletions vanilla/applications/vanilla/views/moderation/confirmdiscussionmoves.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php if (!defined('APPLICATION')) exit(); ?>
<h1><?php echo $this->data('Title'); ?></h1>
<h1><?php echo 'Move'; ?></h1>
<?php
echo $this->Form->open();
echo $this->Form->errors();
Expand All @@ -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'));
}
?>

Expand All @@ -51,7 +51,7 @@
<?php
echo '<div class="Buttons Buttons-Confirm">';
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 '</div>';
echo '</div>';