Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rf7cb84defcd7ff6e4f3232f2ef1856f1311215d9
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision f7cb84defcd7ff6e4f3232f2ef1856f1311215d9)
@@ -20,21 +20,20 @@
 <html-el:hidden property="orgId" />
 <html-el:hidden property="parentId" />
 <html-el:hidden property="typeId" />
-<h4>
-	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
-	
+
+<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 	<logic:equal name="OrganisationForm" property="typeId" value="3">
-		: <a href="orgmanage.do?org=<bean:write name="OrganisationForm" property="parentId" />"><bean:write name="OrganisationForm" property="parentName"/></a>
+		: <a href="orgmanage.do?org=<bean:write name="OrganisationForm" property="parentId" />" class="btn btn-default"><bean:write name="OrganisationForm" property="parentName"/></a>
 	</logic:equal>
 	
 	<logic:notEmpty name="OrganisationForm" property="orgId">
-		: <a href="orgmanage.do?org=<bean:write name="OrganisationForm" property="orgId" />"><bean:write name="OrganisationForm" property="name"/></a>
+		: <a href="orgmanage.do?org=<bean:write name="OrganisationForm" property="orgId" />" class="btn btn-default"><bean:write name="OrganisationForm" property="name"/></a>
 	</logic:notEmpty>
-</h4>
+</p>
 
-<h1>
+<h4>
 	<logic:notEmpty name="OrganisationForm" property="orgId">
-		<fmt:message key="admin.edit"/> <bean:write name="OrganisationForm" property="name"/>
+		<fmt:message key="admin.edit"/>&nbsp;<bean:write name="OrganisationForm" property="name"/>&nbsp;
 	</logic:notEmpty>
 	<logic:empty name="OrganisationForm" property="orgId">
 		<logic:equal name="OrganisationForm" property="typeId" value="2">
@@ -44,26 +43,27 @@
 			<fmt:message key="admin.class.add"/>
 		</logic:equal>
 	</logic:empty>
-</h1>
+</h4>
 
 <div align="center"><html-el:errors/></div>
-<table>
+
+<table class="table table-condensed table-no-border">
 	<tr>
-		<td><fmt:message key="admin.organisation.name"/>:</td>
-		<td><html-el:text property="name" size="40" /> *</td>
+		<td width="15%"><fmt:message key="admin.organisation.name"/> *</td>
+		<td><html-el:text property="name" size="40" styleClass="form-control" /></td>
 	</tr>
 	<tr>
-	<td><fmt:message key="admin.organisation.code"/>:</td>
-		<td><html-el:text property="code" size="20" /></td>
+	<td><fmt:message key="admin.organisation.code"/></td>
+		<td><html-el:text property="code" size="20" styleClass="form-control" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.organisation.description"/>:</td>
-		<td><html-el:textarea property="description" cols="50" rows="3" /></td>
+		<td><fmt:message key="admin.organisation.description"/></td>
+		<td><html-el:textarea property="description" cols="50" rows="3" styleClass="form-control" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.organisation.locale"/>:</td>
+		<td><fmt:message key="admin.organisation.locale"/></td>
 		<td>
-			<html-el:select property="localeId">
+			<html-el:select property="localeId" styleClass="form-control" >
 				<c:forEach items="${locales}" var="locale">
 					<html-el:option value="${locale.localeId}">
 						<c:out value="${locale.description}" />
@@ -73,107 +73,82 @@
 		</td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.organisation.status"/>:</td>
+		<td><fmt:message key="admin.organisation.status"/></td>
 		<td>
-			<html-el:select property="stateId">
+			<html-el:select property="stateId" styleClass="form-control" >
 				<c:forEach items="${status}" var="state">
 					<html-el:option value="${state.organisationStateId}"><fmt:message key="organisation.state.${state.description}"/></html-el:option>
 				</c:forEach>
 			</html-el:select>
 		</td>
 	</tr>
+</table>
 	
 	<logic:equal name="OrganisationForm" property="typeId" value="2">
-	<tr>
-		<td colspan=2>
-			<html-el:checkbox property="courseAdminCanAddNewUsers" styleId="course-admin-can-add-new-users" />
+		<div class="checkbox">
 			<label for="course-admin-can-add-new-users">
+			<html-el:checkbox property="courseAdminCanAddNewUsers" styleId="course-admin-can-add-new-users" />
 				<fmt:message key="admin.can.add.user"/>
 			</label>
-		</td>
-	</tr>
-	<tr>
-		<td colspan=2>
-			<html-el:checkbox property="courseAdminCanBrowseAllUsers" styleId="course-admin-can-browse-all-users"/>
+		</div>
+		<div class="checkbox">
 			<label for="course-admin-can-browse-all-users">
+			<html-el:checkbox property="courseAdminCanBrowseAllUsers" styleId="course-admin-can-browse-all-users"/>
 				<fmt:message key="admin.can.browse.user"/>
 			</label>
-		</td>
-	</tr>
-	<tr>
-		<td colspan=2>
-			<html-el:checkbox property="courseAdminCanChangeStatusOfCourse" styleId="course-admin-can-change-status-of-course"/>
+		</div>
+		<div class="checkbox">
 			<label for="course-admin-can-change-status-of-course">
+			<html-el:checkbox property="courseAdminCanChangeStatusOfCourse" styleId="course-admin-can-change-status-of-course"/>
 				<fmt:message key="admin.can.change.status"/>
 			</label>
-		</td>
-	</tr>
-	<tr>
-		<td colspan=2>
-			<html-el:checkbox property="enableCourseNotifications" styleId="enable-course-notifications"/>
+		</div>
+		<div class="checkbox">
 			<label for="enable-course-notifications">
+			<html-el:checkbox property="enableCourseNotifications" styleId="enable-course-notifications"/>
 				<fmt:message key="admin.enable.course.notifications"/>
 			</label>
-		</td>
-	</tr>
-	<tr>
-		<td colspan=2>
-			<html-el:checkbox onclick="unSelectLearnerGradebook();" styleId="enableGradebookForMonitors" property="enableGradebookForMonitors" />
+		</div>
+		<div class="checkbox">
 			<label for="enableGradebookForMonitors">
+			<html-el:checkbox onclick="unSelectLearnerGradebook();" styleId="enableGradebookForMonitors" property="enableGradebookForMonitors" />
 				<fmt:message key="admin.gradebook.monitor.enable"/>
 			</label>
-		</td>
-	</tr>
-	<tr>
-		<td colspan=2>
-			<html-el:checkbox onclick="selectMonitorGradebook();" styleId="enableGradebookForLearners" property="enableGradebookForLearners" />
+		</div>
+		<div class="checkbox">
 			<label for="enableGradebookForLearners">
+			<html-el:checkbox onclick="selectMonitorGradebook();" styleId="enableGradebookForLearners" property="enableGradebookForLearners" />
 				<fmt:message key="admin.gradebook.learner.enable"/>
 			</label>
-		</td>
-	</tr>
-	<tr>
-		<td colspan=2>
-			<html-el:checkbox property="enableSingleActivityLessons" styleId="enable-single-activity-lessons"/>
+		</div>
+		<div class="checkbox">
 			<label for="enable-single-activity-lessons">
+			<html-el:checkbox property="enableSingleActivityLessons" styleId="enable-single-activity-lessons"/>
 				<fmt:message key="config.authoring.single.activity"/>
 			</label>
-		</td>
-	</tr>
+		</div>
 	</logic:equal>
 	
-	<tr>
-		<td colspan=2>
+		<div class="checkbox">
+			<label for="enable-live-edit">
 			<html-el:checkbox property="enableLiveEdit" styleId="enable-live-edit"/>
 			<!-- to overcome nasty DynaActionForm bug (http://www.coderanch.com/t/46408/Struts/DynaValidatorActionForm-checkboxes) -->
 			<input type="hidden" name="enableLiveEdit" value="false">
-			<label for="enable-live-edit">
 				<fmt:message key="config.live.edit"/>
 			</label>
-		</td>
-	</tr>
+		</div>
 	
 	<logic:notEmpty name="OrganisationForm" property="orgId">
-	<tr>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-		<td>
+		<div class="voffset10">
 			<logic:equal name="OrganisationForm" property="typeId" value="2"><fmt:message key="msg.group.organisation_id"/></logic:equal>
 			<logic:equal name="OrganisationForm" property="typeId" value="3"><fmt:message key="msg.subgroup.organisation_id"/></logic:equal>
-			<bean:write name="OrganisationForm" property="orgId" />.
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">&nbsp;</td>
-	</tr>
+			&nbsp;<bean:write name="OrganisationForm" property="orgId" />.
+		</div>
 	</logic:notEmpty>
 	
-	<tr>
-		<td colspan=2 class="align-right">
-			<html-el:submit styleId="saveButton" styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
-			<html-el:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
-		</td>
-	</tr>
-</table>
+	<div class="pull-right">
+		<html-el:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html-el:cancel>
+		<html-el:submit styleId="saveButton" styleClass="btn btn-primary loffset5"><fmt:message key="admin.save"/></html-el:submit>
+	</div>
+
 </html-el:form>