OO-990: use the same "student" details page for authors too

src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java

@@ -205,10 +205,16 @@ public abstract class FormBasicController extends BasicController {
 	protected void constructorInit(String mainFormId, String pageName) {
 		String ffo_pagename = null;
 		if (pageName != null) {
-			// init with provided layout
-			String vc_pageName = velocity_root + "/" + pageName + ".html";
-			ffo_pagename = "ffo_" + pageName;
-			flc = FormLayoutContainer.createCustomFormLayout(ffo_pagename, getTranslator(), vc_pageName);
+			if(pageName.endsWith(".html")) {
+				// init with provided layout
+				ffo_pagename = "ffo_" + pageName.replace("/", "_");
+				flc = FormLayoutContainer.createCustomFormLayout(ffo_pagename, getTranslator(), pageName);
+			} else {
+				// init with provided layout
+				String vc_pageName = velocity_root + "/" + pageName + ".html";
+				ffo_pagename = "ffo_" + pageName;
+				flc = FormLayoutContainer.createCustomFormLayout(ffo_pagename, getTranslator(), vc_pageName);
+			}
 		} else {
 			// init with default layout
 			ffo_pagename="ffo_default";

src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/CSSIconFlexiCellRenderer.java

@@ -95,7 +95,7 @@ public class CSSIconFlexiCellRenderer implements FlexiCellRenderer {
 			target.append("\" title=\"");
 			target.append(StringEscapeUtils.escapeHtml(hoverText));
 		}
-		target.append("\">&nsbp;</i>");
+		target.append("\"> </i>");
 		if(delegate == null) {
 			target.append(getCellValue(cellValue));
 		} else {

src/main/java/org/olat/core/util/mail/_spring/mailContext.xml

@@ -75,7 +75,7 @@
 	<bean class="org.olat.core.extensions.action.GenericActionExtension" name="mailBox" init-method="initExtensionPoints" >
 		<property name="order" value="404" />
 		<property name="navigationKey" value="Mail" />
-		<property name="iconCssClass" value="b_with_small_icon_left b_mail_icon" />
+		<property name="iconCssClass" value="o_icon o_icon-fw o_icon_mail" />
 		<property name="actionController">	
 			<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
 				<property name="className" value="org.olat.core.util.mail.ui.MailBoxOverviewController"/>

src/main/java/org/olat/gui/control/OlatTopNavController.java

@@ -230,7 +230,7 @@ public class OlatTopNavController extends BasicController implements GenericEven
 						Link link = LinkFactory.createLink(linkName, container, this);
 						link.setUserObject(gAe);
 						link.setCustomDisplayText(gAe.getActionText(getLocale()));
-						link.setCustomEnabledLinkCSS(node.getIconCssClass());
+						link.setIconLeftCSS(node.getIconCssClass());
 						linksName.add(linkName);
 					} else if("config".equals(gAe.getParentTreeNodeIdentifier())) {
 						GenericTreeNode node = gAe.createMenuNode(ureq);
@@ -238,7 +238,7 @@ public class OlatTopNavController extends BasicController implements GenericEven
 						Link link = LinkFactory.createLink(linkName, container, this);
 						link.setUserObject(gAe);
 						link.setCustomDisplayText(gAe.getActionText(getLocale()));
-						link.setCustomEnabledLinkCSS(node.getIconCssClass());
+						link.setIconLeftCSS(node.getIconCssClass());
 						configLinksName.add(linkName);
 					}
 				}	

src/main/java/org/olat/home/_spring/homeContext.xml

@@ -12,7 +12,7 @@
 		<property name="order" value="102" />
 		<property name="enabled" value="${minimalhome.ext.calendar}"></property>
 		<property name="navigationKey" value="calendar" />
-		<property name="iconCssClass" value="b_with_small_icon_left o_cal_icon" />
+		<property name="iconCssClass" value="o_icon o_icon-fw o_icon_calendar" />
 		<property name="actionController">	
 			<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
 				<property name="className" value="org.olat.home.HomeCalendarController"/>
@@ -33,7 +33,7 @@
 		<property name="order" value="103" />
 		<property name="enabled" value="${minimalhome.ext.notifications}"></property>
 		<property name="navigationKey" value="notifications" />
-		<property name="iconCssClass" value="b_with_small_icon_left o_notifications_icon" />
+		<property name="iconCssClass" value="" />
 		<property name="actionController">
 			<bean class="org.olat.home.controllerCreators.NotificationsControllerCreator" scope="prototype"/>
 		</property>
@@ -75,7 +75,7 @@
 		<property name="order" value="105" />
 		<property name="enabled" value="${minimalhome.ext.userfolder}"></property>
 		<property name="navigationKey" value="userfolder" />
-		<property name="iconCssClass" value="b_with_small_icon_left o_bc_icon" />
+		<property name="iconCssClass" value="o_icon o_icon-fw o_bc_icon" />
 		<property name="actionController">	
 			<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
 				<property name="className" value="org.olat.core.commons.modules.bc.FolderRunController"/>
@@ -97,7 +97,7 @@
 		<property name="order" value="106" />
 		<property name="enabled" value="${minimalhome.ext.notelist}"></property>
 		<property name="navigationKey" value="notelist" />
-		<property name="iconCssClass" value="b_with_small_icon_left o_notes_icon" />
+		<property name="iconCssClass" value="o_icon o_icon-fw o_icon_notes" />
 		<property name="actionController">	
 			<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
 				<property name="className" value="org.olat.note.NoteListController"/>
@@ -119,7 +119,7 @@
 		<property name="order" value="107" />
 		<property name="enabled" value="${minimalhome.ext.efficiencystatement}"></property>
 		<property name="navigationKey" value="effstatements" />
-		<property name="iconCssClass" value="b_with_small_icon_left o_efficiencystatement_icon" />
+		<property name="iconCssClass" value="" />
 		<property name="actionController">	
 			<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
 				<property name="className" value="org.olat.course.assessment.EfficiencyStatementsListController"/>
@@ -202,7 +202,7 @@
 	<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
 		<property name="order" value="110" />
 		<property name="enabled" value="true" />
-		<property name="iconCssClass" value="b_with_small_icon_left o_settings" />
+		<property name="iconCssClass" value="o_icon o_icon-fw o_icon_settings" />
 		<property name="navigationKey" value="mysettings" />
 		<property name="parentTreeNodeIdentifier" value="config" />
 		<property name="actionController">	

src/main/java/org/olat/modules/qpool/ui/_content/pools.html

 $r.contextHelpWithWrapper("org.olat.modules.qpool.ui","share-pool.html","help.hover.sharepool")
-
-
 $r.render("pools")
 $r.render("buttons")
\ No newline at end of file

src/main/java/org/olat/modules/qpool/ui/metadata/_content/item_metadatas.html

-<div class="b_clearfix">
-	<div class="b_c50l">
-		<div class="b_subcl">
-			$r.render("details_general")
-			$r.render("details_lifecycle")
-			$r.render("details_rights")
-			$r.render("details_sharing")
-		</div>
+<div class="clearfix">
+	<div class="col-md-6">
+		$r.render("details_general")
+		$r.render("details_lifecycle")
+		$r.render("details_rights")
+		$r.render("details_sharing")
 	</div>
-	<div class="b_c50r">
-		<div class="b_subcr">	
-			$r.render("details_educational")
-			$r.render("details_question")
-			$r.render("details_technical")
-		</div>
+	<div class="col-md-6">
+		$r.render("details_educational")
+		$r.render("details_question")
+		$r.render("details_technical")
 	</div>
 </div>
 

src/main/java/org/olat/portfolio/_spring/portfolioContext.xml

@@ -148,7 +148,7 @@
 	<bean class="org.olat.core.extensions.action.GenericActionExtension" name="personal.tool.ep" init-method="initExtensionPoints" >
 		<property name="order" value="301" />
 		<property name="navigationKey" value="Portfolio" />
-		<property name="iconCssClass" value="b_with_small_icon_left o_ep_icon" />
+		<property name="iconCssClass" value="o_icon o_icon-fw o_ep_icon" />
 		<property name="actionController">
 			<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
 				<property name="className" value="org.olat.portfolio.ui.EPOverviewController"/>

src/main/java/org/olat/repository/ui/author/AuthorListController.java

@@ -71,6 +71,7 @@ import org.olat.core.util.Util;
 import org.olat.core.util.resource.OresHelper;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryAuthorView;
+import org.olat.repository.RepositoryEntryMyView;
 import org.olat.repository.RepositoryEntryRef;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
@@ -79,6 +80,7 @@ import org.olat.repository.handlers.RepositoryHandlerFactory;
 import org.olat.repository.model.SearchAuthorRepositoryEntryViewParams;
 import org.olat.repository.model.TransientRepositoryEntryRef;
 import org.olat.repository.ui.author.AuthoringEntryDataModel.Cols;
+import org.olat.repository.ui.list.RepositoryEntryRow;
 import org.olat.util.logging.activity.LoggingResourceable;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -382,13 +384,12 @@ public class AuthorListController extends FormBasicController implements Activat
 	}
 	
 	private AuthoringEntryDetailsController doOpenDetails(UserRequest ureq, RepositoryEntryRef entry) {
-		RepositoryEntryAuthorView view = repositoryService.loadAuthorView(getIdentity(), entry);
-		String fullnameAuthor = "";
-		AuthoringEntryRow row = new AuthoringEntryRow(view, fullnameAuthor);
+		RepositoryEntryMyView view = repositoryService.loadMyView(getIdentity(), entry);
+		RepositoryEntryRow row = new RepositoryEntryRow(view);
 		return doOpenDetails(ureq, row);
 	}
 	
-	private AuthoringEntryDetailsController doOpenDetails(UserRequest ureq, AuthoringEntryRow row) {
+	private AuthoringEntryDetailsController doOpenDetails(UserRequest ureq, RepositoryEntryRow row) {
 		stackPanel.popUpToRootController(ureq);
 
 		removeAsListenerAndDispose(detailsCtrl);

src/main/java/org/olat/repository/ui/author/AuthoringEntryDetailsController.java

@@ -37,7 +37,6 @@ import org.olat.core.gui.components.dropdown.Dropdown.Spacer;
 import org.olat.core.gui.components.form.flexible.FormItem;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.FormLink;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
 import org.olat.core.gui.components.form.flexible.impl.FormEvent;
 import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.components.image.ImageComponent;
@@ -61,7 +60,6 @@ import org.olat.core.id.context.StateEntry;
 import org.olat.core.logging.OLATSecurityException;
 import org.olat.core.util.Formatter;
 import org.olat.core.util.StringHelper;
-import org.olat.core.util.Util;
 import org.olat.core.util.coordinate.CoordinatorManager;
 import org.olat.core.util.coordinate.LockResult;
 import org.olat.core.util.filter.FilterFactory;
@@ -86,6 +84,8 @@ import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
 import org.olat.repository.ui.PriceMethod;
 import org.olat.repository.ui.RepositoyUIFactory;
+import org.olat.repository.ui.list.RepositoryEntryDetailsController;
+import org.olat.repository.ui.list.RepositoryEntryRow;
 import org.olat.resource.OLATResource;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.AccessControlModule;
@@ -105,7 +105,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  *
  */
-public class AuthoringEntryDetailsController extends FormBasicController implements Activateable2 {
+public class AuthoringEntryDetailsController extends RepositoryEntryDetailsController implements Activateable2 {
 	
 	public static final OLATResourceable EDIT_SETTINGS_ORES = OresHelper.createOLATResourceableInstance("Settings", 0l);
 	
@@ -129,8 +129,6 @@ public class AuthoringEntryDetailsController extends FormBasicController impleme
 	private final TooledStackedPanel stackPanel;
 	
 	private boolean corrupted;
-	private RepositoryEntry entry;
-	private final AuthoringEntryRow row;
 
 	@Autowired
 	private ACService acService;
@@ -161,13 +159,9 @@ public class AuthoringEntryDetailsController extends FormBasicController impleme
 	private LockResult lockResult;
 	
 	public AuthoringEntryDetailsController(UserRequest ureq, WindowControl wControl,
-			TooledStackedPanel stackPanel, AuthoringEntryRow row) {
-		super(ureq, wControl, "details");
-		setTranslator(Util.createPackageTranslator(RepositoryService.class, getLocale(), getTranslator()));
-
+			TooledStackedPanel stackPanel, RepositoryEntryRow row) {
+		super(ureq, wControl, row);
 		this.stackPanel = stackPanel;
-		this.row = row;
-		entry = repositoryService.loadByKey(row.getKey());
 		
 		Identity identity = getIdentity();
 		Roles roles = ureq.getUserSession().getRoles();
@@ -182,7 +176,7 @@ public class AuthoringEntryDetailsController extends FormBasicController impleme
 		initForm(ureq);
 		
 		if(stackPanel != null) {
-			String displayName = row.getDisplayname();
+			String displayName = row.getDisplayName();
 			stackPanel.pushController(displayName, this);
 			initToolbar(ureq);
 		}
@@ -223,10 +217,12 @@ public class AuthoringEntryDetailsController extends FormBasicController impleme
 		if (isAuthor || isOwner) {
 			if (isOwner) {
 				editLink = LinkFactory.createToolLink("edit", translate("details.openeditor"), this, "o_sel_repo_edit_descritpion");
+				editLink.setIconLeftCSS("o_icon o_icon_edit");
 				boolean editManaged = RepositoryEntryManagedFlag.isManaged(entry, RepositoryEntryManagedFlag.editcontent);
 				editLink.setEnabled(handler.supportsEdit(entry) && !corrupted && !editManaged);
 
 				editSettingsLink = LinkFactory.createToolLink("editdesc", translate("details.chprop"), this, "o_sel_repor_edit_properties");
+				editSettingsLink.setIconLeftCSS("o_icon o_icon_settings");
 				editSettingsLink.setEnabled(!corrupted);
 
 				if(repositoryModule.isCatalogEnabled()) {
@@ -315,6 +311,7 @@ public class AuthoringEntryDetailsController extends FormBasicController impleme
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		super.initForm(formLayout, listener, ureq);
 		if(formLayout instanceof FormLayoutContainer) {
 			FormLayoutContainer layoutCont = (FormLayoutContainer)formLayout;
 			layoutCont.contextPut("v", entry);

src/main/java/org/olat/repository/ui/author/_content/details.html

-<div class="f_metadata_details b_clearfix">
-	<div class="b_c38r">
-		#if($r.available("thumbnail"))
-			<div class="f_metadata_media">
-			$r.render("thumbnail")
-			</div>
-		#end
-		#if($v.lifecycle || $v.lifecycle.softKey || $row.lifecycle.start || $row.lifecycle.end)
-			<h5>$r.translate("cif.dates")</h5>
-			<div class="f_metadata_lifecycle">
-				#if($!v.lifecycle.private && $v.lifecycle.softKey) $v.lifecycle.softKey #end
-				#if($v.lifecycle.validFrom) $r.formatDateAndTime($v.lifecycle.validFrom) #end
-				#if($v.lifecycle.validTo) - $r.formatDateAndTime($v.lifecycle.validTo) #end
-			</div>
-		#end
-		#if($v.expenditureOfWork)
-			<div class="f_metadata_expenditure">
-				$r.translate("details.expenditureOfWork", $r.escapeHtml($v.expenditureOfWork))
-			</div>
-		#end
-		#if($v.mainLanguage)
-			<h5>$r.translate("cif.mainLanguage")</h5>
-			<p>$r.escapeHtml($v.mainLanguage)</p>
-		#end
-		#if($ac)
-			#foreach($ac_type in $ac)
-				#if($ac_type.price && $ac_type.price.length() > 0)
-					<span class='b_float_right b_with_small_icon_left $ac_type.type'>$ac_type.price</span>
-				#else
-					<span class='b_float_right b_small_icon $ac_type.type'></span>
-				#end
-			#end
-		#end
-		<div class="f_metadata_go">
-			$r.render("start")
-		</div>
-		
-		#if($categories && $categories.size() > 0)
-			<h5>$r.translate("cif.categories")</h5>
-			<ul>
-			#foreach($category in $categories)
-				<li>$r.render($category)</li>
-			#end
-			</ul>
-		#end
-		
-		#if($groups && $groups.size() > 0)
-			<h5>$r.translate("cif.groups")</h5>
-			<ul>
-			#foreach($group in $groups)
-				<li>$r.render($group)</li>
-			#end
-			</ul>
-		#end
-	</div>
-	<div class="b_c60r">
-		<h4 class="b_with_small_icon_left $cssClass">$r.escapeHtml($v.displayname)</h4>
-		#if($v.authors)
-			<h5>$r.translate("cif.authors")</h5>
-			<p>$r.escapeHtml($v.authors)</p>
-		#end
-		<div class="b_clearfix">$description</div>
-		#if($objectives)
-			<h5>$r.translate("cif.objectives")</h5>
-			<div class="b_clearfix">$objectives</div>
-		#end
-		#if($requirements)
-			<h5>$r.translate("cif.requirements")</h5>
-			<div class="b_clearfix">$requirements</div>
-		#end
-		#if($credits)
-			<h5>$r.translate("cif.credits")</h5>
-			<div class="b_clearfix">$credits</div>
-		#end
-	</div>
-</div>
-

src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java

@@ -94,8 +94,8 @@ public class RepositoryEntryDetailsController extends FormBasicController {
 	private CloseableModalController cmc;
 	private UserCommentsController commentsCtrl;
 	
-	private final RepositoryEntry entry;
-	private final RepositoryEntryRow row;
+	protected RepositoryEntry entry;
+	protected RepositoryEntryRow row;
 
 	@Autowired
 	private UserRatingsDAO userRatingsDao;
@@ -119,7 +119,7 @@ public class RepositoryEntryDetailsController extends FormBasicController {
 	private String baseUrl;
 	
 	public RepositoryEntryDetailsController(UserRequest ureq, WindowControl wControl, RepositoryEntryRow row) {
-		super(ureq, wControl, "details");
+		super(ureq, wControl, Util.getPackageVelocityRoot(RepositoryEntryDetailsController.class) + "/details.html");
 		setTranslator(Util.createPackageTranslator(RepositoryService.class, getLocale(), getTranslator()));
 
 		this.row = row;

src/main/java/org/olat/resource/accesscontrol/_spring/acContext.xml

@@ -72,7 +72,7 @@
 			</bean>
 		</property>
 		<property name="navigationKey" value="booking" />
-		<property name="iconCssClass" value="b_with_small_icon_left b_order_icon" />
+		<property name="iconCssClass" value="" />
 		<property name="securityCallbackClassName" value="org.olat.core.extensions.security.UserOnlyExtensionSecurityCallback" />
 		<property name="translationPackage" value="org.olat.home" />
 		<property name="i18nActionKey" value="menu.orders"/>

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

@@ -44,6 +44,7 @@ $fa-css-prefix: "o_icon" !default;
 .o_icon_filter {@extend .o_icon-filter;}
 .o_icon_help { @extend .o_icon-question-circle; @extend .o_icon-lg; cursor: help;}
 .o_icon_impress { @extend .o_icon-info-circle; }
+.o_icon_mail { @extend .o_icon-envelope-o; }
 .o_icon_membersmanagement { @extend .o_icon-users;}
 .o_icon_message { @extend .o_icon-envelope;}
 .o_icon_move{ @extend .o_icon-arrows;}