diff --git a/src/main/java/org/olat/course/nodes/projectbroker/ProjectListController.java b/src/main/java/org/olat/course/nodes/projectbroker/ProjectListController.java
index 74c382478bccd86ea7dc0ab4387ab6ed25e9d0e3..21a59abd42e19e83886cf4fa81cdef9cb7871350 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/ProjectListController.java
+++ b/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);
}
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/account_management.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/account_management.html
index 5ecb849f0cfc0af8690b304e708a8ab18398f534..ee1b61cfab07f1bb1f8a7cf678e079b93b7d003f 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/account_management.html
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_content/account_management.html
@@ -1,10 +1,12 @@
<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
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/dropbox.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/dropbox.html
index 8c9932e1381a75b4ca534556b95aa5593e8b341d..0581be338cb6f08021cbffc7716fc146b16a87ea 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/dropbox.html
+++ b/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>
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/editModules.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/editModules.html
index 5528eeac1b578f053c46115cf84b34ad607c3211..8ebd54361ba6cae56bf5d33f7509b2c84744f706 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/editModules.html
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_content/editModules.html
@@ -1,5 +1,5 @@
<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
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/editProject.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/editProject.html
index dbf398f7d056067fb9f993ff061bf2ece05131ca..0e155d95eb37833cb419ff1c5e48ad222a43ca36 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/editProject.html
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_content/editProject.html
@@ -1,5 +1,5 @@
<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
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/editScoring.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/editScoring.html
index b63331089482f2120ead41c1fd08111ea83e7f1b..d1c3c761c45f2ce3cf405288591413171e9746b8 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/editScoring.html
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_content/editScoring.html
@@ -1,6 +1,6 @@
<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>
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/edit_condition.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/edit_condition.html
index 8398a697d622d29858d607d18def881308022197..207e5dcebd3b6059b71bfdb16052a79fe900802c 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/edit_condition.html
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_content/edit_condition.html
@@ -1,7 +1,7 @@
#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
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/optionsForm.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/optionsForm.html
index 43ddbfa991a7b5d8b704384b7d4c7e2767785b1e..7d1ba176548c67069d13c90caf463e8a8d4a0d58 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/optionsForm.html
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_content/optionsForm.html
@@ -1,15 +1,15 @@
<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
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/project_list.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/project_list.html
index 44f9f5673cb3b2120aff4d226d7d91c2e2148902..93efad13869b3a031a5d4da249af633d6509a913 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/project_list.html
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_content/project_list.html
@@ -1,9 +1,7 @@
-$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
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/projectdetailsdisplay.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/projectdetailsdisplay.html
index 9d2949f6137eaebd4bbf41fa4ed09f01eaffde6d..a52a5be80644e82a6ed47c5c8c69019f8b52692b 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/projectdetailsdisplay.html
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_content/projectdetailsdisplay.html
@@ -1,81 +1,79 @@
<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")
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/projectdetailspanel.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/projectdetailspanel.html
deleted file mode 100644
index cd98e1d73899eef6006ebf651b85ce5a848827c5..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/projectdetailspanel.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="o_course_run">
- <h3 class="b_with_small_icon_left o_projectbroker_icon">$!menuTitle</h3>
-
-</div>
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_content/projectgroup_management.html b/src/main/java/org/olat/course/nodes/projectbroker/_content/projectgroup_management.html
index 36f2adf77e713b3a85732ba590f85b491ddf0408..c6d3ae70a1379ba8dbfe093f775fbbbc44894e79 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_content/projectgroup_management.html
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_content/projectgroup_management.html
@@ -1,22 +1,22 @@
<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
diff --git a/src/test/java/org/olat/repository/RepositoryManagerTest.java b/src/test/java/org/olat/repository/RepositoryManagerTest.java
index 18596cd80ad36a2cd941f97ec6e49cdbba68e8c1..8ed3a1c0f18138148c4d8f75f41ba8d27183f7ea 100644
--- a/src/test/java/org/olat/repository/RepositoryManagerTest.java
+++ b/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.