OO-1068: boostrapify chat part 1

src/main/java/org/olat/core/gui/control/floatingresizabledialog/_content/index.html

 <div id="${panelName}" class="${panelName} ${cssClass}">
 	#if ($r.available("collapsibleContent"))
-		<div id="${panelName}-east" class="pane ui-layout-east">
-			$r.render("collapsibleContent")
+		<div class="container-fluid">
+			<div class="row">
+				<div class="col-sm-8">
+					$r.render("panelContent")
+				</div>
+				<div class="col-sm-4">
+					$r.render("collapsibleContent")
+				</div>
+			</div>
 		</div>
-	#end
-	<div id="${panelName}-center" class="pane ui-layout-center">
+	#else
 		$r.render("panelContent")
-	</div>
+	#end
 </div>
 <script type="text/javascript">
 /* <![CDATA[ */ 
@@ -57,10 +63,7 @@
 					tweak_${panelName}(win);
 				} catch (Exception) { /**/ }
 			}
-		})#if($r.available("collapsibleContent")).layout({
-			center: { size: '66%' },
-			east: { size: '33%' }
-		})#end;
+		});
 		
 		//override the default z-index of jQuery UI dialog
 		jQuery('#${panelName}').dialog("widget").css('z-index', 10000);

src/main/java/org/olat/course/assessment/portfolio/EfficiencyStatementArtefact.java

@@ -38,7 +38,7 @@ public class EfficiencyStatementArtefact extends AbstractArtefact {
 	
 	@Override
 	public String getIcon() {
-		return "o_efficiencystatement_icon";
+		return "o_icon_certificate";
 	}
 
 	@Override

src/main/java/org/olat/instantMessaging/ui/IMBuddyListController.java

@@ -68,6 +68,7 @@ public class IMBuddyListController extends BasicController {
 			toggleOffline = LinkFactory.createCustomLink("toggleOnline", "cmd.online", "", Link.NONTRANSLATED, mainVC, this);
 			toggleOffline.setCustomDisplayText(translate("im.show.offline.buddies"));
 			toggleOffline.setCustomEnabledLinkCSS("o_instantmessaging_showofflineswitch");
+			toggleOffline.setIconLeftCSS("o_icon o_icon_status_unavailable");
 			viewMode = ViewMode.onlineUsers;
 		} else {
 			viewMode = ViewMode.offlineUsers;			
@@ -76,6 +77,7 @@ public class IMBuddyListController extends BasicController {
 		toggleGroup = LinkFactory.createCustomLink("toggleGroups", "cmd.group", "", Link.NONTRANSLATED, mainVC, this);
 		toggleGroup.setCustomDisplayText(translate("im.hide.groups"));
 		toggleGroup.setCustomEnabledLinkCSS("o_instantmessaging_showgroupswitch");
+		toggleGroup.setIconLeftCSS("o_icon o_icon_group");
 
 		buddyList = new Roster(getIdentity().getKey());
 		mainVC.contextPut("buddyList", buddyList);
@@ -98,10 +100,12 @@ public class IMBuddyListController extends BasicController {
 			if (viewMode == ViewMode.onlineUsers) {
 				toggleOffline.setCustomDisplayText(translate("im.hide.offline.buddies"));
 				toggleOffline.setCustomEnabledLinkCSS("o_instantmessaging_hideofflineswitch");
+				toggleOffline.setIconLeftCSS("o_icon o_icon_status_available");
 				loadRoster(ViewMode.offlineUsers);
 			} else {
 				toggleOffline.setCustomDisplayText(translate("im.show.offline.buddies"));
 				toggleOffline.setCustomEnabledLinkCSS("o_instantmessaging_showofflineswitch");
+				toggleOffline.setIconLeftCSS("o_icon o_icon_status_unavailable");
 				loadRoster(ViewMode.onlineUsers);
 			}
 		} else if (source == toggleGroup) {
@@ -147,7 +151,7 @@ public class IMBuddyListController extends BasicController {
 			Link buddyLink = LinkFactory.createCustomLink(linkId, "cmd.buddy", "", Link.NONTRANSLATED, buddiesListContent, this);
 			buddyLink.setCustomDisplayText(StringHelper.escapeHtml(buddy.getName()));
 			String css = getStatusCss(buddy);
-			buddyLink.setCustomEnabledLinkCSS(css);
+			buddyLink.setIconLeftCSS(css);
 			buddyLink.setUserObject(buddy);
 		}
 
@@ -156,15 +160,16 @@ public class IMBuddyListController extends BasicController {
 			Link buddyLink = LinkFactory.createCustomLink(linkIdAlt, "cmd.buddy", "", Link.NONTRANSLATED, buddiesListContent, this);
 			buddyLink.setCustomDisplayText(StringHelper.escapeHtml(buddy.getName()));
 			String css = getStatusCss(buddy);
-			buddyLink.setCustomEnabledLinkCSS(css);
+			buddyLink.setIconLeftCSS(css);
 			buddyLink.setUserObject(buddy);
 		}
 	}
 	
 	private String getStatusCss(Buddy buddy) {
 		StringBuilder sb = new StringBuilder(32);
+		sb.append("o_icon ");
 		if(imModule.isOnlineStatusEnabled()) {
-			sb.append("o_instantmessaging_").append(buddy.getStatus()).append("_icon ");
+			sb.append("o_icon_status_").append(buddy.getStatus()).append(" ");
 		} else {
 			sb.append("o_instantmessaging_chat_icon ");
 		}

src/main/java/org/olat/instantMessaging/ui/_content/buddies_content.html

-<ul>
+<ul class="list-unstyled">
 	#if($viewGroups)
 		#foreach ($group in $buddyList.groups)
 			<li class="o_instantmessaging_group">
-				<div class="o_instantmessaging_groupname">$r.escapeHtml($group.groupName)</div>
-				<ul>
+				<div><i class="o_icon o_icon_group"> </i> $r.escapeHtml($group.groupName)</div>
+				<ul class="list-unstyled">
 				#foreach ($buddy in $group.buddy)
 					<li>$r.render("buddy_${group.groupKey}_${buddy.identityKey}")</li>
 				#end

src/main/java/org/olat/instantMessaging/ui/_content/roster.html

@@ -2,9 +2,9 @@
 	#if ($offerAnonymMode)
 		<div>$r.render("toggle")</div>
 		$r.render("nickname")
-		<hr/>
+		<hr />
 	#end
-	<ul>
+	<ul class="list-unstyled">
 	#foreach($entry in $roster.entries)
 		<li class="#if($entry.vip) o_instantmessaging_vip #end #if($entry.anonym) o_instantmessaging_anonymous #end">
 			<span>$r.escapeHtml(${entry.name})</span>

src/main/java/org/olat/instantMessaging/ui/_content/sendMessageForm.html

-$r.render("msg")
-<div class="b_button_group">
-	$r.render("subm")	
+ <div class="input-group">
+	$r.render("msg")
+	<span class="input-group-btn">
+		$r.render("subm")
+	</span>	
 </div>
\ No newline at end of file

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

@@ -13,4 +13,17 @@
 	#o_im_status div.o_chelp_wrapper {
 		right: 0.5em;
 	}
-}
+}
\ No newline at end of file
+
+.o_instantmessaging_chat_history {
+	height:170px;
+	font-size: 90%;
+	
+	/* scrollbar */
+	margin: 0 0 1em 0; 
+	overflow: scroll; 
+	overflow-x:auto; 
+	
+}
+
+a.o_instantmessaging_hidegroupswitch { @include o-opacity(60); }