Fixed CLA doc encoding problem and removed unnecessary text in CLA form

Change-Id: I6edb74dc0750523c08fe19ec13212e846444b0cc
Signed-off-by: Eric Poirier <eric@eclipse.org>

eclipse.org-common/classes/users/cla.class.php

diff --git a/eclipse.org-common/classes/users/cla.class.php b/eclipse.org-common/classes/users/cla.class.php
index d9925dd..5d76cdf 100644
--- a/eclipse.org-common/classes/users/cla.class.php
+++ b/eclipse.org-common/classes/users/cla.class.php
@@ -272,9 +272,9 @@
       'question_2' => $question2->nodeValue,
       'question_3' => $question3->nodeValue,
       'question_4' => $question4->nodeValue,
-      'text_1' => mb_convert_encoding($cla_document->saveHTML($text1), 'HTML-ENTITIES', "UTF-8"),
-      'text_2' => mb_convert_encoding($cla_document->saveHTML($text2), 'HTML-ENTITIES', "UTF-8"),
-      'text_3' => mb_convert_encoding($cla_document->saveHTML($text3), 'HTML-ENTITIES', "UTF-8"),
+      'text_1' => $cla_document->saveXML($text1),
+      'text_2' => $cla_document->saveXML($text2),
+      'text_3' => $cla_document->saveXML($text3),
     );
   }
 

eclipse.org-common/classes/users/tpl/cla_form.tpl.php

diff --git a/eclipse.org-common/classes/users/tpl/cla_form.tpl.php b/eclipse.org-common/classes/users/tpl/cla_form.tpl.php
index 67ad4da..9dbb71f 100644
--- a/eclipse.org-common/classes/users/tpl/cla_form.tpl.php
+++ b/eclipse.org-common/classes/users/tpl/cla_form.tpl.php
@@ -13,14 +13,6 @@
 <?php if (is_a($this, 'Cla') && $this->Friend->getUID()): ?>
   <form id="frm_cla" name="frm_cla" action="#open_tab_cla" method="post">
     <?php print $this->getClaFormContent('text_1'); ?>
-    <ul>
-      <li><?php print $this->getClaFormContent('question_1'); ?></li>
-      <li><?php print $this->getClaFormContent('question_2'); ?></li>
-      <li><?php print $this->getClaFormContent('question_3'); ?></li>
-      <li><?php print $this->getClaFormContent('question_4'); ?></li>
-    </ul>
-    <?php print $this->getClaFormContent('text_2'); ?>
-    <?php print $this->getClaFormContent('text_3'); ?>
     <div class="well">
       <h2>YOU ACCEPT ...</h2>
 
@@ -88,7 +80,7 @@
     </div>
 
 
-      <p><strong>You represent that the information provided below is accurate.</strong></p>
+    <?php print $this->getClaFormContent('text_3'); ?>
 
     <div class="form-group">
       <label for="edit-email">Email Address <span class="form-required"