Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.93 -r1.94
--- lams_central/conf/language/lams/ApplicationResources.properties	1 Feb 2012 10:41:54 -0000	1.93
+++ lams_central/conf/language/lams/ApplicationResources.properties	2 Feb 2012 08:13:47 -0000	1.94
@@ -282,6 +282,9 @@
 index.conditions  =Conditions
 index.conditions.tooltip  =Conditions of participation in lesson
 label.conditions.box.title  =Lesson "{0}" will only be available after these lesson(s) are completed:
+label.conditions.box.no.dependency  =There are no dependencies for this lesson.
+label.conditions.box.add.dependency  =Select lesson that will need to be completed first:
+label.conditions.box.remove.dependency  =Remove lesson dependency
 label.portrait.please.wait  =Please wait
 label.portrait.take.snapshot.from.webcamera  =Take portrait using Webcam
 label.portrait.configure  =Configure
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v
diff -u -r1.28 -r1.29
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	1 Feb 2012 10:41:54 -0000	1.28
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	2 Feb 2012 08:13:47 -0000	1.29
@@ -382,9 +382,9 @@
 		    log.error("Error while encoding course name, skipping gradebook lesson monitor link", e);
 		}
 	    }
-	    
-	    // Add lesson conditions thickbox if it has dependencies
-	    if (isGroupManagerOrMonitor && bean.isDependent()) {
+
+	    // Add lesson conditions thickbox
+	    if (isGroupManagerOrMonitor) {
 		String conditionsLink = Configuration.get(ConfigurationKeys.SERVER_URL)
 			+ "/lessonConditions.do?method=getIndexLessonConditions&" + CentralConstants.PARAM_LESSON_ID
 			+ "=" + bean.getId() + "&KeepThis=true&TB_iframe=true&height=480&width=610";
Index: lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsAction.java,v
diff -u -r1.1 -r1.2
--- lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsAction.java	1 Feb 2012 10:41:54 -0000	1.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsAction.java	2 Feb 2012 08:13:47 -0000	1.2
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -45,6 +46,7 @@
 
 /**
  * This Action takes care of operations on lesson conditional release based on preceding lesson completion.
+ * 
  * @author Marcin Cieslak
  * 
  * @struts.action path="/lessonConditions" parameter="method" validate="false"
@@ -57,12 +59,14 @@
 
     private static final String PARAM_PRECEDING_LESSONS = "precedingLessons";
     private static final String PARAM_PRECEDING_LESSON_ID = "precedingLessonId";
+    private static final String PARAM_AVAILABLE_LESSONS = "availableLessons";
 
     private static LessonService lessonService;
 
     /**
      * Prepares data for thickbox displayed on Index page.
      */
+    @SuppressWarnings("unchecked")
     public ActionForward getIndexLessonConditions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
@@ -78,6 +82,18 @@
 	request.setAttribute(CentralConstants.PARAM_TITLE, lesson.getLessonName());
 	request.setAttribute(LessonConditionsAction.PARAM_PRECEDING_LESSONS, precedingLessons);
 
+	Set<Lesson> organisationLessons = lesson.getOrganisation().getLessons();
+	List<IndexLessonBean> availableLessons = new ArrayList<IndexLessonBean>(organisationLessons.size());
+	for (Lesson organisationLesson : organisationLessons) {
+	    if (!lessonId.equals(organisationLesson.getLessonId())
+		    && !lesson.getPrecedingLessons().contains(organisationLesson)) {
+		IndexLessonBean availableLessonBean = new IndexLessonBean(organisationLesson.getLessonId(),
+			organisationLesson.getLessonName());
+		availableLessons.add(availableLessonBean);
+	    }
+	}
+	request.setAttribute(LessonConditionsAction.PARAM_AVAILABLE_LESSONS, availableLessons);
+
 	return mapping.findForward(LessonConditionsAction.FORWARD_INDEX_LESSON_CONDITION);
     }
 
@@ -87,7 +103,8 @@
     public ActionForward removeLessonDependency(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	Long lessonId = WebUtil.readLongParam(request, CentralConstants.PARAM_LESSON_ID, false);
-	Long removedPrecedingLessonId = WebUtil.readLongParam(request, PARAM_PRECEDING_LESSON_ID, false);
+	Long removedPrecedingLessonId = WebUtil.readLongParam(request,
+		LessonConditionsAction.PARAM_PRECEDING_LESSON_ID, false);
 
 	Lesson lesson = getLessonService().getLesson(lessonId);
 	Iterator<Lesson> precedingLessonIter = lesson.getPrecedingLessons().iterator();
@@ -97,11 +114,28 @@
 		break;
 	    }
 	}
-	
+
 	// after operation, display contents again
 	return getIndexLessonConditions(mapping, form, request, response);
     }
 
+    /**
+     *  Adds given lesson to dependecies and displays updated list in thickbox.
+     */
+    public ActionForward addLessonDependency(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	Long lessonId = WebUtil.readLongParam(request, CentralConstants.PARAM_LESSON_ID, false);
+	Long addedPrecedingLessonId = WebUtil.readLongParam(request, LessonConditionsAction.PARAM_PRECEDING_LESSON_ID,
+		false);
+
+	Lesson lesson = getLessonService().getLesson(lessonId);
+	Lesson addedPrecedingLesson = getLessonService().getLesson(addedPrecedingLessonId);
+	lesson.getPrecedingLessons().add(addedPrecedingLesson);
+
+	// after operation, display contents again
+	return getIndexLessonConditions(mapping, form, request, response);
+    }
+
     private LessonService getLessonService() {
 	if (LessonConditionsAction.lessonService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
Index: lams_central/web/indexLessonConditions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/indexLessonConditions.jsp,v
diff -u -r1.1 -r1.2
--- lams_central/web/indexLessonConditions.jsp	1 Feb 2012 10:41:54 -0000	1.1
+++ lams_central/web/indexLessonConditions.jsp	2 Feb 2012 08:13:47 -0000	1.2
@@ -6,7 +6,21 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <lams:html>
 <lams:head>
+	<c:url value="/lessonConditions.do" var="addLessonDependencyUrl">
+		<c:param name="method" value="addLessonDependency" />
+		<c:param name="lsId" value="${lsId}" />
+	</c:url>
+	
 	<lams:css/>
+	<style type="text/css">
+		td.lessonList {
+			padding: 0px 0px 10px 10px;
+		}
+		
+		td.emptyList {
+			font-style: italic;
+		}
+	</style>
 	
 	<script type="text/javascript">
 		var lessonId="${lsId}";
@@ -21,30 +35,77 @@
 <body class="stripes">
 <div id="page">
 <div id="content">
-	<h4>
-		<fmt:message key="label.conditions.box.title">
-			<fmt:param>${title}</fmt:param>
-		</fmt:message>
-	</h4>
-	
+<table>
+
+	<tr>
+		<td colspan="2">
+			<h4>
+				<fmt:message key="label.conditions.box.title">
+					<fmt:param>${title}</fmt:param>
+				</fmt:message>
+			</h4>
+		</td>
+	</tr>
 	<c:choose>
 		<c:when test="${empty precedingLessons}">
-			<i>There are no dependencies for this lesson.</i>
+			<tr>
+				<td colspan="2" class="lessonList emptyList">
+					<fmt:message key="label.conditions.box.no.dependency" />
+				</td>
+			</tr>
 		</c:when>
 		<c:otherwise>
-			<ul>
-				<c:forEach var="precedingLesson" items="${precedingLessons}">
-					<li>
+			<c:forEach var="precedingLesson" items="${precedingLessons}">
+				<tr>
+					<td class="lessonList" style="width: 70%">
 						<c:out value="${precedingLesson.name}" />
+					</td>
+					<td>
 						<img src="<lams:LAMSURL/>images/icons/cross.png"
-							 style="cursor: pointer; margin-left: 10px; postion: relative; top: 2px"
-							 title="Delete lesson dependency"
+							 style="cursor: pointer;"
+							 title="<fmt:message key="label.conditions.box.remove.dependency" />"
 							 onclick="javascript:removePrecedingLesson(${precedingLesson.id})" />
-					</li>
-				</c:forEach>
-			</ul>
+					</td>
+				</tr>
+			</c:forEach>
 		</c:otherwise>
 	</c:choose>
+	
+	
+	<tr>
+		<td colspan="2">
+			<h4>
+				<fmt:message key="label.conditions.box.add.dependency" />
+			</h4>
+		</td>
+	</tr>
+	
+	<c:choose>
+		<c:when test="${empty availableLessons}">
+			<tr>
+				<td colspan="2" class="lessonList emptyList">
+					<fmt:message key="label.conditions.box.no.dependency" />
+				</td>
+			</tr>
+		</c:when>
+		<c:otherwise>
+			<form action="${addLessonDependencyUrl}" method="post">
+			<tr>
+				<td class="lessonList" style="width: 70%">
+					<select name="precedingLessonId">
+						<c:forEach var="availableLesson" items="${availableLessons}">
+							<option value="${availableLesson.id}">${availableLesson.name}</option>
+						</c:forEach>
+					</select>
+				</td>
+				<td>
+					<input class="button" type="submit" value="<fmt:message key="index.addlesson"/>" />
+				</td>
+			</tr>	
+			</form>
+		</c:otherwise>
+	</c:choose>
+</table>
 </div>
 </div>
 </body>
Index: lams_central/web/css/highContrast.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/highContrast.css,v
diff -u -r1.3 -r1.4
--- lams_central/web/css/highContrast.css	1 Feb 2012 10:41:54 -0000	1.3
+++ lams_central/web/css/highContrast.css	2 Feb 2012 08:13:47 -0000	1.4
@@ -1361,9 +1361,6 @@
 .mycourses-completed-img {background: url('../images/css/lesson_completed.png') no-repeat 0 3px; margin-left:20px; margin-right:5px; padding:5px 0px 5px 25px; 
 }
 
-.mycourses-conditions-img {background: url('../images/css/conditions.png') no-repeat 0 3px; margin-left:20px; margin-right:5px; padding:5px 0px 5px 25px; 
-}
-
 /*IE style workarounds */
 
 * html  #content {
Index: lams_central/web/css/highContrast_rtl.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/highContrast_rtl.css,v
diff -u -r1.3 -r1.4
--- lams_central/web/css/highContrast_rtl.css	1 Feb 2012 10:41:54 -0000	1.3
+++ lams_central/web/css/highContrast_rtl.css	2 Feb 2012 08:13:47 -0000	1.4
@@ -1354,9 +1354,6 @@
 .mycourses-completed-img {background: url('../images/css/lesson_completed.png') no-repeat 0 3px; margin-left:20px; margin-right:5px; padding:5px 0px 5px 25px; 
 }
 
-.mycourses-conditions-img {background: url('../images/css/conditions.png') no-repeat 0 3px; margin-left:20px; margin-right:5px; padding:5px 0px 5px 25px; 
-}
-
 /*IE style workarounds */
 * html  #content {
 	background-color:#fff;
Index: lams_central/web/css/ramsthemeHTML.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/Attic/ramsthemeHTML.css,v
diff -u -r1.6 -r1.7
--- lams_central/web/css/ramsthemeHTML.css	1 Feb 2012 10:41:54 -0000	1.6
+++ lams_central/web/css/ramsthemeHTML.css	2 Feb 2012 08:13:47 -0000	1.7
@@ -293,9 +293,6 @@
 .mycourses-addlesson-img {background: url('../images/ramsthemecss/mycourses_addlesson.jpg') no-repeat 0 3px; margin-right:5px; padding:5px 0px 5px 25px;
 }
 
-.mycourses-conditions-img {background: url('../images/css/conditions.png') no-repeat 0 3px; margin-left:20px; margin-right:5px; padding:5px 0px 5px 25px; 
-}
-
 /*layout of the forum tables with the colored table heading cell */
 table.forum { 
 	width:93%;