More work trying to understand util.js and get my ajax working right

[quix0rs-gnu-social.git] / plugins / QnA / QnAPlugin.php

diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php
index d768411d73aeabee2687409a299a8dae9b3a33a9..1e68376cdd34541c55bc98f91a44f595f4d0a90f 100644 (file)
--- a/plugins/QnA/QnAPlugin.php
+++ b/plugins/QnA/QnAPlugin.php
@@ -431,12 +431,17 @@ class QnAPlugin extends MicroAppPlugin
 
                 // Output a placeholder input -- clicking on it will
                 // bring up a real answer form
-                if (empty($answer) && empty($question->closed)) {
-                    $out->elementStart('ul', 'notices threaded-replies xoxo');
-                    $out->elementStart('li', 'notice-answer-placeholder');
+
+                // NOTE: this whole ul is just a placeholder
+                if (empty($question->closed) && empty($answer)) {
+                    $out->elementStart('ul', 'notices qna-dummy');
+                    $out->elementStart('li', 'qna-dummy-placeholder');
                     $out->element(
                         'input',
-                        array('class' => 'placeholder', 'value' => 'Answer...')
+                        array(
+                            'class' => 'placeholder',
+                            'value' => _m('Your answer...')
+                        )
                     );
                     $out->elementEnd('li');
                     $out->elementEnd('ul');
@@ -458,7 +463,7 @@ class QnAPlugin extends MicroAppPlugin
         $nli = new NoticeListItem($notice, $out);
         $nli->showNotice();
 
-        $out->elementStart('div', array('class' => 'entry-content answer-content'));
+        $out->elementStart('p', array('class' => 'entry-content answer-content'));
 
         if (!empty($answer)) {
             $form = new QnashowanswerForm($out, $answer);
@@ -467,7 +472,7 @@ class QnAPlugin extends MicroAppPlugin
             $out->text(_m('Answer data is missing.'));
         }
 
-        $out->elementEnd('div');
+        $out->elementEnd('p');
 
         // @fixme
         $out->elementStart('div', array('class' => 'entry-content'));