adaptation theme clean

amd/build/annotationcommentplus.min.js

-define(["jquery","./annotation"],function(a,b){function c(){return b.call(this),this}return c.prototype=Object.create(b.prototype),c.prototype.initAdminDemo=function(a,c){b.prototype.initAdminDemo.call(this,a,c),this.x=30,this.y=90},c.prototype.draw=function(b){if(b){var c="<div id='"+this.id+"'><i class='fa fa-commenting' aria-hidden='true' style='color:black;'></i></div>";b.append(c),a("#"+this.id).css("color",this.get_color()),a("#"+this.id).css("width",this.endx-this.x),a("#"+this.id).css("height",this.endy-this.y),a("#"+this.id).css("padding","0 2px"),a("#"+this.id).css("position","absolute"),a("#"+this.id).css("display","inline-block"),a("#"+this.id).css("left",this.x),a("#"+this.id).css("top",this.y)}this.draw_catridge(b)},c.prototype.draw_catridge=function(a){var b;if(!this.divcartridge||""===this.divcartridge){this.init_div_cartridge_id();var c=this.get_color_cartridge();b=this.get_div_cartridge(c,a),b.addClass("assignfeedback_editpdfplus_commentplus"),this.get_div_cartridge_label(c,b);var d=this.get_div_container(c,b);this.get_div_edition(d),this.cartridgex&&0!==this.cartridgex||(this.cartridgex=parseInt(this.tooltypefamille.cartridge_x,10)),this.cartridgey&&0!==this.cartridgey||(this.cartridgey=parseInt(this.tooltypefamille.cartridge_y,10)),b.css("left",this.x+20),b.css("top",this.y),this.apply_visibility_annot()}return!0},c});
\ No newline at end of file
+define(["jquery","./annotation"],function(a,b){function c(){return b.call(this),this}return c.prototype=Object.create(b.prototype),c.prototype.initAdminDemo=function(a,c){b.prototype.initAdminDemo.call(this,a,c),this.x=30,this.y=90},c.prototype.draw=function(b){if(b){var c="<div id='"+this.id+"'><i class='fa fa-commenting' aria-hidden='true' style='color:black;'></i></div>";b.append(c),a("#"+this.id).css("color",this.get_color()),a("#"+this.id).css("width",this.endx-this.x),a("#"+this.id).css("height",this.endy-this.y),a("#"+this.id).css("padding","0 2px"),a("#"+this.id).css("position","relative"),a("#"+this.id).css("left",this.x),a("#"+this.id).css("top",this.y)}this.draw_catridge(b)},c.prototype.draw_catridge=function(a){var b;if(!this.divcartridge||""===this.divcartridge){this.init_div_cartridge_id();var c=this.get_color_cartridge();b=this.get_div_cartridge(c,a),b.addClass("assignfeedback_editpdfplus_commentplus"),this.get_div_cartridge_label(c,b);var d=this.get_div_container(c,b);this.get_div_edition(d),this.cartridgex&&0!==this.cartridgex||(this.cartridgex=parseInt(this.tooltypefamille.cartridge_x,10)),this.cartridgey&&0!==this.cartridgey||(this.cartridgey=parseInt(this.tooltypefamille.cartridge_y,10)),b.css("left",this.x+20),b.css("top",this.y-20),this.apply_visibility_annot()}return!0},c});
\ No newline at end of file

amd/build/annotationhighlightplus.min.js

-define(["jquery","./annotation"],function(a,b){function c(){return b.call(this),this}return c.prototype=Object.create(b.prototype),c.prototype.initAdminDemo=function(a,c){b.prototype.initAdminDemo.call(this,a,c),this.x=83,this.y=84,this.endx=239,this.endy=100},c.prototype.draw=function(b){if(b){var c="<div id='"+this.id+"'></div>";b.append(c),a("#"+this.id).css("background-color",this.get_color()),a("#"+this.id).css("width",this.endx-this.x),a("#"+this.id).css("height",this.endy-this.y),a("#"+this.id).css("opacity",.5),a("#"+this.id).css("position","relative"),a("#"+this.id).css("display","inline-block"),a("#"+this.id).css("left",this.x),a("#"+this.id).css("top",this.y)}this.draw_catridge(b)},c.prototype.draw_catridge=function(a){var b;if(!this.divcartridge||""===this.divcartridge){this.init_div_cartridge_id();var c=this.get_color_cartridge();b=this.get_div_cartridge(c,a),b.addClass("assignfeedback_editpdfplus_hightlightplus"),this.get_div_cartridge_label(c,b);var d=this.get_div_container(c,b);this.get_div_edition(d),this.cartridgex&&0!==this.cartridgex||(this.cartridgex=parseInt(this.tooltypefamille.cartridge_x,10)),this.cartridgey&&0!==this.cartridgey||(this.cartridgey=parseInt(this.tooltypefamille.cartridge_y,10)),b.css("left",this.x+this.cartridgex+17),b.css("top",this.y+this.cartridgey),this.apply_visibility_annot()}return!0},c});
\ No newline at end of file
+define(["jquery","./annotation"],function(a,b){function c(){return b.call(this),this}return c.prototype=Object.create(b.prototype),c.prototype.initAdminDemo=function(a,c){b.prototype.initAdminDemo.call(this,a,c),this.x=83,this.y=84,this.endx=239,this.endy=100},c.prototype.draw=function(b){if(b){var c="<div id='"+this.id+"'></div>";b.append(c),a("#"+this.id).css("background-color",this.get_color()),a("#"+this.id).css("width",this.endx-this.x),a("#"+this.id).css("height",this.endy-this.y),a("#"+this.id).css("opacity",.5),a("#"+this.id).css("position","relative"),a("#"+this.id).css("left",this.x),a("#"+this.id).css("top",this.y)}this.draw_catridge(b)},c.prototype.draw_catridge=function(a){var b;if(!this.divcartridge||""===this.divcartridge){this.init_div_cartridge_id();var c=this.get_color_cartridge();b=this.get_div_cartridge(c,a),b.addClass("assignfeedback_editpdfplus_hightlightplus"),this.get_div_cartridge_label(c,b);var d=this.get_div_container(c,b);this.get_div_edition(d),this.cartridgex&&0!==this.cartridgex||(this.cartridgex=parseInt(this.tooltypefamille.cartridge_x,10)),this.cartridgey&&0!==this.cartridgey||(this.cartridgey=parseInt(this.tooltypefamille.cartridge_y,10)),b.css("left",this.x+this.cartridgex),b.css("top",this.y+this.cartridgey-15),this.apply_visibility_annot()}return!0},c});
\ No newline at end of file

amd/build/annotationstampcomment.min.js

-define(["jquery","./annotation"],function(a,b){function c(){return b.call(this),this}return c.prototype=Object.create(b.prototype),c.prototype.initAdminDemo=function(a,c){b.prototype.initAdminDemo.call(this,a,c),this.x=188,this.y=118,this.displayrotation=1},c.prototype.draw=function(b){if(b){this.shape_id="ct_stampcomment_"+(new Date).toJSON().replace(/:/g,"").replace(/\./g,"");var c='<i id="'+this.shape_id+'_img" class="fa fa-arrows-h fa-2x" aria-hidden="true"></i>';this.displayrotation>0&&(c='<i id="'+this.shape_id+'_img" class="fa fa-arrows-v fa-2x" aria-hidden="true"></i>');var d="<div id='"+this.id+"'>"+c+"</div>";b.append(d),a("#"+this.id).css("position","absolute"),a("#"+this.id).css("display","inline-block"),a("#"+this.id).css("left",this.x),a("#"+this.id).css("top",this.y)}this.draw_catridge(b)},c.prototype.draw_catridge=function(a){var b;if(!this.divcartridge||""===this.divcartridge){this.init_div_cartridge_id();var c=this.get_color_cartridge();b=this.get_div_cartridge(c,a),b.addClass("assignfeedback_editpdfplus_stampcomment"),this.get_div_cartridge_label(c,b);var d=this.get_div_container(c,b),e=0;this.displayrotation>0&&(e=1);var f="<input type='hidden' id='"+this.divcartridge+"_rotation' value="+e+" />";d.append(f);var g="<button id='"+this.divcartridge+"_buttonrotation' class='btn btn-default";this.adminDemo&&(g+=" disabled"),g+='\' type=\'button\'><i class="fa fa-refresh" aria-hidden="true"></i></button>',d.append(g),this.get_div_edition(d),this.cartridgex&&0!==this.cartridgex||(this.cartridgex=parseInt(this.tooltypefamille.cartridge_x,10)),this.cartridgey&&0!==this.cartridgey||(this.cartridgey=parseInt(this.tooltypefamille.cartridge_y,10)),b.css("left",this.x+this.cartridgex),b.css("top",this.y+this.cartridgey-5),this.apply_visibility_annot()}return!0},c});
\ No newline at end of file
+define(["jquery","./annotation"],function(a,b){function c(){return b.call(this),this}return c.prototype=Object.create(b.prototype),c.prototype.initAdminDemo=function(a,c){b.prototype.initAdminDemo.call(this,a,c),this.x=188,this.y=118,this.displayrotation=1},c.prototype.draw=function(b){if(b){this.shape_id="ct_stampcomment_"+(new Date).toJSON().replace(/:/g,"").replace(/\./g,"");var c='<i id="'+this.shape_id+'_img" class="fa fa-arrows-h fa-2x" aria-hidden="true"></i>';this.displayrotation>0&&(c='<i id="'+this.shape_id+'_img" class="fa fa-arrows-v fa-2x" aria-hidden="true"></i>');var d="<div id='"+this.id+"'>"+c+"</div>";b.append(d),a("#"+this.id).css("position","relative"),a("#"+this.id).css("left",this.x),a("#"+this.id).css("top",this.y)}this.draw_catridge(b)},c.prototype.draw_catridge=function(a){var b;if(!this.divcartridge||""===this.divcartridge){this.init_div_cartridge_id();var c=this.get_color_cartridge();b=this.get_div_cartridge(c,a),b.addClass("assignfeedback_editpdfplus_stampcomment"),this.get_div_cartridge_label(c,b);var d=this.get_div_container(c,b),e=0;this.displayrotation>0&&(e=1);var f="<input type='hidden' id='"+this.divcartridge+"_rotation' value="+e+" />";d.append(f);var g="<button id='"+this.divcartridge+"_buttonrotation' class='btn btn-default";this.adminDemo&&(g+=" disabled"),g+='\' type=\'button\'><i class="fa fa-refresh" aria-hidden="true"></i></button>',d.append(g),this.get_div_edition(d),this.cartridgex&&0!==this.cartridgex||(this.cartridgex=parseInt(this.tooltypefamille.cartridge_x,10)),this.cartridgey&&0!==this.cartridgey||(this.cartridgey=parseInt(this.tooltypefamille.cartridge_y,10)),b.css("left",this.x+this.cartridgex),b.css("top",this.y+this.cartridgey-30),this.apply_visibility_annot()}return!0},c});
\ No newline at end of file

amd/build/annotationverticalline.min.js

-define(["jquery","./annotation"],function(a,b){function c(){return b.call(this),this}return c.prototype=Object.create(b.prototype),c.prototype.initAdminDemo=function(a,c){b.prototype.initAdminDemo.call(this,a,c),this.x=285,this.y=65,this.endy=175},c.prototype.draw=function(b){if(b){var c="<div id='"+this.id+"'></div>";b.append(c),a("#"+this.id).css("background-color",this.get_color()),a("#"+this.id).css("width",3),this.endy-this.y<=30&&(this.endy=this.y+30),a("#"+this.id).css("height",this.endy-this.y),a("#"+this.id).css("position","relative"),a("#"+this.id).css("display","inline-block"),a("#"+this.id).css("left",this.x),a("#"+this.id).css("top",this.y)}this.draw_catridge(b)},c.prototype.draw_catridge=function(a){var b;if(!this.divcartridge||""===this.divcartridge){this.init_div_cartridge_id();var c=this.get_color_cartridge();b=this.get_div_cartridge(c,a),b.addClass("assignfeedback_editpdfplus_verticalline"),this.get_div_cartridge_label(c,b);var d=this.get_div_container(c,b);this.get_div_edition(d),this.cartridgex&&0!==this.cartridgex||(this.cartridgex=parseInt(this.tooltypefamille.cartridge_x,10)),this.cartridgey&&0!==this.cartridgey||(this.cartridgey=parseInt(this.tooltypefamille.cartridge_y,10)),b.css("left",this.x+this.cartridgex+17),b.css("top",this.y+this.cartridgey),this.apply_visibility_annot()}return!0},c});
\ No newline at end of file
+define(["jquery","./annotation"],function(a,b){function c(){return b.call(this),this}return c.prototype=Object.create(b.prototype),c.prototype.initAdminDemo=function(a,c){b.prototype.initAdminDemo.call(this,a,c),this.x=285,this.y=65,this.endy=175},c.prototype.draw=function(b){if(b){var c="<div id='"+this.id+"'></div>";b.append(c),a("#"+this.id).css("background-color",this.get_color()),a("#"+this.id).css("width",3),this.endy-this.y<=30&&(this.endy=this.y+30),a("#"+this.id).css("height",this.endy-this.y),a("#"+this.id).css("position","relative"),a("#"+this.id).css("left",this.x),a("#"+this.id).css("top",this.y)}this.draw_catridge(b)},c.prototype.draw_catridge=function(a){var b;if(!this.divcartridge||""===this.divcartridge){this.init_div_cartridge_id();var c=this.get_color_cartridge();b=this.get_div_cartridge(c,a),b.addClass("assignfeedback_editpdfplus_verticalline"),this.get_div_cartridge_label(c,b);var d=this.get_div_container(c,b);this.get_div_edition(d),this.cartridgex&&0!==this.cartridgex||(this.cartridgex=parseInt(this.tooltypefamille.cartridge_x,10)),this.cartridgey&&0!==this.cartridgey||(this.cartridgey=parseInt(this.tooltypefamille.cartridge_y,10)),b.css("left",this.x+this.cartridgex),b.css("top",this.y+this.cartridgey-109),this.apply_visibility_annot()}return!0},c});
\ No newline at end of file

amd/src/admin_panel.js

@@ -432,9 +432,14 @@ define(['jquery'/*, 'core/yui'*/, 'core/notification', 'core/templates', 'core/f
                 $(".editpdlplus_tool").each(function () {
                     $(this).removeClass("btn-primary");
                     $(this).removeClass("btn-default");
+                    $(this).css("background-image","");
+                    $(this).css("background-color","");
                     var enabled = $(this).data('enable');
                     if (enabled === 1 && $(this).val() !== selectid) {
                         $(this).addClass("btn-default");
+                    } else if ($(this).val() !== selectid) {
+                    $(this).css("background-image","none");
+                    $(this).css("background-color","#CCCCCC");
                     }
                 });
                 $(this).addClass("btn-primary");
@@ -512,16 +517,17 @@ define(['jquery'/*, 'core/yui'*/, 'core/notification', 'core/templates', 'core/f
                                                     //var newtool = null;
                                                     for (var i = 0; i < toolbar.length; i++) {
                                                         var classButton = "btn-default";
+                                                        var style = "";
                                                         if (toolbar[i].enable !== 1) {
                                                             classButton = "";
+                                                            style = "background-image:none;background-color:#CCCCCC;";
                                                         }
                                                         if (toolbar[i].toolid === toolbar[i].selecttool) {
                                                             classButton = "btn-primary";
                                                             //newtool = toolbar[i];
                                                         }
-                                                        var style = "";
                                                         if (toolbar[i].typetool === 4 || toolbar[i].typetool === 1) {
-                                                            style = "text-decoration: underline;";
+                                                            style += "text-decoration: underline;";
                                                         }
                                                         var label = toolbar[i].button;
                                                         if (toolbar[i].typetool === 4 || toolbar[i].typetool === 5) {

amd/src/annotation.js

@@ -234,7 +234,7 @@ define(['jquery', './global'],
                 var div = "<div ";
                 div += "id='" + this.divcartridge + "' ";
                 div += "class='assignfeedback_editpdfplus_cartridge' ";
-                div += "style='border-color: " + colorcartridge + ";'> ";
+                div += "style='border-color: " + colorcartridge + ";position:relative;'> ";
                 div += "</div>";
                 if (canevas) {
                     canevas.append(div);

amd/src/annotationcommentplus.js

@@ -53,8 +53,8 @@ define(['jquery', './annotation'],
                     $("#" + this.id).css('width', this.endx - this.x);
                     $("#" + this.id).css('height', this.endy - this.y);
                     $("#" + this.id).css('padding', '0 2px');
-                    $("#" + this.id).css('position', 'absolute');
-                    $("#" + this.id).css('display', 'inline-block');
+                    $("#" + this.id).css('position', 'relative');
+                    //$("#" + this.id).css('display', 'inline-block');
                     $("#" + this.id).css('left', this.x);
                     $("#" + this.id).css('top', this.y);
                 }
@@ -99,7 +99,7 @@ define(['jquery', './annotation'],
                         this.cartridgey = parseInt(this.tooltypefamille.cartridge_y, 10);
                     }
                     divdisplay.css('left', this.x + 20);
-                    divdisplay.css('top', this.y);
+                    divdisplay.css('top', this.y - 20);
 
                     this.apply_visibility_annot();
                 } else {

amd/src/annotationframe.js

@@ -45,9 +45,9 @@ define(['jquery', './annotation'],
             AnnotationFrame.prototype.initChildAdminDemo = function (annotationparent) {
                 Annotation.prototype.initAdminDemo.call(this, annotationparent.tooltype, annotationparent.tooltypefamille);
                 this.x = 144;
-                this.y = 216;
+                this.y = 192;
                 this.endx = 296;
-                this.endy = 232;
+                this.endy = 208;
                 this.parent_annot = annotationparent.id;
                 this.id = 'previsu_annot_child';
                 this.colour = "#FF0000";
@@ -70,6 +70,7 @@ define(['jquery', './annotation'],
                     //$("#" + this.id).css('display', 'inline-block');
                     $("#" + this.id).css('left', this.x);
                     $("#" + this.id).css('top', this.y);
+                    $("#" + this.id).css('box-sizing', 'inherit');
                 }
                 this.draw_catridge(canevas);
                 return this;
@@ -143,7 +144,7 @@ define(['jquery', './annotation'],
                             this.cartridgey = parseInt(this.tooltypefamille.cartridge_y, 10);
                         }
                         divdisplay.css('left', this.cartridgex + 15);
-                        divdisplay.css('top', this.y + this.cartridgey);
+                        divdisplay.css('top', this.y + this.cartridgey - 12);
 
                         this.apply_visibility_annot();
                     } else {

amd/src/annotationhighlightplus.js

@@ -54,7 +54,7 @@ define(['jquery', './annotation'],
                     $("#" + this.id).css('height', this.endy - this.y);
                     $("#" + this.id).css('opacity', .5);
                     $("#" + this.id).css('position', 'relative');
-                    $("#" + this.id).css('display', 'inline-block');
+                    //$("#" + this.id).css('display', 'inline-block');
                     $("#" + this.id).css('left', this.x);
                     $("#" + this.id).css('top', this.y);
                 }
@@ -99,8 +99,8 @@ define(['jquery', './annotation'],
                     if (!this.cartridgey || this.cartridgey === 0) {
                         this.cartridgey = parseInt(this.tooltypefamille.cartridge_y, 10);
                     }
-                    divdisplay.css('left', this.x + this.cartridgex + 17);
-                    divdisplay.css('top', this.y + this.cartridgey);
+                    divdisplay.css('left', this.x + this.cartridgex);
+                    divdisplay.css('top', this.y + this.cartridgey - 15);
 
                     this.apply_visibility_annot();
                 } else {

amd/src/annotationstampcomment.js

@@ -57,8 +57,8 @@ define(['jquery', './annotation'],
                     }
                     var divStampComment = "<div id='" + this.id + "'>" + fleche + "</div>";
                     canevas.append(divStampComment);
-                    $("#" + this.id).css('position', 'absolute');
-                    $("#" + this.id).css('display', 'inline-block');
+                    $("#" + this.id).css('position', 'relative');
+                    //$("#" + this.id).css('display', 'inline-block');
                     $("#" + this.id).css('left', this.x);
                     $("#" + this.id).css('top', this.y);
                 }
@@ -126,7 +126,7 @@ define(['jquery', './annotation'],
                         this.cartridgey = parseInt(this.tooltypefamille.cartridge_y, 10);
                     }
                     divdisplay.css('left', this.x + this.cartridgex);
-                    divdisplay.css('top', this.y + this.cartridgey - 5);
+                    divdisplay.css('top', this.y + this.cartridgey - 30);
 
                     this.apply_visibility_annot();
                 } else {

amd/src/annotationverticalline.js

@@ -55,7 +55,7 @@ define(['jquery', './annotation'],
                     }
                     $("#" + this.id).css('height', this.endy - this.y);
                     $("#" + this.id).css('position', 'relative');
-                    $("#" + this.id).css('display', 'inline-block');
+                    //$("#" + this.id).css('display', 'inline-block');
                     $("#" + this.id).css('left', this.x);
                     $("#" + this.id).css('top', this.y);
                 }
@@ -100,8 +100,8 @@ define(['jquery', './annotation'],
                     if (!this.cartridgey || this.cartridgey === 0) {
                         this.cartridgey = parseInt(this.tooltypefamille.cartridge_y, 10);
                     }
-                    divdisplay.css('left', this.x + this.cartridgex + 17);
-                    divdisplay.css('top', this.y + this.cartridgey);
+                    divdisplay.css('left', this.x + this.cartridgex);
+                    divdisplay.css('top', this.y + this.cartridgey - 109);
 
                     this.apply_visibility_annot();
                 } else {

locallib_admin.php

@@ -235,8 +235,10 @@ class assign_feedback_editpdfplus_admin {
                 if ($tool->axis == $ax->id) {
                     if ($tool->enabled == "1") {
                         $tool->button = "btn-default";
+                        $tool->style = "";
                     } else {
                         $tool->button = "";
+                        $tool->style = "background-image:none;background-color:#CCCCCC;";
                     }
                     if ($tool->type == "4") {
                         $tool->label = '| ' . $tool->label . ' |';
@@ -244,7 +246,7 @@ class assign_feedback_editpdfplus_admin {
                         $tool->label = '| ' . $tool->label;
                     }
                     if ($tool->type == "4" || $tool->type == "1") {
-                        $tool->style = "text-decoration: underline;";
+                        $tool->style .= "text-decoration: underline;";
                     }
                     $toolbar->tools[] = $tool;
                     $ax->children++;

templates/admin.mustache

@@ -51,7 +51,26 @@
         </div>
         <div class="panel-body">
             <div id="message_import_axis" class="alert" style="display:none;"></div>
-            <div class='row'>
+            <table style="width: 100%">
+                <tr>
+                    <td style="width: 17%">
+                        <h6>
+                            {{# str }} adminaxis, assignfeedback_editpdfplus {{/ str }}
+                            <button type="button" class="btn btn-default" id="assignfeedback_editpdfplus_widget_admin_button_addaxis">
+                                <i class="fa fa-plus" aria-hidden="true"></i>
+                            </button>
+                        </h6>
+                    </td>
+                    <td id='assignfeedback_editpdfplus_widget_admin_toolheader' style="padding-left: 20px;">
+                        <h6>
+                            {{# str }} admintools, assignfeedback_editpdfplus {{/ str }}
+                            <button type="button" class="btn btn-default" id="assignfeedback_editpdfplus_widget_admin_button_addtool">
+                                <i class="fa fa-plus" aria-hidden="true"></i>
+                            </button>
+                        </h6>
+                    </td>
+                </tr>
+                <!--div class='row'>
                     <div class='col-sm-2'>
                         <h6>
                             {{# str }} adminaxis, assignfeedback_editpdfplus {{/ str }}
@@ -68,8 +87,55 @@
                             </button>
                         </h6>
                     </div>
+                </div-->
+                <tr id='assignfeedback_editpdfplus_widget_admin_workspace'>
+                    <td style="vertical-align: top;">
+                        <select id='editpdlplus_axes' class='form-control'>
+                            {{# axis }}
+                            <option value="{{id}}" data-delete="{{children}}">{{label}}</option>
+                            {{/ axis }}
+                        </select>
+                        <div class="panel panel-default" id="axistool">
+                            <div class="panel-body" style="text-align: center;">
+                                <button type="button" class="btn btn-default" id="assignfeedback_editpdfplus_widget_admin_button_editaxis">
+                                    <i class="fa fa-pencil" aria-hidden="true"></i>
+                                </button>
+                                <button type="button" class="btn btn-default" id="assignfeedback_editpdfplus_widget_admin_button_delaxis">
+                                    <i class="fa fa-remove" aria-hidden="true"></i>
+                                </button>
+                            </div>
                         </div>
-            <div class='row' id='assignfeedback_editpdfplus_widget_admin_workspace'>
+                    </td>
+                    <td id='assignfeedback_editpdfplus_widget_admin_toolworkspace' style="padding-left: 20px;vertical-align: top;">
+                        <div id='editpdlplus_toolbars'>
+                            {{# toolbars }}
+                            <div id="editpdlplus_toolbar_{{axis.id}}" class="btn-group toolbar" style="display: none;">
+                                {{# tools }}
+                                <button class="btn {{button}} editpdlplus_tool" id="editpdlplus_tool_{{id}}" value="{{id}}" style="{{style}}" data-enable="{{enabled}}">
+                                    {{label}}
+                                </button>
+                                {{/ tools }}
+                            </div>
+                            {{/ toolbars }}
+                        </div>
+
+                        <div class="alert" id="message_edit_tool" style="margin-top: 10px;margin-bottom: 0px;display: none;width: 50%;"></div>
+
+                        <div id="editpdlplus_tool_item" style="margin-top: 15px;"></div>
+                    </td>
+                    <td>
+                        <div id="assignfeedback_editpdfplus_widget_admin_div_addaxis" style="display:none;">
+                            <div class="panel-body"></div>
+                        </div>
+                        <div id="assignfeedback_editpdfplus_widget_admin_div_editaxis" style="display:none;">
+                            <div class="panel-body"></div>
+                        </div>
+                        <div id="assignfeedback_editpdfplus_widget_admin_div_delaxis" style="display:none;">
+                            <div class="panel-body"></div>
+                        </div>
+                    </td>
+                </tr>
+                <!--div class='row' id='assignfeedback_editpdfplus_widget_admin_workspace'>
                     <div class='col-sm-2'>
                         <select id='editpdlplus_axes' class='form-control'>
                             {{# axis }}
@@ -116,7 +182,8 @@
                             <div class="panel-body"></div>
                         </div>
                     </div>
-            </div>
+                </div-->
+            </table>
         </div>
     </div>
     <!--/div-->

templates/tool_form.mustache

@@ -3,7 +3,30 @@
 }}
 
 <div id="toolworkspace">
-    <div class='row' style="margin-bottom: 10px;">
+    {{^tool.id}}<h4>{{# str }} adminaddtool, assignfeedback_editpdfplus {{/ str }}</h4>{{/tool.id}}
+    <table style="margin-bottom: 10px;width:100%;">
+        <tr>
+            <td >
+                {{#tool.id}}<div id="editpdlplus_tool_label" class="btn alert-info" style="cursor: default;">{{tool.label}}</div>{{/tool.id}}
+            </td>
+            <td style="text-align: right;padding-left: 20px;">
+                {{# str }} admintoolboxaction, assignfeedback_editpdfplus {{/ str }}{{#tool.id}}s{{/tool.id}} :
+                <div class="btn-group">
+                    <button type="button" class="btn btn-default" id="toolFormSubmit"><i class="fa fa-{{#tool.id}}save{{/tool.id}}{{^tool.id}}save{{/tool.id}}" aria-hidden="true"></i></button>
+                    {{#tool.id}}
+                    <button type="button" class="btn btn-default" id="toolClone"><i class="fa fa-clone" aria-hidden="true"></i></button>
+                    <button type="button" class="btn btn-default" id="toolEnabled"><i class="fa fa-eye{{^tool.enabled}}-slash{{/tool.enabled}}" aria-hidden="true"></i></button>
+                    <button type="button" class="btn btn-default {{^tool.removable}}disabled{{/tool.removable}}" id="toolRemove"><i class="fa fa-remove" aria-hidden="true"></i></button>
+                    {{/tool.id}}
+                </div>
+            </td>
+            <td style="padding-left: 15px;">
+                {{#tool.id}}
+                <button type="button" class="btn btn-default" id="toolRefesh"><i class="fa fa-refresh" aria-hidden="true"></i></button>
+                {{/tool.id}}
+            </td>
+        </tr>
+        <!--div class='row' style="margin-bottom: 10px;">
             {{^tool.id}}<h4>{{# str }} adminaddtool, assignfeedback_editpdfplus {{/ str }}</h4>{{/tool.id}}
             <div class='col-sm-3'>
                 {{#tool.id}}<div id="editpdlplus_tool_label" class="btn alert-info" style="cursor: default;">{{tool.label}}</div>{{/tool.id}}
@@ -22,9 +45,189 @@
                 <button type="button" class="btn btn-default" id="toolRefesh"><i class="fa fa-refresh" aria-hidden="true"></i></button>
                 {{/tool.id}}
             </div>
+        </div-->
+
+        <tr>
+            <td style="width:50%;vertical-align: top;padding-top: 20px;" colspan="2">
+                <form id="{{formid}}" method="post" action="{{actionurl}}" class="form-horizontal">
+                    <div class="panel-group" id="accordion">
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <i class="fa fa-wrench" aria-hidden="true"></i>&nbsp;&nbsp;
+                                <a data-toggle="collapse" href="#collapse1" data-parent="#accordion">{{# str }} admintoolboxtypetool, assignfeedback_editpdfplus {{/ str }}</a>
+                            </div>
+                            <div id="collapse1" class="panel-collapse collapse">
+                                <div class="panel-body">
+                                    <!--div class="form-group"-->
+                                    <table style="width:100%;">
+                                        <tr>
+                                            <td style="width: 25%;">
+                                                <label class="control-label" for="typetool" style="width: 100%;">{{# str }} admintoolboxtypetool_type, assignfeedback_editpdfplus {{/ str }}</label>
+                                            </td>
+                                            <td>
+                                                <!--div class="col-sm-9"-->
+                                                <select class="form-control" id="typetool" name="typetool">
+                                                    {{# tools }}
+                                                    <option value='{{id}}'>{{libelle}}</option>
+                                                    {{/ tools }}
+                                                </select>
+                                                <!--/div-->
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <!--/div-->
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <i class="fa fa-bars" aria-hidden="true"></i>&nbsp;&nbsp;
+                                <a data-toggle="collapse" href="#collapse2" data-parent="#accordion">{{# str }} admintoolboxtoolbardisplay, assignfeedback_editpdfplus {{/ str }}</a>
+                            </div>
+                            <div id="collapse2" class="panel-collapse collapse">
+                                <div class="panel-body">
+                                    <!--div class="form-group"-->
+                                    <table style="width:100%;">
+                                        <tr>
+                                            <td style="width: 25%;">
+                                                <label class="control-label" for="button" style="width: 100%;">{{# str }} admintoolboxtoolbardisplay_button, assignfeedback_editpdfplus {{/ str }}</label>
+                                            </td>
+                                            <td>
+                                                <!--div class="col-sm-9"-->
+                                                <input type="text" class="form-control" id="button" value="{{tool.label}}" name="button" />
+                                                <!--/div-->
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="width: 25%;">
+                                                <label class="control-label" for="order" style="width: 100%;">{{# str }} admintoolboxtoolbardisplay_order, assignfeedback_editpdfplus {{/ str }}</label>
+                                            </td>
+                                            <td>
+                                                <!--div class="col-sm-9"-->
+                                                <input type="number" class="form-control" id="order" value="{{tool.order_tool}}" name="order" />
+                                                <!--/div-->
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <!--/div-->
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <i class="fa fa-address-card-o" aria-hidden="true"></i>&nbsp;&nbsp;
+                                <a data-toggle="collapse" href="#collapse3" data-parent="#accordion">{{# str }} admintoolboxcartridge, assignfeedback_editpdfplus {{/ str }}</a>
+                            </div>
+                            <div id="collapse3" class="panel-collapse collapse">
+                                <div class="panel-body">
+                                    <!--div class="form-group"-->
+                                    <table style="width:100%;">
+                                        <tr>
+                                            <td style="width: 25%;">
+                                                <label class="control-label " for="libelle" style="width: 100%;">{{# str }} admintoolboxcartridge_label, assignfeedback_editpdfplus {{/ str }}</label>
+                                            </td>
+                                            <td>
+                                                <!--div class="col-sm-9"-->
+                                                <input type="text" class="form-control" id="libelle" value="{{tool.cartridge}}" name="libelle" />
+                                                <!--/div-->
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="width: 25%;">
+                                                <label class="control-label " for="cartridgecolor" style="width: 100%;">{{# str }} admintoolboxcartridge_color, assignfeedback_editpdfplus {{/ str }}</label>
+                                            </td>
+                                            <td>
+                                                <!--div class="col-sm-9"-->
+                                                <input type="color" class="form-control" id="cartridgecolor" placeholder="{{^tool.cartridge_color}}-{{/tool.cartridge_color}}"
+                                                       value="{{#tool.cartridge_color}}{{tool.cartridge_color}}{{/tool.cartridge_color}}" name="catridgecolor" />
+                                                <input type="hidden" id="realcartridgecolor" value="{{#tool.cartridge_color}}{{tool.cartridge_color}}{{/tool.cartridge_color}}" />
+                                                <!--/div-->
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <!--/div-->
+                                </div>
+                            </div>
                         </div>
 
-    <div class='row'>
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;&nbsp;
+                                <a data-toggle="collapse" href="#collapse4" data-parent="#accordion">{{# str }} admintoolboxannotation, assignfeedback_editpdfplus {{/ str }}</a>
+                            </div>
+                            <div id="collapse4" class="panel-collapse collapse">
+                                <div class="panel-body" style="overflow: auto;">
+                                    <!--div class="form-group"-->
+                                    <table style="width:100%;">
+                                        <tr>
+                                            <td style="width: 25%;">
+                                                <label class="control-label" for="color" style="width: 100%;">{{# str }} admintoolboxannotation_color, assignfeedback_editpdfplus {{/ str }}</label>
+                                            </td>
+                                            <td>
+                                                <!--div class="col-sm-9"-->
+                                                <input type="color" class="form-control" id="color" placeholder="{{^tool.colors}}-{{/tool.colors}}"
+                                                       value="{{#tool.colors}}{{tool.colors}}{{/tool.colors}}" name="color" />
+                                                <input type="hidden" id="realcolor" value="{{#tool.colors}}{{tool.colors}}{{/tool.colors}}" />
+                                                <!--/div-->
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="width: 25%;">
+                                                <label class="control-label" for="texts" style="width: 100%;">{{# str }} admintoolboxannotation_texts, assignfeedback_editpdfplus {{/ str }}</label>
+                                            </td>
+                                            <td>
+                                                <!--div class="col-sm-9"-->
+                                                <input type="hidden" class="form-control" id="texts" value="{{tool.texts}}" name="texts" />
+                                                <ul class="textform"
+                                                    data-prototype="<input  type='text' class='form-control' value='' name='text[__name__]' style='width:90%;display:inline-block;' />" 
+                                                    style="list-style-type:none;padding:0px;margin-left: 0px;">
+                                                    {{#tool.textsarray}}
+                                                    <li><input  type='text' class='form-control' value='{{text}}' name='text[{{index}}]' style='width:90%;display:inline-block;' /></li>
+                                                    {{/tool.textsarray}}
+                                                </ul>
+                                                <!--/div-->
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="width: 25%;">
+                                                <label class="control-label" for="reply" style="width: 100%;">{{# str }} admintoolboxannotation_reply, assignfeedback_editpdfplus {{/ str }}</label>
+                                            </td>
+                                            <td>
+                                                <!--div class="col-sm-9"-->
+                                                <input type="checkbox" id="reply" {{#tool.reply}}checked {{/tool.reply}}name="reply" />
+                                                       <!--/div-->
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <!--/div-->
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div style='display:none;'>
+                        <input type="hidden" name="toolid" value="{{tool.id}}" />
+                        <input type="hidden" name="axisid" value="{{tool.axis}}" />
+                        <input type="hidden" name="courseid" value="{{courseid}}" />
+                        <input type="hidden" name="sesskey" value="{{sesskey}}" />
+                        <input type="hidden" name="enabled" id="toolenabled" value="{{tool.enabled}}" />
+                    </div>
+
+                </form>
+            </td>
+            <td style="width:50%;padding-left: 15px;vertical-align: top;padding-top: 20px;">
+                <input id='map01' type='hidden' value='{{map01}}' />
+                <input id='map02' type='hidden' value='{{map02}}' />
+                <input id='map03' type='hidden' value='{{map03}}' />
+                <!--{{# pix }} cross, assignfeedback_editpdfplus, previsu {{/ pix }}-->
+                <div id="canevas" style="background-image: url('{{map01}}');background-repeat: no-repeat; border-width: 1px; border-style: solid; height: 330px;box-sizing: border-box;" class="drawingcanvas">
+                </div>
+            </td>
+        </tr>
+
+        <!--div class='row'>
             <div class='col-sm-6'>
                 <form id="{{formid}}" method="post" action="{{actionurl}}" class="form-horizontal">
                     <div class="panel-group" id="accordion">
@@ -151,10 +354,12 @@
                 <input id='map02' type='hidden' value='{{map02}}' />
                 <input id='map03' type='hidden' value='{{map03}}' />
         <!--{{# pix }} cross, assignfeedback_editpdfplus, previsu {{/ pix }}-->
-            <div id="canevas" style="background-image: url('{{map01}}');background-repeat: no-repeat; border-width: 1px; border-style: solid; height: 330px;" class="drawingcanvas">
-            </div>
+        <!--div id="canevas" style="background-image: url('{{map01}}');background-repeat: no-repeat; border-width: 1px; border-style: solid; height: 330px;" class="drawingcanvas">