Merge with 99aefd8ce657e4781c44bde5a97b8c0080db1d00

src/main/java/org/olat/user/HomePageDisplayController.java

@@ -39,6 +39,7 @@ import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.controller.BasicController;
+import org.olat.core.helpers.Settings;
 import org.olat.core.id.Identity;
 import org.olat.core.id.User;
 import org.olat.core.id.UserConstants;
@@ -56,7 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired;
   *
  * @author Alexander Schneider
  * 
- * Comment: 
+ * Comment: This controller displays the users visiting card
  */
 public class HomePageDisplayController extends BasicController {
 	private static final String usageIdentifyer = HomePageConfig.class.getCanonicalName();
@@ -75,7 +76,7 @@ public class HomePageDisplayController extends BasicController {
 	 */
 	public HomePageDisplayController(UserRequest ureq, WindowControl wControl, Identity homeIdentity, HomePageConfig hpc) {
 		super(ureq, wControl);
-
+		
 		// use property handler translator for translating of user fields
 		setTranslator(userManager.getPropertyHandlerTranslator(getTranslator()));
 		VelocityContainer mainVC = createVelocityContainer("homepagedisplay");
@@ -98,6 +99,12 @@ public class HomePageDisplayController extends BasicController {
 		}
 		mainVC.contextPut("userPropertyHandlers", userPropertyHandlers);
 		mainVC.contextPut("homepageConfig", hpc);	
+		
+		// Add external link to visiting card
+		StringBuilder extLink = new StringBuilder();
+		extLink.append(Settings.getServerContextPathURI())
+			.append("/url/HomeSite/").append(homeIdentity.getKey());
+		mainVC.contextPut("extLink", extLink);
 
 		Controller dpc = new DisplayPortraitController(ureq, getWindowControl(), homeIdentity, true, false);
 		listenTo(dpc); // auto dispose

src/main/java/org/olat/user/UserInfoMainController.java

@@ -119,7 +119,7 @@ public class UserInfoMainController extends MainLayoutBasicController implements
 	 */
 	public UserInfoMainController(UserRequest ureq, WindowControl wControl, Identity chosenIdentity) {
 		super(ureq, wControl);
-		
+				
 		this.chosenIdentity = chosenIdentity;
 
 		main = new Panel("userinfomain");
@@ -134,6 +134,12 @@ public class UserInfoMainController extends MainLayoutBasicController implements
 		menuTree.setSelectedNodeId(tm.getRootNode().getChildAt(0).getIdent());
 		menuTree.addListener(this);
 
+		// override if user is guest, don't show anything
+		if (ureq.getUserSession().getRoles().isGuestOnly()) {
+			main = new Panel("empty");
+			menuTree = null;
+		}
+
 		LayoutMain3ColsController columnLayoutCtr = new LayoutMain3ColsController(ureq, getWindowControl(), menuTree, main, "userinfomain");
 		listenTo(columnLayoutCtr);
 		putInitialPanel(columnLayoutCtr.getInitialComponent());

src/main/java/org/olat/user/_content/homepagedisplay.html

@@ -56,4 +56,19 @@
 		#end
 		</table>
 	</div>
-</div></div>
+</div></div>
\ No newline at end of file
+
+<div class="o_extlink clearfix o_block_large_bottom">
+	<h5>$r.translate("extlink")</h5>
+	<div class="o_copy_code">
+		<a href="javascript:;" id="o_extlink" data-original-title="" title=""><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a>
+		$extLink
+		<script type="text/javascript">
+		/* <![CDATA[ */
+			jQuery(function() {
+				o_QRCodePopup('o_extlink', '$extLink', 'right');
+			});
+		/* ]]> */
+		</script>
+	</div>
+</div>

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

@@ -104,6 +104,7 @@ error.password.empty=Geben Sie Ihr bisheriges Passwort an
 error.password.noauth=Ihr bisheriges Passwort ist nicht korrekt
 error.password.nomatch=Die beiden neuen Passw\u00F6rter stimmen nicht \u00FCberein.
 error.user.logged.in=Diese \u00C4nderung kann nicht vorgenommen werden da der Benutzer {0} zur Zeit eingeloggt ist. Warten Sie bis der Benutzer sich ausloggt und versuchen Sie es erneut. 
+extlink=Externer Link zur Visitenkarte
 form.address=Adresse
 form.charset=Zeichensatz f\u00FCr Download
 form.checkPassword=Das Passwort muss mindestens 4 Zeichen haben. Verwenden Sie dabei sowohl Ziffern als auch Buchstaben.

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

@@ -104,6 +104,7 @@ error.password.empty=Please indicate your previous password
 error.password.noauth=Your previous password is inaccurate
 error.password.nomatch=The two new passwords do not match.
 error.user.logged.in=This change can not be made as the user {0} is currently logged in. Please wait until the user has logged out and try it again. 
+extlink=External link to visiting card
 form.address=Address
 form.charset=Character set used in download
 form.checkPassword=Your password must contain at least 4 characters and include digits and letters.

src/main/resources/serviceconfig/olat.properties

@@ -931,7 +931,7 @@ ldap.learningResourceManagerRoleValue=
 # Build properties
 #####
 application.name=OpenOLAT
-build.version=10.1a
+build.version=10.1b
 build.identifier=openolat101-dev
 build.repo.revision=local-devel
 

src/main/webapp/static/cp_offline_menu_mat/mktree.css

@@ -19,10 +19,12 @@ html, body {
 }
 #main {
 	background:#fff;
+	width: 100%;
+	height:100%;
 	min-height:500px;
 }
 #menu { width:250px; float:left; font-size: 90%; padding: 5px;}
-#content {margin-left:250px; position:relative;}
+#content {margin-left:250px; position:relative; height: 100%;}
 #content iframe { width:100%; min-height:100%; border:none; }
 
 /* Turn off list bullets */

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

@@ -343,7 +343,7 @@
 					display: none;
 				}
 				
-				h4.title>a>i {
+				h4.o_title>a>i {
 					display:none;
 				}	
 			}	
@@ -400,7 +400,7 @@
 				}				
 			}
 			
-			h4.title>a>i {
+			h4.o_title>a>i {
 				display:none;
 			}
 
@@ -429,6 +429,18 @@
 			}	
 		}
 	}
+
+	/* multi-column layout for list and compact styles */
+	@media (min-width: $screen-sm-min) {
+		.o_sublevels_list, .o_sublevels_compact {
+			-webkit-column-count:2;
+			-moz-column-count:2;
+			-ms-column-count:2;
+			-o-column-count:2;
+			column-count:2;
+			columns:2;
+		}
+	}
 }
  
 

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

@@ -16,25 +16,6 @@ body {
 	transition: all .25s ease-in-out;
 }
 
-/* make page a bid smaller when max width is almost reached. */
-@media screen and (min-width: $o-page-width-max) and (max-width: $o-page-width-max + $o-offcanvas-width)  {
-	body.o_offcanvas_right_visible {
-		.o_container_offcanvas {
-			left: floor(-$o-offcanvas-width / 2);
-			max-width: ($o-page-width-max - $o-offcanvas-width);
-		} 
-	}
-}
-/* move page a bit  to side to make room for offcanvas when left and right has enough room */
-@media screen and (min-width: $o-page-width-max + $o-offcanvas-width) and (max-width: $o-page-width-max + $o-offcanvas-width * 2){
-	body.o_offcanvas_right_visible {
-		.o_container_offcanvas {
-			left: floor(-$o-offcanvas-width / 2);
-		} 
-	}
-}
-
-
 /* 	
 	Offcanvas is an absolute container positioned box outside the viewport. 
 	In closed state the element is hidden. To make the offcanvas appear