Merge remote-tracking branch 'origin/OpenOLAT_13.2'

src/main/java/org/olat/ims/qti21/ui/components/_content/hotspotInteraction.html

@@ -96,7 +96,7 @@
 	#end
 
 	jQuery(function() {
-		maphilightSettings.strokeWidth = 3;
+		maphilightSettings.strokeWidth = 2;
 		maphilightSettings.alwaysOn = true;
 		
 		#if($r.isTrue($isResponsive))

src/main/java/org/olat/restapi/repository/course/CourseElementWebService.java

 /**
+
  * <a href="http://www.openolat.org">
  * OpenOLAT - Online Learning and Training</a><br>
  * <p>
@@ -1218,7 +1219,7 @@ public class CourseElementWebService extends AbstractCourseNodeWebService {
 	@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
 	@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
 	//fxdiff FXOLAT-122: course management
-	public Response updateExternalPage(@PathParam("courseId") Long courseId, @PathParam("parentNodeId") String nodeId,
+	public Response updateExternalPage(@PathParam("courseId") Long courseId, @PathParam("nodeId") String nodeId,
 			@FormParam("shortTitle") @DefaultValue("undefined") String shortTitle,
 			@FormParam("longTitle") @DefaultValue("undefined") String longTitle, @FormParam("objectives") @DefaultValue("undefined") String objectives,
 			@FormParam("visibilityExpertRules") String visibilityExpertRules, @FormParam("accessExpertRules") String accessExpertRules,

src/main/webapp/static/js/jquery/openolat/jquery.drawing.js

@@ -74,12 +74,11 @@
 			width = height = "100px";
 			top = left = "5px";
 		} else {
-			//var borderWidth = jQuery("#" + id).css("border-left-width");
 			var parts = coords.split(',');
 			var radius = parseInt(parts[2]);//border
 			width = height = (2 * radius);
-			left = parseInt(parts[0]) - radius - 3;
-			top = parseInt(parts[1]) - radius - 3;
+			left = parseInt(parts[0]) - radius - 1;
+			top = parseInt(parts[1]) - radius - 1;
 		}
 
 		var nodes = jQuery("#" + id).height(height + 'px').width(width + 'px')
@@ -110,12 +109,14 @@
 			top = left = '5px';
 		} else {
 			var parts = coords.split(',');
-			left = parseInt(parts[0]) - 3;
-			top = parseInt(parts[1]) - 3;
-			width = parseInt(parts[2]) - left;
-			height = parseInt(parts[3]) - top;
+			left = parseInt(parts[0]) - 1;
+			top = parseInt(parts[1]) - 1;
+			width = parseInt(parts[2]) - left - 3;
+			height = parseInt(parts[3]) - top - 3;
 		}
 		
+		console.log(coords, left, top, width, height);
+		
 		var nodes = jQuery("#" + id).height(height + 'px').width(width + 'px')
 			.css('top', top + 'px').css('left', left + 'px');
 		if(this.settings.resize) {
@@ -154,7 +155,7 @@
 		var id = jQuery(spot).attr('id');
         var position = jQuery(spot).position();
         var radius = parseInt(jQuery(spot).width(), 10) / 2;
-        var coords = (position.left + radius) + "," + (position.top + radius) + "," + radius;
+        var coords = (position.left + radius + 1) + "," + (position.top + radius + 1) + "," + radius;
         jQuery("#" + id + "_shape").val("circle");
         jQuery("#" + id + "_coords").val(coords);
         return coords;
@@ -165,7 +166,7 @@
         var position = jQuery(spot).position();
         var width = parseInt(jQuery(spot).width(), 10);
         var height = parseInt(jQuery(spot).height(), 10);
-        var coords = position.left + "," + position.top + "," + (position.left + width) + "," + (position.top + height);
+        var coords = (position.left + 1) + "," + (position.top + 1) + "," + (position.left + width + 3) + "," + (position.top + height + 3);
         jQuery("#" + id + "_shape").val("rect");
         jQuery("#" + id + "_coords").val(coords);
         return coords;

src/main/webapp/static/themes/light/_config.scss

@@ -811,9 +811,9 @@ $o-radial-progress-percentage-danger-color	: $progress-bar-danger-bg !default;
 $o-radial-progress-circle-info-color		: $progress-bar-info-bg !default;
 $o-radial-progress-percentage-info-color	: $progress-bar-info-bg !default;
 
-/* Drawing */
+/* Drawing (border cannot be change without modifications of the jquery plugin and hotspot interaction) */
 $o-drawing-border-color		: $brand-primary;
-$o-drawing-border-width		: 4px !default;
+$o-drawing-border-width		: 2px !default;
 
 /* Placeholder panels */
 $o-panel-placeholder-border-width	: 2px !default;

src/main/webapp/static/themes/light/modules/_various_modules.scss

@@ -48,11 +48,13 @@ a.o_chelp {
 	border: $o-drawing-border-width solid $o-drawing-border-color;
 	border-radius: 50%;
 	position: absolute !important;
+	box-sizing: border-box;
 }
 
 .o_draw_rectangle {
 	border: $o-drawing-border-width solid $o-drawing-border-color;
 	position: absolute !important;
+	box-sizing: border-box;
 }