Merge pull request #583 from topcoder-platform/issues-559

Issues-559: Fixed popups

Author: jmgasper

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();
     }
 

vanilla/applications/vanilla/views/discussion/announce.php

@@ -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();
 ?>

vanilla/applications/vanilla/views/discussion/delete.php

@@ -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();
+?>

vanilla/applications/vanilla/views/moderation/confirmdiscussionmoves.php

@@ -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();
@@ -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 @@
 <?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>';