Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.2 -r1.3
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	4 Jul 2007 08:16:01 -0000	1.2
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	9 Jul 2007 05:41:24 -0000	1.3
@@ -62,9 +62,7 @@
 label.branching.branch.heading  =Branch
 label.branching.non.allocated.users.heading  =Students without a Branch
 label.branching.allocated.users.heading  =Members of selected Branch
-label.branching.no.groups.created  =No groups have been created.
 button.branching.add.user.to.branch  =Add selected to Branch
 button.branching.remove.user.from.branch  =Remove selected from Branch
 
-
 #======= End labels: Exported 51 labels for en AU =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.2 -r1.3
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	4 Jul 2007 08:16:01 -0000	1.2
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	9 Jul 2007 05:41:24 -0000	1.3
@@ -62,7 +62,6 @@
 label.branching.branch.heading  =Branch
 label.branching.non.allocated.users.heading  =Students without a Branch
 label.branching.allocated.users.heading  =Members of selected Branch
-label.branching.no.groups.created  =No groups have been created.
 button.branching.add.user.to.branch  =Add selected to Branch
 button.branching.remove.user.from.branch  =Remove selected from Branch
 
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java,v
diff -u -r1.3 -r1.4
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java	4 Jul 2007 08:15:17 -0000	1.3
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java	9 Jul 2007 05:41:13 -0000	1.4
@@ -80,7 +80,7 @@
 *                parameter="method" 
 *                validate="false"
 * @struts.action-forward name = "chosenSelection" path = "/branching/chosenSelection.jsp"
-* @struts.action-forward name = "viewBranches" path = "/branching/viewBranches.jsp"
+* @struts.action-forward name = "viewBranches" path = ".viewBranches"
 * 
 * ----------------XDoclet Tags--------------------
 */
@@ -95,6 +95,7 @@
 	public static final String PARAM_BRANCH_ID = "branchID";
 	public static final String PARAM_MAY_DELETE = "mayDelete";
 	public static final String PARAM_MEMBERS = "members";
+	public static final String PARAM_SHOW_GROUP_NAME = "showGroupName";
 	
 	private Integer getUserId(HttpServletRequest request) {
 		HttpSession ss = SessionManager.getSession();
@@ -160,8 +161,11 @@
 			
 		} else {
 			// go to a view only screen for group based and tool based grouping
+			// only show the group names if this is a group based branching activity - the names
+			// are meaningless for tool based branching
 			BranchingDTO dto = new BranchingDTO((BranchingActivity) activity);
 			request.setAttribute(PARAM_BRANCHING_DTO, dto);
+			request.setAttribute(PARAM_SHOW_GROUP_NAME, activity.isGroupBranchingActivity());
 			if ( log.isDebugEnabled() ) {
 				log.debug("assignBranch: Branching activity "+dto);
 			}
Index: lams_monitoring/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.17 -r1.18
--- lams_monitoring/web/WEB-INF/struts/struts-config.xml	17 Sep 2006 06:19:59 -0000	1.17
+++ lams_monitoring/web/WEB-INF/struts/struts-config.xml	9 Jul 2007 05:41:50 -0000	1.18
@@ -61,6 +61,24 @@
       />
     </action>
     <action
+      path="/branching"
+      type="org.lamsfoundation.lams.monitoring.web.ChosenBranchingAJAXAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="chosenSelection"
+        path="/branching/chosenSelection.jsp"
+        redirect="false"
+      />
+      <forward
+        name="viewBranches"
+        path=".viewBranches"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/monitoring"
       type="org.lamsfoundation.lams.monitoring.web.MonitoringAction"
       parameter="method"
Index: lams_monitoring/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.7 -r1.8
--- lams_monitoring/web/WEB-INF/struts/tiles-defs.xml	17 Sep 2006 06:19:59 -0000	1.7
+++ lams_monitoring/web/WEB-INF/struts/tiles-defs.xml	9 Jul 2007 05:41:34 -0000	1.8
@@ -45,4 +45,8 @@
 	<definition name=".viewGroups" extends=".baseDef" >
 		<put name="content" value="/grouping/viewGroups.jsp" />	
 	</definition>
+<!-- ============= Branching Page Definitions ====================== -->	
+	<definition name=".viewBranches" extends=".baseDef" >
+		<put name="content" value="/branching/viewBranches.jsp" />	
+	</definition>
 </tiles-definitions>
\ No newline at end of file
Index: lams_monitoring/web/branching/viewBranches.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/branching/viewBranches.jsp,v
diff -u -r1.1 -r1.2
--- lams_monitoring/web/branching/viewBranches.jsp	4 Jul 2007 08:15:47 -0000	1.1
+++ lams_monitoring/web/branching/viewBranches.jsp	9 Jul 2007 05:41:40 -0000	1.2
@@ -36,32 +36,30 @@
 		<p><c:out value="${description}"/></p>
 	</c:if>
 
-	<c:choose>
-	<c:when test="${empty branches}">
-		<p><fmt:message key="label.grouping.no.branches.created"/></p>
-	</c:when>
-	<c:otherwise>
-	
-	
-		<table class="alternative-color" cellspacing="0">
-			<c:forEach items="${branches}" var="branch">
-			<tr>
-				<td width="25%" class="first">
-					<c:out value="${branch.branchName}"/>
-				</td>
-				<td>
-					<c:forEach items="${branch.groups}" var="group">
+	<table class="alternative-color" cellspacing="0">
+		<tr>
+			<th><fmt:message key="label.branching.branch.heading"/></th>
+			<th>&nbsp;</th>
+		</tr>
+			
+		<c:forEach items="${branching.branches}" var="branch">
+		<tr>
+			<td width="25%" class="first">
+				<c:out value="${branch.branchName}"/>
+			</td>
+			<td>
+				<c:forEach items="${branch.groups}" var="group" varStatus="status">
+ 					<c:if test="${showGroupName}">
 						<strong><c:out value="${group.groupName}"/></strong><BR>
-						<c:forEach items="${group.users}" var="user">
-							<c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/>
-						</c:forEach>
+					</c:if>
+					<c:forEach items="${group.users}" var="user">
+						<c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/><BR>
 					</c:forEach>
-				</td>
-			</tr>
-			</c:forEach>
-		</table>
-	</c:otherwise>
-	</c:choose>
+				</c:forEach>
+			</td>
+		</tr>
+		</c:forEach>
+	</table>
 		
 	<%@ include file="../template/finishbutton.jsp" %>