OO-1068: small fix, close callout, thumbnails in folder, wording...

src/main/java/org/olat/core/commons/modules/bc/components/ListRenderer.java

@@ -333,31 +333,18 @@ public class ListRenderer {
 				  .append("	   container: 'body',\n")
 				  .append("    title: function(){ return jQuery('#o_sel_doc_tooltip_").append(pos).append("').html(); }\n")
 				  .append("  });\n")
+				  .append("  jQuery('#o_sel_doc_").append(pos).append("').on('show.bs.tooltip', function(){\n")
+				  .append("	   setTimeout(function() {\n")
+				  .append("	    jQuery('#o_sel_doc_").append(pos).append("').tooltip('hide');\n")
+				  .append("	   }, 30000);\n")
+				  .append("  });\n")
 				  .append("});")
 				  .append("/* ]]> */")
 				  .append("</script>");
-
-				/*
-				sb.append("<script type='text/javascript'>")
-			    .append("/* <![CDATA[ *//*")
-				  .append("jQuery(function() {")
-					.append("  jQuery('#o_sel_doc_").append(pos).append("').tooltip({")
-					.append("	  items: 'a', tooltipClass: 'b_briefcase_meta ")
-					.append(isContainer ? "b_briefcase_folder " : "b_briefcase_file ")
-					.append(hasMetaAuthor ? "b_briefcase_with_meta_author " : "b_briefcase_with_uploader_author ")
-					.append(hasThumbnail ? "b_briefcase_with_thumbnail " : "b_briefcase_without_thumbnail ")
-					.append("', ")
-					.append("     content: function(){ return jQuery('#o_sel_doc_tooltip_").append(pos).append("').html(); }")
-					.append("  });")
-					.append("});")
-					.append("/* ]]> *//*")
-					.append("</script>");
-				
-				*/
 			}
 		}
-		sb.append("</span>");
-		sb.append("</td><td>");
+		sb.append("</span>")
+		  .append("</td><td>");
 		
 		// filesize
 		if (!isContainer) {

src/main/java/org/olat/core/gui/control/generic/closablewrapper/_content/callout.html

@@ -9,9 +9,9 @@
 jQuery(function() {
 	jQuery('#callout_layer_$r.getCId()').each(function(index, el) {
 		jQuery(el).parents('div.popover').next('div.o_callout_overlay').each(function(index2, el2) {
-			jQuery(el2).click(function() {if (o2cl()) {
-				$r.javaScriptBgCommand('close');
-			}});
+			jQuery(el2).click(function() {
+				if (o2cl()) { $r.javaScriptBgCommand('close'); }
+			});
 		});
 	});
 });

src/main/java/org/olat/core/gui/control/guistack/_content/callout.html

@@ -48,7 +48,8 @@ jQuery(function() {
 					left: (targetOffset.left + targetEl.width()) - callout.width()/2 
 				});
 			}
-			callout.css('display','block').css('zindex', o_info.zseed + 5);
+			callout.css('display','block').css('z-index', o_info.zseed + 105);
+			jQuery('#callout_overlay_$r.getCId()').css('z-index', o_info.zseed + 103);
 		}
 	});
 });

src/main/java/org/olat/portfolio/ui/artefacts/collect/EPAddArtefactController.java

@@ -21,7 +21,6 @@ package org.olat.portfolio.ui.artefacts.collect;
 
 import java.util.Date;
 
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.link.Link;
@@ -45,6 +44,7 @@ import org.olat.portfolio.model.artefacts.AbstractArtefact;
 import org.olat.portfolio.model.artefacts.EPTextArtefact;
 import org.olat.portfolio.model.artefacts.FileArtefact;
 import org.olat.portfolio.model.structel.PortfolioStructure;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Description:<br>
@@ -59,24 +59,24 @@ import org.olat.portfolio.model.structel.PortfolioStructure;
  */
 public class EPAddArtefactController extends BasicController {
 
-	private Link uploadBtn;
-	private Link liveBlogBtn;
-	private EPFrontendManager ePFMgr;
-	private VelocityContainer addPage = null;
-	private Link textBtn;
-	private Link addBtn;
+	private Link uploadBtn, liveBlogBtn;
+	private VelocityContainer addPage;
+	private Link textBtn, addBtn;
 	private StepsMainRunController collectStepsCtrl;
-	private PortfolioModule portfolioModule;
+	
 	private VFSContainer vfsTemp;
 	private VelocityContainer addLinkVC;
 	private CloseableCalloutWindowController calloutCtr;
 	
+	@Autowired
+	private EPFrontendManager ePFMgr;
+	@Autowired
+	private PortfolioModule portfolioModule;
+	
 	private PortfolioStructure preSelectedStruct;
 
 	public EPAddArtefactController(UserRequest ureq, WindowControl wControl) {
 		super(ureq, wControl);
-		ePFMgr = (EPFrontendManager) CoreSpringFactory.getBean("epFrontendManager");
-		portfolioModule = (PortfolioModule) CoreSpringFactory.getBean("portfolioModule");
 		addLinkVC = createVelocityContainer("addLink");
 		addBtn = LinkFactory.createButton("add.artefact", addLinkVC, this);
 		addBtn.setElementCssClass("o_sel_add_artfeact");

src/main/java/org/olat/portfolio/ui/artefacts/view/EPArtefactViewController.java

@@ -174,13 +174,12 @@ public class EPArtefactViewController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		if(detailsLinkEnabled && !artefactChooseMode) {
-			detailsLink = uifactory.addFormLink("details.link", formLayout, Link.LINK);
+			detailsLink = uifactory.addFormLink("details.link", formLayout, Link.BUTTON);
 			detailsLink.setElementCssClass("o_sel_artefact_details");
 		}
 
 		title = uifactory.addInlineTextElement("title", artefact.getTitle(), formLayout, this);
 		
-		System.out.println("Closed: " + artefactInClosedMap);
 		flc.contextPut("cssClosed", artefactInClosedMap ? "o_artefact_closed" : "");
 		flc.contextPut("viewOnly", viewOnlyMode);
 		
@@ -223,7 +222,8 @@ public class EPArtefactViewController extends FormBasicController {
 		}
 		
 		// create a delete button
-		deleteBtn = uifactory.addFormLink("delete.artefact", formLayout, "b_with_small_icon_left b_delete_icon");
+		deleteBtn = uifactory.addFormLink("delete.artefact", formLayout, Link.BUTTON);
+		deleteBtn.setIconLeftCSS("o_icon o_icon_delete");
 		deleteBtn.addActionListener(FormEvent.ONCLICK);
 		if (viewOnlyMode || artefactChooseMode || artefactInClosedMap) deleteBtn.setVisible(false);
 		
@@ -259,7 +259,7 @@ public class EPArtefactViewController extends FormBasicController {
 		
 		// if in artefactChooseMode, add an "choose this" button
 		if(artefactChooseMode) {
-			chooseBtn = uifactory.addFormLink("choose.artefact", formLayout);
+			chooseBtn = uifactory.addFormLink("choose.artefact", formLayout, Link.BUTTON);
 			chooseBtn.addActionListener(FormEvent.ONCLICK);
 		}
 		

src/main/java/org/olat/portfolio/ui/artefacts/view/_content/singleArtefact.html

@@ -62,9 +62,17 @@
 			<td>#if ($r.available("detailsController")) $r.render("detailsController") #end </td></tr>
 		#end
 	</tbody></table>
-	<div class="panel-body">
-		#if ($r.available("details.link")) <div class="b_float_right"> $r.render("details.link") </div> #end
-		#if ($r.available("delete.artefact")) <div class="b_float_left">$r.render("delete.artefact")</div> #end
-		#if ($r.available("choose.artefact")) <p style="text-align: center">$r.render("choose.artefact")</p> #end
+	#if ($r.visible("details.link") || $r.visible("delete.artefact") || $r.visible("choose.artefact"))
+	<div class="panel-body ">
+		#set($count = 0)
+		#if ($r.visible("details.link")) #set($count = $count + 1) #end
+		#if ($r.visible("delete.artefact")) #set($count = $count + 1) #end
+		#if ($r.visible("choose.artefact")) #set($count = $count + 1) #end
+		#if($count > 1) <div class="btn-group"> #end
+		#if ($r.available("details.link")) $r.render("details.link") #end
+		#if ($r.available("delete.artefact")) $r.render("delete.artefact") #end
+		#if ($r.available("choose.artefact")) $r.render("choose.artefact") #end
+		#if($count > 1) </div> #end
 	</div>
+	#end
 </div>
\ No newline at end of file

src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties

@@ -236,7 +236,7 @@ cif.error.description.empty=Bitte f\u00FCllen Sie das Feld "Beschreibung" aus.
 cif.error.displayname.empty=Bitte f\u00FCllen Sie das Feld "Titel der Lernressource" aus.
 cif.error.idnotint=Diese Identifikationsnummer existiert nicht.
 cif.error.resourcename.empty=Bitte f\u00FCllen Sie das Feld "Referenz" aus.
-cif.expenditureOfWork=Expenditure of work
+cif.expenditureOfWork=Zeitaufwand
 cif.groups=Gruppen
 cif.id=Id
 cif.id.na=Nicht verf\u00FCgbar
@@ -246,11 +246,11 @@ cif.lastusage=Letzter Zugriff
 cif.launched=Anzahl Launches
 cif.mainLanguage=Hauptsprache
 cif.managedflags=Extern verwaltete Module
-cif.objectives=Objectives
+cif.objectives=Beschreibung
 cif.ores_id=OpenOLAT-Ressourcen-ID
 cif.owners=Autoren
 cif.resourcename=Dateiname
-cif.requirements=Requirements
+cif.requirements=Voraussetzungen
 cif.softkey=OpenOLAT-Soft-ID
 cif.type=Typ
 cif.type.na=keine Angabe
@@ -450,7 +450,7 @@ rentry.publish.course.desc=Definieren Sie in diesem Formular ob andere Autoren d
 rentry.publish.other.desc=Hinweis: Sie mssen Ressourcen fr Benutzer nicht freigeben um diese in einem Kurs verwenden zu knnen. Es wird empfohlen nur Kurse direkt als Lernressourcen freizugeben und andere Ressourcen stattdessen in Kurse einzubinden. Die Freigabe fr Autoren ermglicht es anderen Autoren Ressourcen von Ihnen zu verwenden ohne selbst Besitzer dieser Ressourcen zu sein.  
 rentry.pic=Bild zur Lernressource (jpg,png,gif)
 rentry.prop=Einstellungen zur Lernressource
-rentry.movie=Movie zur Lernressource (mp4,flv)
+rentry.movie=Film zur Lernressource (mp4,flv)
 repo.login=Login
 repositoryentry.not.existing=Diese Ressource ist nicht mehr verf\u00FCgbar.
 resource.error.test.xml=Die Lernressource konnte nicht hinzugef\u00FCgt werden. Die qti.xml-Datei konnte nicht geparst werden.
@@ -507,7 +507,7 @@ rating.average.explanation=Basierend auf {0} Bewertungen
 rating.average.title=Bewertung der anderen
 rating.personal.title=Ihre Bewertung
 references=References
-tab.accesscontrol=Access control
+tab.accesscontrol=Zugangskontrolle
 tab.calendar=Kalender
 tab.chat=Kurs-Chat
 tab.efficencystatement=Leistungsnachweis

src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties

@@ -215,6 +215,8 @@ cif.canDownload.na=<i>Export not supported</i>
 cif.canLaunch=Can be launched
 cif.canLaunch.na=<i>Launch not supported</i>
 cif.canReference=Can be referenced
+cif.categories=Categories
+cif.credits=ECTS-Punkte
 cif.date.end=End
 cif.date.start=Begin
 cif.dates=Execution Period
@@ -230,6 +232,7 @@ cif.error.description.empty=Please fill in the field "Description".
 cif.error.displayname.empty=Please fill in the field "Title of learning resource".
 cif.error.idnotint=This identification number does not exist.
 cif.error.resourcename.empty=Please fill in the field "Reference".
+cif.expenditureOfWork=Expenditure of work
 cif.externalid=External ID
 cif.externalref=External ref.
 cif.id=ID
@@ -239,11 +242,13 @@ cif.lastUsage.na=-
 cif.lastusage=Last access
 cif.launched=Number of launches
 cif.managedflags=Externally managed modules
+cif.objectives=Objectives
 cif.ores_id=OpenOLAT resource ID
 cif.owners=Authors
 cif.private.dates=Dates
 cif.public.dates=Semester
 cif.resourcename=File name
+cif.requirements=Requirements
 cif.softkey=OpenOLAT soft ID
 cif.type=Type
 cif.type.na=n/a

src/main/java/org/olat/user/_i18n/LocalStrings_de.properties

@@ -239,6 +239,6 @@ reset.elements.resume=Sitzung wiederherstellen
 reset.submit=Zurücksetzen
 form.checkUsername=Der Benutzername muss mindestens 4 Zeichen lang sein und darf nur Buchstaben von a bis z (keine Umlaute, keine Grossbuchstaben) und Ziffern von 0 bis 9 enthalten. Zus\u00E4tzlich sind die Sonderzeichen . _  und - erlaubt.
 help.hover.usertools=Hilfe zur Benutzerwerkzeug Einstellungen
-usertools.title=Benutzerwrkzeuge
+usertools.title=Benutzerwerkzeuge
 usertools.descr=Wählen Sie hier aus auf welche Werkzeuge Sie schnell zugreifen wollen.
 usertools.set=Werkzeug
\ No newline at end of file

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

@@ -76,7 +76,7 @@ a.o_chelp {
 .o_bc_empty{
 	@extend %o_important;
 }
-.o_bc_meta {
+.o_bc_meta, .tooltip {
 	@extend %o_small;
 	.o_thumbnail{
 		width:200px;