Skip to content
Snippets Groups Projects
Commit de878346 authored by srosse's avatar srosse
Browse files

CL-526: add logo if configured in business card

parent cb1ac929
No related branches found
No related tags found
No related merge requests found
......@@ -49,6 +49,7 @@ import org.olat.instantMessaging.InstantMessagingModule;
import org.olat.instantMessaging.InstantMessagingService;
import org.olat.instantMessaging.OpenInstantMessageEvent;
import org.olat.instantMessaging.model.Buddy;
import org.olat.user.DisplayPortraitController.Display;
import org.olat.user.propertyhandlers.UserPropertyHandler;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -120,8 +121,16 @@ public class HomePageDisplayController extends BasicController {
Controller dpc = new DisplayPortraitController(ureq, getWindowControl(), homeIdentity, true, false);
listenTo(dpc); // auto dispose
mainVC.put("image", dpc.getInitialComponent());
if(UserModule.isLogoByProfileEnabled()) {
Controller dlc = new DisplayPortraitController(ureq, getWindowControl(), homeIdentity, true, false, false, Display.logo);
listenTo(dlc); // auto dispose
mainVC.put("logo", dlc.getInitialComponent());
}
putInitialPanel(mainVC);
if(imModule.isEnabled() && imModule.isPrivateEnabled()) {
InstantMessagingService imService = CoreSpringFactory.getImpl(InstantMessagingService.class);
ImPreferences prefs = imService.getImPreferences(homeIdentity);
......
......@@ -5,8 +5,11 @@
#end
<div class="o_visitingcard_content">
<div class="o_visitingcard_image o_block">$r.render("image")</div>
<div class="o_visitingcard_image o_block">$r.render("image")
#if($r.available("logo"))
<div class="o_visitingcard_logo">$r.render("logo")</div>
#end
</div>
<table class="table table-condensed table-striped">
#if($r.available("im.link"))
<tr class="o_im_status">
......
......@@ -12,6 +12,16 @@
padding-right: 86px;
}
.o_visitingcard_image.o_block {
position: relative;
}
.o_visitingcard_content .o_visitingcard_logo {
position: absolute;
top: 0px;
right: 0px;
}
.o_visitingcard .o_portrait_avatar,
.o_visitingcard .o_portrait_logo,
.o_visitingcard .o_portrait_dummy,
......
This diff is collapsed.
source diff could not be displayed: it is too large. Options to address this: view the blob.
This diff is collapsed.
This diff is collapsed.
source diff could not be displayed: it is too large. Options to address this: view the blob.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment