Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -rc92ea51a973dc03ece970c057dd9369eda6a8c24 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java	(.../ThemeManagementAction.java)	(revision c92ea51a973dc03ece970c057dd9369eda6a8c24)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java	(.../ThemeManagementAction.java)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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/WEB-INF/tags/Alert.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/Alert.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/Alert.tag	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -0,0 +1,46 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="close" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
+<c:set var="idName" value="alert-${type}" />
+<c:if test="${not empty id}">
+	<c:set var="idName" value="${id}" />
+</c:if>
+
+<c:set var="alertType" value="info" />
+<c:set var="iconType" value="info-circle" />
+<c:choose>
+	<c:when test="${type == 'danger'}">
+		<c:set var="alertType" value="danger" />
+		<c:set var="iconType" value="times-circle" />
+	</c:when>
+	<c:when test="${type == 'success'}">
+		<c:set var="alertType" value="success" />
+		<c:set var="iconType" value="check-circle" />
+	</c:when>
+	<c:when test="${type == 'warning'}">
+		<c:set var="alertType" value="warning" />
+		<c:set var="iconType" value="exclamation-circle" />
+	</c:when>
+</c:choose>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-${alertType}" style="margin-bottom: 10px; padding: 8px">
+			<div class="media">
+				<div class="media-left">
+					<i class="fa fa-lg fa-${iconType} text-muted"></i>
+				</div>
+				<div class="media-body">
+					<c:if test="${close}">
+							<a href="#" class="close pull-right" data-dismiss="alert" aria-label="close">&times;</a>
+					</c:if>
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
Index: lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -0,0 +1,349 @@
+<% 
+ /**
+  * AuthoringRatingCriteria.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+
+<!-- calculate whether isCommentsAllowed is true -->
+<c:set var="isCommentsEnabled" value="false"/>
+<c:set var="commentsMinWordsLimit" value="0"/>
+<c:forEach var="criteria" items="${criterias}" varStatus="status">
+	<c:if test="${criteria.commentsEnabled}">
+		<c:set var="isCommentsEnabled" value="true"/>
+		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
+	</c:if>
+</c:forEach>
+
+<!-- begin tab content -->
+<script type="text/javascript">
+$(document).ready(function() { 
+	
+	// find max orderId
+	<c:set var="maxOrderId" value="0"/>
+	<c:forEach var="criteria" items="${criterias}" varStatus="status">
+		<c:if test="${criteria.orderId > maxOrderId}">
+			<c:set var="maxOrderId" value="${criteria.orderId}"/>
+		</c:if>
+	</c:forEach>
+	var maxOrderId = ${maxOrderId};
+	
+	function addCriteria() {
+		//increase maxOrderId by 1
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		
+		jQuery('<tr/>').append(jQuery('<td/>', {
+			'class': 'criteria-info',
+		    html: '<input type="hidden" name="criteriaOrderId' + maxOrderId + '" value="' + maxOrderId + '">' + 
+		    		'<input type="text" name="criteriaTitle' + maxOrderId + '" value="" class="form-control">'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');
+		
+		reactivateArrows();
+	}
+	<c:if test="${empty criterias}">
+		addCriteria(); 
+		addCriteria();
+	</c:if>
+	reactivateArrows();
+	
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+	
+	//upCriteria
+	 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+		var currentRow = $(this).closest('tr');
+		var currentCriteriaTd = $( ".criteria-info", currentRow);
+		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+		//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+		var prevRow = currentRow.prev();
+		var prevCriteriaTd = $( ".criteria-info", prevRow);
+		var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+		//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+		
+		//swap orderIds
+		var temp = currentOrderId.val();
+		currentOrderId.val(prevOrderId.val());
+		prevOrderId.val(temp);
+		
+		//swap elements
+		currentCriteriaTd.detach().prependTo(prevRow);
+		prevCriteriaTd.detach().prependTo(currentRow);
+		
+		reactivateArrows();
+	 } );
+	 
+	//downCriteria
+	 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+		var currentRow = $(this).closest('tr');
+		var currentCriteriaTd = $( ".criteria-info", currentRow);
+		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+		//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+		var nextRow = currentRow.next();
+		var nextCriteriaTd = $( ".criteria-info", nextRow);
+		var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+		//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+		
+		//swap orderIds
+		var temp = currentOrderId.val();
+		currentOrderId.val(nextOrderId.val());
+		nextOrderId.val(temp);
+		
+		//swap elements
+		currentCriteriaTd.detach().prependTo(nextRow);
+		nextCriteriaTd.detach().prependTo(currentRow);
+		
+		reactivateArrows();
+	 });
+	 
+	 //deleteCriteria
+	 $( "body" ).on( "click", ".fa-times", function() {
+		var currentRow = $(this).closest('tr');
+		currentRow.remove();
+		
+		reactivateArrows();
+	});
+	 
+	 //addCriteria
+	 $( "body" ).on( "click", "#add-criteria", function() {
+		 addCriteria();
+	});
+	 
+ 	//spinner
+ 	var minimumWordsSpinner = $("#comments-min-words-limit").spinner({ 
+ 		min: 0,
+ 		disabled: ${!isCommentsEnabled}
+ 	});
+ 	$("#enable-comments").click(function() {
+ 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+ 			minimumWordsSpinner.spinner( "enable" );
+ 			$("#comments-min-words-limit-label").removeClass("gray-color");
+ 		} else {
+ 			minimumWordsSpinner.spinner( "disable" );
+ 			$("#comments-min-words-limit-label").addClass("gray-color");
+ 		}
+     });
+	 
+})
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum) {
+		var minRateDropDown = document.getElementById("minimum-rates");
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximum-rates");
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+	<div class="panel panel-default voffset5">
+		<div class="panel-heading panel-title">
+			<label><fmt:message key="${headerLabel}" /></label>
+		</div>
+	
+		<div class="form-group roffset10 loffset10">
+			<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+			<table class="table table-condensed table-no-border" id="criterias-table">
+		
+				<c:forEach var="criteria" items="${criterias}" varStatus="status">
+					<c:if test="${!criteria.commentsEnabled}">
+						<tr>
+							
+							<td class="criteria-info">
+								<input type="hidden" name="criteriaOrderId${criteria.orderId}" value="${criteria.orderId}">
+								<input type="text" name="criteriaTitle${criteria.orderId}" value="${criteria.title}" class="form-control">
+							</td>
+							
+							<td width="40px">
+								<div class="arrow-up" title="<fmt:message key="${upLabel}"/>"></div>
+								<div class="arrow-down" title="<fmt:message key="${downLabel}"/>"></div>
+							</td>
+			                
+							<td width="20px">
+								<i class="fa fa-times" title="<fmt:message key="${deleteLabel}" />"></i>
+							</td>
+						</tr>
+					</c:if>
+				</c:forEach>
+			</table>
+	
+			<div style="height: 25px; margin-top: -10px;">
+				<a href="#nogo" class="btn btn-default btn-xs pull-right" id="add-criteria">
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+				</a>
+			</div>
+	
+			<c:if test="${hasRatingLimits}">
+				<div>
+					<label for="minimum-rates">
+						<fmt:message key="${minimumLabel}" />
+					</label>
+					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							styleClass="form-control form-control-inline">
+						<html:option value="0">
+							<fmt:message key="${noMinimumLabel}" />
+						</html:option>
+						<html:option value="1">1</html:option>
+						<html:option value="2">2</html:option>
+						<html:option value="3">3</html:option>
+						<html:option value="4">4</html:option>
+						<html:option value="5">5</html:option>
+						<html:option value="6">6</html:option>
+						<html:option value="7">7</html:option>
+						<html:option value="8">8</html:option>
+						<html:option value="9">9</html:option>
+						<html:option value="10">10</html:option>
+					</html:select>
+				
+					<label for="maximum-rates">
+						<fmt:message key="${maximumLabel}" />
+					</label>
+					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							styleClass="form-control form-control-inline">
+						<html:option value="0">
+							<fmt:message key="${noMaximumLabel}" />
+						</html:option>
+						<html:option value="1">1</html:option>
+						<html:option value="2">2</html:option>
+						<html:option value="3">3</html:option>
+						<html:option value="4">4</html:option>
+						<html:option value="5">5</html:option>
+						<html:option value="6">6</html:option>
+						<html:option value="7">7</html:option>
+						<html:option value="8">8</html:option>
+						<html:option value="9">9</html:option>
+						<html:option value="10">10</html:option>
+					</html:select>
+				</div>
+			</c:if>
+	
+			<div class="checkbox">
+				<label for="enable-comments">
+					<input type="checkbox" name="isCommentsEnabled" value="true" class="noBorder" id="enable-comments"
+						<c:if test="${isCommentsEnabled}">checked="checked"</c:if>
+					/>
+					<fmt:message key="${allowCommentsLabel}" />
+				</label>
+			</div>
+	
+			<div>
+				<label for="comments-min-words-limit" id="comments-min-words-limit-label"
+					<c:if test="${!isCommentsEnabled}">class="gray-color"</c:if>
+				>
+					<fmt:message key="${minNumberWordsLabel}" >
+						<fmt:param> </fmt:param>
+					</fmt:message>
+				</label>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/Comments.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/Comments.tag	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -0,0 +1,47 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
+<%@ attribute name="width" required="false" rtexprvalue="true"%>
+<%@ attribute name="mode" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeAndDislike" required="false" rtexprvalue="true"%>
+<%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
+<%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
+<%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+
+
+<c:if test="${empty width}">
+	<c:set var="width" value="100%" />
+</c:if>
+
+<c:if test="${empty height}">
+	<c:set var="height" value="auto" />
+</c:if>
+
+<c:set var="modeStr" value=""/>
+<c:if test="${!empty mode}">
+	<c:set var="modeStr">&mode=${mode}</c:set>
+</c:if>
+
+<c:if test="${empty likeAndDislike}">
+	<c:set var="likeAndDislike" value="false" />
+</c:if>
+
+<c:if test="${empty readOnly}">
+	<c:set var="readOnly" value="false" />
+</c:if>
+
+<c:if test="${empty sortBy}">
+	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
+</c:if>
+
+<div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+<script>
+$(document).ready(function(){
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$('#commentFrame').load(url);
+});
+</script>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/CommentsAuthor.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/CommentsAuthor.tag	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -0,0 +1,51 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
+<%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+
+<c:if test="${empty allowCommentsVariableName}">
+	<c:set var="allowCommentsVariableName" value="allowComments" />
+</c:if>
+<c:if test="${empty allowCommentLabelKey}">
+	<c:set var="allowCommentLabelKey" value="advanced.allow.comments" />
+</c:if>
+<c:if test="${empty likeDislikeVariableName}">
+	<c:set var="likeDislikeVariableName" value="commentsLikeAndDislike" />
+</c:if>
+<c:if test="${empty likeOnlyCommentLabelKey}">
+	<c:set var="likeOnlyCommentLabelKey" value="advanced.comments.like.only" />
+</c:if>
+<c:if test="${empty likeDislikeLabelKey}">
+	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
+</c:if>
+
+<div class="checkbox">
+	<label>
+	<html:checkbox property="${allowCommentsVariableName}" value="1"
+		styleId="${allowCommentsVariableName}">
+	</html:checkbox>
+	<fmt:message key="${allowCommentLabelKey}"/>
+	</label>
+</div>
+<div class="loffset20" id="likedislike">
+		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+</div>
+
+<script>
+jQuery( document ).ready(function( $ ) {
+	if (! $("#${allowCommentsVariableName}").is(':checked')) {
+		$("#likedislike").hide();
+	}
+	$("#${allowCommentsVariableName}").click(function() {
+		$("#likedislike").toggle('slow');
+	});
+});
+</script>
+
+
Index: lams_admin/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rfef442a88ab05c91db8a551081c4abc060d4da5e -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision fef442a88ab05c91db8a551081c4abc060d4da5e)
+++ lams_admin/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
Index: lams_admin/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/Rating.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/Rating.tag	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -0,0 +1,194 @@
+<% 
+ /**
+  * Rating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows rating stars widget
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="itemRatingDto" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.ItemRatingDTO" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="disabled" required="false" rtexprvalue="true" %>
+<%@ attribute name="isItemAuthoredByUser" required="false" rtexprvalue="true" %>
+<%@ attribute name="maxRates" required="false" rtexprvalue="true" %>
+<%@ attribute name="countRatedItems" required="false" rtexprvalue="true" %>
+<%@ attribute name="yourRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty disabled}">
+	<c:set var="disabled" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty isItemAuthoredByUser}">
+	<c:set var="isItemAuthoredByUser" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty maxRates}">
+	<c:set var="maxRates" value="0" scope="request"/>
+</c:if>
+<c:if test="${empty countRatedItems}">
+	<c:set var="countRatedItems" value="0" scope="request"/>
+</c:if>
+<c:if test="${empty yourRatingLabel}">
+	<c:set var="yourRatingLabel" value="label.your.rating" scope="request"/>
+</c:if>
+<c:if test="${empty averageRatingLabel}">
+	<c:set var="averageRatingLabel" value="label.average.rating" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.comment.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty showComments}">
+	<c:set var="showComments" value="true" scope="request"/>
+</c:if>
+<c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled && showComments}"/>
+
+<c:if test="${isCommentsEnabled}">
+	<c:set var="userId"><lams:user property="userID" /></c:set>
+	<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+		<c:if test="${comment.userId == userId}">
+			<c:set var="commentLeftByUser" value="${comment}"/>
+		</c:if>
+	</c:forEach>
+</c:if>
+
+<%--Rating stars area---------------------------------------%>
+
+<div class="extra-controls-inner">
+<div class="rating-stars-holder text-center center-block">
+
+	<c:set var="hasStartedRating" value="false"/>
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}">
+		<c:set var="hasStartedRating" value='${hasStartedRating || criteriaDto.userRating != ""}'/>
+	</c:forEach>
+	<c:set var="hasStartedRating" value='${hasStartedRating || not empty commentLeftByUser}'/>
+	
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}" varStatus="status">
+		<c:set var="objectId" value="${criteriaDto.ratingCriteria.ratingCriteriaId}-${itemRatingDto.itemId}"/>
+		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
+	
+		<c:choose>
+			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingStarsClass" value="rating-stars"/>
+			</c:otherwise>
+		</c:choose>
+			
+		<strong>
+			${criteriaDto.ratingCriteria.title}
+		</strong>
+			
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser || not isCriteriaNotRatedByUser}'>
+				<c:set var="ratingDataAverage" value="${criteriaDto.averageRating}"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingDataAverage" value="0"/>
+			</c:otherwise>
+		</c:choose>
+		
+		<div class="${ratingStarsClass} rating-stars-new" data-average="${ratingDataAverage}" data-id="${objectId}">
+		</div>
+			
+		<c:choose>
+			<c:when test="${isItemAuthoredByUser}">
+				<div class="rating-stars-caption">
+					<fmt:message key="${averageRatingLabel}" >
+						<fmt:param>
+							<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+						</fmt:param>
+						<fmt:param>
+							${criteriaDto.numberOfVotes}
+						</fmt:param>
+					</fmt:message>
+				</div>
+			</c:when>
+				
+			<c:otherwise>
+				<div class="rating-stars-caption" id="rating-stars-caption-${objectId}"
+					<c:if test="${isCriteriaNotRatedByUser}">style="visibility: hidden;"</c:if>
+				>
+					<fmt:message key="${yourRatingLabel}" >
+						<fmt:param>
+							<span id="user-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.userRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>			
+						<fmt:param>
+							<span id="average-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>
+						<fmt:param>
+							<span id="number-of-votes-${objectId}">${criteriaDto.numberOfVotes}</span>
+						</fmt:param>
+					</fmt:message>
+				</div>
+				
+			</c:otherwise>
+		</c:choose>
+			
+	</c:forEach>
+
+</div>
+
+</div>
+
+<%--Comments area---------------------------------------%>
+<c:if test="${isCommentsEnabled}">
+	<div id="comments-area-${itemRatingDto.itemId}">
+	
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser}'>
+				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+					<div class="rating-comment">
+						<c:out value="${comment.comment}" escapeXml="false" />
+					</div>
+				</c:forEach>
+			</c:when>
+			
+			<c:when test='${not empty commentLeftByUser}'>
+				<div class="rating-comment">
+					<c:out value="${commentLeftByUser.comment}" escapeXml="false" />
+				</div>
+			</c:when>
+			
+			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
+				<div id="add-comment-area-${itemRatingDto.itemId}">
+			
+					<!-- Comment min words limit -->
+					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
+					
+						<lams:Alert type="info" id="comment-limit-${itemRatingDto.itemId}" close="false">
+							<fmt:message key="${minNumberWordsLabel}">
+								: <fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/>
+							</fmt:message>
+						</lams:Alert>
+					</c:if>		
+				
+					<div class="no-gutter">
+						<div class="col-xs-12 col-sm-11 ">
+						<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" onfocus="if(this.value==this.defaultValue)this.value='';" 
+								onblur="if(this.value=='')this.value=this.defaultValue;" 
+								class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>
+						</div>
+						<div class="button add-comment add-comment-new col-xs-12 col-sm-1 " data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}">
+						</div>
+					</div>		
+				</div>			
+			</c:when>
+		</c:choose>
+			
+	</div>	
+</c:if>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/TSTable.tag	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -0,0 +1,53 @@
+<%-- Tablesorter Table and Pager --%>
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="numColumns" required="true" rtexprvalue="true"%>
+<%@ attribute name="dataId" required="false" rtexprvalue="true"%>
+<%@ attribute name="tableClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="pagerClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="test" required="false" rtexprvalue="true"%>
+
+<c:if test="${empty tableClass}">
+	<c:set var="tableClass" value="tablesorter" />
+</c:if>
+
+<c:if test="${empty pagerClass}">
+	<c:set var="pagerClass" value="ts-pager" />
+</c:if>
+
+<c:if test="${empty dataId}">
+	<c:set var="dataId" value="" />
+</c:if>
+
+<table class="${tableClass}" ${dataId}>
+	<thead>
+		<tr>
+			<jsp:doBody />
+		</tr>
+	</thead>
+	<tfoot>
+		<tr>
+	    	<th colspan="${numColumns}" class="${pagerClass} form-horizontal">
+	        <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">
+	      		<c:if test="${not empty test}"><option value="2">2</option></c:if>
+	      		<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>
+	      </th>
+	    </tr>
+	</tfoot>
+	<tbody>
+	</tbody>
+</table>
+
+	
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_admin/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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>
Index: lams_admin/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/TabBodyArea.tag	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -0,0 +1,39 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * TabBodyArea.tag
+ *	Author: Fiona Malikoff
+ *	Description: Creates the panel body area for a nav bar screen
+ * Wiki: 
+ */
+
+%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<div class="panel-body panel-monitor-body">
+	 <jsp:doBody />
+</div>
+
+</div> <!--  close tab opened in TabHeader -->
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/TabBodys.tag	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -0,0 +1,37 @@
+<%/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+/**
+ * TabBodys.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a tabbody list from nested TabBody tags.
+ * Wiki: 
+ */
+
+		%>
+<%@ tag body-content="scriptless"%>
+
+<!-- tab body holder table -->
+<div class="tab-content">
+	<jsp:doBody />
+</div>
Index: lams_admin/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_admin/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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/tiles-defs.xml
===================================================================
diff -u -r9c83d6e84da12d1d753d9a0588ecd4a1b49de1f7 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 9c83d6e84da12d1d753d9a0588ecd4a1b49de1f7)
+++ lams_admin/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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>
 	
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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/css/admin.css
===================================================================
diff -u
--- lams_admin/web/css/admin.css	(revision 0)
+++ lams_admin/web/css/admin.css	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -0,0 +1,3 @@
+p.warning {
+	color:#a94442
+}
\ No newline at end of file
Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -rf5f2bfea7d848c47c35db86335b0e0156447b7ca -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision f5f2bfea7d848c47c35db86335b0e0156447b7ca)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -rf5f2bfea7d848c47c35db86335b0e0156447b7ca -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision f5f2bfea7d848c47c35db86335b0e0156447b7ca)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r9846cdc7141f0754a67aad3ad18d82cfd67f3152 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 9846cdc7141f0754a67aad3ad18d82cfd67f3152)
+++ lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/import/status.jsp	(.../status.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_admin/web/import/status.jsp	(.../status.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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/parts/breadcrumbs.jsp
===================================================================
diff -u -r109a71a895d44a4bb8294b9b4c127e741cb2f772 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/organisation/parts/breadcrumbs.jsp	(.../breadcrumbs.jsp)	(revision 109a71a895d44a4bb8294b9b4c127e741cb2f772)
+++ lams_admin/web/organisation/parts/breadcrumbs.jsp	(.../breadcrumbs.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r7f0a0929afc52171ff0eeda53824300a5b680c02 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/organisation/parts/selectLearners.jsp	(.../selectLearners.jsp)	(revision 7f0a0929afc52171ff0eeda53824300a5b680c02)
+++ lams_admin/web/organisation/parts/selectLearners.jsp	(.../selectLearners.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r7f0a0929afc52171ff0eeda53824300a5b680c02 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/organisation/parts/selectStaff.jsp	(.../selectStaff.jsp)	(revision 7f0a0929afc52171ff0eeda53824300a5b680c02)
+++ lams_admin/web/organisation/parts/selectStaff.jsp	(.../selectStaff.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -rbb70a5e5c0c3abb5f9331aa2deffe926ecf30659 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision bb70a5e5c0c3abb5f9331aa2deffe926ecf30659)
+++ lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -rafcc8e2197603d94c2c476def4b6dd601951b84b -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision afcc8e2197603d94c2c476def4b6dd601951b84b)
+++ lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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>
Fisheye: Tag add7948dbdf9451fb5bb7839e22d2f22ca8b54f1 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
===================================================================
diff -u -r3dbf966d900adefc34cdad501d3c392118451cd9 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 3dbf966d900adefc34cdad501d3c392118451cd9)
+++ lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -rc0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250)
+++ lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/timezoneServerManagement.jsp	(.../timezoneServerManagement.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_admin/web/timezoneServerManagement.jsp	(.../timezoneServerManagement.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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/toolcontent/learningLibraryGroup.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/toolcontent/learningLibraryGroup.jsp	(.../learningLibraryGroup.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_admin/web/toolcontent/learningLibraryGroup.jsp	(.../learningLibraryGroup.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r5170c21ad54f59efa06760fa86efcace8de2792a -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 5170c21ad54f59efa06760fa86efcace8de2792a)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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.jsp
===================================================================
diff -u -r3dbf966d900adefc34cdad501d3c392118451cd9 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 3dbf966d900adefc34cdad501d3c392118451cd9)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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/user/basiclist.jsp
===================================================================
diff -u -r6452b7bb53f1f0eb5a340fd488a733a9a6bd1415 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/user/basiclist.jsp	(.../basiclist.jsp)	(revision 6452b7bb53f1f0eb5a340fd488a733a9a6bd1415)
+++ lams_admin/web/user/basiclist.jsp	(.../basiclist.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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_admin/web/userlist.jsp
===================================================================
diff -u -r48ed00ae83293d10aae53149bd06ee25598c9432 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 48ed00ae83293d10aae53149bd06ee25598c9432)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r36a78fea0bae9c4073ef18576e3dabd15380da4e -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 36a78fea0bae9c4073ef18576e3dabd15380da4e)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r48ed00ae83293d10aae53149bd06ee25598c9432 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 48ed00ae83293d10aae53149bd06ee25598c9432)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r51e6dce474861837e1e86838bcbc1b1efba971e3 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 51e6dce474861837e1e86838bcbc1b1efba971e3)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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
===================================================================
diff -u -r268809b34d41cef37fc1cbacc9aa0d2eeb245377 -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 268809b34d41cef37fc1cbacc9aa0d2eeb245377)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
@@ -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}">