OO-990: bootstrapify groups

src/main/java/org/olat/core/gui/control/generic/messages/_content/guimsgerror.html

-<div id="b_msg_error" class="b_clearfix">
- <div class="b_msg_title">$r.translate("error.header")</div>
-  <div class="b_msg_content">$message</div>
+<div id="o_msg_error" class="panel-danger">
+ <div class="panel-heading">$r.translate("error.header")</div>
+  <div class="panel-body">$message</div>
 </div>
\ No newline at end of file

src/main/java/org/olat/core/gui/control/generic/messages/_content/guimsginfo.html

-<div id="b_msg_info" class="b_clearfix">
- <div class="b_msg_title">$r.translate("info.header")</div>
-  <div class="b_msg_content">$message</div>
+<div id="o_msg_info" class="panel panel-info">
+ <div class="panel-heading">$r.translate("info.header")</div>
+  <div class="panel-body">$message</div>
 </div>
\ No newline at end of file

src/main/java/org/olat/core/gui/control/generic/messages/_content/guimsgwarn.html

-<div id="b_msg_warn" class="b_clearfix">
- <div class="b_msg_title">$r.translate("warn.header")</div>
-  <div class="b_msg_content">$message</div>
+<div id="o_msg_warn" class="panel-warning">
+ <div class="panel-heading">$r.translate("warn.header")</div>
+  <div class="panel-body">$message</div>
 </div>
\ No newline at end of file

src/main/java/org/olat/group/ui/edit/BusinessGroupEditAccessController.java

@@ -44,7 +44,6 @@ import org.olat.resource.accesscontrol.ui.AccessConfigurationController;
  * Initial Date:  26 avr. 2011 <br>
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  */
-//fxdiff VCRP-1,2: access control of resources
 public class BusinessGroupEditAccessController extends FormBasicController {
 	
 	private final boolean managed;

src/main/java/org/olat/group/ui/edit/BusinessGroupEditController.java

@@ -28,7 +28,6 @@ package org.olat.group.ui.edit;
 import java.util.List;
 
 import org.apache.commons.lang.StringEscapeUtils;
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.panel.Panel;
@@ -61,6 +60,7 @@ import org.olat.group.GroupLoggingAction;
 import org.olat.group.ui.BGControllerFactory;
 import org.olat.resource.accesscontrol.AccessControlModule;
 import org.olat.util.logging.activity.LoggingResourceable;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Description: <BR>
@@ -77,8 +77,10 @@ public class BusinessGroupEditController extends BasicController implements Cont
 
 	private boolean hasResources;
 	private BusinessGroup currBusinessGroup;
-	private final BusinessGroupService businessGroupService;
-	private final AccessControlModule acModule;
+	@Autowired
+	private BusinessGroupService businessGroupService;
+	@Autowired
+	private AccessControlModule acModule;
 
 	private TabbedPane tabbedPane;
 	private VelocityContainer mainVC;
@@ -112,10 +114,6 @@ public class BusinessGroupEditController extends BasicController implements Cont
 		//            basically forcing any logging action called within the bg editor to be of type 'admin'
 		getUserActivityLogger().setStickyActionType(ActionType.admin);
 		addLoggingResourceable(LoggingResourceable.wrap(businessGroup));
-		
-		// Initialize managers
-		acModule = CoreSpringFactory.getImpl(AccessControlModule.class);
-		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
 
 		// Initialize translator:
 		setTranslator(Util.createPackageTranslator(BGControllerFactory.class, getLocale(), getTranslator()));

src/main/java/org/olat/group/ui/edit/BusinessGroupEditDetailsController.java

@@ -19,7 +19,6 @@
  */
 package org.olat.group.ui.edit;
 
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.velocity.VelocityContainer;
@@ -30,6 +29,7 @@ import org.olat.core.gui.control.controller.BasicController;
 import org.olat.group.BusinessGroup;
 import org.olat.group.BusinessGroupService;
 import org.olat.group.ui.BusinessGroupFormController;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -41,13 +41,13 @@ public class BusinessGroupEditDetailsController extends BasicController {
 	private final BusinessGroupFormController editController;
 	
 	private BusinessGroup businessGroup;
-	private final BusinessGroupService businessGroupService;
+	@Autowired
+	private BusinessGroupService businessGroupService;
 	
 	public BusinessGroupEditDetailsController(UserRequest ureq, WindowControl wControl, BusinessGroup businessGroup) {
 		super(ureq, wControl);
 		
 		this.businessGroup = businessGroup;
-		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
 		
 		mainVC = createVelocityContainer("tab_bgDetail");
 

src/main/java/org/olat/group/ui/edit/BusinessGroupEditResourceController.java

@@ -29,7 +29,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-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;
@@ -56,10 +55,12 @@ import org.olat.group.BusinessGroupManagedFlag;
 import org.olat.group.BusinessGroupService;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryManagedFlag;
+import org.olat.repository.RepositoryService;
 import org.olat.repository.controllers.ReferencableEntriesSearchController;
 import org.olat.repository.controllers.RepositoryEntryFilter;
 import org.olat.repository.controllers.RepositorySearchController.Can;
 import org.olat.repository.ui.RepositoryTableModel;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Description:<BR>
@@ -86,7 +87,8 @@ public class BusinessGroupEditResourceController extends BasicController impleme
 
 	private BusinessGroup group;
 	private final boolean managed;
-	private final BusinessGroupService businessGroupService;
+	@Autowired
+	private BusinessGroupService businessGroupService;
 
 	/**
 	 * Constructor for a business group edit controller
@@ -97,11 +99,11 @@ public class BusinessGroupEditResourceController extends BasicController impleme
 	 */
 	public BusinessGroupEditResourceController(UserRequest ureq, WindowControl wControl, BusinessGroup group) {
 		super(ureq, wControl);
-		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
+		
 		this.group = group;
 		managed = BusinessGroupManagedFlag.isManaged(group, BusinessGroupManagedFlag.resources);
 		
-		Translator resourceTrans = Util.createPackageTranslator(RepositoryTableModel.class, getLocale(), getTranslator());
+		Translator resourceTrans = Util.createPackageTranslator(RepositoryService.class, getLocale(), getTranslator());
 		TableGuiConfiguration tableConfig = new TableGuiConfiguration();
 		tableConfig.setTableEmptyMessage(translate("resources.noresources"));
 		resourcesCtr = new TableController(tableConfig, ureq, getWindowControl(), resourceTrans);

src/main/java/org/olat/group/ui/edit/BusinessGroupMembersController.java

@@ -21,7 +21,6 @@ package org.olat.group.ui.edit;
 
 import java.util.List;
 
-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;
@@ -49,6 +48,7 @@ import org.olat.group.GroupLoggingAction;
 import org.olat.group.model.BusinessGroupMembershipChange;
 import org.olat.group.ui.main.MemberPermissionChangeEvent;
 import org.olat.group.ui.main.SearchMembersParams;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -64,13 +64,13 @@ public class BusinessGroupMembersController extends BasicController {
 	private StepsMainRunController importMembersWizard;
 	
 	private BusinessGroup businessGroup;
-	private final BusinessGroupService businessGroupService;
+	@Autowired
+	private BusinessGroupService businessGroupService;
 
 	public BusinessGroupMembersController(UserRequest ureq, WindowControl wControl, BusinessGroup businessGroup) {
 		super(ureq, wControl);
 		
 		this.businessGroup = businessGroup;
-		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
 		
 		mainVC = createVelocityContainer("tab_bgGrpMngmnt");
 		putInitialPanel(mainVC);
@@ -180,7 +180,7 @@ public class BusinessGroupMembersController extends BasicController {
 		StepRunnerCallback finish = new StepRunnerCallback() {
 			@Override
 			public Step execute(UserRequest ureq, WindowControl wControl, StepsRunContext runContext) {
-				addMembers(ureq, runContext);
+				addMembers(runContext);
 				return StepsMainRunController.DONE_MODIFIED;
 			}
 		};
@@ -198,7 +198,7 @@ public class BusinessGroupMembersController extends BasicController {
 		StepRunnerCallback finish = new StepRunnerCallback() {
 			@Override
 			public Step execute(UserRequest ureq, WindowControl wControl, StepsRunContext runContext) {
-				addMembers(ureq, runContext);
+				addMembers(runContext);
 				if(runContext.containsKey("notFounds")) {
 					showWarning("user.notfound", runContext.get("notFounds").toString());
 				}
@@ -212,7 +212,7 @@ public class BusinessGroupMembersController extends BasicController {
 		getWindowControl().pushAsModalDialog(importMembersWizard.getInitialComponent());
 	}
 	
-	protected void addMembers(UserRequest ureq, StepsRunContext runContext) {
+	private void addMembers(StepsRunContext runContext) {
 		@SuppressWarnings("unchecked")
 		List<Identity> members = (List<Identity>)runContext.get("members");
 		

src/main/java/org/olat/group/ui/edit/_content/all_member_list.html

 #if($infos)
-	<br/>
-	<div class="b_clearfix">
-		<p class="b_info">$infos</p>
-	</div>
+	<div class="o_info">$infos</div>
 #end
-
-<div class="b_clearfix">
-	$r.render("memberList")
-</div>
\ No newline at end of file
+$r.render("memberList")
\ No newline at end of file

src/main/java/org/olat/group/ui/edit/_content/deleted.html

-<h4 class="b_with_small_icon_left b_group_icon">
-	$name
-</h4>
-$r.translate("group.deleted")
\ No newline at end of file
+<h2><i class="o_icon o_icon_group"> </i> $name</h2>
+<div class="o_warning">$r.translate("group.deleted")</div>
\ No newline at end of file

src/main/java/org/olat/group/ui/edit/_content/edit.html

-<h4 class="b_with_small_icon_left b_group_icon">
-	$title
-</h4>
+<h2><i class="o_icon o_icon_group"> </i> $title</h2>
 $r.render("tabbedpane")

src/main/java/org/olat/group/ui/edit/_content/tab_bgCollabTools.html

 <fieldset>
-	<legend>$r.translate("fieldset.legend.collabtools")</legend>
-	$r.contextHelpWithWrapper("org.olat.group.ui.edit","grp-tools.html","help.hover.bgCollabTools")
+	<legend>
+		$r.contextHelpWithWrapper("org.olat.group.ui.edit","grp-tools.html","help.hover.bgCollabTools")
+		$r.translate("fieldset.legend.collabtools")</legend>
 	$r.render("collabTools")
 </fieldset>

src/main/java/org/olat/group/ui/edit/_content/tab_bgDetail.html

 <fieldset>
-	<legend>$r.translate("fieldset.legend.details")</legend>
-	$r.contextHelpWithWrapper("org.olat.group.ui.edit","grp-des.html","help.hover.bgDetail")
-		<div class="b_floatbox">
-		<div class="b_small b_float_right">Id: $groupid</div>
-	</div>
+	<legend>
+		$r.contextHelpWithWrapper("org.olat.group.ui.edit","grp-des.html","help.hover.bgDetail")
+		$r.translate("fieldset.legend.details")</legend>
+	<div class="form-horizontal"><div class="form-group">
+		<label class="control-label col-sm-3">Id</label>
+		<div class="col-sm-9"><p class="form-control-static">$groupid</p></div>
+	</div></div>
 	$r.render("businessGroupForm")
 </fieldset>

src/main/java/org/olat/group/ui/edit/_content/tab_bgGrpMngmnt.html

 <fieldset>
-  	<legend>$r.translate("fieldset.legend.displaymembers")</legend>
-	$r.contextHelpWithWrapper("org.olat.group.ui.edit","grp-member.html","help.hover.bgGrpMngmnt")
+  	<legend>
+  		$r.contextHelpWithWrapper("org.olat.group.ui.edit","grp-member.html","help.hover.bgGrpMngmnt")
+  		$r.translate("fieldset.legend.displaymembers")</legend>
   	$r.render("displayMembers")
 </fieldset>
 <fieldset>
-	<legend>$r.translate("group.edit.tab.members")</legend>
-	<div style="position: relative;">
-		<div class="o_buttons_box_right" style="top: 0em;">
-			#if($r.available("addMembers"))
-				$r.render("addMembers")
-			#end
-			#if($r.available("importMembers"))
-				$r.render("importMembers")
-			#end
-		</div>
-		
+	<legend>
 		$r.contextHelpWithWrapper("org.olat.group.ui.edit","grp-memberOwner.html","help.hover.bgGrpMngmntOwner")
-		$r.render("members")
+		$r.translate("group.edit.tab.members")</legend>
+	<div class="pull-right">
+		#if($r.available("addMembers"))
+			$r.render("addMembers")
+		#end
+		#if($r.available("importMembers"))
+			$r.render("importMembers")
+		#end
 	</div>
+	$r.render("members")
 </fieldset>
 

src/main/java/org/olat/group/ui/edit/_content/tab_bgResources.html

 <fieldset>
-	<legend>$r.translate("fieldset.legend.resources")</legend>
-	$r.contextHelpWithWrapper("org.olat.group.ui.edit","grp-resources.html","help.hover.bgGrpResources")
-	<div class="b_clearfix">
-		<div class="b_float_right">
-			$r.render("cmd.addresource")
-		</div>
+	<legend>
+		$r.contextHelpWithWrapper("org.olat.group.ui.edit","grp-resources.html","help.hover.bgGrpResources")
+		$r.translate("fieldset.legend.resources")</legend>
+	<div class="pull-right">
+		$r.render("cmd.addresource")
 	</div>
 	$r.render("resources")
 </fieldset>

src/main/java/org/olat/group/ui/edit/_content/tab_bgRights.html

-<fieldset>
-	<legend>$r.translate("fieldset.legend.rights")</legend>
-	$r.contextHelpWithWrapper("org.olat.group.ui.edit","grp-assign.html","help.hover.bgRights")
-	$r.render("rightsChoice")
-</fieldset>

src/main/java/org/olat/group/ui/main/BGMarkCellRenderer.java

@@ -56,10 +56,9 @@ public class BGMarkCellRenderer implements CustomCellRenderer {
 	public void render(StringOutput sb, Renderer renderer, Object val, Locale locale, int alignment, String action) {
 		if(val instanceof BGTableItem && renderer != null) {
 			BGTableItem item = (BGTableItem)val;
-			sb.append("<div class='b_mark'>");
-			
+		
 			Link link = LinkFactory.createLink("marked_" + UUID.randomUUID().toString(), container, listeningController);
-			link.setCustomDisplayText("&#160;&#160;&#160;");
+			link.setCustomDisplayText(" ");
 			if(item.isMarked()) {
 				link.setIconLeftCSS(Mark.MARK_CSS_LARGE);
 			} else {
@@ -69,7 +68,6 @@ public class BGMarkCellRenderer implements CustomCellRenderer {
 			URLBuilder ubu = renderer.getUrlBuilder().createCopyFor(link);
 			RenderResult renderResult = new RenderResult();
 			link.getHTMLRendererSingleton().render(renderer, sb, link, ubu, translator, renderResult, null);
-			sb.append("</div>");
 		}
 	}
 }

src/main/java/org/olat/group/ui/main/BGResourcesCellRenderer.java

@@ -71,6 +71,7 @@ public class BGResourcesCellRenderer implements CustomCellRenderer {
 						}
 						sb.append(StringHelper.escapeHtml(relation.getDisplayname()));
 					} else if(count >= 2) {
+						sb.append(" ");
 						Link link = LinkFactory.createLink("repo_entry_" + UUID.randomUUID().toString(), container, listeningController);
 						link.setCustomDisplayText("...");
 						link.setUserObject(item.getBusinessGroup());
@@ -80,6 +81,7 @@ public class BGResourcesCellRenderer implements CustomCellRenderer {
 						link.getHTMLRendererSingleton().render(renderer, sb, link, ubu, translator, renderResult, null);
 						break;
 					} else {
+						if(count > 0) sb.append(" ");
 						Link link = LinkFactory.createLink("repo_entry_" + UUID.randomUUID().toString(), container, listeningController);
 						link.setIconLeftCSS("o_icon o_CourseModule_icon");
 						link.setCustomDisplayText(StringHelper.escapeHtml(relation.getDisplayname()));

src/main/java/org/olat/group/ui/main/EditMembershipController.java

@@ -26,11 +26,11 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.commons.persistence.PersistenceHelper;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.EscapeMode;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
+import org.olat.core.gui.components.form.flexible.elements.FlexiTableElement;
 import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
 import org.olat.core.gui.components.form.flexible.impl.Form;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
@@ -62,6 +62,7 @@ import org.olat.repository.RepositoryEntryManagedFlag;
 import org.olat.repository.RepositoryEntryRef;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.model.RepositoryEntryMembership;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -82,8 +83,10 @@ public class EditMembershipController extends FormBasicController {
 	
 	private final BusinessGroup businessGroup;
 	private final RepositoryEntry repoEntry;
-	private final RepositoryManager repositoryManager;
-	private final BusinessGroupService businessGroupService;
+	@Autowired
+	private RepositoryManager repositoryManager;
+	@Autowired
+	private BusinessGroupService businessGroupService;
 	
 	private static final String[] keys = new String[] { "ison" };
 	private static final String[] values = new String[] {""};
@@ -96,8 +99,6 @@ public class EditMembershipController extends FormBasicController {
 		this.repoEntry = repoEntry;
 		this.businessGroup = businessGroup;
 		this.withButtons = true;
-		repositoryManager = CoreSpringFactory.getImpl(RepositoryManager.class);
-		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
 		
 		memberships = repositoryManager.getRepositoryEntryMembership(repoEntry, member);
 		initForm(ureq);
@@ -132,8 +133,6 @@ public class EditMembershipController extends FormBasicController {
 		this.repoEntry = repoEntry;
 		this.businessGroup = businessGroup;
 		this.withButtons = true;
-		repositoryManager = CoreSpringFactory.getImpl(RepositoryManager.class);
-		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
 		
 		memberships = Collections.emptyList();
 
@@ -150,8 +149,6 @@ public class EditMembershipController extends FormBasicController {
 		this.repoEntry = repoEntry;
 		this.businessGroup = businessGroup;
 		this.withButtons = false;
-		repositoryManager = CoreSpringFactory.getImpl(RepositoryManager.class);
-		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
 		
 		memberships = Collections.emptyList();
 
@@ -250,7 +247,8 @@ public class EditMembershipController extends FormBasicController {
 		tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("table.header.waitingList", 6));
 		
 		tableDataModel = new EditMemberTableDataModel(Collections.<MemberOption>emptyList(), tableColumnModel);
-		uifactory.addTableElement(ureq, getWindowControl(), "groupList", tableDataModel, formLayout);
+		FlexiTableElement tableEl = uifactory.addTableElement(ureq, getWindowControl(), "groupList", tableDataModel, formLayout);
+		tableEl.setCustomizeColumns(false);
 		
 		if(withButtons) {
 			FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("buttonLayout", getTranslator());

src/main/java/org/olat/group/ui/main/MemberInfoController.java

@@ -33,6 +33,7 @@ import org.olat.core.gui.components.form.flexible.elements.StaticTextElement;
 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.link.Link;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.id.Identity;
@@ -132,13 +133,15 @@ public class MemberInfoController extends FormBasicController {
 		}
 		
 		//links
-		homeLink = uifactory.addFormLink("home", formLayout, "b_link_left_icon b_link_to_home");
+		homeLink = uifactory.addFormLink("home", formLayout, Link.BUTTON);
+		homeLink.setIconLeftCSS("o_icon o_icon_home");
 		formLayout.add("home", homeLink);
-		contactLink = uifactory.addFormLink("contact", formLayout, "b_link_left_icon b_link_mail");
+		contactLink = uifactory.addFormLink("contact", formLayout, Link.BUTTON);
+		contactLink.setIconLeftCSS("o_icon o_icon_mail");
 		formLayout.add("contact", contactLink);
 		
 		if(repoEntryKey != null) {
-			assessmentLink = uifactory.addFormLink("assessment", formLayout, "b_link_left_icon b_link_assessment");
+			assessmentLink = uifactory.addFormLink("assessment", formLayout, "o_icon o_icon_assessment");
 			formLayout.add("assessment", assessmentLink);
 		}
 	}