Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.100.2.9 -r1.100.2.10
--- lams_admin/conf/language/lams/ApplicationResources.properties	11 May 2016 07:06:56 -0000	1.100.2.9
+++ lams_admin/conf/language/lams/ApplicationResources.properties	16 Jun 2016 03:10:21 -0000	1.100.2.10
@@ -512,5 +512,6 @@
 tool.groups.group.name.error  =A group name can not be blank
 tool.groups.save.error  =Error while saving groups
 config.live.edit  =Enable live edit
+sysadmin.extGroupsUrl  =External groups URL
 
 #======= End labels: Exported 515 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java,v
diff -u -r1.2.4.3 -r1.2.4.4
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java	5 May 2016 07:41:16 -0000	1.2.4.3
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java	16 Jun 2016 03:10:21 -0000	1.2.4.4
@@ -151,7 +151,7 @@
 	theme.setName(form.getName());
 	theme.setDescription(form.getDescription());
 	theme.setImageDirectory(form.getImageDirectory());
-	theme.setType(Integer.parseInt(form.getType()));
+	// theme.setType(Integer.parseInt(form.getType())); no longer in form see LDEV-3674
 	return theme;
     }
 
Index: lams_admin/web/cleanup.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/cleanup.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_admin/web/cleanup.jsp	20 Mar 2010 11:38:42 -0000	1.3
+++ lams_admin/web/cleanup.jsp	16 Jun 2016 03:10:20 -0000	1.3.2.1
@@ -2,26 +2,25 @@
 <%@ page import="org.lamsfoundation.lams.util.FileUtil" %>
 <%@ page import="org.lamsfoundation.lams.util.TempDirectoryFilter" %>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a></h4>
-<h1><fmt:message key="sysadmin.batch.temp.file.delete"/></h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<p><html:errors /></p>
+<html:errors />
 
+<lams:Alert type="warn" id="cleanup-warning" close="false">
+	<fmt:message key="msg.cleanup.warning" /><br />
+</lams:Alert>
+
 <logic:notEmpty name="filesDeleted">
 	<p><c:out value="${filesDeleted}" /></p>
 </logic:notEmpty>
 
-<p>
-	<fmt:message key="msg.cleanup.warning" /><br />
-	<input class="button" type="submit" value="Calculate" onClick="javascript:document.location='cleanup.do?action=refresh'" />
-	<ul>
-		<li><c:out value="<%= FileUtil.getTempDir() %>" />
-		<ul>
-			<li><%= TempDirectoryFilter.zip_prefix %>* : <c:out value="${zipTotal}" /><logic:empty name="zipTotal"><i><fmt:message key="label.unknown"/></i></logic:empty> KB
-			<li><%= TempDirectoryFilter.tmp_prefix %>* : <c:out value="${tmpTotal}" /><logic:empty name="tmpTotal"><i><fmt:message key="label.unknown"/></i></logic:empty> KB
-		</ul>
+	<input class="btn btn-default" type="submit" value="Calculate" onClick="javascript:document.location='cleanup.do?action=refresh'" />
+	<span class="loffset10"><c:out value="<%= FileUtil.getTempDir() %>" /></span>
+	
+	<ul class="list-group voffset5">
+		<li class="list-group-item"><%= TempDirectoryFilter.zip_prefix %>* : <c:out value="${zipTotal}" /><logic:empty name="zipTotal"><i><fmt:message key="label.unknown"/></i></logic:empty> KB
+		<li class="list-group-item"><%= TempDirectoryFilter.tmp_prefix %>* : <c:out value="${tmpTotal}" /><logic:empty name="tmpTotal"><i><fmt:message key="label.unknown"/></i></logic:empty> KB
 	</ul>
-	<br />
 	<fmt:message key="msg.cleanup.actual.space" />
 </p>
 
@@ -30,10 +29,13 @@
 </p>
 
 <html:form action="/cleanup" method="post">
-	<p><fmt:message key="label.cleanup.delete" />: <br />
-	<html:text property="numDays" maxlength="4" size="4" /></p>
 
-	<html:submit styleClass="button"><fmt:message key="admin.delete"/></html:submit>
-	<html:cancel styleClass="button"><fmt:message key="admin.cancel"/></html:cancel>					
-
-</html:form>
\ No newline at end of file
+	<p><fmt:message key="label.cleanup.delete" />:
+	<html:text property="numDays" maxlength="4" size="4" styleClass="form-control form-control-inline"/></p>
+	
+	<div class="pull-right">
+		<html:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html:cancel>	
+		<html:submit styleClass="btn btn-primary loffset5"><fmt:message key="admin.delete"/></html:submit>
+	</div>
+	
+</html:form>
Index: lams_admin/web/disabledusers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/disabledusers.jsp,v
diff -u -r1.5 -r1.5.12.1
--- lams_admin/web/disabledusers.jsp	14 Dec 2007 04:18:18 -0000	1.5
+++ lams_admin/web/disabledusers.jsp	16 Jun 2016 03:10:20 -0000	1.5.12.1
@@ -1,9 +1,8 @@
 <%@ include file="/taglibs.jsp"%>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a></h4>
-<h1><fmt:message key="admin.list.disabled.users"/></h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<table class="alternative-color" width=100% cellspacing="0">
+<table class="table table-striped table-condensed">
 <tr>
 	<th></th>
 	<th><fmt:message key="admin.user.login"/></th>
@@ -30,7 +29,7 @@
 			<bean:write name="user" property="lastName" />
 		</td>
 		<td>
-			<a href="user.do?method=enable&userId=<bean:write name='user' property='userId' />"><fmt:message key="admin.enable"/></a>
+			<a href="user.do?method=enable&userId=<bean:write name='user' property='userId' />" class="btn btn-default btn-sm"><fmt:message key="admin.enable"/></a>
 		</td>		
 	</tr>
 </logic:iterate>
Index: lams_admin/web/groupStatistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/groupStatistics.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_admin/web/groupStatistics.jsp	11 Aug 2009 04:44:23 -0000	1.1
+++ lams_admin/web/groupStatistics.jsp	16 Jun 2016 03:10:20 -0000	1.1.2.1
@@ -1,11 +1,11 @@
 <%@ include file="/taglibs.jsp"%>
 
-<h3>${groupStatisticsDTO.name}</h3>
+<h4>${groupStatisticsDTO.name}</h4>
 
-<table class="alternative-color">
+<table class="table table-striped table-condensed" >
 	<tr>
 		<td><fmt:message key="admin.statistics.totalUsers" /></td>
-		<td>${groupStatisticsDTO.totalUsers}</td>
+		<td width="150px">${groupStatisticsDTO.totalUsers}</td>
 	</tr>
 	<tr>
 		<td><fmt:message key="admin.statistics.lessons" /></td>
@@ -26,15 +26,15 @@
 </table>
 
 <c:if test="${not empty  groupStatisticsDTO.subGroups}">
-	<div style="margin-left: 50px"><c:forEach
+	<div style="margin-left: 4%"><c:forEach
 		var="subGroupStatisticsDTO" items="${groupStatisticsDTO.subGroups}">
 
-		<h3>${subGroupStatisticsDTO.name}</h3>
+		<h4>${subGroupStatisticsDTO.name}</h4>
 
-		<table class="alternative-color">
+		<table class="table table-striped table-condensed" >
 			<tr>
 				<td><fmt:message key="admin.statistics.totalUsers" /></td>
-				<td>${subGroupStatisticsDTO.totalUsers}</td>
+				<td width="150px">${subGroupStatisticsDTO.totalUsers}</td>
 			</tr>
 			<tr>
 				<td><fmt:message key="admin.statistics.lessons" /></td>
Index: lams_admin/web/ldap.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/ldap.jsp,v
diff -u -r1.7 -r1.7.2.1
--- lams_admin/web/ldap.jsp	13 Nov 2009 03:13:57 -0000	1.7
+++ lams_admin/web/ldap.jsp	16 Jun 2016 03:10:20 -0000	1.7.2.1
@@ -11,80 +11,80 @@
 	}
 </script>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a></h4>
-<lams:help style="no-tabs" page="LDAP+Configuration"/>
-<h1><fmt:message key="sysadmin.ldap.configuration"/></h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<c:if test="${not empty config}">
-<html:form action="/config" method="post">
-	<html:hidden property="method" value="save"/>
-	<tiles:insert attribute="items" />
-	<p align="center">
-		<html:submit styleClass="button"><fmt:message key="admin.save" /></html:submit>
-		<html:reset styleClass="button"><fmt:message key="admin.reset" /></html:reset>
-		<html:cancel styleClass="button"><fmt:message key="admin.cancel" /></html:cancel>
-	</p>
-</html:form>
-</c:if>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		<div class="panel-title"><fmt:message key="sysadmin.ldap.configuration"/></div>
+	</div>
 
-<h3><fmt:message key="heading.ldap.synchronise"/></h3>
-<p>
-<fmt:message key="msg.ldap.synchronise.intro"/>
-</p>
-<p>
-<fmt:message key="msg.ldap.synchronise.warning"/>
-</p>
+	<div class="panel-body panel-default">
+		<c:if test="${not empty config}">
+		<html:form action="/config" method="post">
+			<html:hidden property="method" value="save"/>
+			<tiles:insert attribute="items" />
+			<div class="pull-right">
+				<html:reset styleClass="btn btn-default"><fmt:message key="admin.reset" /></html:reset>
+				<html:cancel styleClass="btn btn-default loffset5"><fmt:message key="admin.cancel" /></html:cancel>
+				<html:submit styleClass="btn btn-primary loffset5"><fmt:message key="admin.save" /></html:submit>
+			</div>
+		</html:form>
+		</c:if>
+	</div>
+</div>
 
-<c:if test="${not empty numLdapUsersMsg}">
-	<p><c:out value="${numLdapUsersMsg}"/></p>
-</c:if>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		<div class="panel-title"><fmt:message key="heading.ldap.synchronise"/></div>
+	</div>
 
-<p>
-	<input 
-		class="button" 
-		type="button" 
-		value="<fmt:message key="label.synchronise" />" 
-		onclick='startSync();'
-	/>
-</p>
-
-<p>&nbsp;</p>
-
-<c:if test="${not empty wait}">
-	<p><c:out value="${wait}"/></p>
-	<script language="javascript" type="text/javascript">
-		function refresh() {
-			document.location = 'ldap.do?action=waiting';
-		}
-		window.setInterval("refresh()",5000);
-	</script>
-</c:if>
-
-<c:if test="${not empty done}">
-	<h3><c:out value="${done}"/></h3>
-	<ul>
-		<c:if test="${not empty messages}">
-		<li>
-			<fmt:message key="msg.ldap.synchronise.errors"/>
+	<div class="panel-body panel-default">
+		<p><fmt:message key="msg.ldap.synchronise.intro"/></p>
+		<p><fmt:message key="msg.ldap.synchronise.warning"/></p>
+		
+		<c:if test="${not empty numLdapUsersMsg}">
+			<p><c:out value="${numLdapUsersMsg}"/></p>
+		</c:if>
+		
+		<c:if test="${not empty wait}">
+			<p><c:out value="${wait}"/></p>
+			<script language="javascript" type="text/javascript">
+				function refresh() {
+					document.location = 'ldap.do?action=waiting';
+				}
+				window.setInterval("refresh()",5000);
+			</script>
+		</c:if>
+		
+		<c:if test="${not empty done}">
+			<h4><c:out value="${done}"/></h4>
 			<ul>
-				<c:forEach items="${messages}" var="message">
-					<li><c:out value="${message}"/></li>
-				</c:forEach>
+				<c:if test="${not empty messages}">
+				<li>
+					<fmt:message key="msg.ldap.synchronise.errors"/>
+					<ul>
+						<c:forEach items="${messages}" var="message">
+							<li><c:out value="${message}"/></li>
+						</c:forEach>
+					</ul>
+				</li>
+				</c:if>
+				<c:if test="${not empty numSearchResults}">
+				<li><c:out value="${numSearchResults}"/></li>
+				</c:if>
+				<c:if test="${not empty numLdapUsersCreated}">
+				<li><c:out value="${numLdapUsersCreated}"/></li>
+				</c:if>
+				<c:if test="${not empty numLdapUsersUpdated}">
+				<li><c:out value="${numLdapUsersUpdated}"/></li>
+				</c:if>
+				<c:if test="${not empty numLdapUsersDisabled}">
+				<li><c:out value="${numLdapUsersDisabled}"/></li>
+				</c:if>
 			</ul>
-		</li>
 		</c:if>
-		<c:if test="${not empty numSearchResults}">
-		<li><c:out value="${numSearchResults}"/></li>
-		</c:if>
-		<c:if test="${not empty numLdapUsersCreated}">
-		<li><c:out value="${numLdapUsersCreated}"/></li>
-		</c:if>
-		<c:if test="${not empty numLdapUsersUpdated}">
-		<li><c:out value="${numLdapUsersUpdated}"/></li>
-		</c:if>
-		<c:if test="${not empty numLdapUsersDisabled}">
-		<li><c:out value="${numLdapUsersDisabled}"/></li>
-		</c:if>
-	</ul>
-</c:if>
-
+		
+		<input class="btn btn-primary pull-right" value="<fmt:message key="label.synchronise" />" onclick='startSync();'/>
+		
+	</div>
+</div>
Index: lams_admin/web/loginmaintain.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/loginmaintain.jsp,v
diff -u -r1.17.2.1 -r1.17.2.2
--- lams_admin/web/loginmaintain.jsp	8 Oct 2014 14:26:47 -0000	1.17.2.1
+++ lams_admin/web/loginmaintain.jsp	16 Jun 2016 03:10:20 -0000	1.17.2.2
@@ -1,14 +1,12 @@
 <%@ include file="/taglibs.jsp"%>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
-</h4>
-<h1><fmt:message key="sysadmin.maintain.loginpage"/></h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 <html:errors />
-<br />
+
 <html:form action="/loginsave.do?method=save" enctype="multipart/form-data" method="post">
 <p><fmt:message key="sysadmin.login.logo"/></p>
-<p><html:file property="logo" size="40" styleClass="button" /></p>
+<p><html:file property="logo" size="40" styleClass="form-control" /></p>
 <br />
 <c:set var="language"><lams:user property="localeLanguage"/></c:set>
 <p><fmt:message key="sysadmin.login.text"/></p>
@@ -17,12 +15,12 @@
 
 <c:set var="existingContent"><bean:write name='LoginMaintainForm' property='news' filter='false' /></c:set>
 
-<lams:CKEditor id="news" value="${existingContent}"	contentFolderID="../public" width="95%" height="600px"></lams:CKEditor>
+<lams:CKEditor id="news" value="${existingContent}"	contentFolderID="../public" height="600px"></lams:CKEditor>
 
 </div>
-<br />
-<p align="center">
-	<html:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel" /></html:cancel>
-	<html:submit styleId="saveButton" styleClass="button"><fmt:message key="admin.save" /></html:submit>
-</p>
+
+<div class="pull-right voffset5">
+	<html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel" /></html:cancel>
+	<html:submit styleId="saveButton" styleClass="btn btn-primary loffset5"><fmt:message key="admin.save" /></html:submit>
+</div>
 </html:form>
Index: lams_admin/web/register.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/register.jsp,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_admin/web/register.jsp	30 Sep 2014 13:11:18 -0000	1.14.2.2
+++ lams_admin/web/register.jsp	16 Jun 2016 03:10:20 -0000	1.14.2.3
@@ -31,33 +31,28 @@
 <html:form action="/register" method="post" styleId="RegisterForm">
 	<html:hidden property="method" value="register" />
 	
-	<h4 class="align-left">
-		<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
-	</h4>
-	<h1><fmt:message key="sysadmin.register.server" /></h1>
-	<br />
-	
+	<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+
 	<c:choose>
 		<c:when test="${not empty errorKey}">
-			<p class="warning">
+			<lams:Alert type="warn" id="errorKey" close="false">				
 				<fmt:message key="${errorKey}"/>
-			</p>
+			</lams:Alert>
 		</c:when>
-		<c:otherwise>
-			<c:if test="${not empty successKey}">
-				<p class="info">
-					<fmt:message key="${successKey}"/>
-				</p>
-			</c:if>
-		</c:otherwise>
+		<c:when test="${not empty successKey}">
+			<lams:Alert type="info" id="successKey" close="false">				
+				<fmt:message key="${successKey}"/>
+			</lams:Alert>
+		</c:when>
 	</c:choose>
 
-	<table class="alternative-color" width=100% cellspacing="0">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<div class="panel-title"><fmt:message key="admin.register.heading.title"/></div>
+		</div>
+		<table class="table table-striped table-condensed" >
 			<tr>
-				<th colspan="2"><fmt:message key="admin.register.heading.title"/></th>
-			</tr>
-			<tr>
-				<td>
+				<td width="40%">
 					<fmt:message key="admin.register.enableLamsCommunity"/>
 				</td>
 				<td>
@@ -69,22 +64,22 @@
 					<fmt:message key="admin.register.sitename"/>
 				</td>
 				<td>
-					<html:text property="siteName" size="40"/>
+					<html:text property="siteName" size="40" styleClass="form-control"/>
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="admin.register.orgname"/>
 				</td>
 				<td>
-					<html:text property="organisation" size="40" />
+					<html:text property="organisation" size="40"  styleClass="form-control" />
 				</td>
 			<tr>
 				<td>
 					<fmt:message key="admin.user.name"/>
 				</td>
 				<td>
-					<html:text property="name" size="40" />
+					<html:text property="name" size="40"  styleClass="form-control"/>
 					
 				</td>
 			</tr>
@@ -93,7 +88,7 @@
 					<fmt:message key="admin.user.email"/>
 				</td>
 				<td>
-					<html:text property="email" size="40" />
+					<html:text property="email" size="40"  styleClass="form-control"/>
 				</td>
 			</tr>
 			<tr>
@@ -102,7 +97,7 @@
 				</td>
 				<td>
 					
-					<html:select property="serverCountry">
+					<html:select property="serverCountry"  styleClass="form-control">
 						<html:option value="AF">Afghanistan</html:option>
 						<html:option value="AX">Aland Islands</html:option>
 						<html:option value="AL">Albania</html:option>
@@ -342,13 +337,16 @@
 					<html:checkbox property="publicDirectory" />
 				</td>
 			</tr>
+		</table>
+		</div>
+		
+		<div class="panel panel-default">
+		<div class="panel-heading">
+			<div class="panel-title"><fmt:message key="admin.register.server.config.title"/></div>
+		</div>
+		<table class="table table-striped table-condensed" >
 			<tr>
-				<th colspan="2">
-					<fmt:message key="admin.register.server.config.title"/>
-				</th>
-			</tr>
-			<tr>
-				<td>
+				<td width="40%">
 					<fmt:message key="admin.register.server.config.url"/>
 				</td>
 				<td>
@@ -387,13 +385,16 @@
 					${registerDTO.serverLanguageDate}
 				</td>
 			</tr>
+		</table>
+		</div>
+		
+		<div class="panel panel-default">
+		<div class="panel-heading">
+			<div class="panel-title"><fmt:message key="admin.register.server.stats.title"/></div>
+		</div>
+		<table class="table table-striped table-condensed" >
 			<tr>
-				<th colspan="2">
-					<fmt:message key="admin.register.server.stats.title"/>
-				</th>
-			</tr>
-			<tr>
-				<td>
+				<td width="40%">
 					<fmt:message key="admin.course"/>
 				</td>
 				<td>
@@ -466,10 +467,10 @@
 			</tr>
 	</table>
 	
-	<p align="center">
-		<input class="button" type="submit" value="<fmt:message key="admin.register" />"/>
-		<html:reset styleClass="button"><fmt:message key="admin.reset" /></html:reset>
-        <input class="button" type="button" value="<fmt:message key="admin.cancel" />" onClick="javascript:window.location.href='<lams:LAMSURL/>/admin/sysadminstart.do'"/>
-	</p>
+	<div class="pull-right voffset5">
+        <input class="btn btn-default" type="button" value="<fmt:message key="admin.cancel" />" onClick="javascript:window.location.href='<lams:LAMSURL/>/admin/sysadminstart.do'"/>
+		<html:reset styleClass="btn btn-default"><fmt:message key="admin.reset" /></html:reset>
+		<input class="btn btn-primary loffset5" type="submit" value="<fmt:message key="admin.register" />"/>
+	</div>
 </html:form>
 
Index: lams_admin/web/remove.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/remove.jsp,v
diff -u -r1.8 -r1.8.12.1
--- lams_admin/web/remove.jsp	14 Dec 2007 04:18:18 -0000	1.8
+++ lams_admin/web/remove.jsp	16 Jun 2016 03:10:20 -0000	1.8.12.1
@@ -12,38 +12,52 @@
 </logic:notEmpty>
 
 <logic:equal name="method" value="disable">
-<h1><fmt:message key="admin.user.disable"/></h1>
-<p>&nbsp;</p>
-<p>
-	<fmt:message key="msg.disable.user.1"/>&nbsp;&nbsp;
-	<fmt:message key="msg.disable.user.2"/>&nbsp;&nbsp;
-	<fmt:message key="msg.disable.user.3"/><br />
-	<fmt:message key="msg.disable.user.4"/>
-</p>
-<c:url var="disableaction" value="user.do">
-		<c:param name="method" value="disable" />
-		<c:param name="userId" value="${userId}" />
-		<c:param name="orgId" value="${orgId}" />
-	</c:url>
-<div style="float:right">
-<input class="button" type="button" value="Disable" onClick="javascript:document.location='<c:out value="${disableaction}"/>'" />
-<input class="button" type="button" value="Cancel" onClick="javascript:document.location='<c:out value="${cancel}"/>'" />
-</div>
+	<div class="panel panel-default" >
+		<div class="panel-heading">
+			<span class="panel-title">
+				<fmt:message key="admin.user.disable"/>
+			</span>
+		</div>
+		<div class="panel-body">     
+			<p>
+				<fmt:message key="msg.disable.user.1"/>&nbsp;&nbsp;
+				<fmt:message key="msg.disable.user.2"/>&nbsp;&nbsp;
+				<fmt:message key="msg.disable.user.3"/><br />
+				<fmt:message key="msg.disable.user.4"/>
+			</p>
+			<c:url var="disableaction" value="user.do">
+				<c:param name="method" value="disable" />
+				<c:param name="userId" value="${userId}" />
+				<c:param name="orgId" value="${orgId}" />
+			</c:url>
+			<div class="pull-right">
+				<input class="btn btn-primary" type="button" value="Disable" onClick="javascript:document.location='<c:out value="${disableaction}"/>'" />
+				<input class="btn btn-default" type="button" value="Cancel" onClick="javascript:document.location='<c:out value="${cancel}"/>'" />
+			</div>
+		</div>
+	</div>	
 </logic:equal>
 
 <logic:equal name="method" value="delete">
-<h2><fmt:message key="admin.user.delete"/></h2>
-<p>&nbsp;</p>
-<p><fmt:message key="msg.delete.user.1"/>&nbsp;&nbsp;<fmt:message key="msg.delete.user.2"/></p>
-<c:url var="deleteaction" value="user.do">
-		<c:param name="method" value="delete" />
-		<c:param name="userId" value="${userId}" />
-		<c:param name="orgId" value="${orgId}" />
-	</c:url>
-<div class="float-right">
-<input class="button" type="button" value="Delete" onClick="javascript:document.location='<c:out value="${deleteaction}"/>'" />
-<input class="button" type="button" value="Cancel" onClick="javascript:document.location='<c:out value="${cancel}"/>'" />
-</div>
+	<div class="panel panel-default" >
+		<div class="panel-heading">
+			<span class="panel-title">
+				<fmt:message key="admin.user.delete"/>
+			</span>
+		</div>
+		<div class="panel-body">     
+			<p><fmt:message key="msg.delete.user.1"/>&nbsp;&nbsp;<fmt:message key="msg.delete.user.2"/></p>
+			<c:url var="deleteaction" value="user.do">
+					<c:param name="method" value="delete" />
+					<c:param name="userId" value="${userId}" />
+					<c:param name="orgId" value="${orgId}" />
+				</c:url>
+			<div class="pull-right">
+				<input class="btn btn-default" type="button" value="Delete" onClick="javascript:document.location='<c:out value="${deleteaction}"/>'" />
+				<input class="btn btn-default" type="button" value="Cancel" onClick="javascript:document.location='<c:out value="${cancel}"/>'" />
+			</div>
+		</div>
+	</div>
 </logic:equal>
 </form>
 
Index: lams_admin/web/serverlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/serverlist.jsp,v
diff -u -r1.6.12.2 -r1.6.12.3
--- lams_admin/web/serverlist.jsp	6 Oct 2014 12:57:28 -0000	1.6.12.2
+++ lams_admin/web/serverlist.jsp	16 Jun 2016 03:10:20 -0000	1.6.12.3
@@ -1,10 +1,8 @@
 <%@ include file="/taglibs.jsp"%>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a></h4>
-<h1><fmt:message key="sysadmin.maintain.external.servers" /></h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<p class="align-right"><input class="button" name="addnewserver" type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='servermaintain.do?method=edit'" /></p>
-<table class=alternative-color width=100%>
+<table class="table table-striped">
 	<tr>
 		<th><fmt:message key="sysadmin.serverid" /></th>
 		<th><fmt:message key="sysadmin.serverkey" /></th>
@@ -50,4 +48,7 @@
 	</tr>
 	</c:forEach>
 </table>
-<p>${fn:length(servers)} <fmt:message key="sysadmin.integrated.servers" /></p>
+<p>${fn:length(servers)}&nbsp;<fmt:message key="sysadmin.integrated.servers" /></p>
+
+<input class="btn btn-default pull-right" name="addnewserver" type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='servermaintain.do?method=edit'" />
+
Index: lams_admin/web/servermaintain.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/servermaintain.jsp,v
diff -u -r1.11.2.4 -r1.11.2.5
--- lams_admin/web/servermaintain.jsp	15 Dec 2015 18:13:14 -0000	1.11.2.4
+++ lams_admin/web/servermaintain.jsp	16 Jun 2016 03:10:20 -0000	1.11.2.5
@@ -1,55 +1,44 @@
 <%@ include file="/taglibs.jsp"%>
-<style media="screen,projection" type="text/css">
-	table td {
-  		padding-bottom: 7px;
-	}
-</style>
-
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 
-<h4>
-	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :
-	<a href="serverlist.do"><fmt:message key="sysadmin.maintain.external.servers" /></a>
-</h4>
-<lams:help style="no-tabs" page="Integrations"/>
-<h1><fmt:message key="sysadmin.maintain.server.edit"/></h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 <html:errors/>
-<br />
+
 <html:form action="serversave.do" styleId="ext-server-form" method="post">
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<html:hidden property="sid" />
 	
-<table>
+<table class="table table-no-border">
 	<tr>
-		<td><fmt:message key="sysadmin.serverid" />:</td>
-		<td><html:text property="serverid" size="20"/> *</td>
+		<td width="25%"><fmt:message key="sysadmin.serverid" />&nbsp;*</td>
+		<td><html:text property="serverid" size="20" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.serverkey" />:</td>
-		<td><html:text property="serverkey" size="30"/> *</td>
+		<td><fmt:message key="sysadmin.serverkey" />&nbsp;*</td>
+		<td><html:text property="serverkey" size="30" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.servername" />:</td>
-		<td><html:text property="servername" size="30"/> *</td>
+		<td><fmt:message key="sysadmin.servername" />&nbsp;*</td>
+		<td><html:text property="servername" size="30" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td valign="top"><fmt:message key="sysadmin.serverdesc" />:</td>
-		<td><html:textarea property="serverdesc" cols="40" rows="3"/> </td>
+		<td valign="top"><fmt:message key="sysadmin.serverdesc" /></td>
+		<td><html:textarea property="serverdesc" cols="40" rows="3" styleClass="form-control"/> </td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.prefix" />:</td>
-		<td><html:text property="prefix" size="10"/> *</td>
+		<td><fmt:message key="sysadmin.prefix" />&nbsp;*</td>
+		<td><html:text property="prefix" size="10" styleClass="form-control"/></td>
 	</tr>
 	
 	<tr>
-		<td><fmt:message key="sysadmin.disabled" />:</td>
+		<td><fmt:message key="sysadmin.disabled" /></td>
 		<td><html:checkbox property="disabled" /></td>
 	</tr>
 	
 	<tr>
-		<td><fmt:message key="sysadmin.login.request.ttl.enable" />:</td>
+		<td><fmt:message key="sysadmin.login.request.ttl.enable" /></td>
 		<td>
 			<html:checkbox property="timeToLiveLoginRequestEnabled" styleId="ttl-login-request-enabled"/>
 			<!-- to overcome nasty DynaActionForm bug (http://www.coderanch.com/t/46408/Struts/DynaValidatorActionForm-checkboxes) -->
@@ -58,47 +47,50 @@
 	</tr>
 	
 	<tr id="ttl-login-request-wrap" <c:if test="${!formBean.map.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if>>
-		<td><fmt:message key="sysadmin.login.request.ttl" />:</td>
-		<td><html:text property="timeToLiveLoginRequest" size="10" styleId="ttl-login-request"/></td>
+		<td><fmt:message key="sysadmin.login.request.ttl" /></td>
+		<td><html:text property="timeToLiveLoginRequest" size="10" styleId="ttl-login-request" styleClass="form-control"/></td>
 	</tr>
 	
 	<logic:notEqual name="ServerOrgMapForm" property="orgId" value="-1">
 		<tr>
-			<td><fmt:message key="sysadmin.organisation" />:</td>
+			<td><fmt:message key="sysadmin.organisation" /></td>
 			<td>
-				<html:select property="orgId" >
+				<html:select property="orgId" styleClass="form-control">
 					<html:options collection="orgs" property="organisationId" labelProperty="name"/> 
 				</html:select> &nbsp; 
 			</td>
 		</tr>
 	</logic:notEqual>
 	<tr>
-		<td><fmt:message key="sysadmin.userinfoUrl" />:</td>
-		<td><html:text property="userinfoUrl" size="70"/> *</td>
+		<td><fmt:message key="sysadmin.userinfoUrl" />&nbsp;*</td>
+		<td><html:text property="userinfoUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.serverUrl" />:</td>
-		<td><html:text property="serverUrl" size="70"/></td>
+		<td><fmt:message key="sysadmin.serverUrl" /></td>
+		<td><html:text property="serverUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.timeoutUrl" />:</td>
-		<td><html:text property="timeoutUrl" size="70"/> *</td>
+		<td><fmt:message key="sysadmin.timeoutUrl" />&nbsp;*</td>
+		<td><html:text property="timeoutUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.lessonFinishUrl" />:</td>
-		<td><html:text property="lessonFinishUrl" size="70"/></td>
+		<td><fmt:message key="sysadmin.lessonFinishUrl" /></td>
+		<td><html:text property="lessonFinishUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 		<tr>
-		<td><fmt:message key="sysadmin.extGroupsUrl" />:</td>
-		<td><html:text property="extGroupsUrl" size="70"/></td>
+		<td><fmt:message key="sysadmin.extGroupsUrl" /></td>
+		<td><html:text property="extGroupsUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 </table>
-<div align="center">
-	<html:submit property="submitbutton" styleClass="button"><fmt:message key="admin.save" /></html:submit>
-	<html:reset styleClass="button cancel"><fmt:message key="admin.reset" /></html:reset>
-	<html:cancel styleClass="button cancel"><fmt:message key="admin.cancel" /></html:cancel>
+<div class="pull-right">
+	<html:reset styleClass="btn btn-default"><fmt:message key="admin.reset" /></html:reset>
+	<html:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel" /></html:cancel>
+	<html:submit property="submitbutton" styleClass="btn btn-primary loffset5"><fmt:message key="admin.save" /></html:submit>
 </div>
 </html:form>
+
+<a href="sysadminstart.do" class="btn btn-default pull-left"><fmt:message key="sysadmin.maintain" /></a>
+
 <script type="text/javascript" language="javascript">
 	function changeStatus(obj){
 		document.forms[0].orgId.disabled = obj.checked;
@@ -142,3 +134,5 @@
 		});
 	});
 </script>
+
+
Index: lams_admin/web/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/statistics.jsp,v
diff -u -r1.6 -r1.6.2.1
--- lams_admin/web/statistics.jsp	29 Sep 2012 13:58:15 -0000	1.6
+++ lams_admin/web/statistics.jsp	16 Jun 2016 03:10:20 -0000	1.6.2.1
@@ -20,84 +20,89 @@
 	}
 </script>
 
-<h4 class="align-left">
-		<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
-</h4>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<h1><fmt:message key="admin.statistics.title" /></h1>
-
-<h3><fmt:message key="admin.statistics.overall" /></h3>
-
-<table class="alternative-color">
-	<tr>
-		<td>
-			<fmt:message key="admin.statistics.totalUsers" />
-		</td>
-		<td>
-			${statisticsDTO.users}
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="admin.statistics.learningDesigns" />
-		</td>
-		<td>
-			${statisticsDTO.sequences}
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="admin.statistics.lessons" />
-		</td>
-		<td>
-			${statisticsDTO.lessons}
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="admin.statistics.activities" />
-		</td>
-		<td>
-			${statisticsDTO.activities}
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="admin.statistics.completedActivities" />
-		</td>
-		<td>
-			${statisticsDTO.completedActivities}
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="admin.statistics.groups" />
-		</td>
-		<td>
-			${statisticsDTO.groups}
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="admin.statistics.subGroups" />
-		</td>
-		<td>
-			${statisticsDTO.subGroups}
-		</td>
-	</tr>
-</table>
-
-<br />
-<h1><fmt:message key="admin.statistics.title.byGroup" /></h1>
-<br />
-<select onchange="javascript:loadGroupStats(this.options[this.selectedIndex].value)">
-	<option></option>
-	<c:forEach var="groupEntry" items="${groupMap}" >	
-		<option value="${groupEntry.value}">${groupEntry.key}</option>
-	</c:forEach>
-</select>
-<br />
-<div id="groupDiv">
-
+<div class="panel panel-default">
+	<div class="panel-heading">
+		<div class="panel-title"><fmt:message key="admin.statistics.overall" /></div>
+	</div>
+	<div class="panel-body">
+	<table class="table table-striped table-condensed" >
+		<tr>
+			<td>
+				<fmt:message key="admin.statistics.totalUsers" />
+			</td>
+			<td width="150px">
+				${statisticsDTO.users}
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="admin.statistics.learningDesigns" />
+			</td>
+			<td>
+				${statisticsDTO.sequences}
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="admin.statistics.lessons" />
+			</td>
+			<td>
+				${statisticsDTO.lessons}
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="admin.statistics.activities" />
+			</td>
+			<td>
+				${statisticsDTO.activities}
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="admin.statistics.completedActivities" />
+			</td>
+			<td>
+				${statisticsDTO.completedActivities}
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="admin.statistics.groups" />
+			</td>
+			<td>
+				${statisticsDTO.groups}
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="admin.statistics.subGroups" />
+			</td>
+			<td>
+				${statisticsDTO.subGroups}
+			</td>
+		</tr>
+	</table>
+	</div>
 </div>
 
+<div class="panel panel-default">
+	<div class="panel-heading">
+		<div class="panel-title"><fmt:message key="admin.statistics.title.byGroup" /></div>
+	</div>
+	
+	<div class="panel-body">
+		<select onchange="javascript:loadGroupStats(this.options[this.selectedIndex].value)" class="form-control">
+			<option></option>
+			<c:forEach var="groupEntry" items="${groupMap}" >	
+				<option value="${groupEntry.value}">${groupEntry.key}</option>
+			</c:forEach>
+		</select>
+		<br />
+		<div id="groupDiv">
+	
+		</div>
+	</div>
+</div>
Index: lams_admin/web/sysadmin.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/sysadmin.jsp,v
diff -u -r1.16 -r1.16.18.1
--- lams_admin/web/sysadmin.jsp	30 Oct 2006 01:40:32 -0000	1.16
+++ lams_admin/web/sysadmin.jsp	16 Jun 2016 03:10:20 -0000	1.16.18.1
@@ -1,14 +1,12 @@
 <%@ include file="/taglibs.jsp"%>
 
-<h1 class=no-tabs-below><fmt:message key="sysadmin.headline"/></h1>
-<br />
-
-<logic:iterate name="links" id="linkBean">
-	<p>
+<div class="list-group">
+	<logic:iterate name="links" id="linkBean">
+	<span class="list-group-item">
 		<a href="<bean:write name="linkBean" property="link"/>">
-			<fmt:message><bean:write name="linkBean" property="name"/></fmt:message>
-		</a>
-	</p>
-</logic:iterate>
+				<fmt:message><bean:write name="linkBean" property="name"/></fmt:message>
+			</a>
+	</span>
+	</logic:iterate>
+</div>
 
-
Index: lams_admin/web/template.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/template.jsp,v
diff -u -r1.21.2.3 -r1.21.2.4
--- lams_admin/web/template.jsp	9 Feb 2016 18:53:01 -0000	1.21.2.3
+++ lams_admin/web/template.jsp	16 Jun 2016 03:10:20 -0000	1.21.2.4
@@ -4,18 +4,37 @@
 <lams:html>
 <lams:head>
 	<c:set var="title" scope="session"><tiles:getAsString name="title"/></c:set>
-	<title><fmt:message key="${title}"/></title>
-	<lams:css style="learner"/>
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" type="text/css" media="screen">
+	<c:set var="title" scope="session"><fmt:message key="${title}"/></c:set>
+	<title>${title}</title>
+
+	<lams:css/>
+	<link rel="stylesheet" href="<lams:LAMSURL/>/admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-smoothness-theme.css" type="text/css" media="screen">
 	<script language="JavaScript" type="text/JavaScript" src="<lams:LAMSURL/>/includes/javascript/changeStyle.js"></script>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 </lams:head>
     
 <body class="stripes">
-<div id="page">
-	<div id="content">
-			<tiles:insert attribute="content" />
-	</div>
-</div>
+	<c:set var="subtitle" scope="session"><tiles:getAsString name="subtitle" ignore="true"/></c:set>	
+	<c:if test="${not empty subtitle}">
+		<c:set var="title" scope="session">${title}: <fmt:message key="${subtitle}"/></c:set>
+	</c:if>
+	
+	<c:set var="help"><tiles:getAsString name='help'  ignore="true"/></c:set>
+	<c:choose>
+		<c:when test="${not empty help}">
+			<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
+			<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+				<tiles:insert attribute="content" />
+			</lams:Page>
+		</c:when>
+		<c:otherwise>
+			<lams:Page type="admin" title="${title}" >
+				<tiles:insert attribute="content" />
+			</lams:Page>
+		</c:otherwise>
+	</c:choose>
+
+
 </body>
 </lams:html>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/templatehelp.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/themeManagement.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/themeManagement.jsp,v
diff -u -r1.3.4.1 -r1.3.4.2
--- lams_admin/web/themeManagement.jsp	16 Mar 2016 12:12:40 -0000	1.3.4.1
+++ lams_admin/web/themeManagement.jsp	16 Jun 2016 03:10:20 -0000	1.3.4.2
@@ -2,7 +2,7 @@
 
 
 <script type="text/javascript">
-	function editTheme(name, description, imageDirectory, id, currentDefaultTheme, type) {
+	function editTheme(name, description, imageDirectory, id, currentDefaultTheme) {
 		document.getElementById("name").value = name;
 		document.getElementById("description").value = description;
 		document.getElementById("imageDirectory").value = imageDirectory;
@@ -13,8 +13,6 @@
 		if(currentDefaultTheme == "true") {
 			document.getElementById("currentDefaultTheme").checked = true;
 		}
-		document.getElementById("type").options[type -1].selected = true;
-		
 		document.getElementById("cancelEdit").style.display="block";
 		document.getElementById("normalSave").style.display="none";
 	}
@@ -27,15 +25,13 @@
 		document.getElementById("currentDefaultTheme").checked = false;
 		document.getElementById("cancelEdit").style.display="none";
 		document.getElementById("normalSave").style.display="block";
-		document.getElementById("type").options[0].selected = true;
 	}
 
-	function removeTheme(id, name, type) {
+	function removeTheme(id, name) {
 		var answer = confirm("<fmt:message key="admin.themes.deleteConfirm" />")
 		if (answer) {
 			document.getElementById("name").value = name;
 			document.getElementById("id").value = id;
-			document.getElementById("type").options[type -1].selected = true;
 			document.getElementById("method").value = "removeTheme";
 			submitForm();
 		}
@@ -60,7 +56,6 @@
 				alert("<fmt:message key="admin.themes.nameAlreadyExists" />");
 				return;
 			}
-
 		</c:forEach>
 		submitForm();
 	}
@@ -70,14 +65,10 @@
 	}
 </script>
 
-<h4 class="align-left">
-		<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
-</h4>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<h1><fmt:message key="admin.themes.title" /></h1>
 
-
-<table class="alternative-color">
+<table class="table table-striped table-condensed" >
 	<tr>
 		<th>
 			<fmt:message key="admin.themes.theme" />
@@ -92,7 +83,6 @@
 			<fmt:message key="admin.themes.defaultTheme" />
 		</th>
 		<th>
-			<fmt:message key="admin.themes.type" />
 		</th>
 		<th>
 		</th>
@@ -110,24 +100,24 @@
 			</td>
 			<td align="center">
 				<c:if test="${theme.currentDefaultTheme}">
-					<img src="<lams:LAMSURL/>/images/tick.png" >
+					<i class="fa fa-check"></i>
 				</c:if>
 			</td>
 			<td align="center">
 
 				<c:choose>
 					<c:when test="${not theme.notEditable}">
-						<img src="<lams:LAMSURL/>/images/edit.gif" 
+						<i class="fa fa-pencil" 
 							title="<fmt:message key="admin.themes.edit" />"
-							onclick="editTheme('${theme.name}', '${theme.description}', '${theme.imageDirectory}', '${theme.themeId}', '${theme.currentDefaultTheme}', '${theme.type}')"
-						>
-						<img src="<lams:LAMSURL/>/images/cross.gif" 
+							onclick="editTheme('${theme.name}', '${theme.description}', '${theme.imageDirectory}', '${theme.themeId}', '${theme.currentDefaultTheme}')"
+						></i>
+						<i class="fa fa-times" 
 							title="<fmt:message key="admin.themes.remove" />"
-							onclick="removeTheme('${theme.themeId}', '${theme.name}', '${theme.type}')"
-						>
+							onclick="removeTheme('${theme.themeId}', '${theme.name}')"
+						></i>
 					</c:when>
 					<c:otherwise>
-						<a href="javascript:setAsDefault('${theme.name}')" class="button" title="<fmt:message key="admin.themes.makeThemeDefault"/>">
+						<a href="javascript:setAsDefault('${theme.name}')" class="btn btn-default btn-sm" title="<fmt:message key="admin.themes.makeThemeDefault"/>">
 							<fmt:message key="admin.themes.makeDefault" />
 						</a>
 					</c:otherwise>
@@ -137,15 +127,18 @@
 	</c:forEach>
 </table>
 
-<h3>
-	<fmt:message key="admin.themes.addNew" />
-</h3>
-<br />
-<html:form action="/themeManagement" method="post" styleId="themeForm">	
+<div class="panel panel-default">
+	<div class="panel-heading">
+		<div class="panel-title"><fmt:message key="admin.themes.addNew" /></div>
+	</div>
+	
+	<div class="panel-body">
+	<html:form action="/themeManagement" method="post" styleId="themeForm">	
 	<html:hidden property="method" styleId="method" value="addOrEditTheme"/>
 	<html:hidden property="id" styleId="id" />
 	
-	<table>
+	
+	<table class="table table-no-border" >
 		<tr>
 			<td>
 				* <fmt:message key="admin.themes.name" />:
@@ -180,14 +173,17 @@
 		</tr>
 	</table>
 	
-	<br />
-	
+	<div class="pull-right">
 	<div id="normalSave">
-		<a href="javascript:checkAndSubmit()" class="button"><fmt:message key="admin.save" /></a>
+		<a href="javascript:checkAndSubmit()" class="btn btn-default"><fmt:message key="admin.save" /></a>
 	</div>
 	<div id="cancelEdit" style="display:none;">
-		<a href="javascript:submitForm()" class="button"><fmt:message key="admin.save" /></a> &nbsp;
-		<a href="javascript:cancelEdit()" class="button"><fmt:message key="admin.cancel" /></a>
+		<a href="javascript:cancelEdit()" class="btn btn-default"><fmt:message key="admin.cancel" /></a>
+		<a href="javascript:submitForm()" class="btn btn-default loffset5"><fmt:message key="admin.save" /></a>
 	</div>
-</html:form>
+	</div>
+	</html:form>
+	
+</div>
+</div>
 
Index: lams_admin/web/timezoneManagement.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/timezoneManagement.jsp,v
diff -u -r1.4 -r1.4.2.1
--- lams_admin/web/timezoneManagement.jsp	11 Dec 2012 11:29:41 -0000	1.4
+++ lams_admin/web/timezoneManagement.jsp	16 Jun 2016 03:10:20 -0000	1.4.2.1
@@ -4,24 +4,25 @@
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/thickbox.js"></script>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a></h4>
-<lams:help style="no-tabs" page="<%= Timezone.TIMEZONE_HELP_PAGE %>"/>
-<h1><fmt:message key="admin.timezone.available.timezones" /></h1>
-<fmt:message key="admin.timezone.select.timezones.you.want.users.choose" />
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+<fmt:message key="admin.timezone.select.timezones.you.want.users.choose" >
+<fmt:param>
 	<a class="thickbox" href="timezonemanagement.do?method=serverTimezoneManagement&KeepThis=true&TB_iframe=true&height=188&width=820" title="<fmt:message key='admin.servertimezone.server.timezone.management'/>">
 		${serverTimezone}
 	</a>
+</fmt:param>
+</fmt:message>
 
-<div align="center">
-	<c:if test="${not empty error}">
-		<p class='warning'><c:out value="${error}"/></p>
-	</c:if>
-</div>
+<c:if test="${not empty error}">
+	<lams:Alert type="danger" id="errorKey" close="false">				
+		<c:out value="${error}"/></p>
+	</lams:Alert>
+</c:if>
 
 <html:form action="/timezonemanagement" method="post">
 	<html:hidden property="method" value="save"/>
 	
-	<table class="alternative-color" width=100% cellspacing="0" style="padding-top:20px;">
+	<table class="table table-striped table-condensed">
 		<tr>
 			<th width="8%"><fmt:message key="admin.timezone.select" /></th>
 			<th width="22%"><fmt:message key="admin.timezone.time.zone.id" /></th>
@@ -55,8 +56,8 @@
 		
 	</table>
 	
-	<p align="right" class="small-space-top" style="margin-right: 10px">
-		<html:submit styleClass="button" style="margin-right: 15px"><fmt:message key="admin.save" /></html:submit>
-		<html:cancel styleClass="button"><fmt:message key="admin.cancel" /></html:cancel>
+	<div class="pull-right">
+		<html:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel" /></html:cancel>
+		<html:submit styleClass="btn btn-primary loffset5"><fmt:message key="admin.save" /></html:submit>
 	</p>
 </html:form>
\ No newline at end of file
Index: lams_admin/web/timezoneServerManagement.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/timezoneServerManagement.jsp,v
diff -u -r1.3.2.1 -r1.3.2.2
--- lams_admin/web/timezoneServerManagement.jsp	9 Feb 2016 18:53:01 -0000	1.3.2.1
+++ lams_admin/web/timezoneServerManagement.jsp	16 Jun 2016 03:10:20 -0000	1.3.2.2
@@ -7,7 +7,7 @@
 	<link rel="icon" href="<lams:LAMSURL/>favicon.ico" type="image/x-icon" />
 	<link rel="shortcut icon" href="<lams:LAMSURL/>favicon.ico" type="image/x-icon" />
 	
-	<lams:css style="main" />
+	<lams:css />
 	<style media="screen,projection" type="text/css">
 		html {
 			margin: 1;
@@ -32,12 +32,12 @@
 
 <body>
 
-<h1 style="padding: 20px 10px 0px;"><fmt:message key="admin.servertimezone.select.server.timezone" /></h1>
+<h4 class="loffset10"><fmt:message key="admin.servertimezone.select.server.timezone" /></h4>
 	<div style="padding: 13px 20px 20px;">
 
 		<html:select styleId="timeZoneId" property="timeZoneId" value="${serverTimezone}" style="margin-bottom:40px;">
 			<logic:iterate name="timezoneDtos" id="timezoneDto">
-				<html:option value="${timezoneDto.timeZoneId}">
+				<html:option value="${timezoneDto.timeZoneId}" styleClass="form-control">
 					${timezoneDto.timeZoneId}
 					&nbsp;&nbsp;-&nbsp;&nbsp;
 					<fmt:message key="admin.servertimezone.raw.offset" ><fmt:param><fmt:formatDate value="${timezoneDto.rawOffset}" pattern="H:mm" timeZone="GMT" /></fmt:param></fmt:message>
@@ -49,14 +49,14 @@
 			</logic:iterate>
 		</html:select>
 		
-		<lams:ImgButtonWrapper>
-			<a href="#" onclick="self.parent.tb_remove();" class="button right-buttons space-left">
+		<div class="pull-right">
+			<a href="#" onclick="self.parent.tb_remove();" class="btn btn-default btn-sm">
 				<fmt:message key="admin.cancel" /> 
 			</a>
-			<a href="#" onclick="changeServerTimezone();" class="button right-buttons">
+			<a href="#" onclick="changeServerTimezone();" class="btn btn-primary btn-sm">
 				<fmt:message key="admin.servertimezone.select" /> 
 			</a>
-		</lams:ImgButtonWrapper>
+		</div>
 	</div>
 	
 </body>
Index: lams_admin/web/user.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v
diff -u -r1.29.2.3 -r1.29.2.4
--- lams_admin/web/user.jsp	16 Mar 2016 12:12:40 -0000	1.29.2.3
+++ lams_admin/web/user.jsp	16 Jun 2016 03:10:20 -0000	1.29.2.4
@@ -3,230 +3,233 @@
 <html-el:form action="/usersave.do" method="post">
 <html-el:hidden property="userId" />
 <html-el:hidden property="orgId" />
-<h4 class="align-left">
-	<logic:notEmpty name="UserForm" property="orgId">
-		<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
-		<logic:notEmpty name="pOrgId">
-			: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />"><c:out value="${parentName}" /></a>
-			: <a href="usermanage.do?org=<bean:write name="UserForm" property="orgId" />"><c:out value="${orgName}" /></a>
-		</logic:notEmpty>
-		<logic:empty name="pOrgId">
-			: <a href="orgmanage.do?org=<bean:write name="UserForm" property="orgId" />"><c:out value="${orgName}" /></a>
-		</logic:empty>
-	</logic:notEmpty>
-	<logic:empty name="UserForm" property="orgId">
-		<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
-	</logic:empty>
-</h4>
 
-<h1>
-	<logic:notEmpty name="UserForm" property="userId">
-		<fmt:message key="admin.user.edit"/>
+<logic:notEmpty name="UserForm" property="orgId">
+	<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+	<logic:notEmpty name="pOrgId">
+		: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${parentName}" /></a>
+		: <a href="usermanage.do?org=<bean:write name="UserForm" property="orgId" />" class="btn btn-default"><c:out value="${orgName}" /></a>
 	</logic:notEmpty>
-	<logic:empty name="UserForm" property="userId">
-		<fmt:message key="admin.user.create"/>
+	<logic:empty name="pOrgId">
+		: <a href="orgmanage.do?org=<bean:write name="UserForm" property="orgId" />" class="btn btn-default"><c:out value="${orgName}" /></a>
 	</logic:empty>
-</h1>
+</logic:notEmpty>
 
-<div align="center"><html-el:errors/></div>
+<logic:empty name="UserForm" property="orgId">
+	<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+</logic:empty>
 
-<table>
-	<tr>
-		<td>
-			<table>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.login"/> *:</td>
-					<td><html-el:text property="login" size="50" maxlength="255" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.password"/> *:</td>
-					<td><html-el:password property="password" size="50" maxlength="50" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.password.confirm"/> *:</td>
-					<td><html-el:password property="password2" size="50" maxlength="50" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.authentication.method"/>:</td>
-					<td>
-						<html-el:select property="authenticationMethodId">
-							<c:forEach items="${authenticationMethods}" var="method">
-								<html-el:option value="${method.authenticationMethodId}">
-									<c:out value="${method.authenticationMethodName}" />
-								</html-el:option>
-							</c:forEach>	
-						</html-el:select>
-					</td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.title"/>:</td>
-					<td><html-el:text property="title" size="32" maxlength="32" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.first_name"/> *:</td>
-					<td><html-el:text property="firstName" size="50" maxlength="128" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.last_name"/> *:</td>
-					<td><html-el:text property="lastName" size="50" maxlength="128" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.email"/> *:</td>
-					<td><html-el:text property="email" size="50" maxlength="128" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.address_line_1"/>:</td>
-					<td><html-el:text property="addressLine1" size="50" maxlength="64" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.address_line_2"/>:</td>
-					<td><html-el:text property="addressLine2" size="50" maxlength="64" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.address_line_3"/>:</td>
-					<td><html-el:text property="addressLine3" size="50" maxlength="64" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.city"/>:</td>
-					<td><html-el:text property="city" size="50" maxlength="64" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.postcode"/>:</td>
-					<td><html-el:text property="postcode" size="10" maxlength="10" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.state"/>:</td>
-					<td><html-el:text property="state" size="50" maxlength="64" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.country"/>:</td>
-					<td><html-el:text property="country" size="50" maxlength="64" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.day_phone"/>:</td>
-					<td><html-el:text property="dayPhone" size="50" maxlength="64" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.evening_phone"/>:</td>
-					<td><html-el:text property="eveningPhone" size="50" maxlength="64" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.mobile_phone"/>:</td>
-					<td><html-el:text property="mobilePhone" size="50" maxlength="64" /></td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.fax"/>:</td>
-					<td><html-el:text property="fax" size="50" maxlength="64" /></td>
-				</tr>					
-				
-				<tr>
-					<td class="align-right"><fmt:message key="admin.organisation.locale"/>:</td>
-					<td>
-						<html-el:select property="localeId">
-							<c:forEach items="${locales}" var="locale">
-								<html-el:option value="${locale.localeId}">
-									<c:out value="${locale.description}" />
-								</html-el:option>
-							</c:forEach>	
-						</html-el:select>
-					</td>
-				</tr>
-				
-				<tr>
-					<td class="align-right"><fmt:message key="admin.user.time.zone"/>:</td>
-					<td>
-						<html:select property="timeZone" style="width:328px;">
-							<c:forEach items="${timezoneDtos}" var="timezoneDto">
-								<html:option value="${timezoneDto.timeZoneId}">
-									${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
-								</html:option>
-							</c:forEach>	
-						</html:select>
-					</td>
-				</tr>				
-				
-				<tr>
-					<td class="align-right"><fmt:message key="label.theme"/>:</td>
-					<td>
-					<html:select property="userTheme">
-						<c:forEach items="${themes}" var="theme">	
-							<html:option value="${theme.themeId}">${theme.name}</html:option>
-						</c:forEach>
+<html-el:errors/>
+
+<div class="panel panel-default voffset5" >
+	<div class="panel-heading">
+		<span class="panel-title">
+			<logic:notEmpty name="UserForm" property="userId">
+				<fmt:message key="admin.user.edit"/>
+			</logic:notEmpty>
+			<logic:empty name="UserForm" property="userId">
+				<fmt:message key="admin.user.create"/>
+			</logic:empty>
+		</span>
+	</div>
+
+	<div class="panel-body">     
+		<table class="table table-condensed table-no-border">
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.login"/> *:</td>
+				<td><html-el:text property="login" size="50" maxlength="255" styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.password"/> *:</td>
+				<td><html-el:password property="password" size="50" maxlength="50"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.password.confirm"/> *:</td>
+				<td><html-el:password property="password2" size="50" maxlength="50"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.authentication.method"/>:</td>
+				<td>
+					<html-el:select property="authenticationMethodId"  styleClass="form-control">
+						<c:forEach items="${authenticationMethods}" var="method">
+							<html-el:option value="${method.authenticationMethodId}">
+								<c:out value="${method.authenticationMethodName}" />
+							</html-el:option>
+						</c:forEach>	
+					</html-el:select>
+				</td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.title"/>:</td>
+				<td><html-el:text property="title" size="32" maxlength="32"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.first_name"/> *:</td>
+				<td><html-el:text property="firstName" size="50" maxlength="128"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.last_name"/> *:</td>
+				<td><html-el:text property="lastName" size="50" maxlength="128"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.email"/> *:</td>
+				<td><html-el:text property="email" size="50" maxlength="128"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.address_line_1"/>:</td>
+				<td><html-el:text property="addressLine1" size="50" maxlength="64"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.address_line_2"/>:</td>
+				<td><html-el:text property="addressLine2" size="50" maxlength="64"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.address_line_3"/>:</td>
+				<td><html-el:text property="addressLine3" size="50" maxlength="64"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.city"/>:</td>
+				<td><html-el:text property="city" size="50" maxlength="64"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.postcode"/>:</td>
+				<td><html-el:text property="postcode" size="10" maxlength="10" styleClass="form-control" /></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.state"/>:</td>
+				<td><html-el:text property="state" size="50" maxlength="64"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.country"/>:</td>
+				<td><html-el:text property="country" size="50" maxlength="64"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.day_phone"/>:</td>
+				<td><html-el:text property="dayPhone" size="50" maxlength="64"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.evening_phone"/>:</td>
+				<td><html-el:text property="eveningPhone" size="50" maxlength="64"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.mobile_phone"/>:</td>
+				<td><html-el:text property="mobilePhone" size="50" maxlength="64"  styleClass="form-control"/></td>
+			</tr>
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.fax"/>:</td>
+				<td><html-el:text property="fax" size="50" maxlength="64"  styleClass="form-control"/></td>
+			</tr>					
+			
+			<tr>
+				<td class="align-right"><fmt:message key="admin.organisation.locale"/>:</td>
+				<td>
+					<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}" />
+							</html-el:option>
+						</c:forEach>	
+					</html-el:select>
+				</td>
+			</tr>
+			
+			<tr>
+				<td class="align-right"><fmt:message key="admin.user.time.zone"/>:</td>
+				<td>
+					<html:select property="timeZone"  styleClass="form-control">
+						<c:forEach items="${timezoneDtos}" var="timezoneDto">
+							<html:option value="${timezoneDto.timeZoneId}">
+								${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
+							</html:option>
+						</c:forEach>	
 					</html:select>
-					</td>
-				</tr>
-				<tr>
-					<td colspan=2 class="align-right">
-						<html-el:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
-						<html-el:submit styleId="saveButton" styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
-					</td>
-				</tr>
-			</table>
-			</td>
+				</td>
+			</tr>				
+			
+			<tr>
+				<td class="align-right"><fmt:message key="label.theme"/>:</td>
+				<td>
+				<html:select property="userTheme" styleClass="form-control">
+					<c:forEach items="${themes}" var="theme">	
+						<html:option value="${theme.themeId}">${theme.name}</html:option>
+					</c:forEach>
+				</html:select>
+				</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>
+		
+	</div>
+	</div>
+	
+	
+	<c:if test="${not empty globalRoles || not empty userOrgRoles}">
+	
+		<div class="panel panel-default voffset5" >
+		<div class="panel-heading">
+			<span class="panel-title">
+				<fmt:message key="admin.organisation"/>
+			</span>
+		</div>
 
-			<td>
-				<table>
-				
-				<c:if test="${not empty globalRoles}">
-					<tr><td>
-						<table class="alternative-color" cellspacing="0">
-							<tr>
-								<th><fmt:message key="label.global.roles"/>:</th>
-							</tr>
-							<tr>
-								<td>
-									<small>
-									<c:forEach var="role" items="${globalRoles.roles}">
-										<fmt:message>role.<lams:role role="${role}" /></fmt:message>&nbsp;
-									</c:forEach>
-									</small>
-								</td>
-							</tr>
-						</table>
-					</td></tr>
-				</c:if>
+		<table class="table table-no-border">
+		
+		<c:if test="${not empty globalRoles}">
+			<tr><td>
+				<table class="table table-striped table-condensed">
+					<tr>
+						<th><fmt:message key="label.global.roles"/>:</th>
+					</tr>
+					<tr>
+						<td>
+							<c:forEach var="role" items="${globalRoles.roles}">
+								<fmt:message>role.<lams:role role="${role}" /></fmt:message>&nbsp;
+							</c:forEach>
+						</td>
+					</tr>
+				</table>
+			</td></tr>
+		</c:if>
 
-				<c:if test="${not empty userOrgRoles}">
-					<tr><td>
-						<table id="tableRoles" class="alternative-color" cellspacing="0">
-							<tr>
-								<th><fmt:message key="label.member.of"/>:</th>
-								<th><fmt:message key="label.with.roles"/>:</th>
-							</tr>
-							<c:forEach var="userOrgRole" items="${userOrgRoles}">
+		<c:if test="${not empty userOrgRoles}">
+			<tr><td>
+				<table id="tableRoles" class="table table-striped table-condensed">
+					<tr>
+						<th><fmt:message key="label.member.of"/>:</th>
+						<th><fmt:message key="label.with.roles"/>:</th>
+					</tr>
+					<c:forEach var="userOrgRole" items="${userOrgRoles}">
+						<tr>
+							<td><c:out value="${userOrgRole.orgName}"/></td>
+							<td>
+								<c:forEach var="role" items="${userOrgRole.roles}">
+									<fmt:message>role.<lams:role role="${role}" /></fmt:message>&nbsp;
+								</c:forEach>
+							</td>
+						</tr>
+						<c:if test="${not empty userOrgRole.childDTOs}">
+							<c:forEach var="child" items="${userOrgRole.childDTOs}">
 								<tr>
-									<td><c:out value="${userOrgRole.orgName}"/></td>
+									<td><i class="fa fa-square"></i>&nbsp;<c:out value="${child.orgName}"/></td>
 									<td>
-										<small>
-										<c:forEach var="role" items="${userOrgRole.roles}">
+										<c:forEach var="role" items="${child.roles}">
 											<fmt:message>role.<lams:role role="${role}" /></fmt:message>&nbsp;
 										</c:forEach>
-										</small>
 									</td>
 								</tr>
-								<c:if test="${not empty userOrgRole.childDTOs}">
-									<c:forEach var="child" items="${userOrgRole.childDTOs}">
-										<tr>
-											<td>-- <c:out value="${child.orgName}"/></td>
-											<td>
-												<small>
-												<c:forEach var="role" items="${child.roles}">
-													<fmt:message>role.<lams:role role="${role}" /></fmt:message>&nbsp;
-												</c:forEach>
-												</small>
-											</td>
-										</tr>
-									</c:forEach>
-								</c:if>
 							</c:forEach>
-						</table>
-					</td></tr>
-				</c:if>
-				
+						</c:if>
+					</c:forEach>
 				</table>
-			</td>
-	</tr>
+			</td></tr>
+		</c:if>
+		
+		</table>
+	</div>
+	</c:if>
 
-</table>
-
 </html-el:form>
Index: lams_admin/web/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/userlist.jsp,v
diff -u -r1.33.2.2 -r1.33.2.3
--- lams_admin/web/userlist.jsp	8 Oct 2014 13:07:08 -0000	1.33.2.2
+++ lams_admin/web/userlist.jsp	16 Jun 2016 03:10:20 -0000	1.33.2.3
@@ -1,165 +1,181 @@
 <%@ include file="/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL /></c:set>
 
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pack.js"></script>
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pager.js"></script>
+<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
+<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
+
+<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
+<script src="${lams}includes/javascript/jquery.tablesorter.js" type="text/javascript"></script>
+<script src="${lams}includes/javascript/jquery.tablesorter-widgets.js" type="text/javascript"></script>
+<script src="${lams}includes/javascript/jquery.tablesorter-pager.js" type="text/javascript"></script>
+
 <script>
-	<!--
-	jQuery(document).ready(function() {
-		jQuery("table.tablesorter-admin").tablesorter({widthFixed:true, headers:{4:{sorter:false}}});
+	$(document).ready(function() {
+		
+		$(".tablesorter").tablesorter({
+			widthFixed:true,
+			theme: 'bootstrap',
+			headerTemplate : '{content} {icon}',
+			widgets: ["uitheme"],
+			headers: {4:{sorter:false}}
+		});
+		
 		//sort table only in case there is a data inside (it's a tablesorter bug)
-		if (jQuery("table.tablesorter-admin tbody tr").length > 0) {
-			jQuery("table.tablesorter-admin").tablesorterPager({container: jQuery("#pager")});
-			$("table.tablesorter-admin").trigger("sorton", [[[0, 0]]]);
+		if ($(".tablesorter tbody tr").length > 0) {
+			$(".tablesorter").tablesorterPager({
+				container: jQuery(".ts-pager"),
+	            output: '{startRow} to {endRow} ({totalRows})'
+			});
+			$(".tablesorter").trigger("sorton", [[[0, 0]]]);
 		}
 	});
 	//-->
 </script>
 
-<style>
-table.infoDisplay {
-	margin-left:5px; padding-top:10px; width:60%;
-}
-p {
-	margin-left:5px;
-}
-.floatRight {
-	float:right;
-}
-</style>
-
-<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="orgType" value="2">
-		: <a href="orgmanage.do?org=<bean:write name="UserManageForm" property="orgId" />"><bean:write name="UserManageForm" property="orgName"/></a>
+		: <a href="orgmanage.do?org=<bean:write name="UserManageForm" property="orgId" />" class="btn btn-default"><bean:write name="UserManageForm" property="orgName"/></a>
 	</logic:equal>
 	<logic:equal name="orgType" value="3">
-		: <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
-		: <a href="orgmanage.do?org=<bean:write name="UserManageForm" property="orgId" />"><bean:write name="UserManageForm" property="orgName"/></a>
+		: <a href="orgmanage.do?org=<bean:write name="pOrgId" />" class="btn btn-default"><bean:write name="pOrgName"/></a>
+		: <a href="orgmanage.do?org=<bean:write name="UserManageForm" property="orgId" />" class="btn btn-default"><bean:write name="UserManageForm" property="orgName"/></a>
 	</logic:equal>
-</h4>
+</p>
 
-<h1>
-	<logic:equal name="orgType" value="1">
-		<fmt:message key="admin.global.roles.manage" />
-	</logic:equal>
+<div class="panel panel-default voffset5" >
+	<div class="panel-heading">
+		<span class="panel-title">
+			<logic:equal name="orgType" value="1">
+				<fmt:message key="admin.global.roles.manage" />
+			</logic:equal>
+			<logic:notEqual name="orgType" value="1">
+				<c:out value="${heading}" />
+			</logic:notEqual>
+		</span>
+		<div class="pull-right btn-group btn-group-sm">
+			<input id="addRemoveUsers" class="btn btn-default" type="button" value="<fmt:message key="admin.user.add"/>" onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
+			<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
+				<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit&orgId=<bean:write name="UserManageForm" property="orgId"/>' />
+			</logic:equal>
+		</div>
+	</div>
+
 	<logic:notEqual name="orgType" value="1">
-		<c:out value="${heading}" />
+	<table class="table table-condensed table-striped">
+		<tr>
+			<td width="30%"><fmt:message key="label.learners"/>:</td>
+			<td><c:out value="${LEARNER}"/></td>
+		</tr>
+		<tr>
+			<td><fmt:message key="label.group.managers"/>:</td>
+			<td><c:out value="${GROUP_MANAGER}"/></td>
+		</tr>
+		<tr>
+			<td><fmt:message key="label.monitors"/>:</td>
+			<td><c:out value="${MONITOR}"/></td>
+		</tr>
+		<tr>
+			<td ><fmt:message key="label.group.admins"/>:</td>
+			<td><c:out value="${GROUP_ADMIN}"/></td>
+		</tr>
+		<tr>
+			<td><fmt:message key="label.authors"/>:</td>
+			<td><c:out value="${AUTHOR}"/></td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				<c:out value="${numUsers}"/>
+			</td>
+		</tr>
+	</table>
 	</logic:notEqual>
-</h1>
-
-<logic:notEqual name="orgType" value="1">
-<table cellspacing="7" class="infoDisplay">
-	<tr>
-		<td align="right"><fmt:message key="label.learners"/>:</td>
-		<td><c:out value="${LEARNER}"/></td>
-		<td align="right"><fmt:message key="label.group.managers"/>:</td>
-		<td width="10%"><c:out value="${GROUP_MANAGER}"/></td>
-	</tr>
-	<tr>
-		<td align="right"><fmt:message key="label.monitors"/>:</td>
-		<td><c:out value="${MONITOR}"/></td>
-		<td align="right"><fmt:message key="label.group.admins"/>:</td>
-		<td><c:out value="${GROUP_ADMIN}"/></td>
-	</tr>
-	<tr>
-		<td align="right"><fmt:message key="label.authors"/>:</td>
-		<td><c:out value="${AUTHOR}"/></td>
-		<td align="right"></td>
-		<td></td>
-	</tr>
-</table>
-</logic:notEqual>
-	
-<logic:equal name="orgType" value="1">
-<table cellspacing="7" class="infoDisplay">
-	<tr>
-		<td align="right"><fmt:message key="label.sysadmins"/>:</td>
-		<td><c:out value="${SYSADMIN}"/></td>
-	</tr>
-	<tr>
-		<td align="right"><fmt:message key="label.group.admins"/>:</td>
-		<td><c:out value="${GROUP_ADMIN}"/></td>
-	</tr>
-</table>
-</logic:equal>
-
-<form>
-	
-<p>
-	<input id="addRemoveUsers" class="button" type="button" value="<fmt:message key="admin.user.add"/>" onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
-</p>
-
-<div class="floatRight">
-	<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
-		<input class="button" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit&orgId=<bean:write name="UserManageForm" property="orgId"/>' />
+		
+	<logic:equal name="orgType" value="1">
+	<table class="table table-condensed table-striped">
+		<tr>
+			<td width="30%"><fmt:message key="label.sysadmins"/>:</td>
+			<td><c:out value="${SYSADMIN}"/></td>
+		</tr>
+		<tr>
+			<td width="30%"><fmt:message key="label.group.admins"/>:</td>
+			<td><c:out value="${GROUP_ADMIN}"/></td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				<c:out value="${numUsers}"/>
+			</td>
+		</tr>
+	</table>
 	</logic:equal>
 </div>
-<p style="padding-top:10px;">
-	<c:out value="${numUsers}"/>
-</p>
 
-<table class="tablesorter-admin" width=100% cellspacing="0" >
-<thead>
-<tr>
-	<th><fmt:message key="admin.user.login"/></th>
-	<th><fmt:message key="admin.user.first_name"/></th>
-	<th><fmt:message key="admin.user.last_name"/></th>
-	<th><fmt:message key="admin.user.roles"/></th>
-	<th><fmt:message key="admin.user.actions"/></th>
-</tr>
-</thead>
-<tbody>
-<logic:iterate id="userManageBean" name="UserManageForm" property="userManageBeans">
-	<tr>
-		<td>
-			<bean:write name="userManageBean" property="login" />
-		</td>
-		<td>
-			<bean:write name="userManageBean" property="firstName" />
-		</td>
-		<td>
-			<bean:write name="userManageBean" property="lastName" />
-		</td>
-		<td>
-		    <small>
-		    <logic:iterate id="role" name="userManageBean" property="roles">
-		        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message>&nbsp;
-		    </logic:iterate>
-		    </small>
-		</td>
-		<td>
-				<a href="userroles.do?userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.user.assign.roles"/></a>
-				&nbsp;
-				<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
-					<a href="user.do?method=edit&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.edit" /></a>
+<table class="tablesorter">
+	<thead>
+		<tr>
+			<th><fmt:message key="admin.user.login"/></th>
+			<th><fmt:message key="admin.user.first_name"/></th>
+			<th><fmt:message key="admin.user.last_name"/></th>
+			<th><fmt:message key="admin.user.roles"/></th>
+			<th><fmt:message key="admin.user.actions"/></th>
+		</tr>
+	</thead>
+	<tbody>
+	<logic:iterate id="userManageBean" name="UserManageForm" property="userManageBeans">
+		<tr>
+			<td>
+				<bean:write name="userManageBean" property="login" />
+			</td>
+			<td>
+				<bean:write name="userManageBean" property="firstName" />
+			</td>
+			<td>
+				<bean:write name="userManageBean" property="lastName" />
+			</td>
+			<td>
+			    <small>
+			    <logic:iterate id="role" name="userManageBean" property="roles">
+			        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message>&nbsp;
+			    </logic:iterate>
+			    </small>
+			</td>
+			<td>
+					<a href="userroles.do?userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.user.assign.roles"/></a>
 					&nbsp;
-				</logic:equal>
-				<logic:equal name="canDeleteUser" value="true">
-					<a href="user.do?method=remove&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.user.delete"/></a>
-				</logic:equal>
-				<br/>
-		</td>		
-	</tr>
-</logic:iterate>
-</tbody>
-</table>
-</form>
+					<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
+						<a href="user.do?method=edit&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.edit" /></a>
+						&nbsp;
+					</logic:equal>
+					<logic:equal name="canDeleteUser" value="true">
+						<a href="user.do?method=remove&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.user.delete"/></a>
+					</logic:equal>
+					<br/>
+			</td>		
+		</tr>
+	</logic:iterate>
+	</tbody>
+	<tfoot>
+		<tr>
+	    	<th colspan="5" class="ts-pager form-horizontal">
+	    	<form onsubmit="return false;">	    	
+		        <button type="button" class="btn btn-xs first"><i class="fa fa-step-backward"></i></button>
+		        <button type="button" class="btn btn-xs prev"><i class="fa fa-backward"></i></button>
+		        <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+		        <button type="button" class="btn btn-xs next"><i class="fa fa-forward"></i></button>
+		        <button type="button" class="btn btn-xs last"><i class="fa fa-step-forward"></i></button>
+		        <select class="pagesize" title="Select page size">
+		      		<option selected="selected" value="10">10</option>
+		      		<option value="20">20</option>
+		      		<option value="30">30</option>
+		      		<option value="40">40</option>
+		      		<option value="50">50</option>
+		      		<option value="100">100</option>
+		        </select>
+		    </form>
+	        </th>
+	    </tr>
+	</tfoot>
+	<tbody>
+	</tbody>
+</table> 
 
-<div id="pager" class="pager">
-	<form onsubmit="return false;">
-		<img src="<lams:LAMSURL/>/images/first.png" class="first"/>
-		<img src="<lams:LAMSURL/>/images/prev.png" class="prev">
-		<input type="text" class="pagedisplay"/>
-		<img src="<lams:LAMSURL/>/images/next.png" class="next">
-		<img src="<lams:LAMSURL/>/images/last.png" class="last">
-		<select class="pagesize">
-			<option selected="selected"  value="10">10&nbsp;&nbsp;</option>
-			<option value="20">20</option>
-			<option value="30">30</option>
-			<option value="40">40</option>
-			<option value="50">50</option>
-			<option value="100">100</option>
-		</select>
-	</form>
-</div>
Index: lams_admin/web/userorg.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/userorg.jsp,v
diff -u -r1.22.2.3 -r1.22.2.4
--- lams_admin/web/userorg.jsp	3 Mar 2016 14:25:03 -0000	1.22.2.3
+++ lams_admin/web/userorg.jsp	16 Jun 2016 03:10:20 -0000	1.22.2.4
@@ -13,10 +13,6 @@
 		height:250px; 
 		overflow-y:auto;
 	}
-	.floatRight {
-		float:right;
-		margin-top:5px;
-	}
 </style>
 
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
@@ -135,30 +131,32 @@
 	}
 </script>
 
-<h4 class="align-left">
-	<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:notEmpty name="pOrgId">
-        : <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
+        : <a href="orgmanage.do?org=<bean:write name="pOrgId" />" class="btn btn-default"><bean:write name="pOrgName"/></a>
     </logic:notEmpty>
     <logic:notEqual name="UserOrgForm" property="orgId" value="1">
-		: <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgForm" property="orgId" />">
+		: <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgForm" property="orgId" />" class="btn btn-default">
 		<bean:write name="UserOrgForm" property="orgName"/></a>
 	</logic:notEqual>
 	<logic:equal name="UserOrgForm" property="orgId" value="1">
-		: <a href="usermanage.do?org=<bean:write name="UserOrgForm" property="orgId" />"><fmt:message key="admin.global.roles.manage" /></a>
+		: <a href="usermanage.do?org=<bean:write name="UserOrgForm" property="orgId" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
 	</logic:equal>
-</h4>
+</p>
 
-<h1><fmt:message key="admin.user.add"/></h1>
+<h4><fmt:message key="admin.user.add"/></h4>
 
 <div align="center"><html-el:errors/></div>
 
 <logic:equal name="orgType" value="2">
-	<p><fmt:message key="msg.remove.from.subgroups"/></p>
+	<lams:Alert id="subgroup-warning" type="info" close="false">
+		<fmt:message key="msg.remove.from.subgroups"/>
+	</lams:Alert>
 </logic:equal>
 
 <h3><fmt:message key="heading.users"/></h3>
-<div class="floatRight"><span id="totalUsers"><c:out value="${numExistUsers}"/></span></div>
+<div class="pull-right"><span id="totalUsers"><c:out value="${numExistUsers}"/></span></div>
 <p>
 	 <fmt:message key="msg.click.remove.user"/>
 </p>
@@ -169,11 +167,11 @@
 
 <p>&nbsp;</p>
 
-<h3><fmt:message key="heading.potential.users"/></h3>
+<h4><fmt:message key="heading.potential.users"/></h4>
 <p>
 	<fmt:message key="msg.click.add.user"/>
 </p>
-<div class="floatRight"><span id="potentialUsers"><c:out value="${numPotentialUsers}"/></span></div>
+<div class="pull-right"><span id="potentialUsers"><c:out value="${numPotentialUsers}"/></span></div>
 <form onsubmit="return loadSearchResults(0);">
 	<p>
 		<fmt:message key="admin.search"/>: <input id="term" type="text"/> or <a onclick="loadSearchResults(1);"><fmt:message key="msg.show.all.potential.users"/></a>
@@ -186,12 +184,10 @@
 
 <p>&nbsp;</p>
 
-<div id="form" class="floatRight">
+<div id="form" class="pull-right">
 	<html:form action="userorgsave.do" method="post">
 		<html:hidden property="orgId" />
-		<html:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel"/></html:cancel>
-		<html:submit styleId="nextButton" styleClass="button" onclick="return populateForm();"><fmt:message key="label.next"/></html:submit>
+		<html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html:cancel>
+		<html:submit styleId="nextButton" styleClass="btn btn-primary loffset5" onclick="return populateForm();"><fmt:message key="label.next"/></html:submit>
 	</html:form>
 </div>
-
-<p>&nbsp;</p>
Index: lams_admin/web/userorgrole.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/userorgrole.jsp,v
diff -u -r1.13.12.1 -r1.13.12.2
--- lams_admin/web/userorgrole.jsp	8 Oct 2014 13:07:08 -0000	1.13.12.1
+++ lams_admin/web/userorgrole.jsp	16 Jun 2016 03:10:20 -0000	1.13.12.2
@@ -8,17 +8,16 @@
 }
 </script>
 
-<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:notEmpty name="pOrgId">
-        : <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
+        : <a href="orgmanage.do?org=<bean:write name="pOrgId" />" class="btn btn-default"><bean:write name="pOrgName"/></a>
     </logic:notEmpty>
     <logic:notEqual name="UserOrgRoleForm" property="orgId" value="1">
-		: <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgRoleForm" property="orgId" />">
+		: <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgRoleForm" property="orgId" />" class="btn btn-default">
 		<bean:write name="orgName"/></a>
 	</logic:notEqual>
 	<logic:equal name="UserOrgRoleForm" property="orgId" value="1">
-		: <a href="usermanage.do?org=<bean:write name="UserOrgRoleForm" property="orgId" />"><fmt:message key="admin.global.roles.manage" /></a>
+		: <a href="usermanage.do?org=<bean:write name="UserOrgRoleForm" property="orgId" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
 	</logic:equal>
 </h4>
 
@@ -29,14 +28,14 @@
 <html-el:form action="/userorgrolesave.do" method="post">
 <html-el:hidden property="orgId" />
 
-<table class="alternative-color" width=100% cellspacing="0">
+<table class="table table-condensed table-no-border">
 <tr>
 	<th><fmt:message key="admin.user.login"/></th>
 	<logic:iterate id="role" name="roles" indexId="roleIndex">
 		<th><input type="checkbox" 
 					name="<c:out value="${roleIndex}" />" 
 					onclick="toggleCheckboxes(<c:out value="${roleIndex}" />, this);" 
-					onkeyup="toggleCheckboxes(<c:out value="${roleIndex}" />, this);" />
+					onkeyup="toggleCheckboxes(<c:out value="${roleIndex}" />, this);" />&nbsp;
 			<fmt:message>role.<lams:role role="${role.name}" /></fmt:message></th>
 	</logic:iterate>
 </tr>
@@ -52,15 +51,13 @@
 		</logic:iterate>
 	</tr>
 </logic:iterate>
-<tr>
-	<td></td>
-	<td colspan=<c:out value="${numroles}" /> class="align-right">
-		<html-el:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
-		<html-el:submit styleId="saveButton"   styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
-	</td>
-</tr>
 </table>
 <c:if test="${parentFlag}">
 <p><fmt:message key="msg.user.add.to.parent.group" /></p>
 </c:if>
+
+<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>
Index: lams_admin/web/userrole.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/userrole.jsp,v
diff -u -r1.10 -r1.10.12.1
--- lams_admin/web/userrole.jsp	14 Dec 2007 04:18:18 -0000	1.10
+++ lams_admin/web/userrole.jsp	16 Jun 2016 03:10:20 -0000	1.10.12.1
@@ -3,51 +3,52 @@
 <html-el:form action="/userrolessave.do" method="post">
 <html-el:hidden property="userId" />
 <html-el:hidden property="orgId" />
-<h4 align="left">
-	<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:notEmpty name="pOrgId">
-		: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />"><c:out value="${parentName}" /></a>
-		: <a href="usermanage.do?org=<bean:write name="UserRolesForm" property="orgId" />"><c:out value="${orgName}" /></a>
+		: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${parentName}" /></a>
+		: <a href="usermanage.do?org=<bean:write name="UserRolesForm" property="orgId" />" class="btn btn-default"><c:out value="${orgName}" /></a>
 	</logic:notEmpty>
 	<logic:empty name="pOrgId">
 		<logic:notEqual name="UserRolesForm" property="orgId" value="1">
-			: <a href="orgmanage.do?org=<bean:write name="UserRolesForm" property="orgId" />"><c:out value="${orgName}" /></a>
+			: <a href="orgmanage.do?org=<bean:write name="UserRolesForm" property="orgId" />" class="btn btn-default"><c:out value="${orgName}" /></a>
 		</logic:notEqual>
 		<logic:equal name="UserRolesForm" property="orgId" value="1">
-			: <a href="usermanage.do?org=<bean:write name="UserRolesForm" property="orgId" />"><fmt:message key="admin.global.roles.manage" /></a>
+			: <a href="usermanage.do?org=<bean:write name="UserRolesForm" property="orgId" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
 		</logic:equal>
 	</logic:empty>
-</h5>
+</p>
 
-<h1><fmt:message key="admin.user.assign.roles"/></h1>
-
 <p><fmt:message key="msg.roles.mandatory"/></p>
 
 <div align="center"><html-el:errors/><html-el:messages id="roles" message="true"><bean:write name="roles" /></html-el:messages></div>
-<table>
-    <tr>
-		<td align="right"><fmt:message key="admin.user.login"/>:</td>
-		<td><bean:write name="login" /></td>
-	</tr>
-	<tr>
-		<td align="right"><fmt:message key="admin.user.name"/>:</td>
-		<td><bean:write name="fullName" /></td>
-	</tr>
-	<tr>
-	    <td align="right"><fmt:message key="admin.user.roles"/>:</td>
-	    <td>
-            <c:forEach items="${rolelist}" var="role">
-                <html-el:multibox name="UserRolesForm" property="roles" value="${role.roleId}"/>
-                <fmt:message>role.<lams:role role="${role.name}" /></fmt:message><br/>
-            </c:forEach>
-	    </td>
-	</tr>
-	<tr>
-		<td colspan=2 class="align-right">
-			<html-el:submit styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
-			<html-el:reset styleClass="button"><fmt:message key="admin.reset"/></html-el:reset>
-			<html-el:cancel styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
-		</td>
-	</tr>
-</table>
+
+<div class="container-fluid">
+<div class="row">
+  <div class="col-xs-2"><fmt:message key="admin.user.login"/>:</div>
+  <div class="col-xs-10"><bean:write name="login" /></div>
+</div>
+
+<div class="row">
+  <div class="col-xs-2"><fmt:message key="admin.user.name"/>:</div>
+  <div class="col-xs-10"><bean:write name="fullName" /></div>
+</div>
+
+<div class="row">
+  <div class="col-xs-2"><fmt:message key="admin.user.roles"/>:</div>
+  <div class="col-xs-10">            
+  	<c:forEach items="${rolelist}" var="role">
+    	<html-el:multibox name="UserRolesForm" property="roles" value="${role.roleId}"/>
+        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message><br/>
+    </c:forEach>
+  </div>
+</div>
+</div>
+
+<div class="pull-right">
+	<html-el:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html-el:cancel>
+	<html-el:reset styleClass="btn btn-default loffset5"><fmt:message key="admin.reset"/></html-el:reset>
+	<html-el:submit styleClass="btn btn-primary loffset5"><fmt:message key="admin.save"/></html-el:submit>
+</div>
+
 </html-el:form>
Index: lams_admin/web/usersearchlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/usersearchlist.jsp,v
diff -u -r1.27.2.4 -r1.27.2.5
--- lams_admin/web/usersearchlist.jsp	9 Feb 2016 11:28:41 -0000	1.27.2.4
+++ lams_admin/web/usersearchlist.jsp	16 Jun 2016 03:10:20 -0000	1.27.2.5
@@ -4,7 +4,7 @@
 <c:set var="useInternalSMTPServer"><lams:Configuration key="InternalSMTPServer"/></c:set>
 <c:set var="smtpServer"><lams:Configuration key="SMTPServer"/></c:set>
 
-<link type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css" rel="stylesheet">
+<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 <link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
 <style>
 	#tablesorter thead .disabled {
@@ -18,10 +18,10 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
 <script type="text/javascript">
   	$(document).ready(function(){
-	    
-  		var $table = $("#tablesorter").tablesorter({
-			theme: 'blue',
-			widgets: ["zebra", "filter"],
+  		var $table = $(".tablesorter").tablesorter({
+  			theme: 'bootstrap',
+  			headerTemplate : '{content} {icon}',
+			widgets: ["uitheme", "zebra", "filter"],
 		    widgetOptions : {
 		    	filter_external : '.search',
 		        // include column filters
@@ -36,11 +36,17 @@
             sortList: [[1]] 
 		});
 		
-		$("#tablesorter").each(function() {
+		$(".tablesorter").each(function() {
 			$(this).tablesorterPager({
 				savePages: false,
-				ajaxUrl : "<c:url value='/usersearch.do'/>?dispatch=getPagedUsers&page={page}&size={size}&{sortList:column}&{filterList:fcol}",
+                container: $(this).find(".ts-pager"),
+                output: '{startRow} to {endRow} ({totalRows})',
+                cssPageDisplay: '.pagedisplay',
+                cssPageSize: '.pagesize',
+                cssDisabled: 'disabled',
+                ajaxUrl : "<c:url value='/usersearch.do'/>?dispatch=getPagedUsers&page={page}&size={size}&{sortList:column}&{filterList:fcol}",
 				ajaxProcessing: function (data, table) {
+
 			    	if (data && data.hasOwnProperty('rows')) {
 			    		var rows = [],
 			            json = {};
@@ -100,20 +106,8 @@
 						return json;
 			            
 			    	}
-				},
-			    container: $(this).next("#pager"),
-			    output: '{startRow} to {endRow} ({totalRows})',// possible variables: {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows}
-			    // css class names of pager arrows
-			    cssNext: '.tablesorter-next', // next page arrow
-				cssPrev: '.tablesorter-prev', // previous page arrow
-				cssFirst: '.tablesorter-first', // go to first page arrow
-				cssLast: '.tablesorter-last', // go to last page arrow
-				cssGoto: '.gotoPage', // select dropdown to allow choosing a page
-				cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed
-				cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option
-				// class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page)
-				cssDisabled: 'disabled' // Note there is no period "." in front of this class name
-			})
+				}
+            })
 		});
 		
 		// make demo search buttons work
@@ -129,66 +123,34 @@
   	})
 </script>
 
-<h4>
-	<a href="orgmanage.do?org=1">
-		<fmt:message key="admin.course.manage" />
-	</a>
-</h4>
-<h1>
-	<fmt:message key="admin.user.find"/>
-</h1>
+<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default loffset5"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<p align="right">
-	<input class="button" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit' />
-</p>
+<p><input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit' />
 
-<p align="right">
-	<fmt:message key="admin.search" />:&nbsp;<input class="search" type="search" data-column="1">
+<span class="pull-right">
+	<fmt:message key="admin.search" />:&nbsp;<input class="search form-control form-control-inline" type="search" data-column="1">
+</span>
 </p>
 
-<table id="tablesorter">
-	<thead>
-		<tr>
-			<th width="3%" clas="{sorter: 'digit'}">
-				<fmt:message key="admin.user.userid"/>
-			</th>
-			<th width="15%" align="center">
-				<fmt:message key="admin.user.login"/>
-			</th>
-			<th width="15%" align="center">
-				<fmt:message key="admin.user.first_name"/>
-			</th>
-			<th width="15%" align="center">
-				<fmt:message key="admin.user.last_name"/>
-			</th>
-			<th width="15%" align="center">
-				<fmt:message key="admin.user.email"/>
-			</th>
-			<th width="20%" align="center">
-				<fmt:message key="admin.user.actions"/>
-			</th>
-		</tr>
-	</thead>
-			
-	<tbody>
-	</tbody>
-</table>
-		
-<!-- pager -->
-<div id="pager">
-	<form>
-		<img class="tablesorter-first"/>
-		<img class="tablesorter-prev"/>
-		<span class="pagedisplay"></span>
-		<img class="tablesorter-next"/>
-		<img class="tablesorter-last"/>
-		<select class="pagesize">
-			<option selected="selected" value="10">10</option>
-			<option value="20">20</option>
-			<option value="30">30</option>
-			<option value="40">40</option>
-			<option value="50">50</option>
-			<option value="100">100</option>
-		</select>
-	</form>
-</div>
+<lams:TSTable numColumns="6"> 
+	<th width="3%" clas="{sorter: 'digit'}">
+		<fmt:message key="admin.user.userid"/>
+	</th>
+	<th width="15%" align="center">
+		<fmt:message key="admin.user.login"/>
+	</th>
+	<th width="15%" align="center">
+		<fmt:message key="admin.user.first_name"/>
+	</th>
+	<th width="15%" align="center">
+		<fmt:message key="admin.user.last_name"/>
+	</th>
+	<th width="15%" align="center">
+		<fmt:message key="admin.user.email"/>
+	</th>
+	<th width="20%" align="center">
+		<fmt:message key="admin.user.actions"/>
+	</th>
+</lams:TSTable>			
+		
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_admin/web/WEB-INF/tiles-defs.xml	18 Oct 2014 21:17:03 -0000	1.3.2.2
+++ lams_admin/web/WEB-INF/tiles-defs.xml	16 Jun 2016 03:10:21 -0000	1.3.2.3
@@ -25,6 +25,7 @@
 
 	<definition name=".ldap" path="/template.jsp">
 		<put name="title" value="sysadmin.ldap.configuration"/>
+		<put name="help" value="LDAP+Configuration"/>
 		<put name="content" value=".ldap-items" />	
 	</definition>
 	
@@ -34,6 +35,7 @@
 	
 	<definition name=".importGroups" path="/template.jsp">
 		<put name="title" value="sysadmin.import.groups.title"/>
+		<put name="help" value="Import+Groups"/>
 		<put name="content" value="import/importGroups.jsp" />	
 	</definition>
 
@@ -58,7 +60,7 @@
 	</definition>
 
 	<definition name=".toolcontentlist" path="/template.jsp">
-		<put name="title" value="sysadmin.edit.default.tool.content"/>
+		<put name="title" value="sysadmin.tool.management"/>
 		<put name="content" value="toolcontent/toolcontentlist.jsp" />	
 	</definition>
 
@@ -69,11 +71,13 @@
 
 	<definition name=".importexcel" path="/template.jsp">
 		<put name="title" value="admin.user.management"/>
+		<put name="help" value="Import+Users"/>
 		<put name="content" value="import/importexcel.jsp" />	
 	</definition>
 
 	<definition name=".disabledlist" path="/template.jsp">
 		<put name="title" value="admin.user.management"/>
+		<put name="subtitle" value="admin.list.disabled.users"/>
 		<put name="content" value="disabledusers.jsp" />	
 	</definition>
 
@@ -84,16 +88,19 @@
 
 	<definition name=".usersearchlist" path="/template.jsp">
 		<put name="title" value="admin.user.management"/>
+		<put name="subtitle" value="admin.user.find"/>	
 		<put name="content" value="usersearchlist.jsp" />	
 	</definition>
 	
 	<definition name=".userorgrole" path="/template.jsp">
 		<put name="title" value="admin.user.management"/>
+		<put name="subtitle" value="admin.user.assign.roles"/>
 		<put name="content" value="userorgrole.jsp" />	
 	</definition>
 	
 	<definition name=".userorg" path="/template.jsp">
 		<put name="title" value="admin.user.management"/>
+		<put name="subtitle" value="admin.user.add"/> 
 		<put name="content" value="userorg.jsp" />	
 	</definition>
 	
@@ -104,16 +111,18 @@
 	
 	<definition name=".user" path="/template.jsp">
 		<put name="title" value="admin.user.entry"/>
+		<put name="subtitle" value="admin.user.edit"/>
 		<put name="content" value="user.jsp" />	
 	</definition>
 	
 	<definition name=".userrole" path="/template.jsp">
 		<put name="title" value="admin.user.entry"/>
+		<put name="subtitle" value="admin.user.assign.roles"/>
 		<put name="content" value="userrole.jsp" />	
 	</definition>
 	
 	<definition name=".orglist" path="/template.jsp">
-		<put name="title" value="admin.organisation.management"/>
+		<put name="title" value="admin.course.manage" />
 		<put name="content" value="organisation/list.jsp" />	
 	</definition>
 
@@ -163,11 +172,13 @@
 
 	<definition name=".servermaintain" path="/template.jsp">
 		<put name="title" value="sysadmin.maintain.server.edit"/>
+		<put name="help" value="Integrations"/>
 		<put name="content" value="servermaintain.jsp" />	
 	</definition>
 	
 	<definition name=".editconfig" path="/template.jsp">
 		<put name="title" value="sysadmin.config.settings.edit"/>
+		<put name="help" value="LAMS+Configuration"/>
 		<put name="content" value=".editconfig-items"/>
 	</definition>
 	
@@ -192,6 +203,7 @@
 	
 	<definition name=".timezoneManagement" path="/template.jsp">
 		<put name="title" value="admin.timezone.title"/>
+		<put name="help" value="LAMS+Configuration"/>
 		<put name="content" value="timezoneManagement.jsp"/>
 	</definition>	
 	
@@ -202,11 +214,13 @@
 	
 	<definition name=".addSignupPage" path="/template.jsp">
 		<put name="title" value="admin.signup.title" />
+		<put name="subtitle" value="admin.add.edit.signup.page" />
 		<put name="content" value="signupmanagement/add.jsp" />
 	</definition>
 
 	<definition name=".signupPageList" path="/template.jsp">
 		<put name="title" value="admin.signup.title" />
+		<put name="help" value="LAMS+Signup"/>
 		<put name="content" value="signupmanagement/list.jsp" />
 	</definition>
 	
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/AdvancedAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/Alert.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/Arrow.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.16 -r1.16.2.1
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	23 Jul 2013 17:53:07 -0000	1.16
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	16 Jun 2016 03:10:21 -0000	1.16.2.1
@@ -122,12 +122,12 @@
     	window.close();
     }  				
 </script>	
-<p id="saveCancelButtons" >
-		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+<div id="saveCancelButtons" >
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
-</p>
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+		</html:link>
+</div>
 <!-- end tab content -->
\ No newline at end of file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.1 -r1.14.2.2
--- lams_admin/web/WEB-INF/tags/CKEditor.tag	3 Sep 2014 13:19:42 -0000	1.14.2.1
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag	16 Jun 2016 03:10:20 -0000	1.14.2.2
@@ -10,7 +10,12 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
+<%@ attribute name="method" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty method}">
+	<c:set var="method" value="inline" />
+</c:if>
+
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -19,6 +24,10 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
+</c:if>
+
 <c:if test="${empty displayExpanded}">
 	<c:set var="displayExpanded" value="true" />
 </c:if>
@@ -33,10 +42,10 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
-	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
+	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
 </c:if>
 
@@ -59,10 +68,9 @@
 	    var editor = CKEDITOR.instances["${id}"];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.replace( "${id}", {
+		var instance = CKEDITOR.${method}( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
-				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/Comments.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/CommentsAuthor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/WEB-INF/tags/DefineLater.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/DefineLater.tag,v
diff -u -r1.3 -r1.3.18.1
--- lams_admin/web/WEB-INF/tags/DefineLater.tag	27 Oct 2006 02:39:32 -0000	1.3
+++ lams_admin/web/WEB-INF/tags/DefineLater.tag	16 Jun 2016 03:10:21 -0000	1.3.18.1
@@ -1,6 +1,6 @@
 
 <%
-	 /****************************************************************
+	/****************************************************************
 	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 	 * =============================================================
 	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -49,10 +49,18 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<p>
-	<fmt:message key="${defineLaterMessageKey}" />
-</p>
-<div align="right" class="space-bottom-top">
-	<a href="javascript:location.reload(true);" class="button"><fmt:message
-			key="${buttonTryAgainKey}" /> </a>
+<div class="row no-gutter">
+	<div
+		class="col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
+		<div class="alert alert-info">
+			<fmt:message key="${defineLaterMessageKey}" />
+		</div>
+	</div>
 </div>
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<a href="javascript:location.reload(true);"
+			class="btn btn-primary pull-right voffset5"><fmt:message
+				key="${buttonTryAgainKey}" /></a>
+	</div>
+</div>
\ No newline at end of file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/Page.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/Rating.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/RestrictedUsageAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/TSTable.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/WEB-INF/tags/Tab.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Tab.tag,v
diff -u -r1.6 -r1.6.12.1
--- lams_admin/web/WEB-INF/tags/Tab.tag	7 Mar 2008 00:32:02 -0000	1.6
+++ lams_admin/web/WEB-INF/tags/Tab.tag	16 Jun 2016 03:10:20 -0000	1.6.12.1
@@ -1,85 +1,89 @@
-<%
-	 /****************************************************************
-	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-	 * =============================================================
-	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
-	 * 
-	 * This program is free software; you can redistribute it and/or modify
-	 * it under the terms of the GNU General Public License version 2.0
-	 * as published by the Free Software Foundation.
-	 * 
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 * 
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-	 * USA
-	 * 
-	 * http://www.gnu.org/licenses/gpl.txt
-	 * ****************************************************************
-	 */
-
-	/**
-	 * Tab.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates a tab element.
-	 * Wiki: 
-	 */
-%>
-<%@ tag body-content="empty"%>
-<%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="value" required="false" rtexprvalue="true"%>
-<%@ attribute name="key" required="false" rtexprvalue="true"%>
-<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
-<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-
-<%-- Check if  bundle is set --%>
-<c:if test="${not empty bundle}">
-	<fmt:setBundle basename="${bundle}"/>
-</c:if>
-
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-
-<c:set var="tabTitle" value="${value}" />
-
-<%--
-	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-	this is handy if the page needs different logic on initialisation and user switching tabs
---%>
-
-<c:if test="${methodCall == null}">
-	<c:choose>
-		<c:when test="${dControl}">
-			<c:set var="methodCall" value="doSelectTab" />
-		</c:when>
-		<c:otherwise>
-			<c:set var="methodCall" value="selectTab" />
-		</c:otherwise>
-	</c:choose>
-</c:if>
-
-<c:if test="${key != null && value == null}">
-	<c:set var="tabTitle">
-		<fmt:message key="${key}" />
-	</c:set>
-</c:if>
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
-			onclick="${methodCall}(${id});return false;">
-			${tabTitle}
-		</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates a tab element within the Hybrid Tab Header.
+	 * Wiki: 
+	 */
+%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
+<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+	
+	-- 			onclick="${methodCall}(${id});return false;">
+	
+--%>
+
+<c:if test="${methodCall == null}">
+	<c:choose>
+		<c:when test="${dControl}">
+			<c:set var="methodCall" value="doSelectTab" />
+		</c:when>
+		<c:otherwise>
+			<c:set var="methodCall" value="selectTab" />
+		</c:otherwise>
+	</c:choose>
+</c:if>
+
+<c:if test="${key != null && value == null}">
+	<c:set var="tabTitle">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">class="active"</c:set>
+</c:if>
+	
+<c:set var="disabled" value=""/>
+<c:if test="${inactive}">
+	<c:set var="class">class="disabled"</c:set>
+</c:if>
+
+<li role="presentation" ${class}><a href="#t${id}" aria-controls="t${id}" role="tab" onclick="${methodCall}(${id});return false;">${tabTitle}</a></li>
Index: lams_admin/web/WEB-INF/tags/TabBody.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/TabBody.tag,v
diff -u -r1.3 -r1.3.14.1
--- lams_admin/web/WEB-INF/tags/TabBody.tag	9 May 2007 01:02:41 -0000	1.3
+++ lams_admin/web/WEB-INF/tags/TabBody.tag	16 Jun 2016 03:10:21 -0000	1.3.14.1
@@ -1,52 +1,44 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * TabBody.tag
- *	Author: Mitchell Seaton
- *	Description: Creates the body container for a tab element
- * Wiki: 
- */
-
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="page" required="false" rtexprvalue="true"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-
-<!-- begin tab content -->
-<div class="box" id="tabbody${id}">
-	<c:choose>
-		<c:when test="${page != null}">
-			<jsp:include page="${page}" />
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-
-</div>
-<!-- end tab content -->
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBody.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates the body container for a tab element
+ * Wiki: 
+ */
+
+%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="page" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">active</c:set>
+</c:if>
+
+<div role="tabpanel" class="tab-pane ${class}" id="t${id}"><jsp:include page="${page}"/></div>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/TabBodyArea.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/TabBodys.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/WEB-INF/tags/Tabs.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Tabs.tag,v
diff -u -r1.3 -r1.3.14.1
--- lams_admin/web/WEB-INF/tags/Tabs.tag	9 May 2007 01:02:41 -0000	1.3
+++ lams_admin/web/WEB-INF/tags/Tabs.tag	16 Jun 2016 03:10:20 -0000	1.3.14.1
@@ -1,69 +1,92 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tabs.tag
- *	Author: Mitchell Seaton
- *	Description: Create a tab list from a input collection or nested Tab tags.
- * Wiki: 
- */
-
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
-<%@ attribute name="control" required="false" rtexprvalue="true"%>
-<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<c:set var="dControl" value="false" scope="request" />
-<c:if test="${control}">
-	<c:set var="dControl" value="${control}" scope="request" />
-</c:if>
-
-<c:set var="dUseKey" value="false" scope="request" />
-<c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request" />
-</c:if>
-
-<!-- tab holder table -->
-<div id="nav">
-	<c:choose>
-		<c:when test="${collection != null}">
-			<c:set var="count" value="0" />
-			<c:forEach var="tab" begin="0" items="${collection}">
-				<c:set var="count" value="${count+1}" />
-				<c:choose>
-					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}" />
-					</c:when>
-					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}" />
-					</c:otherwise>
-				</c:choose>
-			</c:forEach>
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-</div>
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * Tabs.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a hybrid panel header that contains a nav bar that acts like tabs.
+ */
+
+%>
+<%@ attribute name="control" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpModule" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<c:set var="useActions" value="false" scope="request" />
+<c:if test="${not empty helpToolSignature or not empty helpModule or not empty refreshOnClickAction or not empty extraControl}">
+	<c:set var="useActions" value="true" scope="request" />
+</c:if>
+
+<c:set var="dControl" value="false" scope="request" />
+<c:if test="${control}">
+	<c:set var="dControl" value="${control}" scope="request" />
+</c:if>
+
+<!-- navbar combined with tabs -->
+<div class="panel panel-default panel-monitor-page">
+<div class="panel-heading navbar-heading">
+
+ 	<nav class="navbar navbar-default navbar-heading">
+	<div class="container-fluid">
+    	<!-- Brand and toggle get grouped for better mobile display -->
+		<div class="navbar-header">
+	      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
+	        <span class="sr-only">Toggle navigation</span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	      </button>
+	      <span class="navbar-brand">${title}</span>
+		</div>
+		<div class="collapse navbar-collapse" id="navbar-collapse-1" role="navigation">
+         <ul class="nav navbar-nav" id="page-tabs">
+	         <li role="separator" class="divider"></li>
+	          <jsp:doBody />
+         </ul>
+         <c:if test="${useActions}">
+         <ul class="nav navbar-nav navbar-right" id="page-actions">
+		     <li role="separator" class="divider"></li>
+		     <c:if test="${not empty refreshOnClickAction}">
+             <li class="navbar-text" ><span onclick="${refreshOnClickAction}"><i class="fa fa-refresh"></i></span></li>
+             </c:if>
+             <c:if test="${not empty helpToolSignature or not empty helpModule}">
+             <li class="navbar-text" ><lams:help toolSignature="${helpToolSignature}" module="${helpModule}" style="small"/></li>
+             </c:if>
+             <c:if test="${not empty extraControl}">
+             <li class="navbar-text" >${extraControl}</li>
+             </c:if>
+         </ul>
+         </c:if>
+ 	    
+ 		</div>
+	 </div>
+     </nav>
+     <!-- /top nav -->
+</div>
+<!-- panel div closed by TabBodyArea -->
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.6.2.1 -r1.6.2.2
--- lams_admin/web/WEB-INF/tags/headItems.tag	10 Feb 2016 10:01:25 -0000	1.6.2.1
+++ lams_admin/web/WEB-INF/tags/headItems.tag	16 Jun 2016 03:10:21 -0000	1.6.2.2
@@ -41,7 +41,9 @@
 	<lams:WebAppURL />
 </c:set>
 
-<lams:css style="main"/>
+<lams:css/>
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:35:38 -0000	1.3.2.2
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	16 Jun 2016 03:10:21 -0000	1.3.2.3
@@ -178,7 +178,7 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+      
       <attribute>
          <description>Output stylesheet based on the user preferences.</description>
          <name>style</name>
@@ -408,18 +408,34 @@
        <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>TabName</name>
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>CKEditor</name>
        <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
-   	</tag-file>   	
+   	</tag-file>   
    	<tag-file>
+       <name>AuthoringRatingCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file>    		
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
@@ -432,6 +448,30 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>    
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+   	</tag-file>  
+   	<tag-file>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
@@ -473,5 +513,13 @@
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
 	</tag-file>
+   	<tag-file>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_admin/web/config/editconfig.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/config/editconfig.jsp,v
diff -u -r1.14.2.2 -r1.14.2.3
--- lams_admin/web/config/editconfig.jsp	16 Feb 2016 16:03:18 -0000	1.14.2.2
+++ lams_admin/web/config/editconfig.jsp	16 Jun 2016 03:10:20 -0000	1.14.2.3
@@ -2,37 +2,28 @@
 <%@ page import="org.lamsfoundation.lams.config.ConfigurationItem"%>
 <%@ include file="/taglibs.jsp"%>
 
-<h4>
-	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
-</h4>
-<lams:help style="no-tabs"
-	page="<%=Configuration.CONFIGURATION_HELP_PAGE%>" />
-<h1>
-	<fmt:message key="sysadmin.config.settings.edit" />
-</h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<div align="center">
-	<c:if test="${not empty error}">
-		<p class='warning'>
+<c:if test="${not empty error}">
+	<lams:Alert type="danger" id="error-messages" close="false">
 			<c:out value="${error}" />
-		</p>
-	</c:if>
-</div>
+	</lams:Alert>
+</c:if>
 
 <html:form action="/config" method="post">
 	<html:hidden property="method" value="save" />
 
 	<tiles:insert attribute="items" />
 
-	<p align="center">
-		<html:submit styleId="saveButton" styleClass="button">
-			<fmt:message key="admin.save" />
-		</html:submit>
-		<html:reset styleClass="button">
-			<fmt:message key="admin.reset" />
-		</html:reset>
-		<html:cancel styleClass="button">
+	<div class="pull-right">
+		<html:cancel styleClass="btn btn-default">
 			<fmt:message key="admin.cancel" />
 		</html:cancel>
-	</p>
-</html:form>
\ No newline at end of file
+		<html:reset styleClass="btn btn-default loffset5">
+			<fmt:message key="admin.reset" />
+		</html:reset>
+		<html:submit styleId="saveButton" styleClass="btn btn-primary loffset5">
+			<fmt:message key="admin.save" />
+		</html:submit>
+	</div>
+</html:form>
Index: lams_admin/web/config/items.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/config/items.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_admin/web/config/items.jsp	7 Oct 2014 20:10:35 -0000	1.1.2.1
+++ lams_admin/web/config/items.jsp	16 Jun 2016 03:10:20 -0000	1.1.2.2
@@ -2,11 +2,14 @@
 <%@ include file="/taglibs.jsp"%>
 
 	<logic:iterate name="config" id="group">
-		<h2 align="center"><fmt:message key="${group.key}"/></h2>
-		<table class="alternative-color" width=100% cellspacing="0">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<div class="panel-title"><fmt:message key="${group.key}"/></div>
+			</div>
+		<table class="table table-striped table-condensed" >
 		<logic:iterate name="group" property="value" id="row">
 			<tr>
-				<td align="right" width="50%">
+				<td>
 					<fmt:message key="${row.descriptionKey}"/>
 					<c:if test="${row.required}">&nbsp;&nbsp;*</c:if>
 				</td>
@@ -15,17 +18,18 @@
 					<c:set var="BOOLEAN"><%= ConfigurationItem.BOOLEAN_FORMAT %></c:set>
 					<c:choose>
 					<c:when test="${row.format==BOOLEAN}">
-						<html:select styleId="${row.key}" name="row" property="value">
+						<html:select styleId="${row.key}" name="row" property="value" styleClass="form-control form-control-sm">
 						<html:option value="true">true</html:option>
 						<html:option value="false">false&nbsp;&nbsp;</html:option>
 						</html:select>
 					</c:when>
 					<c:otherwise>
-						<html:text styleId="${row.key}" property="value" name="row" value="${row.value}" size="50" maxlength="255"/>
+						<html:text styleId="${row.key}" property="value" name="row" value="${row.value}" size="50" maxlength="255" styleClass="form-control"/>
 					</c:otherwise>
 					</c:choose>
 				</td>
 			</tr>
 		</logic:iterate>
 		</table>
+		</div>
 	</logic:iterate>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/css/admin.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/import/importGroups.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/import/importGroups.jsp,v
diff -u -r1.5.12.1 -r1.5.12.2
--- lams_admin/web/import/importGroups.jsp	8 Oct 2014 05:37:42 -0000	1.5.12.1
+++ lams_admin/web/import/importGroups.jsp	16 Jun 2016 03:10:21 -0000	1.5.12.2
@@ -11,19 +11,17 @@
 }
 </script>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a></h4>
-<lams:help style="no-tabs" page="<%= IImportService.IMPORT_GROUPS_HELP_PAGE %>"/>
-<h1><fmt:message key="sysadmin.import.groups.title" /></h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 <div id="loading" style="display:none">
-	<h3><fmt:message key="msg.please.wait"/></h3>
+	<h4><fmt:message key="msg.please.wait"/></h4>
 	<p align="center"><img src="<lams:LAMSURL/>/images/loading.gif" alt="loading..." /></p>
 </div>
 
 <div id="main-page">
 
 <logic:notEmpty name="results">
-	<h3><fmt:message key="heading.import.results"/></h3>
+	<h4><fmt:message key="heading.import.results"/></h4>
 	<table cellspacing="5" cellpadding="5">
 		<tr><th width="115" align="right"><fmt:message key="table.heading.organisation.id"/></th><th><fmt:message key="admin.organisation.name"/></th></tr>
 		<%
@@ -33,10 +31,10 @@
 				List rowResult = (List)results.get(i);
 				if (rowResult != null && rowResult.size() >= 4) {
 					if (rowResult.get(3).equals(OrganisationType.COURSE_TYPE.toString())) {
-						out.print("<th align=\"right\">"+rowResult.get(0)+"</th>");
+						out.print("<th>"+rowResult.get(0)+"</th>");
 						out.print("<th>"+rowResult.get(1)+"</th>");
 					} else if (rowResult.get(3).equals(OrganisationType.CLASS_TYPE.toString())) {
-						out.print("<td align=\"right\">"+rowResult.get(0)+"</td>");
+						out.print("<td>"+rowResult.get(0)+"</td>");
 						out.print("<td>"+rowResult.get(1)+"</td>");
 					}
 				} else { // it's an error message
@@ -50,7 +48,6 @@
 			}
 		%>
 	</table>
-	<p>&nbsp;</p>
 	<hr />
 </logic:notEmpty>
 
@@ -77,13 +74,13 @@
 <table>
 	<tr>
 		<td align="right"><fmt:message key="label.excel.spreadsheet" />:&nbsp;</td>
-		<td><html:file property="file" /></td>
+		<td><html:file property="file" styleClass="form-control"/></td>
 	</tr>
 </table>
-<p align="center">
-<html:submit styleId="importButton" styleClass="button"><fmt:message key="label.import"/></html:submit> &nbsp; 	
-<html:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel"/></html:cancel>
-</p>
+<div class="pull-right">
+<html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html:cancel>
+<html:submit styleId="importButton" styleClass="btn btn-primary loffset5"><fmt:message key="label.import"/></html:submit> &nbsp; 	
+</div>
 
 </html:form>
 
Index: lams_admin/web/import/importexcel.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/import/importexcel.jsp,v
diff -u -r1.12.12.1 -r1.12.12.2
--- lams_admin/web/import/importexcel.jsp	8 Oct 2014 05:37:42 -0000	1.12.12.1
+++ lams_admin/web/import/importexcel.jsp	16 Jun 2016 03:10:21 -0000	1.12.12.2
@@ -7,9 +7,7 @@
 	}
 </script>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a></h4>
-<lams:help style="no-tabs" page="<%= IImportService.IMPORT_HELP_PAGE %>"/>
-<h1><fmt:message key="admin.user.import" /></h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 <p><fmt:message key="msg.import.intro"/></p>
 <p>
@@ -35,12 +33,12 @@
 <table>
 	<tr>
 		<td align="right"><fmt:message key="label.excel.spreadsheet" />:&nbsp;</td>
-		<td><html:file property="file" /></td>
+		<td><html:file property="file" styleClass="form-control"/></td>
 	</tr>
 </table>
-<p align="center">
-<html:submit styleId="importButton" styleClass="button"><fmt:message key="label.import"/></html:submit> &nbsp; 	
-<html:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel"/></html:cancel>
-</p>
+<div class="pull-right">
+<html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html:cancel>
+<html:submit styleId="importButton" styleClass="btn btn-primary loffset5"><fmt:message key="label.import"/></html:submit> &nbsp; 	
+</div>
 
-</html:form>
+</html:form>
\ No newline at end of file
Index: lams_admin/web/import/importresult.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/import/importresult.jsp,v
diff -u -r1.5 -r1.5.12.1
--- lams_admin/web/import/importresult.jsp	9 Jan 2008 04:20:28 -0000	1.5
+++ lams_admin/web/import/importresult.jsp	16 Jun 2016 03:10:21 -0000	1.5.12.1
@@ -1,7 +1,6 @@
 <%@ include file="/taglibs.jsp"%>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a></h4>
-<h1><fmt:message key="admin.user.import" /></h1>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 <p><c:out value="${successful}" /></p>
 <p>
@@ -14,10 +13,3 @@
 	</logic:notEmpty>
 </logic:iterate>
 </p>
-
-<p>&nbsp;</p>
-
-<p>
-	<input type="submit" class="button" value="Ok"
-		onclick="javascript:document.location='sysadminstart.do';" />
-</p>
\ No newline at end of file
Index: lams_admin/web/import/status.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/import/status.jsp,v
diff -u -r1.1.12.1 -r1.1.12.2
--- lams_admin/web/import/status.jsp	9 Feb 2016 18:53:01 -0000	1.1.12.1
+++ lams_admin/web/import/status.jsp	16 Jun 2016 03:10:21 -0000	1.1.12.2
@@ -24,7 +24,7 @@
 <div id="page">
 	<div id="content">
 		<h2>
-			<a href="<lams:LAMSURL/>/admin/sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
+			<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 			: <fmt:message key="admin.user.import" />
 		</h2>
 
Index: lams_admin/web/organisation/cloneResult.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/cloneResult.jsp,v
diff -u -r1.2 -r1.2.4.1
--- lams_admin/web/organisation/cloneResult.jsp	22 Jan 2010 02:59:10 -0000	1.2
+++ lams_admin/web/organisation/cloneResult.jsp	16 Jun 2016 03:10:20 -0000	1.2.4.1
@@ -2,22 +2,19 @@
 
 <tiles:insert attribute="breadcrumbs" />
 
-<h1><fmt:message key="title.clone.lessons.for"><fmt:param value="${org.name}" /></fmt:message></h1>
+<h4><fmt:message key="title.clone.lessons.for"><fmt:param value="${org.name}" /></fmt:message></h4>
 
 <c:if test="${not empty errors}">
-	<p class="warning">
+	<lams:Alert type="danger" id="errorKey" close="false">	
 		<c:forEach items="${errors}" var="error">
 			<c:out value="${error}" />
 		</c:forEach>
-	</p>
+	</lams:Alert>
 </c:if>
 
 <p>
 	<fmt:message key="message.cloned.lessons"><fmt:param value="${result}" /></fmt:message>
 </p>
 
-<p align="center">
-	<input type="button" class="button" value="<fmt:message key="label.return.to.group" />" 
-		onclick="document.location='orgmanage.do?org=<c:out value="${org.organisationId}" />';"
-	>
-</p>
\ No newline at end of file
+<input type="button" class="btn btn-default pull-right" value="<fmt:message key="label.return.to.group" />" 
+		onclick="document.location='orgmanage.do?org=<c:out value="${org.organisationId}" />';"	>
Index: lams_admin/web/organisation/cloneStart.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/cloneStart.jsp,v
diff -u -r1.4 -r1.4.2.1
--- lams_admin/web/organisation/cloneStart.jsp	29 Sep 2012 13:58:15 -0000	1.4
+++ lams_admin/web/organisation/cloneStart.jsp	16 Jun 2016 03:10:20 -0000	1.4.2.1
@@ -1,152 +1,166 @@
 <%@ include file="/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL /></c:set>
 
-<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery.tablesorter.theme.bootstrap.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css"  rel="stylesheet">
 
-<style type="text/css">
-	.clone-box {
-		border: 1px solid grey; padding: 10px; margin-top: 10px;
-	}
-	.padding-bottom {
-		padding-bottom: 20px;
-	}
-</style>
 
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-ui.js"></script>
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pack.js"></script>
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pager.js"></script>
+<script language="JavaScript" type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script language="JavaScript" type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+<script language="JavaScript" type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
+<script language="JavaScript" type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
+<script language="JavaScript" type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
+
+<%-- <script language="JavaScript" type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.pack.js"></script>
+ --%>
 <script language="JavaScript" type="text/javascript">
 	<!--
 	var staffLoaded, learnersLoaded = false;
 	var lessonsLoaded = {};
 
-	jQuery(document).ready(function() {
-		jQuery("#sourceGroupId").change(function() {
-			loadSubgroups(jQuery("#sourceGroupId").val());
+	$(document).ready(function() {
+		$("#sourceGroupId").change(function() {
+			loadSubgroups($("#sourceGroupId").val());
 		});
-		jQuery("#sourceGroupId").load("<lams:LAMSURL/>/admin/clone.do", { method: "getGroups" }, function() {
-			loadSubgroups(jQuery("#sourceGroupId").val());
+		$("#sourceGroupId").load("<lams:LAMSURL/>/admin/clone.do", { method: "getGroups" }, function() {
+			loadSubgroups($("#sourceGroupId").val());
 		});
-		jQuery("a.lessonNameLink").live("click", function() {
-			lessonDialog(jQuery(this).attr("id"));
+		$("a.lessonNameLink").on("click", function() {
+			lessonDialog($(this).attr("id"));
 		});
 	});
 
 	function loadSubgroups(groupId) {
-		jQuery("#sourceSubgroupId").load("<lams:LAMSURL/>/admin/clone.do", { method: "getSubgroups", groupId: groupId });
+		$("#sourceSubgroupId").load("<lams:LAMSURL/>/admin/clone.do", { method: "getSubgroups", groupId: groupId });
 	}
 
 	function chosenGroup() {
-		if (jQuery("#sourceSubgroupId").val() != '') {
-			return jQuery("#sourceSubgroupId").val();
+		if ($("#sourceSubgroupId").val() != '') {
+			return $("#sourceSubgroupId").val();
 		} else {
-			return jQuery("#sourceGroupId").val();
+			return $("#sourceGroupId").val();
 		}
 	}
 
 	function loadGroupAttributes(sourceGroupId) {
-		jQuery("#cloneOptionsDiv").show();
-		jQuery("#availableLessons").load("<lams:LAMSURL/>/admin/clone.do", { method: "availableLessons", sourceGroupId: sourceGroupId });
+		$("#cloneOptionsDiv").show();
+		$("#availableLessons").load("<lams:LAMSURL/>/admin/clone.do", { method: "availableLessons", sourceGroupId: sourceGroupId });
 	}
 
 	function lessonDialog(lessonId) {
 		if (lessonsLoaded[lessonId] == null || !lessonsLoaded[lessonId]) {
-			jQuery("#lessonDialog-"+lessonId).dialog({
+			$("#lessonDialog-"+lessonId).dialog({
 				autoOpen: false,
 				modal: true
 			});
 			lessonsLoaded[lessonId] = true;
 		}
-		jQuery("#lessonDialog-"+lessonId).dialog("open");
+		$("#lessonDialog-"+lessonId).dialog("open");
 		return false;
 	}
 
 	function initUserDialog(selector) {
-		jQuery(selector).dialog({
+		$(selector).dialog({
 			autoOpen: false,
 			modal: true, 
-			width: 500, 
+			width: 680, 
 			buttons: { 
 				"<fmt:message key='label.ok' />": function() {
-					jQuery(this).dialog("close");
+					$(this).dialog("close");
 				} 
 			} 
 		});
 	}
 
 	function staffDialog() {
 		if (!staffLoaded) {
-			jQuery("#staffDialog").load("<lams:LAMSURL/>/admin/clone.do", { method: "selectStaff", groupId: <c:out value="${org.organisationId}" /> });
+			$("#staffDialog").load("<lams:LAMSURL/>/admin/clone.do", { method: "selectStaff", groupId: <c:out value="${org.organisationId}" /> });
 			initUserDialog("#staffDialog");
 			staffLoaded = true;
 		}
-		jQuery("#staffDialog").dialog("open");
+		$("#staffDialog").dialog("open");
 		return false;
 	}
 
 	function learnerDialog() {
 		if (!learnersLoaded) {
-			jQuery("#learnerDialog").load("<lams:LAMSURL/>/admin/clone.do", { method: "selectLearners", groupId: <c:out value="${org.organisationId}" /> });
+			$("#learnerDialog").load("<lams:LAMSURL/>/admin/clone.do", { method: "selectLearners", groupId: <c:out value="${org.organisationId}" /> });
 			initUserDialog("#learnerDialog");
 			learnersLoaded = true;
 		}
-		jQuery("#learnerDialog").dialog("open");
+		$("#learnerDialog").dialog("open");
 		return false;
 	}
 
 	function clone() {
 		var lessons = [];
 		var staff = [];
 		var learners = [];
-		jQuery("input[name=lessons]:checked").each(function() {
-			lessons.push(jQuery(this).val());
+		$("input[name=lessons]:checked").each(function() {
+			lessons.push($(this).val());
 		});
-		jQuery("input[name=staff]:checked").each(function() {
-			staff.push(jQuery(this).val());
+		$("input[name=staff]:checked").each(function() {
+			staff.push($(this).val());
 		});
-		jQuery("input[name=learners]:checked").each(function() {
-			learners.push(jQuery(this).val());
+		$("input[name=learners]:checked").each(function() {
+			learners.push($(this).val());
 		});
-		jQuery("input[name=lessons]").val(lessons.join(","));
-		jQuery("input[name=staff]").val(staff.join(","));
-		jQuery("input[name=learners]").val(learners.join(","));
-		jQuery("input[name=addAllStaff]").val(jQuery("#addAllStaff").is(":checked"));
-		jQuery("input[name=addAllLearners]").val(jQuery("#addAllLearners").is(":checked"));
+		$("input[name=lessons]").val(lessons.join(","));
+		$("input[name=staff]").val(staff.join(","));
+		$("input[name=learners]").val(learners.join(","));
+		$("input[name=addAllStaff]").val($("#addAllStaff").is(":checked"));
+		$("input[name=addAllLearners]").val($("#addAllLearners").is(":checked"));
 		return true;
 	}
 	//-->
 </script>
 
 <tiles:insert attribute="breadcrumbs" />
 
-<h1><fmt:message key="title.clone.lessons.for"><fmt:param value="${org.name}" /></fmt:message></h1>
+<h4><fmt:message key="title.clone.lessons.for"><fmt:param value="${org.name}" /></fmt:message></h4>
 
 <c:if test="${not empty errors}">
-	<p class="warning">
+	<lams:Alert type="danger" id="errorKey" close="false">			
 		<c:forEach items="${errors}" var="error">
 			<c:out value="${error}" />
 		</c:forEach>
-	</p>
+	</lams:Alert>
 </c:if>
 
-<h2><fmt:message key="title.choose.group" /></h2>
-<div class="clone-box">
-	<p>
-		<fmt:message key="admin.course" />:
-		<select id="sourceGroupId">
-			<option value="">...</option>
-		</select>
-	</p>
-	<p class="padding-bottom">
-		<fmt:message key="admin.class" />:
-		<select id="sourceSubgroupId">
-		</select>
-	</p>
-	<p>
-		<input type="submit" class="button" value="<fmt:message key="label.choose" />" onclick="javascript:loadGroupAttributes(chosenGroup());">
-	</p>
+<div class="panel panel-default voffset5" >
+	<div class="panel-heading">
+		<span class="panel-title">
+			<fmt:message key="title.choose.group" />
+		</span>
+	</div>
+	<div class="panel-body">
+		<div class="form-group">
+			<fmt:message key="admin.course" />:
+			<select id="sourceGroupId" class="form-control">
+				<option value="">...</option>
+			</select>
+		</div>
+		<div class="form-group">
+			<fmt:message key="admin.class" />:
+			<select id="sourceSubgroupId" class="form-control">
+			</select>
+		</div>
+		<div class="form-group">
+			<input type="submit" class="btn btn-default" value="<fmt:message key="label.choose" />" onclick="javascript:loadGroupAttributes(chosenGroup());">
+		</div>
+	</div>
 </div>
 
+<div id="staffDialog" title="<fmt:message key="label.configure.staff" />" style="display:none;">
+
+</div>
+
+<div id="learnerDialog" title="<fmt:message key="label.configure.learners" />" style="display:none;">
+
+</div>
+
+
 <form name="cloneForm" id="cloneForm" action="<lams:LAMSURL/>/admin/clone.do" method="post">
 	<input type="hidden" name="method" value="clone">
 	<input type="hidden" name="groupId" value="<c:out value="${org.organisationId}" />">
@@ -155,41 +169,45 @@
 	<input type="hidden" name="learners">
 
 	<div style="display:none;" id="cloneOptionsDiv">
-		<h2><fmt:message key="title.select.lessons" /></h2>
-		<p class="clone-box" id="availableLessons"></p>
-		
-		<h2><fmt:message key="title.select.staff" /></h2>
-		<div class="clone-box">
-			<p class="padding-bottom">
-				<input type="checkbox" id="addAllStaff" name="addAllStaff" checked="checked"> <fmt:message key="message.add.all.monitors" />
-			</p>
-			<p>
-				<a onclick="staffDialog();"><fmt:message key="label.configure.staff" /></a>
-			</p>
+	
+		<div class="panel panel-default voffset5" >
+		<div class="panel-heading">
+			<span class="panel-title">
+				<fmt:message key="title.select.lessons" />
+			</span>
 		</div>
-		
-		<h2><fmt:message key="title.select.learners" /></h2>
-		<div class="clone-box">
-			<p class="padding-bottom">
-				<input type="checkbox" id="addAllLearners" name="addAllLearners" checked="checked"> <fmt:message key="message.add.all.learners" />
-			</p>
-			<p>
-				<a onclick="learnerDialog();"><fmt:message key="label.configure.learners" /></a>
-			</p>
+		<div class="panel-body">
+			<p id="availableLessons"></p>
 		</div>
+		</div>
+	
+		<div class="panel panel-default voffset5" >
+		<div class="panel-heading">
+			<span class="panel-title">
+				<fmt:message key="title.select.staff" />
+			</span>
+		</div>
+		<div class="panel-body">
+			<input type="checkbox" id="addAllStaff" name="addAllStaff" checked="checked"> <fmt:message key="message.add.all.monitors" />
+			<a onclick="staffDialog();" class="btn btn-default pull-right"><fmt:message key="label.configure.staff" /></a>
+		</div>
+		</div>
 		
-		<p style="float:right;">
-			<input type="submit" class="button" onclick="return clone();" value="<fmt:message key="label.clone" />">
-		</p>
-		<p class="padding-bottom"></p>
+		<div class="panel panel-default voffset5" >
+		<div class="panel-heading">
+			<span class="panel-title">
+				<fmt:message key="title.select.learners" />
+			</span>
+		</div>
+		<div class="panel-body">
+			<input type="checkbox" id="addAllLearners" name="addAllLearners" checked="checked"> <fmt:message key="message.add.all.learners" />
+			<a onclick="learnerDialog();" class="btn btn-default pull-right"><fmt:message key="label.configure.learners" /></a>
+		</div>
+		</div>
+
+		<div class="pull-right">
+			<input type="submit" class="btn btn-primary" onclick="return clone();" value="<fmt:message key="label.clone" />">
+		</div>
 	</div>
 	
-	<div id="staffDialog" title="<fmt:message key="label.configure.staff" />" style="display:none;">
-	
-	</div>
-	
-	<div id="learnerDialog" title="<fmt:message key="label.configure.learners" />" style="display:none;">
-	
-	</div>
-
 </form>
\ No newline at end of file
Index: lams_admin/web/organisation/courseAdminEdit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/courseAdminEdit.jsp,v
diff -u -r1.1 -r1.1.12.1
--- lams_admin/web/organisation/courseAdminEdit.jsp	9 Jan 2008 00:53:14 -0000	1.1
+++ lams_admin/web/organisation/courseAdminEdit.jsp	16 Jun 2016 03:10:20 -0000	1.1.12.1
@@ -10,35 +10,35 @@
 <logic:equal name="OrganisationForm" property="courseAdminCanChangeStatusOfCourse" value="false">
 	<html:hidden property="stateId" />
 </logic:equal>
-<h4>
-	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a> : 
-	<a href="orgmanage.do?org=<bean:write name="OrganisationForm" property="orgId" />">
+<p>
+	<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> : 
+	<a href="orgmanage.do?org=<bean:write name="OrganisationForm" property="orgId" />" class="btn btn-default">
 		<bean:write name="OrganisationForm" property="name"/>
 	</a>
-</h4>
+</p>
 
 <h1>
 	<fmt:message key="admin.edit"/> <bean:write name="OrganisationForm" property="name"/>
 </h1>
 
 <div align="center"><html-el:errors/></div>
-<table>
+<table  class="table table-no-border">
 	<tr>
 		<td><fmt:message key="admin.organisation.name"/>:</td>
-		<td><html-el:text property="name" size="40" /> *</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><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><html-el:textarea property="description" cols="50" rows="3"  styleClass="form-control"/></td>
 	</tr>
 	<tr>
 		<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}" />
@@ -51,7 +51,7 @@
 	<tr>
 		<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>
@@ -71,12 +71,13 @@
 	<tr>
 		<td colspan="2">&nbsp;</td>
 	</tr>
-	<tr>
-		<td colspan=2 class="align-right">
-			<html-el:submit styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
-			<html-el:reset styleClass="button"><fmt:message key="admin.reset"/></html-el:reset>
-			<html-el:cancel styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
-		</td>
-	</tr>
 </table>
+
+<div class="pull-right">
+	<html-el:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html-el:cancel>
+	<html-el:reset styleClass="btn btn-default loffset5"><fmt:message key="admin.reset"/></html-el:reset>
+	<html-el:submit styleClass="btn btn-primary loffset5"><fmt:message key="admin.save"/></html-el:submit>
+</div>
+
 </html-el:form>
+		
\ No newline at end of file
Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/createOrEdit.jsp,v
diff -u -r1.5.2.3 -r1.5.2.4
--- lams_admin/web/organisation/createOrEdit.jsp	24 Feb 2016 12:35:38 -0000	1.5.2.3
+++ lams_admin/web/organisation/createOrEdit.jsp	16 Jun 2016 03:10:20 -0000	1.5.2.4
@@ -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>
Index: lams_admin/web/organisation/list.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/list.jsp,v
diff -u -r1.8.2.3 -r1.8.2.4
--- lams_admin/web/organisation/list.jsp	5 Oct 2015 18:02:59 -0000	1.8.2.3
+++ lams_admin/web/organisation/list.jsp	16 Jun 2016 03:10:20 -0000	1.8.2.4
@@ -2,27 +2,19 @@
 <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %>
 <c:set var="lams"><lams:LAMSURL /></c:set>
 
-<link type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css" rel="stylesheet">
+ <link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 <link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
 <style>
 	table.infoDisplay {
 		margin-left:5px; 
 		padding-top:10px; 
 		width:100%;
 	}
-	p {
-		margin-left:5px;
-	}
-	.floatRight {
-		float:right;
-	}
-	.indentPad {
+/* 	.indentPad {
 		margin-left:5px; 
 		padding-top:10px;
 	}
-	#tablesorter thead .disabled {
-		display: none
-	}
+ */
 </style>
 
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
@@ -33,9 +25,10 @@
 	
   	$(document).ready(function(){
 	    
-		$("#tablesorter").tablesorter({
-			theme: 'blue',
-			widgets: ["zebra", "filter"],
+		$(".tablesorter").tablesorter({
+			theme: 'bootstrap',
+			headerTemplate : '{content} {icon}',
+			widgets: ["uitheme","zebra", "filter"],
 			headers: { 0: { filter: false }, 2: { filter: false }, 3: { filter: false } },
 		    widgetOptions : {
 		        // include column filters
@@ -47,10 +40,15 @@
             sortList: [[1]] 
 		});
 		
-		$("#tablesorter").each(function() {
+		$(".tablesorter").each(function() {
 			$(this).tablesorterPager({
 				savePages: false,
-				ajaxUrl : "<c:url value='/orgmanage.do'/>?dispatch=getOrgs&type=${OrgManageForm.type}&page={page}&size={size}&{sortList:column}&parentOrgId=${OrgManageForm.parentId}&{filterList:fcol}",
+                container: $(this).find(".ts-pager"),
+                output: '{startRow} to {endRow} ({totalRows})',
+                cssPageDisplay: '.pagedisplay',
+                cssPageSize: '.pagesize',
+                cssDisabled: 'disabled',
+                ajaxUrl : "<c:url value='/orgmanage.do'/>?dispatch=getOrgs&type=${OrgManageForm.type}&page={page}&size={size}&{sortList:column}&parentOrgId=${OrgManageForm.parentId}&{filterList:fcol}",
 				ajaxProcessing: function (data, table) {
 			    	if (data && data.hasOwnProperty('rows')) {
 			    		var rows = [],
@@ -92,240 +90,209 @@
 				customAjaxUrl: function(table, url) {
 				    // get current selection & add it to the url
 				    return url += '&stateId=' + $("#org-state-id").val();
-				},
-			    container: $(this).next("#pager"),
-			    output: '{startRow} to {endRow} ({totalRows})',// possible variables: {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows}
-			    // css class names of pager arrows
-			    cssNext: '.tablesorter-next', // next page arrow
-				cssPrev: '.tablesorter-prev', // previous page arrow
-				cssFirst: '.tablesorter-first', // go to first page arrow
-				cssLast: '.tablesorter-last', // go to last page arrow
-				cssGoto: '.gotoPage', // select dropdown to allow choosing a page
-				cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed
-				cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option
-				// class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page)
-				cssDisabled: 'disabled' // Note there is no period "." in front of this class name
+				}
 			})
 		});
 		
 		$( "#org-state-id" ).change(function() {
-			$('#tablesorter').trigger('pagerUpdate');
+			$('.tablesorter').trigger('pagerUpdate');
 		});
   	})
 </script>
 
 <logic:equal name="OrgManageForm" property="type" value="1">
-	<h4>
-		<a href="orgmanage.do?org=<bean:write name="OrgManageForm" property="parentId"/>"><fmt:message key="admin.course.manage" /></a>
-	</h4>
-	<h1><fmt:message key="admin.course.manage" /></h1>
-	
 	<form>
 	
-	<div class="floatRight">
-		<input id="userCreate" class="button" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit' />
-		<input id="findUsers" class="button" type="button" value="<fmt:message key="admin.user.find"/>" onclick=javascript:document.location='usersearch.do' />
+	<div class="pull-right">
+		<input id="userCreate" class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit' />
+		<input id="findUsers" class="btn btn-default" type="button" value="<fmt:message key="admin.user.find"/>" onclick=javascript:document.location='usersearch.do' />
 		<logic:equal name="manageGlobalRoles" value="true">
-			<input id="manageGlobalRoles" class="button" type="button" value="<fmt:message key="admin.global.roles.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+			<input id="manageGlobalRoles" class="btn btn-default" type="button" value="<fmt:message key="admin.global.roles.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
 		</logic:equal>
-	</div>
-	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
-	<div class="floatRight">
 		<logic:equal name="createGroup" value="true">
 			<c:url var="editaction" value="organisation.do">
 				<c:param name="method" value="create" />
 				<c:param name="typeId" value="2" />
 				<c:param name="parentId" value="${OrgManageForm.parentId}" />
 			</c:url>
-			<input id="createCourse" class="button" type="button" value="<fmt:message key="admin.course.add"/>" onclick=javascript:document.location='<c:out value="${editaction}"/>' />
+			<input id="createCourse" class="btn btn-default" type="button" value="<fmt:message key="admin.course.add"/>" onclick=javascript:document.location='<c:out value="${editaction}"/>' />
 		</logic:equal>
 	</div>
+	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
 	</form>
+
 	<html:form styleClass="indentPad" action="orgmanage.do" method="post">
 		<input type="hidden" name="org" value="<bean:write name="OrgManageForm" property="parentId"/>" />
-		<fmt:message key="label.show"/> 
-		<html:select property="stateId" styleId="org-state-id">
+		<fmt:message key="label.show"/> &nbsp;
+		<html:select property="stateId" styleId="org-state-id" styleClass="form-control form-control-inline input-sm">
 			<html:option value="1"><fmt:message key="organisation.state.ACTIVE"/></html:option>
 			<html:option value="2"><fmt:message key="organisation.state.HIDDEN"/></html:option>
 			<html:option value="3"><fmt:message key="organisation.state.ARCHIVED"/></html:option>
-		</html:select> 
+		</html:select> &nbsp;
 		<fmt:message key="label.groups"/>:
 	</html:form>
 </logic:equal>
 
 <logic:equal name="OrgManageForm" property="type" value="2">
-	<h4>
-		<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
-		: <a href="orgmanage.do?org=<bean:write name="OrgManageForm" property="parentId"/>"><bean:write name="OrgManageForm" property="parentName"/></a>
-	</h4>
-	<h1><bean:write name="OrgManageForm" property="parentName"/></h1>
+	<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a></p>
+
+	<div class="panel panel-default voffset5" >
+		<div class="panel-heading">
+			<span class="panel-title">
+				<bean:write name="OrgManageForm" property="parentName"/>
+			</span>
+			<div class="btn-group btn-group-sm  pull-right">
+				<logic:equal name="editGroup" value="true">
+					<input id="editCourse" class="btn btn-default" type="button" value="<fmt:message key="admin.edit" />&nbsp;<bean:write name="OrgManageForm" property="parentName"/>" onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
+				</logic:equal>
+				<input id="manageUsers" class="btn btn-default" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+				<% if (request.isUserInRole(Role.SYSADMIN)) { %>
+					<input id="closeLessons" class="btn btn-default" type="button" value="<fmt:message key="title.clone.lessons" />" onclick="javascript:document.location='clone.do?groupId=<c:out value="${OrgManageForm.parentId}"/>';">
+				<% } %>
+			</div>
+		</div>
 	
-	<table cellspacing="7" class="infoDisplay">
-		<tr>
-			<td id="courseName" align="right"><fmt:message key="admin.organisation.name"/>:</td>
-			<td><c:out value="${org.name}" /></td>
-			<td align="right"><fmt:message key="admin.organisation.status"/>:</td>
-			<td id="courseStatus" width="10%"><c:out value="${org.organisationState.description}" /></td>
-		</tr>
-		<tr>
-			<td align="right"><fmt:message key="admin.organisation.code"/>:</td>
-			<td><c:out value="${org.code}" /></td>
-			<td align="right"><fmt:message key="admin.can.add.user"/>:</td>
-			<td><c:out value="${org.courseAdminCanAddNewUsers}" /></td>
-		</tr>
-		<tr>
-			<td align="right"><fmt:message key="admin.organisation.description"/>:</td>
-			<td><c:out value="${org.description}" /></td>
-			<td align="right"><fmt:message key="admin.can.browse.user"/>:</td>
-			<td><c:out value="${org.courseAdminCanBrowseAllUsers}" /></td>
-		</tr>
-		<tr>
-			<td align="right"><fmt:message key="admin.organisation.locale"/>:</td>
-			<td><c:out value="${org.locale.description}" /></td>
-			<td align="right"><fmt:message key="admin.can.change.status"/>:</td>
-			<td><c:out value="${org.courseAdminCanChangeStatusOfCourse}" /></td>
-		</tr>
-	</table>
-	
-	<form>
-	
-	<p>
-	<logic:equal name="editGroup" value="true">
-		<input id="editCourse" class="button" type="button" value="<fmt:message key="admin.edit" /> <bean:write name="OrgManageForm" property="parentName"/>" onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
-	</logic:equal>
-	</p>
-	
-	<div class="floatRight">
-		<input id="manageUsers" class="button" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+		<table class="table table-striped">
+			<tr>
+				<td id="courseName" width="50%"><fmt:message key="admin.organisation.name"/>:</td>
+				<td><c:out value="${org.name}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.organisation.code"/>:</td>
+				<td><c:out value="${org.code}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.organisation.description"/>:</td>
+				<td><c:out value="${org.description}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.organisation.status"/>:</td>
+				<td id="courseStatus"><c:out value="${org.organisationState.description}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.organisation.locale"/>:</td>
+				<td><c:out value="${org.locale.description}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.can.add.user"/>:</td>
+				<td><c:out value="${org.courseAdminCanAddNewUsers}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.can.browse.user"/>:</td>
+				<td><c:out value="${org.courseAdminCanBrowseAllUsers}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.can.change.status"/>:</td>
+				<td><c:out value="${org.courseAdminCanChangeStatusOfCourse}" /></td>
+			</tr>
+			<tr>
+				<td colspan="2"><c:out value="${numUsers}"/></td>
+			</tr>
+		</table>		
 	</div>
-	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
 	
-	<% if (request.isUserInRole(Role.SYSADMIN)) { %>
-	<div class="floatRight">
-		<input id="closeLessons" class="button" type="button" value="<fmt:message key="title.clone.lessons" />" onclick="javascript:document.location='clone.do?groupId=<c:out value="${OrgManageForm.parentId}"/>';">
-	</div>
-	<p style="padding-top:10px;">&nbsp;</p>
-	<% } %>
-	
-	<div class="floatRight">
+	<form>
+	<div class="pull-right">
 		<c:url var="createSubgroupLink" value="organisation.do">
 			<c:param name="method" value="create" />
 			<c:param name="typeId" value="3" />
 			<c:param name="parentId" value="${OrgManageForm.parentId}" />
 		</c:url>
-		<input id="createNewSubcourse" class="button" type="button" value="<fmt:message key="admin.class.add"/>" onclick=javascript:document.location='<c:out value="${createSubgroupLink}"/>' />
+		<input id="createNewSubcourse" class="btn btn-default" type="button" value="<fmt:message key="admin.class.add"/>" onclick=javascript:document.location='<c:out value="${createSubgroupLink}"/>' />
 	</div>
 	</form>
+
 	<html:form styleClass="indentPad" action="orgmanage.do" method="post">
 		<input type="hidden" name="org" value="<bean:write name="OrgManageForm" property="parentId"/>" />
-		<fmt:message key="label.show"/> 
-		<html:select property="stateId" styleId="org-state-id">
+		<fmt:message key="label.show"/>&nbsp;
+		<html:select property="stateId" styleId="org-state-id" styleClass="form-control form-control-inline input-sm">
 			<html:option value="1"><fmt:message key="organisation.state.ACTIVE"/></html:option>
 			<html:option value="2"><fmt:message key="organisation.state.HIDDEN"/></html:option>
 			<html:option value="3"><fmt:message key="organisation.state.ARCHIVED"/></html:option>
-		</html:select> 
+		</html:select> &nbsp;
 		<fmt:message key="label.subgroups"/>:
 	</html:form>
 </logic:equal>
 
 <logic:equal name="OrgManageForm" property="type" value="3">
-	<h4>
-		<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
-		: <a href="orgmanage.do?org=<c:out value="${parentGroupId}"/>"><c:out value="${parentGroupName}"/></a>
-		: <a href="orgmanage.do?org=<bean:write name="OrgManageForm" property="parentId"/>"><bean:write name="OrgManageForm" property="parentName"/></a>
-	</h4>
-	<h1><bean:write name="OrgManageForm" property="parentName"/></h1>
-	
-	<table cellspacing="7" class="infoDisplay">
-		<tr>
-			<td align="right"><fmt:message key="admin.organisation.name"/>:</td>
-			<td><c:out value="${org.name}" /></td>
-			<td align="right"><fmt:message key="admin.organisation.status"/>:</td>
-			<td width="10%"><c:out value="${org.organisationState.description}" /></td>
-		</tr>
-		<tr>
-			<td align="right"><fmt:message key="admin.organisation.code"/>:</td>
-			<td><c:out value="${org.code}" /></td>
-			<td align="right"><fmt:message key="admin.can.add.user"/>:</td>
-			<td><c:out value="${org.courseAdminCanAddNewUsers}" /></td>
-		</tr>
-		<tr>
-			<td align="right"><fmt:message key="admin.organisation.description"/>:</td>
-			<td><c:out value="${org.description}" /></td>
-			<td align="right"><fmt:message key="admin.can.browse.user"/>:</td>
-			<td><c:out value="${org.courseAdminCanBrowseAllUsers}" /></td>
-		</tr>
-		<tr>
-			<td align="right"><fmt:message key="admin.organisation.locale"/>:</td>
-			<td><c:out value="${org.locale.description}" /></td>
-			<td align="right"><fmt:message key="admin.can.change.status"/>:</td>
-			<td><c:out value="${org.courseAdminCanChangeStatusOfCourse}" /></td>
-		</tr>
-	</table>
-	
-	<form>
-	
 	<p>
-		<logic:equal name="editGroup" value="true">
-			<input class="button" type="button" value="<fmt:message key="admin.edit" /> <bean:write name="OrgManageForm" property="parentName"/>" onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
-		</logic:equal>
+		<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+		: <a href="orgmanage.do?org=<c:out value="${parentGroupId}"/>" class="btn btn-default"><c:out value="${parentGroupName}"/></a>
 	</p>
 	
-	<div class="floatRight">
-		<input class="button" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
-	</div>
-	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
-	
-	<% if (request.isUserInRole(Role.SYSADMIN)) { %>
-		<div class="floatRight">
-			<input class="button" type="button" value="<fmt:message key="title.clone.lessons" />" onclick="javascript:document.location='clone.do?groupId=<c:out value="${OrgManageForm.parentId}"/>';">
+	<div class="panel panel-default voffset5" >
+		<div class="panel-heading">
+			<span class="panel-title">
+				<bean:write name="OrgManageForm" property="parentName"/>
+			</span>
+			<div class="btn-group btn-group-sm  pull-right">
+				<logic:equal name="editGroup" value="true">
+					<input class="btn btn-default" type="button" value="<fmt:message key="admin.edit" />&nbsp;<bean:write name="OrgManageForm" property="parentName"/>" onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
+				</logic:equal>
+				<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+				<% if (request.isUserInRole(Role.SYSADMIN)) { %>
+						<input class="btn btn-default" type="button" value="<fmt:message key="title.clone.lessons" />" onclick="javascript:document.location='clone.do?groupId=<c:out value="${OrgManageForm.parentId}"/>';">
+				<% } %>
+			</div>
 		</div>
-		<p style="padding-top:10px;">&nbsp;</p>
-	<% } %>
+
+		<table class="table table-striped">
+			<tr>
+				<td width="50%"><fmt:message key="admin.organisation.name"/>:</td>
+				<td><c:out value="${org.name}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.organisation.code"/>:</td>
+				<td><c:out value="${org.code}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.organisation.description"/>:</td>
+				<td><c:out value="${org.description}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.organisation.status"/>:</td>
+				<td><c:out value="${org.organisationState.description}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.organisation.locale"/>:</td>
+				<td><c:out value="${org.locale.description}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.can.add.user"/>:</td>
+				<td><c:out value="${org.courseAdminCanAddNewUsers}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.can.browse.user"/>:</td>
+				<td><c:out value="${org.courseAdminCanBrowseAllUsers}" /></td>
+			</tr>
+			<tr>
+				<td><fmt:message key="admin.can.change.status"/>:</td>
+				<td><c:out value="${org.courseAdminCanChangeStatusOfCourse}" /></td>
+			</tr>
+			<tr>
+				<td colspan="2"><c:out value="${numUsers}"/></td>
+			</tr>
+		</table>
 	
-	</form>
+		</div>	
 </logic:equal>
 
 <c:if test="${OrgManageForm.type != 3}">
 
-	<table id="tablesorter">
-		<thead>
-			<tr>
-				<th width="3%" clas="filter-false">
-					Id
-				</th>
-				<th width="10%" align="center"> 
-					<fmt:message key="admin.organisation.name"/>
-				</th>
-				<th width="10%" align="center">
-					<fmt:message key="admin.organisation.code"/>
-				</th>
-				<th width="20%" align="center">
-					<fmt:message key="admin.organisation.description"/>
-				</th>
-			</tr>
-		</thead>
-			
-		<tbody>
-		</tbody>
-	</table>
-		
-	<!-- pager -->
-	<div id="pager">
-		<form>
-			<img class="tablesorter-first"/>
-			<img class="tablesorter-prev"/>
-			<span class="pagedisplay"></span> <!-- this can be any element, including an input -->
-			<img class="tablesorter-next"/>
-			<img class="tablesorter-last"/>
-			<select class="pagesize">
-				<option selected="selected" value="10">10</option>
-				<option value="20">20</option>
-				<option value="30">30</option>
-				<option value="40">40</option>
-				<option value="50">50</option>
-				<option value="100">100</option>
-			</select>
-		</form>
+	<div class="voffset10">
+	<lams:TSTable numColumns="4"> 
+		<th width="3%" clas="filter-false">
+			Id
+		</th>
+		<th width="10%" align="center"> 
+			<fmt:message key="admin.organisation.name"/>
+		</th>
+		<th width="10%" align="center">
+			<fmt:message key="admin.organisation.code"/>
+		</th>
+		<th width="20%" align="center">
+			<fmt:message key="admin.organisation.description"/>
+		</th>
+	</lams:TSTable>
 	</div>
 </c:if>
Index: lams_admin/web/organisation/parts/breadcrumbs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/parts/breadcrumbs.jsp,v
diff -u -r1.1 -r1.1.4.1
--- lams_admin/web/organisation/parts/breadcrumbs.jsp	21 Jan 2010 08:18:32 -0000	1.1
+++ lams_admin/web/organisation/parts/breadcrumbs.jsp	16 Jun 2016 03:10:21 -0000	1.1.4.1
@@ -1,15 +1,14 @@
 <%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.usermanagement.OrganisationType" %>
 
-<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> :
 	<c:set var="classTypeId"><%= OrganisationType.CLASS_TYPE %></c:set>
 	<c:if test="${org.organisationType.organisationTypeId eq classTypeId}">
-		<a href="orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />">
+		<a href="orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />" class="btn btn-default">
 			<c:out value="${org.parentOrganisation.name}" />
 		</a> :
 	</c:if>
-	<a href="orgmanage.do?org=<c:out value="${org.organisationId}" />">
+	<a href="orgmanage.do?org=<c:out value="${org.organisationId}" />" class="btn btn-default">
 		<c:out value="${org.name}" />
 	</a>
-</h4>
\ No newline at end of file
+</p>
\ No newline at end of file
Index: lams_admin/web/organisation/parts/selectLearners.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/parts/selectLearners.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_admin/web/organisation/parts/selectLearners.jsp	1 Nov 2010 23:06:08 -0000	1.3
+++ lams_admin/web/organisation/parts/selectLearners.jsp	16 Jun 2016 03:10:21 -0000	1.3.2.1
@@ -1,39 +1,44 @@
 <%@ include file="/taglibs.jsp"%>
 
-<script>
-	<!--
-	jQuery(document).ready(function() {
+<link type="text/css" href="${lams}css/jquery.tablesorter.theme.bootstrap.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css"  rel="stylesheet">
 
-		//big workaround in order to bind Lams event
-		$.tablesorter.addWidget({
-			id: "checkallCheckbox",
-			// format is called when the on init and when a sorting has finished
-			format: function(table) {
-				var hasCheckedItems = false;
-				jQuery("input[id=learners]").each(function(index) {
-					hasCheckedItems = hasCheckedItems || $(this).attr('checked');
-					//alert(index + " " + $(this).attr('checked')+ " " + hasCheckedItems);
-				 });
-				jQuery("#checkall").attr('checked', hasCheckedItems);
-			}
-		});
-		
-		jQuery("#learnersTable").tablesorter({
+<script>
+	$(document).ready(function() {
+		$(".tablesorter").tablesorter({
 			widthFixed:true,
+			theme: 'bootstrap',
+			headerTemplate : '{content} {icon}',
 			sortList:[[1,0]],
 			headers: { 0: { sorter: false}},
 			textExtraction:'complex',
-			widgets: ['checkallCheckbox']
-		}).tablesorterPager({
-			positionFixed: false,
-			container: jQuery("#pager1")
+			widgets: ['uitheme','checkallCheckbox2']		
 		});
+		
+		//sort table only in case there is a data inside (it's a tablesorter bug)
+		if ($(".tablesorter tbody tr").length > 0) {
+			$(".tablesorter").tablesorterPager({
+				container: jQuery(".ts-pager"),
+	            output: '{startRow} to {endRow} ({totalRows})'
+			});
+			$(".tablesorter").trigger("sorton", [[[0, 0]]]);
+		}
+		
+		updateAllLearners();
 	});
 	
-	function checkAll () {
-		var isChecked = jQuery("#checkall").attr('checked');
-		jQuery("input[name=learners]").attr('checked', isChecked);
-	}	
+	function updateAllLearners() {
+		var allCheckedItems = true;
+		$("input[id=learners]").each(function(index) {
+			allCheckedItems = allCheckedItems && $(this).prop('checked');
+		 });
+		$("#checkAllLearners").prop('checked', allCheckedItems);
+	}
+	
+	function checkAllLearners () {
+		var isChecked = $("#checkAllLearners").prop('checked');
+		$("input[name=learners]").prop('checked', isChecked);
+	}
 	//-->
 </script>
 
@@ -44,51 +49,55 @@
 <c:if test="${not empty learners}">
 	<p><fmt:message key="message.check.to.add.learner" /></p>
 
-	<table id="learnersTable" class="alternative-color">
-		<thead>
+<table id="learnersTable" class="tablesorter">
+	<thead>
+		<tr>
+			<th><input type='checkbox' id='checkAllLearners' onclick='checkAllLearners();' ></th>
+			<th><fmt:message key="admin.user.login" /></th>
+			<th><fmt:message key="admin.user.name" /></th>
+			<th><fmt:message key="admin.user.email" /></th>
+		</tr>
+	</thead>
+	<tbody>
+		<c:forEach items="${learners}" var="user">
 			<tr>
-				<th><input type='checkbox' id='checkall' onclick='checkAll();' ></th>
-				<th><fmt:message key="admin.user.login" /></th>
-				<th><fmt:message key="admin.user.name" /></th>
-				<th><fmt:message key="admin.user.email" /></th>
+				<td>
+					<input id="learners" name="learners" type="checkbox" value="<c:out value="${user.userId}" />" checked="checked" onclick='updateAllLearners();'/>
+				</td>
+				<td>
+					<c:out value="${user.login}" />
+				</td>
+				<td>
+					<c:out value="${user.title}" />&nbsp;<c:out value="${user.firstName}" />&nbsp;<c:out value="${user.lastName}" />
+				</td>
+				<td>
+					<c:out value="${user.email}" />
+				</td>
 			</tr>
-		</thead>
-		
-		<tbody>
-			<c:forEach items="${learners}" var="user">
-				<tr>
-					<td>
-						<input id="learners" name="learners" type="checkbox" value="<c:out value="${user.userId}" />" checked="checked" />
-					</td>
-					<td>
-						<c:out value="${user.login}" />
-					</td>
-					<td>
-						<c:out value="${user.title}" /> <c:out value="${user.firstName}" /> <c:out value="${user.lastName}" />
-					</td>
-					<td>
-						<c:out value="${user.email}" />
-					</td>
-				</tr>
-			</c:forEach>
-		</tbody>
-	</table>
-	
-	<div id="pager1">
-		<form onsubmit="return false;">
-			<img src="<lams:LAMSURL/>/images/first.png" class="first"/>
-			<img src="<lams:LAMSURL/>/images/prev.png" class="prev">
-			<input type="text" class="pagedisplay"/>
-			<img src="<lams:LAMSURL/>/images/next.png" class="next">
-			<img src="<lams:LAMSURL/>/images/last.png" class="last">
-			<select class="pagesize">
-				<option selected="selected" value="10">10&nbsp;&nbsp;</option>
-				<option value="20">20</option>
-				<option value="30">30</option>
-				<option value="40">40</option>
-				<option value="50">50</option>
-				<option value="100">100</option>
-			</select>
-		</form>
-	</div>
+		</c:forEach>
+	</tbody>
+	<tfoot>
+		<tr>
+	    	<th colspan="4" class="ts-pager form-horizontal">
+	    	<form onsubmit="return false;">	    	
+		        <button type="button" class="btn btn-xs first"><i class="fa fa-step-backward"></i></button>
+		        <button type="button" class="btn btn-xs prev"><i class="fa fa-backward"></i></button>
+		        <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+		        <button type="button" class="btn btn-xs next"><i class="fa fa-forward"></i></button>
+		        <button type="button" class="btn btn-xs last"><i class="fa fa-step-forward"></i></button>
+		        <select class="pagesize" title="Select page size">
+		      		<option selected="selected" value="10">10</option>
+		      		<option value="20">20</option>
+		      		<option value="30">30</option>
+		      		<option value="40">40</option>
+		      		<option value="50">50</option>
+		      		<option value="100">100</option>
+		        </select>
+		    </form>
+	        </th>
+	    </tr>
+	</tfoot>
+	<tbody>
+	</tbody>
+</table> 	
 </c:if>
\ No newline at end of file
Index: lams_admin/web/organisation/parts/selectStaff.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/parts/selectStaff.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_admin/web/organisation/parts/selectStaff.jsp	1 Nov 2010 23:06:08 -0000	1.3
+++ lams_admin/web/organisation/parts/selectStaff.jsp	16 Jun 2016 03:10:21 -0000	1.3.2.1
@@ -1,36 +1,43 @@
 <%@ include file="/taglibs.jsp"%>
 
+<link type="text/css" href="${lams}css/jquery.tablesorter.theme.bootstrap.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css"  rel="stylesheet">
+
 <script>
-	<!--
-	jQuery(document).ready(function() {
-		//big workaround in order to bind Lams event
-		$.tablesorter.addWidget({
-			id: "checkallCheckbox2",
-			// format is called when the on init and when a sorting has finished
-			format: function(table) {
-				var hasCheckedItems = false;
-				jQuery("input[id=staff]").each(function(index) {
-					hasCheckedItems = hasCheckedItems || $(this).attr('checked');
-				 });
-				jQuery("#checkAllStaff").attr('checked', hasCheckedItems);
-			}
-		});
-		
-		jQuery("#staffTable").tablesorter({
+	$(document).ready(function() {
+		$(".tablesorter").tablesorter({
 			widthFixed:true,
+			theme: 'bootstrap',
+			headerTemplate : '{content} {icon}',
 			sortList:[[1,0]],
 			headers: { 0: { sorter: false}},
 			textExtraction:'complex',
-			widgets: ['checkallCheckbox2']			
-		}).tablesorterPager({
-			positionFixed: false,
-			container: jQuery("#pager")
+			widgets: ['uitheme','checkallCheckbox2']		
 		});
+		
+		//sort table only in case there is a data inside (it's a tablesorter bug)
+		if ($(".tablesorter tbody tr").length > 0) {
+			$(".tablesorter").tablesorterPager({
+				container: jQuery(".ts-pager"),
+	            output: '{startRow} to {endRow} ({totalRows})'
+			});
+			$(".tablesorter").trigger("sorton", [[[0, 0]]]);
+		}
+		
+		updateAllStaff();
 	});
-
+	
+	function updateAllStaff() {
+		var allCheckedItems = true;
+		$("input[id=staff]").each(function(index) {
+			allCheckedItems = allCheckedItems && $(this).prop('checked');
+		 });
+		$("#checkAllStaff").prop('checked', allCheckedItems);
+	}
+	
 	function checkAllStaff () {
-		var isChecked = jQuery("#checkAllStaff").attr('checked');
-		jQuery("input[name=staff]").attr('checked', isChecked);
+		var isChecked = $("#checkAllStaff").prop('checked');
+		$("input[name=staff]").prop('checked', isChecked);
 	}
 	//-->
 </script>
@@ -42,50 +49,55 @@
 <c:if test="${not empty monitors}">
 	<p><fmt:message key="message.check.to.add.monitor" /></p>
 
-	<table id="staffTable" class="alternative-color tablesorter-admin">
-		<thead>
+<table id="staffTable" class="tablesorter">
+	<thead>
+		<tr>
+			<th><input type='checkbox' id='checkAllStaff' onclick='checkAllStaff();' ></th>
+			<th><fmt:message key="admin.user.login" /></th>
+			<th><fmt:message key="admin.user.name" /></th>
+			<th><fmt:message key="admin.user.email" /></th>
+		</tr>
+	</thead>
+	<tbody>
+		<c:forEach items="${monitors}" var="user">
 			<tr>
-				<th><input type='checkbox' id='checkAllStaff' onclick='checkAllStaff();' ></th>
-				<th><fmt:message key="admin.user.login" /></th>
-				<th><fmt:message key="admin.user.name" /></th>
-				<th><fmt:message key="admin.user.email" /></th>
+				<td>
+					<input id="staff" name="staff" type="checkbox" value="<c:out value="${user.userId}" />" checked="checked" onclick='updateAllStaff();'/>
+				</td>
+				<td>
+					<c:out value="${user.login}" />
+				</td>
+				<td>
+					<c:out value="${user.title}" />&nbsp;<c:out value="${user.firstName}" />&nbsp;<c:out value="${user.lastName}" />
+				</td>
+				<td>
+					<c:out value="${user.email}" />
+				</td>
 			</tr>
-		</thead>
-		<tbody>
-			<c:forEach items="${monitors}" var="user">
-				<tr>
-					<td>
-						<input id="staff" name="staff" type="checkbox" value="<c:out value="${user.userId}" />" checked="checked" />
-					</td>
-					<td>
-						<c:out value="${user.login}" />
-					</td>
-					<td>
-						<c:out value="${user.title}" /> <c:out value="${user.firstName}" /> <c:out value="${user.lastName}" />
-					</td>
-					<td>
-						<c:out value="${user.email}" />
-					</td>
-				</tr>
-			</c:forEach>
-		</tbody>
-	</table>
-	
-	<div id="pager">
-		<form onsubmit="return false;">
-			<img src="<lams:LAMSURL/>/images/first.png" class="first"/>
-			<img src="<lams:LAMSURL/>/images/prev.png" class="prev">
-			<input type="text" class="pagedisplay"/>
-			<img src="<lams:LAMSURL/>/images/next.png" class="next">
-			<img src="<lams:LAMSURL/>/images/last.png" class="last">
-			<select class="pagesize">
-				<option selected="selected" value="10">10&nbsp;&nbsp;</option>
-				<option value="20">20</option>
-				<option value="30">30</option>
-				<option value="40">40</option>
-				<option value="50">50</option>
-				<option value="100">100</option>
-			</select>
-		</form>
-	</div>
+		</c:forEach>
+	</tbody>
+	<tfoot>
+		<tr>
+	    	<th colspan="4" class="ts-pager form-horizontal">
+	    	<form onsubmit="return false;">	    	
+		        <button type="button" class="btn btn-xs first"><i class="fa fa-step-backward"></i></button>
+		        <button type="button" class="btn btn-xs prev"><i class="fa fa-backward"></i></button>
+		        <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+		        <button type="button" class="btn btn-xs next"><i class="fa fa-forward"></i></button>
+		        <button type="button" class="btn btn-xs last"><i class="fa fa-step-forward"></i></button>
+		        <select class="pagesize" title="Select page size">
+		      		<option selected="selected" value="10">10</option>
+		      		<option value="20">20</option>
+		      		<option value="30">30</option>
+		      		<option value="40">40</option>
+		      		<option value="50">50</option>
+		      		<option value="100">100</option>
+		        </select>
+		    </form>
+	        </th>
+	    </tr>
+	</tfoot>
+	<tbody>
+	</tbody>
+</table> 	
 </c:if>
\ No newline at end of file
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/signupmanagement/add.jsp,v
diff -u -r1.6.2.2 -r1.6.2.3
--- lams_admin/web/signupmanagement/add.jsp	28 Jul 2015 20:27:49 -0000	1.6.2.2
+++ lams_admin/web/signupmanagement/add.jsp	16 Jun 2016 03:10:21 -0000	1.6.2.3
@@ -1,21 +1,19 @@
 <%@ include file="/taglibs.jsp"%>
 
-<h4>
-	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :
-	<a href="signupManagement.do"><fmt:message key="admin.signup.title" /></a>
-</h4>
+<div>
+<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
+<a href="signupManagement.do" class="btn btn-default loffset5"><fmt:message key="admin.signup.title" /></a>
+</div>
 
-<h1><fmt:message key="admin.add.edit.signup.page" /></h1>
-
 <html:form action="/signupManagement.do" method="post">
 	<html:hidden property="method" value="add" />
 	<html:hidden property="signupOrganisationId" />
 	
-	<table>
+	<table class="table table-condensed table-no-border">
 		<tr>
 			<td style="width: 250px;"><fmt:message key="admin.group" />:</td>
 			<td>
-				<html:select property="organisationId">
+				<html:select property="organisationId" styleClass="form-control">
 					<c:forEach items="${organisations}" var="organisation">
 						<html:option value="${organisation.organisationId}"><c:out value="${organisation.name}" /></html:option>
 					</c:forEach>
@@ -34,13 +32,14 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td><fmt:message key="admin.course.key" />:</td>
-			<td><html:text property="courseKey" size="40" maxlength="255" /></td>
-			<td><html:errors property="courseKey" /></td>
+			<td colspan="2"><html:errors property="courseKey" /></td>
 		</tr>
 		<tr>
+			<td><fmt:message key="admin.course.key" />:</td>
+			<td><html:text property="courseKey" size="40" maxlength="255"  styleClass="form-control"/></td>
+		<tr>
 			<td><fmt:message key="admin.confirm.course.key" />:</td>
-			<td><html:text property="confirmCourseKey" size="40" maxlength="255" /></td>
+			<td><html:text property="confirmCourseKey" size="40" maxlength="255"  styleClass="form-control"/></td>
 			<td></td>
 		</tr>
 		<tr>
@@ -64,18 +63,17 @@
 			<td></td>
 		</tr>		
 		<tr>
+			<td colspan="2"><html:errors property="context" /></td>
+		</tr>
+		<tr>
 			<td><fmt:message key="admin.context.path" />:</td>
 			<td style="vertical-align: middle;"><lams:LAMSURL/>signup/<html:text property="context" /></td>
-			<td><html:errors property="context" /></td>
 		</tr>
-		<tr>
-			<td></td>
-			<td style="padding-left: 80px; padding-top: 15px;">
-				<html:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel" /></html:cancel>
-				<html:submit styleId="submitButton" styleClass="button"><fmt:message key="admin.submit" /></html:submit>
-			</td>
-			<td></td>
-		</tr>
 	</table>
+	
+	<div class="pull-right">
+				<html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel" /></html:cancel>
+				<html:submit styleId="submitButton" styleClass="btn btn-primary loffset5"><fmt:message key="admin.submit" /></html:submit>
+	</div>
 
 </html:form>
\ No newline at end of file
Index: lams_admin/web/signupmanagement/list.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/signupmanagement/list.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_admin/web/signupmanagement/list.jsp	7 Aug 2012 19:00:49 -0000	1.2
+++ lams_admin/web/signupmanagement/list.jsp	16 Jun 2016 03:10:21 -0000	1.2.2.1
@@ -1,17 +1,15 @@
 <%@ page import="org.lamsfoundation.lams.signup.model.SignupOrganisation" %>
 <%@ include file="/taglibs.jsp"%>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a></h4>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<lams:help style="no-tabs" page="<%= SignupOrganisation.SIGNUP_HELP_PAGE %>"/>
-
-<h1><fmt:message key="admin.list.signup.pages"/></h1>
-
 <c:if test="${not empty error}">
-	<p class="warning"><c:out value="${error}" /></p>
+	<lams:Alert type="warn" id="errorMessage" close="false">	
+		<c:out value="${error}" />
+	</lams:Alert>
 </c:if>
 
-<table border="0" cellspacing="1" cellpadding="1" class="alternative-color">
+<table class="table table-striped table-condensed" >
 	<tr>
 		<th><fmt:message key="admin.group" /></th>
 		<th><fmt:message key="admin.group.code" /></th>
@@ -54,6 +52,4 @@
 	</c:forEach>
 </table>
 
-<p>
-	<html:link styleClass="button" page="/signupManagement.do?method=add"><fmt:message key="admin.add.new.signup.page"/></html:link>
-</p>
\ No newline at end of file
+<html:link styleClass="btn btn-primary pull-right" page="/signupManagement.do?method=add"><fmt:message key="admin.add.new.signup.page"/></html:link>
Index: lams_admin/web/toolcontent/learningLibraryGroup.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/toolcontent/learningLibraryGroup.jsp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_admin/web/toolcontent/learningLibraryGroup.jsp	9 Feb 2016 18:53:01 -0000	1.1.2.4
+++ lams_admin/web/toolcontent/learningLibraryGroup.jsp	16 Jun 2016 03:10:21 -0000	1.1.2.5
@@ -5,8 +5,8 @@
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<lams:css style="main" />
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" type="text/css" media="screen" />
+	<lams:css/>
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-smoothness-theme.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="css/learningLibraryGroup.css" type="text/css" media="screen" />
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
@@ -21,13 +21,13 @@
 			decoderDiv = $('<div />'),
 			LABELS = {
 					<fmt:message key="tool.groups.group.default.name" var="GROUP_DEFAULT_NAME_VAR"/>
-					GROUP_DEFAULT_NAME : '<c:out value="${GROUP_DEFAULT_NAME_VAR}" />',
+					GROUP_DEFAULT_NAME : '${GROUP_DEFAULT_NAME_VAR}',
 					<fmt:message key="tool.groups.remove.confirm" var="GROUP_REMOVE_CONFIRM_VAR"/>
-					GROUP_REMOVE_CONFIRM : decoderDiv.html('<c:out value="${GROUP_REMOVE_CONFIRM_VAR}" />').text(),
+					GROUP_REMOVE_CONFIRM : decoderDiv.html('${GROUP_REMOVE_CONFIRM_VAR}').text(),
 					<fmt:message key="tool.groups.group.name.error" var="GROUP_NAME_VALIDATION_ERROR_VAR"/>
-					GROUP_NAME_VALIDATION_ERROR : decoderDiv.html('<c:out value="${GROUP_NAME_VALIDATION_ERROR_VAR}" />').text(),
+					GROUP_NAME_VALIDATION_ERROR : decoderDiv.html('${GROUP_NAME_VALIDATION_ERROR_VAR}').text(),
 					<fmt:message key="tool.groups.save.error" var="SAVE_ERROR_VAR"/>
-					SAVE_ERROR : decoderDiv.html('<c:out value="${SAVE_ERROR_VAR}" />').text()
+					SAVE_ERROR : decoderDiv.html('${SAVE_ERROR_VAR}').text()
 			};
 	</script>
 </lams:head>
@@ -53,8 +53,8 @@
 <!-- A template which gets cloned when a group is added -->
 <div id="groupTemplate" class="groupContainer">
 	<div class="learningLibraryContainerTitle">
-		<img class="removeGroupButton" src="<lams:LAMSURL/>images/css/delete.png"
-			 title="<fmt:message key='tool.groups.remove.group.button.tooltip' />" />
+		<i class="removeGroupButton fa fa-times" src="<lams:LAMSURL/>images/css/delete.png"
+			 title="<fmt:message key='tool.groups.remove.group.button.tooltip' />"></i>
 		<input type="text" />
 	</div>
 	<div class="learningLibraryContainer"></div>
Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/toolcontent/toolcontentlist.jsp,v
diff -u -r1.10.2.1 -r1.10.2.2
--- lams_admin/web/toolcontent/toolcontentlist.jsp	8 Oct 2014 14:26:47 -0000	1.10.2.1
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	16 Jun 2016 03:10:21 -0000	1.10.2.2
@@ -35,37 +35,40 @@
 </script>
 
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a></h4>
+<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+
 <h1><fmt:message key="sysadmin.tool.management" /></h1>
 
-<p>
-	<fmt:message key="msg.edit.tool.content.1" />
-	&nbsp;&nbsp;
-	<fmt:message key="msg.edit.tool.content.2" />
-</p>
-<p>
-	<fmt:message key="msg.edit.tool.content.3" />
-</p>
+<div class="panel">
+	<p>
+		<fmt:message key="msg.edit.tool.content.1" />
+		&nbsp;
+		<fmt:message key="msg.edit.tool.content.2" />
+	</p>
+	<p>
+		<fmt:message key="msg.edit.tool.content.3" />
+	</p>
+	
+	<a href="javascript:openToolGroups()" class="btn btn-default pull-right" 
+	   title="<fmt:message key='tool.groups.open.button.tooltip' />"><fmt:message key="tool.groups.open.button" /></a>
+	<div id="toolGroupsDialog" style="display: none">
+		<a class="customDialogButton" href="javascript:saveToolGroups()" style="right: 50px;">
+			<fmt:message key="admin.save" />
+		</a>
+		<iframe id="toolGroupsFrame" style="border: none; width: 100%; height: 100%"></iframe>
+	</div>
+	
+	<p>${fn:length(toolLibrary)}&nbsp;<fmt:message key="sysadmin.library.totals" /></p>
+</div>	
 
-<a href="javascript:openToolGroups()" class="button" style="float:right; margin: 10px 0"
-   title="<fmt:message key='tool.groups.open.button.tooltip' />"><fmt:message key="tool.groups.open.button" /></a>
-<div id="toolGroupsDialog" style="display: none">
-	<a class="customDialogButton" href="javascript:saveToolGroups()" style="right: 50px;">
-		<fmt:message key="admin.save" />
-	</a>
-	<iframe id="toolGroupsFrame" style="border: none; width: 100%; height: 100%"></iframe>
-</div>
-
-
 <c:set var="displayToolManagement" value="false" />
 <logic:iterate id="dto" name="toolLibrary">
 	<c:if test="${dto.adminURL != null}">
 		<c:set var="displayToolManagement" value="true" />
 	</c:if>
 </logic:iterate>
 
-<p>
-<table class="alternative-color" width="100%">
+<table class="table table-striped table-condensed voffset10">
 	<tr>
 		<th><fmt:message key="label.tool" /></th>
 		<th><fmt:message key="sysadmin.library.activity.description" /></th>
@@ -111,4 +114,3 @@
 	</logic:iterate>
 </table>
 </p>
-<p>${fn:length(toolLibrary)} <fmt:message key="sysadmin.library.totals" /></p>
Index: lams_admin/web/user/basiclist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/user/basiclist.jsp,v
diff -u -r1.1 -r1.1.12.1
--- lams_admin/web/user/basiclist.jsp	5 Dec 2007 05:52:49 -0000	1.1
+++ lams_admin/web/user/basiclist.jsp	16 Jun 2016 03:10:21 -0000	1.1.12.1
@@ -1,6 +1,6 @@
 <%@ include file="/taglibs.jsp"%>
 
-<lams:css style="learner"/>
+<lams:css/>
 
 <c:forEach var="user" items="${users}">
 	<li id="<c:out value="${user.userId}"/>"><c:out value="${user.login}" /> (<c:out value="${user.firstName}" /> <c:out value="${user.lastName}" />) - <c:out value="${user.email}" /></li>
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.138.2.25 -r1.138.2.26
--- lams_central/conf/language/lams/ApplicationResources.properties	11 May 2016 07:07:57 -0000	1.138.2.25
+++ lams_central/conf/language/lams/ApplicationResources.properties	16 Jun 2016 03:13:10 -0000	1.138.2.26
@@ -684,4 +684,5 @@
 label.private.notifications.read =Read
 label.private.notifications.read.hint =Mark notification as read
 label.private.notifications.read.all.hint =Mark all notifications as read
+label.select.groups =Select groups 
 #======= End labels: Exported 439 labels for en AU =====
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_central/web/WEB-INF/tags/Page.tag	19 Apr 2016 00:04:06 -0000	1.1.2.4
+++ lams_central/web/WEB-INF/tags/Page.tag	16 Jun 2016 03:13:27 -0000	1.1.2.5
@@ -24,7 +24,7 @@
 						<div class="panel-title panel-${type}-title">
 							<c:out value="${title}" escapeXml="true" />
 							<c:if test="${not empty titleHelpURL}">
-								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+								<span class="pull-right">${titleHelpURL}</span>
 							</c:if>
 						</div>
 						<c:if test="${not empty headingContent}">