--- a/client/annot-client/app/annotationclient.html	Thu Jan 22 02:58:41 2015 +0100
+++ b/client/annot-client/app/annotationclient.html	Thu Jan 22 03:23:08 2015 +0100
@@ -16,13 +16,18 @@
       </form>
       </div>
     </div>
+    <form role="form">
     <div class="row">
       <div class="col-md-12">
-        <form role="form">
-          <autocomplete ng-model="yourchoice" data="allCatLabels" attr-input-class="form-control" attr-placeholder="Catégories..." ></autocomplete>
-        </form>
+          <autocomplete ng-model="catLabel" data="allCatLabels" attr-input-class="form-control" attr-placeholder="Catégories..." ></autocomplete>
       </div>
     </div>
+    <div class="row">
+      <div class="col-md-12">
+          <textarea ng-model="catText" class="form-control" placeholder="Texte..." rows="2"></textarea>
+      </div>
+    </div>
+    </form>
     <div class="row mons-content">
         <div class="mons-button hand return" ng-style="returnVisStyle" ng-click="selectLevel()" ng-init="returnVisStyle={visibility:'hidden'}">
           <div class="content">
@@ -33,7 +38,7 @@
               </div>
           </div>
         </div>
-        <div class="mons-button hand send" id="sendButton" ng-click="sendAnnotation(yourchoice)" ng-class="{'success-border':sendBtnSuccess, 'error-border':sendBtnError}">
+        <div class="mons-button hand send" id="sendButton" ng-click="sendFreeAnnotation(catLabel, catText)" ng-class="{'success-border':sendBtnSuccess, 'error-border':sendBtnError}">
           <div class="content">
               <div class="table">
                 <div class="table-cell">
@@ -47,7 +52,7 @@
     <div class="mons-content">
       <div ng-show="!selectedlevel">
           <div class="mons-button hand" ng-repeat="c in data.categories" style="background-color: {{ '{{' }} c.color {{ '}}' }}"
-                                        ng-click="selectLevel(c.label, c.code, c)" ng-class="{'success-border':c.sendSuccess, 'error-border':c.sendError}">
+                                        ng-click="selectLevel(c.label, c.code, catLabel, catText, c.color, c)" ng-class="{'success-border':c.sendSuccess, 'error-border':c.sendError}">
             <div class="content">
                 <div class="table">
                   <div class="table-cell">
@@ -60,7 +65,7 @@
       </div>
       <div ng-show="selectedlevel">
           <div class="mons-button hand" ng-repeat="c in selectedlevel" style="background-color: {{ '{{' }} c.color {{ '}}' }}"
-                                        ng-click="sendAnnotation({% raw %} (c.prelabel !== '') ? (c.prelabel + ': ' + c.label) : c.label {% endraw %}, c.code, c)" ng-class="{'success-border':c.sendSuccess, 'error-border':c.sendError}">
+                                        ng-click="sendAnnotation({% raw %} (c.prelabel !== '') ? (c.prelabel + ': ' + c.label) : c.label {% endraw %}, c.code, catLabel, catText, c.color, c)" ng-class="{'success-border':c.sendSuccess, 'error-border':c.sendError}">
             <div class="content">
                 <div class="table">
                   <div class="table-cell">