Merge branch 'master' into devel_vfsAdminGUI

src/main/java/org/olat/core/gui/components/image/ImageComponent.java

@@ -77,11 +77,14 @@ public class ImageComponent extends AbstractComponent implements Disposable {
 	private float scalingFactor;
 	private boolean divImageWrapper = true;
 	private boolean cropSelectionEnabled = false;
+	private boolean preventBrowserCaching = true;
 	
 	private final MapperService mapperService;
 
 	/**
-	 * @param name
+	 * 
+	 * @param usess The user session
+	 * @param name The name of the component
 	 */
 	public ImageComponent(UserSession usess, String name) {
 		super(name);
@@ -104,6 +107,14 @@ public class ImageComponent extends AbstractComponent implements Disposable {
 		this.alt = alt;
 	}
 
+	public boolean isPreventBrowserCaching() {
+		return preventBrowserCaching;
+	}
+
+	public void setPreventBrowserCaching(boolean preventBrowserCaching) {
+		this.preventBrowserCaching = preventBrowserCaching;
+	}
+
 	public boolean isDivImageWrapper() {
 		return divImageWrapper;
 	}

src/main/java/org/olat/core/gui/components/image/ImageRenderer.java

@@ -96,14 +96,12 @@ public class ImageRenderer extends DefaultComponentRenderer {
 		}
 		sb.append("' class='o_video_wrapper'></div>")
 		  .append("<script>")
-		  .append("/* <![CDATA[ */")
 		  .append("BPlayer.insertPlayer('").append(Settings.createServerURI()).append(mapperUrl);
 		sb.append("','").append(imgId).append("',").append(width).append(",").append(height).append(",'video'");
 		if (poster != null) {
 			sb.append(",null,null,null,null,null,null,'").append(poster).append("'");
 		}
 		sb.append(");")
-		  .append("/* ]]> */")
 		  .append("</script>")
 		  .append("</div>"); // ENDcomponent
 	}
@@ -140,10 +138,16 @@ public class ImageRenderer extends DefaultComponentRenderer {
 
 		String mapperUrl = ic.getMapperUrl();
 		String name = ic.getMedia().getName();
-		if(name.lastIndexOf('.') > 0) {
-			mapperUrl += "/" + name + "?" + System.nanoTime();
+		if(ic.isPreventBrowserCaching()) {
+			if(name.lastIndexOf('.') > 0) {
+				mapperUrl += "/" + name + "?" + System.nanoTime();
+			} else {
+				mapperUrl += "/?" + System.nanoTime();
+			}
+		} else if(name.lastIndexOf('.') > 0) {
+			mapperUrl += "/" + name;
 		} else {
-			mapperUrl += "/?" + System.nanoTime();
+			mapperUrl += "/";
 		}
 		sb.append(" src='").append(mapperUrl).append("' alt=\"");
 		if(StringHelper.containsNonWhitespace(ic.getAlt())) {
@@ -160,7 +164,6 @@ public class ImageRenderer extends DefaultComponentRenderer {
 			  .append("<input id='").append(imgId).append("_h' name='").append(imgId).append("_h' type='hidden' value='' />");
 			
 			sb.append("<script>\n")
-			  .append("/* <![CDATA[ */ \n")
 			  .append("jQuery(function() {\n")
 			  .append("  jQuery('#").append(imgId).append("').cropper({\n")
 			  .append("    aspectRatio:1,\n")
@@ -172,7 +175,6 @@ public class ImageRenderer extends DefaultComponentRenderer {
 			  .append("    }")
 			  .append("  });")
 			  .append("});")
-		      .append("/* ]]> */\n")
 		      .append("</script>");
 		}
 		sb.append("</div>", divWrapper); // ENDcomponent

src/main/java/org/olat/course/assessment/ui/tool/_content/assessment_mode_overview_row.html

@@ -9,7 +9,7 @@
 		#end
 	</ul>
 	#end
-	#if($row.endInMilliSeconds > 300000)
+	#if($r.isNotNull($row) && ${row.getEndInMilliSeconds()} > 300000)
 	<script>
 	jQuery(function() {
 		setTimeout(function() {

src/main/java/org/olat/ims/qti21/pool/QTI21ExportProcessor.java

@@ -36,8 +36,11 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import org.apache.logging.log4j.Logger;
+import org.olat.core.gui.translator.Translator;
 import org.olat.core.logging.Tracing;
 import org.olat.core.util.FileUtils;
+import org.olat.core.util.StringHelper;
+import org.olat.core.util.Util;
 import org.olat.core.util.ZipUtil;
 import org.olat.core.util.io.ShieldOutputStream;
 import org.olat.ims.qti21.QTI21Service;
@@ -49,6 +52,7 @@ import org.olat.ims.qti21.model.xml.ManifestMetadataBuilder;
 import org.olat.ims.qti21.model.xml.QtiNodesExtractor;
 import org.olat.ims.qti21.pool.ImportExportHelper.AssessmentItemsAndResources;
 import org.olat.ims.qti21.pool.ImportExportHelper.ItemMaterial;
+import org.olat.ims.qti21.ui.editor.AssessmentTestComposerController;
 import org.olat.imscp.xml.manifest.ResourceType;
 import org.olat.modules.qpool.QuestionItemFull;
 import org.olat.modules.qpool.manager.QPoolFileStorage;
@@ -176,7 +180,7 @@ public class QTI21ExportProcessor {
 		metadataBuilder.appendMetadataFrom(qitem, resolvedAssessmentItem, locale);	
 	}
 	
-	public void assembleTest(List<QuestionItemFull> fullItems, File directory) {
+	public void assembleTest(String title, List<QuestionItemFull> fullItems, File directory) {
 		try {
 			QtiSerializer qtiSerializer = qtiService.qtiSerializer();
 			//imsmanifest
@@ -184,7 +188,14 @@ public class QTI21ExportProcessor {
 			
 			//assessment test
 			DoubleAdder atomicMaxScore = new DoubleAdder();
-			AssessmentTest assessmentTest = AssessmentTestFactory.createAssessmentTest("Assessment test from pool", "Section");
+			if(!StringHelper.containsNonWhitespace(title)) {
+				title = "Assessment test from pool";
+			}
+			
+			Translator translator = Util.createPackageTranslator(AssessmentTestComposerController.class, locale);
+			String sectionTitle = translator.translate("new.section");
+			
+			AssessmentTest assessmentTest = AssessmentTestFactory.createAssessmentTest(title, sectionTitle);
 			String assessmentTestFilename = assessmentTest.getIdentifier() + ".xml";
 			manifest.appendAssessmentTest(assessmentTestFilename);
 

src/main/java/org/olat/ims/qti21/pool/QTI21QPoolServiceProvider.java

@@ -475,10 +475,17 @@ public class QTI21QPoolServiceProvider implements QPoolSPI {
 		processor.assembleTest(fullItems, zout);	
 	}
 	
-	public void exportToEditorPackage(File exportDir, List<QuestionItemShort> items, Locale locale) {
+	/**
+	 * 
+	 * @param testTitle The title of the test
+	 * @param exportDir The directory to export to
+	 * @param items The list of questions to export
+	 * @param locale The language
+	 */
+	public void exportToEditorPackage(String testTitle, File exportDir, List<QuestionItemShort> items, Locale locale) {
 		List<QuestionItemFull> fullItems = loadQuestionFullItems(items);
 		QTI21ExportProcessor processor = new QTI21ExportProcessor(qtiService, qpoolFileStorage, locale);
-		processor.assembleTest(fullItems, exportDir);
+		processor.assembleTest(testTitle, fullItems, exportDir);
 	}
 	
 	private List<QuestionItemFull> loadQuestionFullItems(List<QuestionItemShort> items) {

src/main/java/org/olat/ims/qti21/repository/handlers/QTI21AssessmentTestHandler.java

@@ -167,7 +167,7 @@ public class QTI21AssessmentTestHandler extends FileHandler {
 		}
 		if(createObject instanceof QItemList) {
 			QItemList itemToImport = (QItemList)createObject;
-			qpoolServiceProvider.exportToEditorPackage(repositoryDir, itemToImport.getItems(), locale);
+			qpoolServiceProvider.exportToEditorPackage(displayname, repositoryDir, itemToImport.getItems(), locale);
 		} else if(createObject instanceof QTIEditorPackage) {
 			QTIEditorPackage testToConvert = (QTIEditorPackage)createObject;
 			QTI21DeliveryOptions options = qtiService.getDeliveryOptions(re);

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

@@ -13,16 +13,14 @@
 	#if($print || $pdf)
 	<div class="o_button_group o_button_group_right">
 		<script>
-		/* <![CDATA[ */ 
-			function print() {
-				try {
-					var ww = window.open("$r.commandURI("print")", "$winid", "height=800,left=100,top=100,width=800,toolbar=no,titlebar=0,status=0,menubar=yes,location=no,scrollbars=1");
-					ww.focus();
-				} catch(e) {
-					if(window.console) console.log('Error when trying to dock div id::$r.getId("undck")');
-				}
+		function print() {
+			try {
+				var ww = window.open("$r.commandURI("print")", "$winid", "height=800,left=100,top=100,width=800,toolbar=no,titlebar=0,status=0,menubar=yes,location=no,scrollbars=1");
+				ww.focus();
+			} catch(e) {
+				if(window.console) console.log('Error when trying to dock div id::$r.getId("undck")');
 			}
-		/* ]]> */
+		}
 		</script>
 		#if($print && $pdf) <div class='btn-group'> #end
 		#if($print)
@@ -499,10 +497,9 @@
 				<div id="o_c$itemResult.interactionResults.solutionFormItem.component.dispatchID" class="o_qti21_solution">
 					<h4 onclick="jQuery('#collapse_${itemResult.interactionResults.solutionFormItem.name}').collapse('toggle')">
 						#if($toggleSolution)<i id="collapse_${itemResult.interactionResults.solutionFormItem.name}_toggler" class="o_icon o_icon-fw o_icon_open_togglebox"> </i>#end $r.translate("solution")</h4>
-					<div id="collapse_${itemResult.interactionResults.solutionFormItem.name}" class="#if($toggleSolution) collapse #end">$r.render($itemResult.interactionResults.solutionFormItem.name)</div>
+					<div id="collapse_${itemResult.interactionResults.solutionFormItem.name}" class="#if($toggleSolution) collapse #end o_qti21_collapsable_solution">$r.render($itemResult.interactionResults.solutionFormItem.name)</div>
 				</div>
 				<script>
-				/* <![CDATA[ */
 				jQuery(function() {
 					jQuery('#collapse_${itemResult.interactionResults.solutionFormItem.name}').on('hide.bs.collapse', function () {
 						jQuery('#collapse_${itemResult.interactionResults.solutionFormItem.name}_toggler').removeClass('o_icon_close_togglebox').addClass('o_icon_open_togglebox');
@@ -525,7 +522,6 @@
 						});
 					})
 				});
-				/* ]]> */
 				</script>
 			#end
 		#end

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

@@ -25,7 +25,6 @@
 		</map>
 	</div>
 	<script>
-	/* <![CDATA[ */
 	var maphilightSettings;
 	#if($r.hasCssClass($interaction, "hotspot-light"))
 	maphilightSettings = {
@@ -116,6 +115,5 @@
 			maphilightSettings: maphilightSettings
 		});
 	});
-	/* ]]> */
 	</script>
 </div>
\ No newline at end of file

src/main/java/org/olat/modules/ceditor/ui/ImageEditorController.java

@@ -326,11 +326,13 @@ public class ImageEditorController extends FormBasicController implements PageEl
 		String settingsXml = ContentEditorXStream.toXml(settings);
 		imageElement.setLayoutOptions(settingsXml);
 		imageElement = store.savePageElement(imageElement);
+		settings = imageElement.getImageSettings();
 		
-		removeAsListenerAndDispose(imagePreview);
-		imagePreview = new ImageRunController(ureq, getWindowControl(), dataStorage, imageElement, new StandardMediaRenderingHints());
-		listenTo(imagePreview);
-		flc.getFormItemComponent().put("imagePreview", imagePreview.getInitialComponent());
+		DublinCoreMetadata meta = null;
+		if(imageElement.getStoredData() instanceof DublinCoreMetadata) {
+			meta = (DublinCoreMetadata)imageElement.getStoredData();
+		}
+		imagePreview.updateImageSettings(settings, meta);
 		
 		fireEvent(ureq, new ChangePartEvent(imageElement));
 	}

src/main/java/org/olat/modules/ceditor/ui/ImageRunController.java

@@ -64,53 +64,11 @@ public class ImageRunController extends BasicController implements PageRunElemen
 		
 		ImageSettings settings = media.getImageSettings();
 		if(settings != null) {
-			if(settings.getAlignment() != null) {
-				mainVC.contextPut("alignment", settings.getAlignment().name());
-			}
-			if(settings.getSize() != null) {
-				mainVC.contextPut("size", settings.getSize().name());
-			}
-			if(StringHelper.containsNonWhitespace(settings.getStyle())) {
-				imageCmp.setCssClasses(settings.getStyle());
-			}
-			
-			if(settings.getSize() != null) {
-				mainVC.contextPut("imageSizeStyle", settings.getSize().name());
-			}
-			
-			mainVC.contextPut("someId", CodeHelper.getRAMUniqueID());
-			
+			DublinCoreMetadata meta = null;
 			if(media.getStoredData() instanceof DublinCoreMetadata) {
-				DublinCoreMetadata dMeta = (DublinCoreMetadata)media.getStoredData();
-				boolean hasSource = settings.isShowSource() && StringHelper.containsNonWhitespace(dMeta.getSource());
-				if(hasSource) {
-					mainVC.contextPut("source", dMeta.getSource());
-					mainVC.contextPut("showSource", Boolean.valueOf(settings.isShowSource()));
-				}
-			}
-			
-			boolean hasDescriptionToShow = settings.isShowDescription() && StringHelper.containsNonWhitespace(settings.getDescription());
-			mainVC.contextPut("showDescription", Boolean.valueOf(hasDescriptionToShow));
-			if(hasDescriptionToShow) {
-				mainVC.contextPut("description", settings.getDescription());
-			}
-			
-			boolean hasCaptionToShow = StringHelper.containsNonWhitespace(settings.getCaption());
-			mainVC.contextPut("showCaption", Boolean.valueOf(hasCaptionToShow));
-			if(hasCaptionToShow) {
-				mainVC.contextPut("caption", settings.getCaption());
-			}
-			
-			boolean hasTitle = StringHelper.containsNonWhitespace(settings.getTitle());
-			mainVC.contextPut("showTitle", Boolean.valueOf(hasTitle));
-			if(hasTitle) {
-				mainVC.contextPut("title", settings.getTitle());
-				ImageTitlePosition position = settings.getTitlePosition() == null ? ImageTitlePosition.above : settings.getTitlePosition();
-				mainVC.contextPut("titlePosition", position.name());
-				if(StringHelper.containsNonWhitespace(settings.getTitleStyle())) {
-					mainVC.contextPut("titleStyle", settings.getTitleStyle());
-				}
+				meta = (DublinCoreMetadata)media.getStoredData();
 			}
+			updateImageSettings(settings, meta);
 		}
 	}
 
@@ -123,6 +81,7 @@ public class ImageRunController extends BasicController implements PageRunElemen
 		imageCmp = new ImageComponent(ureq.getUserSession(), "image");
 		imageCmp.setMedia(mediaFile);
 		imageCmp.setDivImageWrapper(false);
+		imageCmp.setPreventBrowserCaching(false);
 		
 		mainVC.put("image", imageCmp);
 		mainVC.contextPut("imageSizeStyle", "none");
@@ -149,11 +108,60 @@ public class ImageRunController extends BasicController implements PageRunElemen
 		mainPanel.setDomReplaceable(false);
 	}
 	
+	public void updateImageSettings(ImageSettings settings, DublinCoreMetadata meta) {
+		if(settings.getAlignment() != null) {
+			mainVC.contextPut("alignment", settings.getAlignment().name());
+		}
+		if(settings.getSize() != null) {
+			mainVC.contextPut("size", settings.getSize().name());
+		}
+		if(StringHelper.containsNonWhitespace(settings.getStyle())) {
+			imageCmp.setCssClasses(settings.getStyle());
+		}
+		
+		if(settings.getSize() != null) {
+			mainVC.contextPut("imageSizeStyle", settings.getSize().name());
+		}
+		
+		mainVC.contextPut("someId", CodeHelper.getRAMUniqueID());
+		
+		if(meta != null) {
+			boolean hasSource = settings.isShowSource() && StringHelper.containsNonWhitespace(meta.getSource());
+			if(hasSource) {
+				mainVC.contextPut("source", meta.getSource());
+				mainVC.contextPut("showSource", Boolean.valueOf(settings.isShowSource()));
+			}
+		}
+		
+		boolean hasDescriptionToShow = settings.isShowDescription() && StringHelper.containsNonWhitespace(settings.getDescription());
+		mainVC.contextPut("showDescription", Boolean.valueOf(hasDescriptionToShow));
+		if(hasDescriptionToShow) {
+			mainVC.contextPut("description", settings.getDescription());
+		}
+		
+		boolean hasCaptionToShow = StringHelper.containsNonWhitespace(settings.getCaption());
+		mainVC.contextPut("showCaption", Boolean.valueOf(hasCaptionToShow));
+		if(hasCaptionToShow) {
+			mainVC.contextPut("caption", settings.getCaption());
+		}
+		
+		boolean hasTitle = StringHelper.containsNonWhitespace(settings.getTitle());
+		mainVC.contextPut("showTitle", Boolean.valueOf(hasTitle));
+		if(hasTitle) {
+			mainVC.contextPut("title", settings.getTitle());
+			ImageTitlePosition position = settings.getTitlePosition() == null ? ImageTitlePosition.above : settings.getTitlePosition();
+			mainVC.contextPut("titlePosition", position.name());
+			if(StringHelper.containsNonWhitespace(settings.getTitleStyle())) {
+				mainVC.contextPut("titleStyle", settings.getTitleStyle());
+			}
+		}
+	}
+	
 	/**
 	 * @param ureq The user request
 	 * @param storedData To be extended 
 	 */
-	protected void initMetadata(UserRequest ureq, StoredData storedData) {
+	protected void  initMetadata(UserRequest ureq, StoredData storedData) {
 		//
 	}
 

src/main/webapp/static/js/jquery/qti/jquery.hotspot.js

 (function ($) {
+	"use strict";
 	$.fn.hotspotInteraction = function(options) {
 		var settings = $.extend({
 			responseIdentifier: null,
@@ -28,7 +29,7 @@
 		var divContainer = jQuery('#' + containerId);
 		
 		var areaIds = settings.responseValue.split(',');
-		for(i=areaIds.length; i-->0; ) {
+		for(var i=areaIds.length; i-->0; ) {
 			var areaEl = jQuery('#ac_' + settings.responseIdentifier + '_' + areaIds[i]);
 			var data = areaEl.data('maphilight') || {};
 			data.selectedOn = true;
@@ -49,7 +50,7 @@
 				clickHotspotArea(this, containerId, settings.responseIdentifier, settings.maxChoices, settings.singleChoice, settings.maphilightSettings);
 			});
 		})
-	};
+	}
 
 	function clickHotspotArea(spot, containerId, responseIdentifier, maxChoices, singleChoice, maphilightSettings) {
 		var areaEl = jQuery(spot);
@@ -101,7 +102,7 @@
 				divContainer.append(inputElement);
 			}
 		});
-	};
+	}
 
 	/*
 	 * Color the data based on the selectedOn flag

src/main/webapp/static/js/jquery/qti/jquery.hotspot.responsive.js

@@ -9,6 +9,7 @@
 * Licensed under the MIT license
 */
 ;(function($) {
+	"use strict";
 	$.fn.rwdImageMaps = function(options) {
 		var settings = $.extend({
 			fillColor: 'bbbbbb',
@@ -20,6 +21,7 @@
 		var $img = this;
 		var loaded = null;
 		var windowWidth = 0;
+		var hotSpotContainerWidth = 0;
 
 		var rwdImageMap = function() {
 			$img.each(function() {
@@ -32,7 +34,6 @@
 						var attrW = 'width',
 							attrH = 'height';
 						
-						var $this = $(this);
 						if (!$that.data(attrW)) // size are backuped
 							$that.data(attrW, $that.attr(attrW));
 						if (!$that.data(attrH)) // size are backuped
@@ -64,7 +65,13 @@
 							th = ((containerWidth * ratio)|0);
 							$that.width(tw);
 							$that.height(th);
-						}
+						} else if(tw == 0 && th == 0) {
+							// image was hidden
+							tw = w;
+							th = h;
+							$that.width(tw);
+							$that.height(th);
+						} 
 					
 						var wPercent = tw/100,
 							hPercent = th/100,
@@ -104,19 +111,23 @@
 				
 				var that = this,
 					$that = $(that);
-				
+				var containerWidth = $that.closest(".o_oo_hotcontainer").width();
+
 				if(loaded) {
-					if(windowWidth != window.innerWidth) {
+					if(windowWidth != window.innerWidth || hotSpotContainerWidth != containerWidth) {
 						recalculateMap(that, $that);
 						windowWidth = window.innerWidth;
+						hotSpotContainerWidth = containerWidth
 					}
 				} else {
 					windowWidth = window.innerWidth;
+					hotSpotContainerWidth = containerWidth;
 					recalculateMap(that, $that);
 				}
 			});
 		};
 		$(window).resize(rwdImageMap).trigger('resize');
+		$($img).closest('.o_qti21_collapsable_solution').on('shown.bs.collapse', rwdImageMap);
 
 		return this;
 	};