OO-1068: bootstrapify project broker

src/main/java/org/olat/course/nodes/projectbroker/ProjectListController.java

@@ -159,6 +159,7 @@ public class ProjectListController extends BasicController implements GenericEve
 				|| ureq.getUserSession().getRoles().isOLATAdmin()) {
 			contentVC.contextPut("isAccountManager", true);
 			createNewProjectButton = LinkFactory.createButtonSmall("create.new.project.button", contentVC, this);
+			createNewProjectButton.setIconLeftCSS("o_icon o_icon_add");
 		} else {
 			contentVC.contextPut("isAccountManager", false);
 		}

src/main/java/org/olat/course/nodes/projectbroker/_content/account_management.html

 <fieldset>
-	<legend>$r.translate("form.accountmanagement.title")</legend>
+	<legend>
 	#if ($r.available("accountManagementController"))
 		$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-accountmgmt.html","help.hover.projectbroker-accountmgmt")
+	#end
+	$r.translate("form.accountmanagement.title")</legend>
+	#if ($r.available("accountManagementController"))
 		$r.render("accountManagementController")
 	#else
 		$r.translate("form.accountmanagement.no.account.manager.group")
 	#end
-	
 </fieldset>
\ No newline at end of file

src/main/java/org/olat/course/nodes/projectbroker/_content/dropbox.html

@@ -3,11 +3,7 @@
 		$r.render("subscription")
 	#end
 	<h4>$r.translate("dropbox.title")</h4>		
-	<p>
-		$r.translate("dropbox.intro")
-	</p>
-	<p>
-	</p>
+	<p>$r.translate("dropbox.intro")</p>
 	<p>
 	#if($numfiles)
 		<i>$r.translate("dropbox.files", $numfiles)</i>

src/main/java/org/olat/course/nodes/projectbroker/_content/editModules.html

 <fieldset>
-	<legend>$r.translate("form.modules.title")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-editModules.html","help.hover.projectbroker-editModules")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-editModules.html","help.hover.projectbroker-editModules")
+	$r.translate("form.modules.title")</legend>
 	$r.render("editModules")
 </fieldset>
\ No newline at end of file

src/main/java/org/olat/course/nodes/projectbroker/_content/editProject.html

 <fieldset class="clearfix">
-	<legend>$r.translate("editproject.title")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-editProject.html","help.hover.projectbroker-editProject")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-editProject.html","help.hover.projectbroker-editProject")
+	$r.translate("editproject.title")</legend>
 	$r.render("editController")
 </fieldset>
\ No newline at end of file

src/main/java/org/olat/course/nodes/projectbroker/_content/editScoring.html

 <fieldset>
-	<legend>$r.translate("form.configuration")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.ms","ced-ms.html","help.hover.ms-conf")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.ms","ced-ms.html","help.hover.ms-conf")
+	$r.translate("form.configuration")</legend>
 	#if ($hasLogEntries)
 		#if ($isOverwriting)
 			<p>

src/main/java/org/olat/course/nodes/projectbroker/_content/edit_condition.html

 #if ($r.available("projectBrokerCondition"))
 <fieldset class="clearfix">
-	<legend>$r.translate("projectbroker.condition.title")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.editor","ced-acc.html","help.hover.acc")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.editor","ced-acc.html","help.hover.acc")
+	$r.translate("projectbroker.condition.title")</legend>
 	$r.render("projectBrokerCondition")
 </fieldset>
 #end

src/main/java/org/olat/course/nodes/projectbroker/_content/optionsForm.html

 <fieldset>
-	<legend>$r.translate("form.options.title")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-optionsFormSettings.html","help.hover.projectbroker-optionsFormSettings")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-optionsFormSettings.html","help.hover.projectbroker-optionsFormSettings")
+	$r.translate("form.options.title")</legend>
 	$r.render("optionsForm")
 </fieldset>
 <fieldset>
-	<legend>$r.translate("form.options.customfield.legend")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-optionsCustomfields.html","help.hover.projectbroker-optionsCustomfields")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-optionsCustomfields.html","help.hover.projectbroker-optionsCustomfields")
+	$r.translate("form.options.customfield.legend")</legend>
 	$r.render("customfieldsForm")
 </fieldset>
 <fieldset>
-	<legend>$r.translate("form.options.date.legend")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-optionsFormDates.html","help.hover.projectbroker-optionsFormDates")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-optionsFormDates.html","help.hover.projectbroker-optionsFormDates")
+	$r.translate("form.options.date.legend")</legend>
 	$r.render("projectEventForm")
 </fieldset>
\ No newline at end of file

src/main/java/org/olat/course/nodes/projectbroker/_content/project_list.html

-$infoProjectBrokerRunMode
-<br />
-<br />
+<div class="o_info">$infoProjectBrokerRunMode</div>
 #if ($isAccountManager == true)
-	$r.render("create.new.project.button")
-	<br />
-	<br />
+	<div class="o_button_group o_button_group_right">
+		$r.render("create.new.project.button")
+	</div>
 #end
 $r.render("projectList")
\ No newline at end of file

src/main/java/org/olat/course/nodes/projectbroker/_content/projectdetailsdisplay.html

 <fieldset>
-	<legend>$r.translate("detailsform.description.fieldset")</legend>
+	<legend>
 	#if ($isProjectManager == true)
 		$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-descriptionProjectManager.html","help.hover.projectbroker-descriptionProjectManager")
 	#else
 		$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-descriptionProject.html","help.hover.projectbroker-descriptionProject")	
 	#end
-<div class="o_xxx"><div class="b_floatscrollbox">
-	<div class="o_projectbroker_details_content">		
-		<table>
-			<tr>
-				<td valign="top"><label>$r.translate("detailsform.title.label")</label></td>
-				<td><strong>$title</strong></td>
-			</tr>
-			<tr>
-				<td valign="top"><label>$r.translate("detailsform.projectleaders.label")</label></td>
-				<td>
-                        #set ($notFirst = false)
-						#foreach($projectLeaderLinkName in $projectLeaderLinkNameList)
-                            #if ($notFirst)
-                                , 
-                            #end
-                            #set ($notFirst = true)
-							$r.render("${projectLeaderLinkName}")
-						#end
-				</td>
-			</tr>
-			<tr>
-				<td valign="top"><label>$r.translate("detailsform.description.label")</label></td>
-				<td>$description</td>
-				
-			</tr>
-			<tr>
-				<td valign="top"><label>$r.translate("detailsform.state.label")</label></td>
-				<td>$state</td>
-			</tr>
-			<tr>
-				<td valign="top"><label>$r.translate($keyMaxLabel)</label></td>
-				<td>$projectPlaces</td>
-			</tr>
-			#foreach($customField in $customFieldList)
-			<tr>
-				<td valign="top"><label>$customField.name</label></td>
-				<td>$customField.value</td>
-			</tr>
-			#end
-			#foreach($event in $eventList)
-			<tr>
-				<td valign="top"><label>$r.translate("$event.eventType")</label></td>
-				<td>#if ($event.startDate)
-				      $r.translate("event.start.text")
-				      $event.formattedStartDate 
-				    #end
-				    #if ($event.endDate)
-				      $r.translate("event.to.text") 
-				      $event.formattedEndDate
-				    #end
-				</td>
-			</tr>
-			#end
-			<tr>
-				<td valign="top"><label>$r.translate("detailsform.attachmentfilename.label")</label></td>
-				<td>$r.render("attachedFileLink")</td>
-			</tr>
-		</table>
-		#if ($isProjectManager == true)
-		    <br/>
-			$r.render("edit.project.button")
-			$r.render("delete.project.button")
-			#if ($r.available("change.project.state.not_assign.button"))
-				$r.render("change.project.state.not_assign.button")
-			#end
-			#if ($r.available("change.project.state.assign.button"))
-				$r.render("change.project.state.assign.button")
+	$r.translate("detailsform.description.fieldset")</legend>
+	
+<div class="panel panel-default">
+	<div class="panel-heading"><h4>$title</h4></div>
+	<table class="table table-condensed"><tbody>
+		<tr>
+			<th>$r.translate("detailsform.projectleaders.label")</th>
+			<td>
+            #set ($notFirst = false)
+			#foreach($projectLeaderLinkName in $projectLeaderLinkNameList)
+                         #if ($notFirst)
+                             , 
+                         #end
+                         #set ($notFirst = true)
+				$r.render("${projectLeaderLinkName}")
 			#end
+			</td>
+		</tr>
+		<tr>
+			<th>$r.translate("detailsform.description.label")</th>
+			<td>$description</td>
+			
+		</tr>
+		<tr>
+			<th>$r.translate("detailsform.state.label")</th>
+			<td>$state</td>
+		</tr>
+		<tr>
+			<th>$r.translate($keyMaxLabel)</th>
+			<td>$projectPlaces</td>
+		</tr>
+		#foreach($customField in $customFieldList)
+		<tr>
+			<th>$customField.name</th>
+			<td>$customField.value</td>
+		</tr>
 		#end
-	</div>
+		#foreach($event in $eventList)
+		<tr>
+			<th>$r.translate("$event.eventType")</th>
+			<td>#if ($event.startDate)
+			      $r.translate("event.start.text")
+			      $event.formattedStartDate 
+			    #end
+			    #if ($event.endDate)
+			      $r.translate("event.to.text") 
+			      $event.formattedEndDate
+			    #end
+			</td>
+		</tr>
+		#end
+		<tr>
+			<th>$r.translate("detailsform.attachmentfilename.label")</th>
+			<td>$r.render("attachedFileLink")</td>
+		</tr>
+	</tbody></table>
 </div>
+#if ($isProjectManager == true)
+	<div class="o_button_group">
+	$r.render("edit.project.button")
+	$r.render("delete.project.button")
+	#if ($r.available("change.project.state.not_assign.button"))
+		$r.render("change.project.state.not_assign.button")
+	#end
+	#if ($r.available("change.project.state.assign.button"))
+		$r.render("change.project.state.assign.button")
+	#end
+	</div>
+#end
 </fieldset>
 #if ($r.available("autoDownloadComp"))
 	$r.render("autoDownloadComp")

src/main/java/org/olat/course/nodes/projectbroker/_content/projectdetailspanel.html

-<div class="o_course_run">
-	<h3 class="b_with_small_icon_left o_projectbroker_icon">$!menuTitle</h3>
-
-</div>
\ No newline at end of file

src/main/java/org/olat/course/nodes/projectbroker/_content/projectgroup_management.html

 <fieldset>
-	<legend>$r.translate("projectgroup.projectleader.title")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-leader.html","help.hover.projectbroker-leader")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-leader.html","help.hover.projectbroker-leader")
+	$r.translate("projectgroup.projectleader.title")</legend>
 	$r.render("projectLeaderController")
 </fieldset>
 
 <fieldset>
-	<legend>$r.translate("projectgroup.member.title")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-member.html","help.hover.projectbroker-member")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-member.html","help.hover.projectbroker-member")
+	$r.translate("projectgroup.member.title")</legend>
 	$r.render("projectMemberController")
 </fieldset>
 
 #if ($r.available("projectCandidatesController"))
 <fieldset>
-	<legend>$r.translate("projectgroup.candidates.title")</legend>
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-candidates.html","help.hover.projectbroker-candidates")
+	$r.translate("projectgroup.candidates.title")</legend>
 	#if ($isProjectCandidatesListEmpty == false)
 		<div>$r.translate("projectgroup.candidates.message")<br/><br/></div>
 	#end
-	$r.contextHelpWithWrapper("org.olat.course.nodes.projectbroker","projectbroker-candidates.html","help.hover.projectbroker-candidates")
 	$r.render("projectCandidatesController")
 </fieldset>
 #end
\ No newline at end of file

src/test/java/org/olat/repository/RepositoryManagerTest.java

@@ -39,8 +39,6 @@ import java.util.UUID;
 
 import junit.framework.Assert;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.olat.basesecurity.BaseSecurity;
 import org.olat.basesecurity.Constants;
@@ -67,7 +65,6 @@ import org.olat.repository.model.RepositoryEntryMembership;
 import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.resource.OLATResource;
 import org.olat.resource.OLATResourceManager;
-import org.olat.test.JMSCodePointServerJunitHelper;
 import org.olat.test.JunitTestHelper;
 import org.olat.test.OlatTestCase;
 import org.olat.user.UserManager;
@@ -81,7 +78,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class RepositoryManagerTest extends OlatTestCase {
 	
 	private static final OLog log = Tracing.createLoggerFor(RepositoryManagerTest.class);
-	private static String CODEPOINT_SERVER_ID = "RepositoryManagerTest";
 
 	@Autowired
 	private DB dbInstance;
@@ -105,24 +101,6 @@ public class RepositoryManagerTest extends OlatTestCase {
 	private MarkManager markManager;
 	@Autowired
 	private RepositoryEntryLifecycleDAO lifecycleDao;
-	
-	@Before
-	public void setup() {
-		try {
-			// Setup for code-points
-			JMSCodePointServerJunitHelper.startServer(CODEPOINT_SERVER_ID);
-		} catch (Exception e) {
-			log.error("Error while setting up activeMq or Codepointserver", e);
-		}
-	}
-
-	@After public void tearDown() {
-		try {
-			JMSCodePointServerJunitHelper.stopServer();
-		} catch (Exception e) {
-			log.error("tearDown failed", e);
-		}
-	}
 
 	/**
 	 * Test creation of a repository entry.