Index: lams_tool_survey/web/pages/learning/question.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/question.jsp,v
diff -u -r1.10.2.1 -r1.10.2.2
--- lams_tool_survey/web/pages/learning/question.jsp	29 Oct 2014 19:58:20 -0000	1.10.2.1
+++ lams_tool_survey/web/pages/learning/question.jsp	5 Mar 2016 21:09:05 -0000	1.10.2.2
@@ -1,68 +1,82 @@
 <%@ include file="/common/taglibs.jsp"%>
-<div class="shading-bg">
-	<c:if test="${not question.optional}">
-		<span style="color: #FF0000">*</span>
-	</c:if>
-	<c:out value="${question.description}" escapeXml="false" />
 
-	<logic:messagesPresent property="questionError${question.uid}">
-		<p class="warning">
-			<html:messages id="error" property="questionError${question.uid}">
-				<c:out value="${error}" escapeXml="false" />
-			</html:messages>
-		</p>
-	</logic:messagesPresent>
+<div class="sbox voffset5">
+	<div class="sbox-heading clearfix">
+		<c:if test="${not question.optional}">
+			<abbr class="pull-right" title="<fmt:message key='label.answer.required'/>"><i class="fa fa-xs fa-asterisk text-danger pull-right"></i></abbr>
+		</c:if>
 
-	<c:set var="answerText" value="" />
-	<c:if test="${not empty question.answer}">
-		<c:set var="answerText" value="${question.answer.answerText}" />
-	</c:if>
-	<c:forEach var="option" items="${question.options}">
-		<c:set var="checked" value="" />
+		<c:out value="${question.description}" escapeXml="false" />
+
+		<logic:messagesPresent property="questionError${question.uid}">
+			<lams:Alert id="error" type="danger" close="false">
+				<html:messages id="error" property="questionError${question.uid}">
+					<c:out value="${error}" escapeXml="false" />
+				</html:messages>
+			</lams:Alert>
+		</logic:messagesPresent>
+
+
+	</div>
+	<div class="sbox-body">
+
+		<c:set var="answerText" value="" />
 		<c:if test="${not empty question.answer}">
-			<c:forEach var="choice" items="${question.answer.choices}">
-				<c:if test="${choice == option.uid}">
-					<c:set var="checked" value="checked='checked'" />
-				</c:if>
-			</c:forEach>
+			<c:set var="answerText" value="${question.answer.answerText}" />
 		</c:if>
-		<p>
-			<c:choose>
-				<c:when test="${question.type == 1}">
-					<input type="radio" name="optionChoice${question.uid}" class="noBorder"
-						value="${option.uid}" ${checked} />
-					<c:out value="${option.description}" escapeXml="true"/>
-				</c:when>
-				<c:when test="${question.type == 2}">
-					<input type="checkbox" class="noBorder"
-					 name="optionChoice${question.uid}"
-						value="${option.uid}" ${checked}/>
-					<c:out value="${option.description}" escapeXml="true"/>
-				</c:when>
-			</c:choose>
-		</p>
-	</c:forEach>
 
-	<c:if test="${question.type == 3}">
-		<p>
-			<lams:textarea name="optionText${question.uid}" rows="7" cols="50" class="text-area">${answerText}</lams:textarea>
-		</p>
-	</c:if>
-	<c:if test="${question.appendText}">
-		<c:set var="jsfunc" value="" />
-		<%-- for single choice question, use javascript to ensure only one option or openText can be chosen --%>
-		<c:if test="${question.type == 1}">
-			<c:set var="jsfunc" value="onclick=\" singleChoice('optionChoice${question.uid}')\""/>
+		<c:forEach var="option" items="${question.options}">
+			<c:set var="checked" value="" />
+			<c:if test="${not empty question.answer}">
+				<c:forEach var="choice" items="${question.answer.choices}">
+					<c:if test="${choice == option.uid}">
+						<c:set var="checked" value="checked='checked'" />
+					</c:if>
+				</c:forEach>
+			</c:if>
+			<div class="form-group">
+				<c:choose>
+					<c:when test="${question.type == 1}">
+
+						<input type="radio" id="optionChoice${question.uid}${option.uid}" name="optionChoice${question.uid}" value="${option.uid}"
+							${checked} />
+						<label for="optionChoice${question.uid}${option.uid}"><c:out value="${option.description}" escapeXml="true" /></label>
+
+					</c:when>
+					<c:when test="${question.type == 2}">
+
+						<input type="checkbox" id="optionChoice${question.uid}${option.uid}" name="optionChoice${question.uid}" value="${option.uid}"
+							${checked} />
+						<label for="optionChoice${question.uid}${option.uid}"><c:out value="${option.description}" escapeXml="true" /></label>
+
+					</c:when>
+				</c:choose>
+			</div>
+		</c:forEach>
+
+		<c:if test="${question.type == 3}">
+			<p>
+				<lams:textarea name="optionText${question.uid}" rows="7" class="form-control">${answerText}</lams:textarea>
+			</p>
 		</c:if>
-		
-		<p>
-			<fmt:message key="label.specifyOther" />
-		</p>
-		<p>
-			<textarea name="optionText${question.uid}" rows="7" cols="50"
-				type="_moz"${jsfunc}>${answerText}</textarea>
-		</p>
-	</c:if>
+		<c:if test="${question.appendText}">
+			<c:set var="jsfunc" value="" />
+			<%-- for single choice question, use javascript to ensure only one option or openText can be chosen --%>
+			<c:if test="${question.type == 1}">
+				<c:set var="jsfunc" value="onclick=\" singleChoice('optionChoice${question.uid}')\""/>
+			</c:if>
 
+			<p>
+				<fmt:message key="label.specifyOther" />
+			</p>
+			<p>
+				<textarea name="optionText${question.uid}" rows="7" cols="50" type="_moz" ${jsfunc}>${answerText}</textarea>
+			</p>
+		</c:if>
+
+	</div>
+
 </div>
 
+
+