--- a/client/app/annotationclient.html	Mon Oct 20 15:00:19 2014 +0200
+++ b/client/app/annotationclient.html	Mon Oct 20 18:02:31 2014 +0200
@@ -52,7 +52,7 @@
                 <div class="table">
                   <div class="table-cell">
                     <p class="large-cat">{{ '{{' }} c.label {{ '}}' }}</p>
-                    <p class="normal-cat">{{ '{{' }} c.full_label {{ '}}' }}</p>
+                    <p class="normal-cat">{{ '{{' }} c.prelabel {{ '}}' }}</p>
                   </div>
                 </div>
             </div>
@@ -60,12 +60,12 @@
       </div>
       <div ng-show="selectedlevel">
           <div class="mons-button hand" ng-repeat="c in selectedlevel" style="background-color: {{ '{{' }} c.color {{ '}}' }}"
-                                        ng-click="sendAnnotation(c.label, 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, c)" ng-class="{'success-border':c.sendSuccess, 'error-border':c.sendError}">
             <div class="content">
                 <div class="table">
                   <div class="table-cell">
                     <p class="large-cat">{{ '{{' }} c.label {{ '}}' }}</p>
-                    <p class="normal-cat">{{ '{{' }} c.full_label {{ '}}' }}</p>
+                    <p class="normal-cat">{{ '{{' }} c.prelabel {{ '}}' }}</p>
                   </div>
                 </div>
             </div>