Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp	(revision 1328116)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp	(revision )
@@ -24,66 +24,68 @@
 <fmt:message key="${pageTitleKey}" var="pagetitle"/>
 <rave:header pageTitle="${pagetitle}"/>
 <div class="container-fluid">
-    <div class="span3">
+    <div class="span2">
         <rave:admin_tabsheader/>
     </div>
-    <article class="span12">
+    <div class="span10">
+        <article>
-        <c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
-            <div class="alert alert-info">
-                <p>
-                    <fmt:message key="admin.userdetail.action.${actionresult}.success"/>
-                </p>
-            </div>
-        </c:if>
-        <c:if test="${not empty message}">
-            <div class="alert alert-info"><p>${message}</p></div>
-        </c:if>
+            <c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
+                <div class="alert alert-info">
+                    <p>
+                        <fmt:message key="admin.userdetail.action.${actionresult}.success"/>
+                    </p>
+                </div>
+            </c:if>
+            <c:if test="${not empty message}">
+                <div class="alert alert-info"><p>${message}</p></div>
+            </c:if>
 
 
 
-        <rave:admin_listheader/>
-        <rave:admin_paging/>
+            <rave:admin_listheader/>
+            <rave:admin_paging/>
 
-        <c:if test="${searchResult.totalResults > 0}">
-            <table class="table table-striped table-bordered table-condensed">
-                <thead>
-                <tr>
-                    <th><fmt:message key="admin.userdata.username"/></th>
-                    <th><fmt:message key="admin.userdata.email"/></th>
-                    <th><fmt:message key="admin.userdata.enabled"/></th>
-                </tr>
-                </thead>
-                <tbody>
-                <c:forEach var="user" items="${searchResult.resultSet}">
-                    <spring:url value="/app/admin/userdetail/${user.entityId}" var="detaillink"/>
-                    <tr data-detaillink="${detaillink}">
-                        <td><a href="${detaillink}"><c:out value="${user.username}"/></a></td>
-                        <td><c:out value="${user.email}"/></td>
-                        <td>${user.enabled}</td>
-                    </tr>
-                </c:forEach>
-                </tbody>
-            </table>
-        </c:if>
+            <c:if test="${searchResult.totalResults > 0}">
+                <table class="table table-striped table-bordered table-condensed">
+                    <thead>
+                    <tr>
+                        <th><fmt:message key="admin.userdata.username"/></th>
+                        <th><fmt:message key="admin.userdata.email"/></th>
+                        <th><fmt:message key="admin.userdata.enabled"/></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <c:forEach var="user" items="${searchResult.resultSet}">
+                        <spring:url value="/app/admin/userdetail/${user.entityId}" var="detaillink"/>
+                        <tr data-detaillink="${detaillink}">
+                            <td><a href="${detaillink}"><c:out value="${user.username}"/></a></td>
+                            <td><c:out value="${user.email}"/></td>
+                            <td>${user.enabled}</td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </c:if>
 
-        <rave:admin_paging/>
+            <rave:admin_paging/>
 
-    </article>
-    <div class="span6">
-            <a class="btn btn-success" href="<spring:url value="/app/admin/adduser"/>"><fmt:message key="admin.users.add"/></a>
+        </article>
+        <div class="span6">
+                <a class="btn btn-success" href="<spring:url value="/app/admin/adduser"/>"><fmt:message key="admin.users.add"/></a>
 
-                <form class="form-horizontal" action="<spring:url value="/app/admin/users/search"/>" method="get">
-                    <fieldset>
-                        <label for="searchTerm"><fmt:message key="admin.users.search"/></label>
-                        <input class="search-query" type="search" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>"/>
-                        <fmt:message key="page.store.search.button" var="searchButtonText"/>
-                        <button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
-                    </fieldset>
-                </form>
-            <c:if test="${not empty searchTerm}">
-                <a class="btn btn-success" href="<spring:url value="/app/admin/users"/>"><fmt:message key="admin.clearsearch"/></a>
-            </c:if>
+                    <form class="form-horizontal" action="<spring:url value="/app/admin/users/search"/>" method="get">
+                        <fieldset>
+                            <label for="searchTerm"><fmt:message key="admin.users.search"/></label>
+                            <input class="search-query" type="search" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>"/>
+                            <fmt:message key="page.store.search.button" var="searchButtonText"/>
+                            <button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
+                        </fieldset>
+                    </form>
+                <c:if test="${not empty searchTerm}">
+                    <a class="btn btn-success" href="<spring:url value="/app/admin/users"/>"><fmt:message key="admin.clearsearch"/></a>
+                </c:if>
 
+        </div>
     </div>
 </div>
 <portal:register-init-script location="${'AFTER_RAVE'}">
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp	(revision 1328116)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp	(revision )
@@ -24,111 +24,113 @@
 <c:set var="canChangeUserStatus" value="${user.username ne loggedInUser}"/>
 <rave:header pageTitle="${pagetitle}"/>
 <div class="container-fluid">
-    <div class="span3">
+    <div class="span2">
         <rave:admin_tabsheader/>
     </div>
-    <article class="span12">
+    <div class="span10">
+        <article>
-        <ul class="pager">
-            <li class="previous"><a href="<spring:url value="/app/admin/users"/>"><fmt:message key="admin.userdetail.goback"/></a></li>
-        </ul>
-        <h2><c:out value="${user.username}"/></h2>
-        <div class="span6">
-            <c:if test="${canChangeUserStatus}">
-                <section>
-                    <h3><fmt:message key="admin.delete"/> <c:out value=" ${user.username}"/></h3>
-                    <form:form cssClass="form-horizontal" id="deleteUserProfile" action="delete" commandName="user" method="POST">
-                        <fieldset>
-                            <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
-                            <div>
-                                <ul class="checkboxlist">
-                                    <li>
-                                        <input type="checkbox" name="confirmdelete" id="confirmdelete" value="true"/>
-                                        <label for="confirmdelete"><fmt:message key="admin.userdetail.action.delete.confirm"/></label>
-                                        <c:if test="${missingConfirm}">
-                                            <p class="error"><fmt:message key="admin.userdetail.action.delete.confirm.required"/></p>
-                                        </c:if>
-                                    </li>
-                                </ul>
-                            </div>
-                        </fieldset>
-                        <fieldset>
-                            <p>
-                                <input type="submit" value="Delete the user"/>
-                            </p>
-                        </fieldset>
-                    </form:form>
-                </section>
-            </c:if>
-        </div>
+            <ul class="pager">
+                <li class="previous"><a href="<spring:url value="/app/admin/users"/>"><fmt:message key="admin.userdetail.goback"/></a></li>
+            </ul>
+            <h2><c:out value="${user.username}"/></h2>
+            <div class="span6">
+                <c:if test="${canChangeUserStatus}">
+                    <section>
+                        <h3><fmt:message key="admin.delete"/> <c:out value=" ${user.username}"/></h3>
+                        <form:form cssClass="form-horizontal" id="deleteUserProfile" action="delete" commandName="user" method="POST">
+                            <fieldset>
+                                <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+                                <div>
+                                    <ul class="checkboxlist">
+                                        <li>
+                                            <input type="checkbox" name="confirmdelete" id="confirmdelete" value="true"/>
+                                            <label for="confirmdelete"><fmt:message key="admin.userdetail.action.delete.confirm"/></label>
+                                            <c:if test="${missingConfirm}">
+                                                <p class="error"><fmt:message key="admin.userdetail.action.delete.confirm.required"/></p>
+                                            </c:if>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </fieldset>
+                            <fieldset>
+                                <p>
+                                    <input type="submit" value="Delete the user"/>
+                                </p>
+                            </fieldset>
+                        </form:form>
+                    </section>
+                </c:if>
+            </div>
 
-        <div class="span5">
-            <section>
+            <div class="span5">
+                <section>
 
-                <form:form cssClass="form-horizontal" id="updateUserProfile" action="update" commandName="user" method="POST">
-                    <form:errors cssClass="error" element="p"/>
-                    <fieldset>
-                        <legend><fmt:message key="admin.userdetail.editdata"/></legend>
-                        <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
-                        <div class="control-group">
-                            <label class="control-label" for="email"><fmt:message key="page.general.email"/></label>
-                            <div class="controls"><spring:bind path="email">
-                                <input type="email" name="email" id="email" value="<c:out value="${status.value}"/>"
-                                       class="long"/>
-                            </spring:bind></div>
-                            <form:errors path="email" cssClass="error"/>
-                        </div>
+                    <form:form cssClass="form-horizontal" id="updateUserProfile" action="update" commandName="user" method="POST">
+                        <form:errors cssClass="error" element="p"/>
+                        <fieldset>
+                            <legend><fmt:message key="admin.userdetail.editdata"/></legend>
+                            <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+                            <div class="control-group">
+                                <label class="control-label" for="email"><fmt:message key="page.general.email"/></label>
+                                <div class="controls"><spring:bind path="email">
+                                    <input type="email" name="email" id="email" value="<c:out value="${status.value}"/>"
+                                           class="long"/>
+                                </spring:bind></div>
+                                <form:errors path="email" cssClass="error"/>
+                            </div>
 
-                        <div class="control-group">
-                            <label class="control-label" for="openIdField"><fmt:message key="page.userprofile.openid.url"/></label>
-                            <div class="controls">
-                                <spring:bind path="openId">
-                                    <input type="url" id="openIdField" name="openId" value="<c:out value="${status.value}"/>" class="long"/>
-                                </spring:bind>
-                            </div>
-                            <form:errors path="openId" cssClass="error"/>
-                        </div>
+                            <div class="control-group">
+                                <label class="control-label" for="openIdField"><fmt:message key="page.userprofile.openid.url"/></label>
+                                <div class="controls">
+                                    <spring:bind path="openId">
+                                        <input type="url" id="openIdField" name="openId" value="<c:out value="${status.value}"/>" class="long"/>
+                                    </spring:bind>
+                                </div>
+                                <form:errors path="openId" cssClass="error"/>
+                            </div>
 
-                        <div class="control-group">
-                            <span class="label"><fmt:message key="admin.userdata.accountstatus"/></span>
-                            <ul class="checkboxlist">
-                                <li>
-                                    <fmt:message key="admin.userdata.enabled" var="labelEnabled"/>
-                                    <form:checkbox path="enabled" label="${labelEnabled}"
-                                                   disabled="${canChangeUserStatus ne true}"/>
-                                </li>
-                                <li>
-                                    <fmt:message key="admin.userdata.expired" var="labelExpired"/>
-                                    <form:checkbox path="expired" label="${labelExpired}"
-                                                   disabled="${canChangeUserStatus ne true}"/>
-                                </li>
-                                <li>
-                                    <fmt:message key="admin.userdata.locked" var="labelLocked"/>
-                                    <form:checkbox path="locked" label="${labelLocked}"
-                                                   disabled="${canChangeUserStatus ne true}"/>
-                                </li>
-                            </ul>
-                        </div>
-                    </fieldset>
-                    <fieldset>
-                        <span class="label"><fmt:message key="admin.userdata.authorities"/></span>
-                            <%--@elvariable id="authorities" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Authority>"--%>
-                        <ul class="checkboxlist">
-                            <form:checkboxes path="authorities" items="${authorities.resultSet}" itemLabel="authority" itemValue="authority" element="li"/>
-                        </ul>
-                    </fieldset>
-                    <fieldset>
-                        <fmt:message key="page.userprofile.button" var="updateButtonText"/>
-                        <button class="btn btn-primary" type="submit" value="${updateButtonText}">${updateButtonText}</button>
-                    </fieldset>
-                </form:form>
-            </section>
+                            <div class="control-group">
+                                <span class="label"><fmt:message key="admin.userdata.accountstatus"/></span>
+                                <ul class="checkboxlist">
+                                    <li>
+                                        <fmt:message key="admin.userdata.enabled" var="labelEnabled"/>
+                                        <form:checkbox path="enabled" label="${labelEnabled}"
+                                                       disabled="${canChangeUserStatus ne true}"/>
+                                    </li>
+                                    <li>
+                                        <fmt:message key="admin.userdata.expired" var="labelExpired"/>
+                                        <form:checkbox path="expired" label="${labelExpired}"
+                                                       disabled="${canChangeUserStatus ne true}"/>
+                                    </li>
+                                    <li>
+                                        <fmt:message key="admin.userdata.locked" var="labelLocked"/>
+                                        <form:checkbox path="locked" label="${labelLocked}"
+                                                       disabled="${canChangeUserStatus ne true}"/>
+                                    </li>
+                                </ul>
+                            </div>
+                        </fieldset>
+                        <fieldset>
+                            <span class="label"><fmt:message key="admin.userdata.authorities"/></span>
+                                <%--@elvariable id="authorities" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Authority>"--%>
+                            <ul class="checkboxlist">
+                                <form:checkboxes path="authorities" items="${authorities.resultSet}" itemLabel="authority" itemValue="authority" element="li"/>
+                            </ul>
+                        </fieldset>
+                        <fieldset>
+                            <fmt:message key="page.userprofile.button" var="updateButtonText"/>
+                            <button class="btn btn-primary" type="submit" value="${updateButtonText}">${updateButtonText}</button>
+                        </fieldset>
+                    </form:form>
+                </section>
 
-        </div>
+            </div>
 
-        <div class="clear-float">
+            <div class="clear-float">
 
-        </div>
+            </div>
 
 
-    </article>
+        </article>
+    </div>
 </div>
\ No newline at end of file
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp	(revision 1328116)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp	(revision )
@@ -26,58 +26,60 @@
     <div class="span2">
         <rave:admin_tabsheader/>
     </div>
-    <article class="span6">
+    <div class="span10">
+        <article>
-        <ul class="horizontal-list goback">
-            <li>
-                <a href="<spring:url value="/app/admin/categories"/>"><fmt:message key="admin.categoryDetail.goback"/></a>
-            </li>
-        </ul>
-        <h2><c:out value="${category.text}"/></h2>
+            <ul class="horizontal-list goback">
+                <li>
+                    <a href="<spring:url value="/app/admin/categories"/>"><fmt:message key="admin.categoryDetail.goback"/></a>
+                </li>
+            </ul>
+            <h2><c:out value="${category.text}"/></h2>
 
-        <section class="span6">
-            <h3><fmt:message key="admin.delete"/><c:out value=" ${category.text}"/></h3>
-            <form:form id="deleteCategory" action="delete" commandName="category" method="POST">
-                <fieldset>
-                    <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+            <section class="span6">
+                <h3><fmt:message key="admin.delete"/><c:out value=" ${category.text}"/></h3>
+                <form:form id="deleteCategory" action="delete" commandName="category" method="POST">
+                    <fieldset>
+                        <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
 
-                    <div>
-                        <ul class="checkboxlist">
-                            <li>
-                                <input type="checkbox" name="confirmdelete" id="confirmdelete" value="true"/>
-                                <label for="confirmdelete"><fmt:message key="admin.categoryDetail.action.delete.confirm"/></label>
-                                <c:if test="${missingConfirm}">
-                                    <p class="error"><fmt:message key="admin.userdetail.action.delete.confirm.required"/></p>
-                                </c:if>
-                            </li>
-                        </ul>
-                    </div>
-                </fieldset>
-                <fieldset>
-                        <fmt:message key="admin.category.delete" var="deleteCategoryMsg"/>
-                        <button class="btn btn-primary" type="submit" value="${deleteCategoryMsg}">${deleteCategoryMsg}</button>
-                </fieldset>
-            </form:form>
-        </section>
+                        <div>
+                            <ul class="checkboxlist">
+                                <li>
+                                    <input type="checkbox" name="confirmdelete" id="confirmdelete" value="true"/>
+                                    <label for="confirmdelete"><fmt:message key="admin.categoryDetail.action.delete.confirm"/></label>
+                                    <c:if test="${missingConfirm}">
+                                        <p class="error"><fmt:message key="admin.userdetail.action.delete.confirm.required"/></p>
+                                    </c:if>
+                                </li>
+                            </ul>
+                        </div>
+                    </fieldset>
+                    <fieldset>
+                            <fmt:message key="admin.category.delete" var="deleteCategoryMsg"/>
+                            <button class="btn btn-primary" type="submit" value="${deleteCategoryMsg}">${deleteCategoryMsg}</button>
+                    </fieldset>
+                </form:form>
+            </section>
 
-    </article>
-    <section class="span3">
-        <h3><fmt:message key="admin.categoryDetail.editData"/></h3>
-        <form:form id="updateCategory" action="update" commandName="category" method="POST">
-            <form:errors cssClass="error" element="p"/>
-            <fieldset>
-                <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
-                <p>
-                    <label for="text"><fmt:message
-                            key="admin.categoryDetail.label.text"/></label>
+        </article>
+        <section class="span3">
+            <h3><fmt:message key="admin.categoryDetail.editData"/></h3>
+            <form:form id="updateCategory" action="update" commandName="category" method="POST">
+                <form:errors cssClass="error" element="p"/>
+                <fieldset>
+                    <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+                    <p>
+                        <label for="text"><fmt:message
+                                key="admin.categoryDetail.label.text"/></label>
 
-                    <form:input id="text" path="text" required="required" value="${category.text}" autofocus="autofocus"/>
-                    <form:errors path="text" cssClass="error"/>
-                </p>
-            </fieldset>
-            <fieldset>
-                <fmt:message key="admin.category.update" var="updateCategoryMsg"/>
-                <button class="btn btn-primary" type="submit" value="${updateCategoryMsg}">${updateCategoryMsg}</button>
-            </fieldset>
-        </form:form>
-    </section>
+                        <form:input id="text" path="text" required="required" value="${category.text}" autofocus="autofocus"/>
+                        <form:errors path="text" cssClass="error"/>
+                    </p>
+                </fieldset>
+                <fieldset>
+                    <fmt:message key="admin.category.update" var="updateCategoryMsg"/>
+                    <button class="btn btn-primary" type="submit" value="${updateCategoryMsg}">${updateCategoryMsg}</button>
+                </fieldset>
+            </form:form>
+        </section>
+    </div>
 </div>
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp	(revision 1328116)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp	(revision )
@@ -23,80 +23,82 @@
 <fmt:message key="${pageTitleKey}" var="pagetitle"/>
 <rave:header pageTitle="${pagetitle}"/>
 <div class="container-fluid">
-    <div class="span3">
+    <div class="span2">
         <rave:admin_tabsheader/>
     </div>
-    <article class="span12">
+    <div class="span10">
+        <article>
-        <c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
-            <div class="alert alert-info">
-                <p>
-                    <fmt:message key="admin.widgetdetail.action.${actionresult}.success"/>
-                </p>
-            </div>
-        </c:if>
+            <c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
+                <div class="alert alert-info">
+                    <p>
+                        <fmt:message key="admin.widgetdetail.action.${actionresult}.success"/>
+                    </p>
+                </div>
+            </c:if>
 
-        <rave:admin_listheader/>
-        <rave:admin_paging/>
+            <rave:admin_listheader/>
+            <rave:admin_paging/>
 
-        <c:if test="${searchResult.totalResults > 0}">
-            <table class="table table-striped table-bordered table-condensed">
-                <thead>
-                <tr>
-                    <th><fmt:message key="widget.title"/></th>
-                    <th><fmt:message key="widget.type"/></th>
-                    <th><fmt:message key="widget.widgetStatus"/></th>
-                </tr>
-                </thead>
-                <tbody>
-                <c:forEach var="widget" items="${searchResult.resultSet}">
-                    <spring:url value="/app/admin/widgetdetail/${widget.entityId}" var="detaillink"/>
-                    <tr data-detaillink="${detaillink}">
-                        <td><a href="${detaillink}"><c:out value="${widget.title}"/></a></td>
-                        <td><fmt:message key="widget.type.${widget.type}"/></td>
-                        <td><c:out value="${widget.widgetStatus}"/></td>
-                    </tr>
-                </c:forEach>
-                </tbody>
-            </table>
-        </c:if>
+            <c:if test="${searchResult.totalResults > 0}">
+                <table class="table table-striped table-bordered table-condensed">
+                    <thead>
+                    <tr>
+                        <th><fmt:message key="widget.title"/></th>
+                        <th><fmt:message key="widget.type"/></th>
+                        <th><fmt:message key="widget.widgetStatus"/></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <c:forEach var="widget" items="${searchResult.resultSet}">
+                        <spring:url value="/app/admin/widgetdetail/${widget.entityId}" var="detaillink"/>
+                        <tr data-detaillink="${detaillink}">
+                            <td><a href="${detaillink}"><c:out value="${widget.title}"/></a></td>
+                            <td><fmt:message key="widget.type.${widget.type}"/></td>
+                            <td><c:out value="${widget.widgetStatus}"/></td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </c:if>
 
-        <rave:admin_paging/>
+            <rave:admin_paging/>
 
-    </article>
+        </article>
-    <div class="span6">
+        <div>
-        <form class="form-horizontal" action="<spring:url value="/app/admin/widgets/search"/>" method="get">
-            <fieldset>
-                <label for="searchTerm" class="hidden"><fmt:message key="admin.widgets.search"/></label>
-                <input class="search-query" type="search" id="searchTerm" name="searchTerm"
-                       value="<c:out value="${searchTerm}"/>"/>
-                <fmt:message key="page.store.search.button" var="searchButtonText"/>
-                <button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
-                <div class="control-group"></div>
-                <div class="control-group">
-                    <label for="widgettype" class="hidden"><fmt:message key="widget.type"/></label>
-                    <select name="widgettype" id="widgettype">
-                        <option value=""><fmt:message key="admin.widgets.search.choosetype"/></option>
-                        <option value="OpenSocial"
-                                <c:if test="${selectedWidgetType eq 'OpenSocial'}"> selected="selected"</c:if>>
-                            <fmt:message key="widget.type.OpenSocial"/></option>
-                        <option value="W3C" <c:if test="${selectedWidgetType eq 'W3C'}"> selected="selected"</c:if>>
-                            <fmt:message key="widget.type.W3C"/></option>
-                    </select></div>
-                <label for="widgetstatus" class="hidden"><fmt:message key="widget.widgetStatus"/></label>
-                <select name="widgetstatus" id="widgetstatus">
-                    <option value=""><fmt:message key="admin.widgets.search.choosestatus"/></option>
-                    <c:forEach items="${widgetStatus}" var="wStatus">
-                        <option value="<c:out value="${wStatus.widgetStatus}"/>"
-                                <c:if test="${wStatus.widgetStatus eq selectedWidgetStatus}"> selected="selected"</c:if>>
-                            <c:out value="${wStatus.widgetStatus}"/></option>
-                    </c:forEach>
-                </select>
+            <form class="form-horizontal" action="<spring:url value="/app/admin/widgets/search"/>" method="get">
+                <fieldset>
+                    <label for="searchTerm" class="hidden"><fmt:message key="admin.widgets.search"/></label>
+                    <input class="search-query" type="search" id="searchTerm" name="searchTerm"
+                           value="<c:out value="${searchTerm}"/>"/>
+                    <fmt:message key="page.store.search.button" var="searchButtonText"/>
+                    <button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
+                    <div class="control-group"></div>
+                    <div class="control-group">
+                        <label for="widgettype" class="hidden"><fmt:message key="widget.type"/></label>
+                        <select name="widgettype" id="widgettype">
+                            <option value=""><fmt:message key="admin.widgets.search.choosetype"/></option>
+                            <option value="OpenSocial"
+                                    <c:if test="${selectedWidgetType eq 'OpenSocial'}"> selected="selected"</c:if>>
+                                <fmt:message key="widget.type.OpenSocial"/></option>
+                            <option value="W3C" <c:if test="${selectedWidgetType eq 'W3C'}"> selected="selected"</c:if>>
+                                <fmt:message key="widget.type.W3C"/></option>
+                        </select></div>
+                    <label for="widgetstatus" class="hidden"><fmt:message key="widget.widgetStatus"/></label>
+                    <select name="widgetstatus" id="widgetstatus">
+                        <option value=""><fmt:message key="admin.widgets.search.choosestatus"/></option>
+                        <c:forEach items="${widgetStatus}" var="wStatus">
+                            <option value="<c:out value="${wStatus.widgetStatus}"/>"
+                                    <c:if test="${wStatus.widgetStatus eq selectedWidgetStatus}"> selected="selected"</c:if>>
+                                <c:out value="${wStatus.widgetStatus}"/></option>
+                        </c:forEach>
+                    </select>
 
-            </fieldset>
-        </form>
-        <c:if test="${not empty searchTerm or not empty selectedWidgetType or not empty selectedWidgetStatus}">
-            <a href="<spring:url value="/app/admin/widgets"/>"><fmt:message key="admin.clearsearch"/></a>
-        </c:if>
+                </fieldset>
+            </form>
+            <c:if test="${not empty searchTerm or not empty selectedWidgetType or not empty selectedWidgetStatus}">
+                <a href="<spring:url value="/app/admin/widgets"/>"><fmt:message key="admin.clearsearch"/></a>
+            </c:if>
+        </div>
     </div>
 </div>
 
\ No newline at end of file
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp	(revision 1328116)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp	(revision )
@@ -23,209 +23,208 @@
 <fmt:message key="${pageTitleKey}" var="pagetitle"/>
 <rave:header pageTitle="${pagetitle}"/>
 <div class="container-fluid">
-<div class="span3">
+<div class="span2">
     <rave:admin_tabsheader/>
 </div>
-<article class="span12">
-
+<div class="span10">
+    <article>
-<ul class="pager">
-    <li class="previous">
-        <a href="<spring:url value="/app/admin/widgets"/>"><fmt:message key="admin.widgetdetail.goback"/> </a></li>
-</ul>
-    <h2>
-        <c:out value="${widget.title}"/>
-    </h2>
+        <ul class="pager">
+            <li class="previous">
+                <a href="<spring:url value="/app/admin/widgets"/>"><fmt:message key="admin.widgetdetail.goback"/> </a></li>
+        </ul>
+        <h2>
+            <c:out value="${widget.title}"/>
+        </h2>
 
-    <div class="rightcolumn">
-        <c:if
-                test="${not empty widget.screenshotUrl or not empty widget.thumbnailUrl}">
-            <section class="formbox"><c:if
-                    test="${not empty widget.screenshotUrl}">
-                <figure class="screenshot"><img
-                        src="<c:out value="${widget.screenshotUrl}"/>" alt="">
-                    <figcaption>
-                        <fmt:message key="widget.screenshotUrl"/></figcaption>
-                </figure>
-            </c:if> <c:if test="${not empty widget.thumbnailUrl}">
-                <figure><img src="<c:out value="${widget.thumbnailUrl}"/>"
-                             alt="">
-                    <figcaption><fmt:message
-                            key="widget.thumbnailUrl"/></figcaption>
-                </figure>
-            </c:if></section>
-        </c:if>
-    </div>
+        <div class="rightcolumn">
+            <c:if
+                    test="${not empty widget.screenshotUrl or not empty widget.thumbnailUrl}">
+                <section class="formbox"><c:if
+                        test="${not empty widget.screenshotUrl}">
+                    <figure class="screenshot"><img
+                            src="<c:out value="${widget.screenshotUrl}"/>" alt="">
+                        <figcaption>
+                            <fmt:message key="widget.screenshotUrl"/></figcaption>
+                    </figure>
+                </c:if> <c:if test="${not empty widget.thumbnailUrl}">
+                    <figure><img src="<c:out value="${widget.thumbnailUrl}"/>"
+                                 alt="">
+                        <figcaption><fmt:message
+                                key="widget.thumbnailUrl"/></figcaption>
+                    </figure>
+                </c:if></section>
+            </c:if>
+        </div>
 
-    <div class="leftcolumn">
-        <section class="formbox">
-            <h3>
-                <fmt:message key="admin.widgetdetail.editdata"/>
-            </h3>
-            <form:form id="updateWidget" action="update" commandName="widget"
-                       method="POST">
-                <form:errors cssClass="error" element="p"/>
-                <fieldset>
-                    <input type="hidden" name="token"
-                           value="<c:out value="${tokencheck}"/>"/>
-                    <p>
-                        <fmt:message key="form.some.fields.required"/>
-                    </p>
+        <div class="leftcolumn">
+            <section class="formbox">
+                <h3>
+                    <fmt:message key="admin.widgetdetail.editdata"/>
+                </h3>
+                <form:form id="updateWidget" action="update" commandName="widget"
+                           method="POST">
+                    <form:errors cssClass="error" element="p"/>
+                    <fieldset>
+                        <input type="hidden" name="token"
+                               value="<c:out value="${tokencheck}"/>"/>
+                        <p>
+                            <fmt:message key="form.some.fields.required"/>
+                        </p>
 
-                    <p>
-                        <form:label path="title">
-                            <fmt:message key="widget.title"/> *</form:label>
-                        <form:input path="title" cssClass="long" required="required"
-                                    autofocus="autofocus"/>
-                        <form:errors path="title" cssClass="error"/>
-                    </p>
+                        <p>
+                            <form:label path="title">
+                                <fmt:message key="widget.title"/> *</form:label>
+                            <form:input path="title" cssClass="long" required="required"
+                                        autofocus="autofocus"/>
+                            <form:errors path="title" cssClass="error"/>
+                        </p>
 
-                    <p>
-                        <spring:bind path="url">
-                            <label for="url"><fmt:message key="widget.url"/> *</label>
-                            <input type="url" name="url" id="url"
-                                   placeholder="http://example.com/widget.xml" required="required"
-                                   class="long" value="<c:out value="${widget.url}"/>"/>
-                        </spring:bind>
-                        <form:errors path="url" cssClass="error"/>
-                    </p>
+                        <p>
+                            <spring:bind path="url">
+                                <label for="url"><fmt:message key="widget.url"/> *</label>
+                                <input type="url" name="url" id="url"
+                                       placeholder="http://example.com/widget.xml" required="required"
+                                       class="long" value="<c:out value="${widget.url}"/>"/>
+                            </spring:bind>
+                            <form:errors path="url" cssClass="error"/>
+                        </p>
 
-                    <p>
-                        <label for="type1"><fmt:message key="widget.type"/> *</label> <label
-                            for="type1" class="formradio"><form:radiobutton
-                            path="type" value="OpenSocial"/> <fmt:message
-                            key="widget.type.OpenSocial"/> </label> <label for="type2"
-                                                                           class="formradio"><form:radiobutton path="type"
-                                                                                                               value="W3C"/>
-                        <fmt:message key="widget.type.W3C"/> </label>
-                        <form:errors path="type" cssClass="error"/>
-                    </p>
-                    <p>
-                        <a href="#" class="storeItemButton" id="fetchMetadataButton"
-                           onclick="rave.api.rpc.getWidgetMetadata({
-                                url: $('#url').get(0).value,
-                                providerType: $('input:radio[name=type]:checked').val(),
-                                successCallback: function(result) {
-                                    var widget = result.result;
-                                    $('#title').val(widget.title);
-                                    $('#description').val(widget.description);
-                                    $('#thumbnailUrl').val(widget.thumbnailUrl);
-                                    $('#screenshotUrl').val(widget.screenshotUrl);
-                                    $('#titleUrl').val(widget.titleUrl);
-                                    $('#author').val(widget.author);
-                                    $('#authorEmail').val(widget.authorEmail);
-                                }
-                            });">
-                            <fmt:message key="page.updateWidgetMetadata.button"/> </a>
+                        <p>
+                            <label for="type1"><fmt:message key="widget.type"/> *</label> <label
+                                for="type1" class="formradio"><form:radiobutton
+                                path="type" value="OpenSocial"/> <fmt:message
+                                key="widget.type.OpenSocial"/> </label> <label for="type2"
+                                                                               class="formradio"><form:radiobutton path="type"
+                                                                                                                   value="W3C"/>
+                            <fmt:message key="widget.type.W3C"/> </label>
+                            <form:errors path="type" cssClass="error"/>
+                        </p>
+                        <p>
+                            <a href="#" class="storeItemButton" id="fetchMetadataButton"
+                               onclick="rave.api.rpc.getWidgetMetadata({
+                                    url: $('#url').get(0).value,
+                                    providerType: $('input:radio[name=type]:checked').val(),
+                                    successCallback: function(result) {
+                                        var widget = result.result;
+                                        $('#title').val(widget.title);
+                                        $('#description').val(widget.description);
+                                        $('#thumbnailUrl').val(widget.thumbnailUrl);
+                                        $('#screenshotUrl').val(widget.screenshotUrl);
+                                        $('#titleUrl').val(widget.titleUrl);
+                                        $('#author').val(widget.author);
+                                        $('#authorEmail').val(widget.authorEmail);
+                                    }
+                                });">
+                                <fmt:message key="page.updateWidgetMetadata.button"/> </a>
 
-                    </p>
-                    <p>
-                        <form:label path="description">
-                            <fmt:message key="widget.description"/> *</form:label>
-                        <form:textarea path="description" required="required"
-                                       cssClass="long"/>
-                        <form:errors path="description" cssClass="error"/>
-                    </p>
+                        </p>
+                        <p>
+                            <form:label path="description">
+                                <fmt:message key="widget.description"/> *</form:label>
+                            <form:textarea path="description" required="required"
+                                           cssClass="long"/>
+                            <form:errors path="description" cssClass="error"/>
+                        </p>
 
-                    <p>
-                        <form:label path="featured">
-                            <fmt:message key="page.general.checkBox.featured"/>
-                        </form:label>
-                        <form:checkbox path="featured" id="featured"/>
-                        <form:errors path="featured" cssClass="error"/>
-                    </p>
+                        <p>
+                            <form:label path="featured">
+                                <fmt:message key="page.general.checkBox.featured"/>
+                            </form:label>
+                            <form:checkbox path="featured" id="featured"/>
+                            <form:errors path="featured" cssClass="error"/>
+                        </p>
 
-                    <p>
-                        <form:label path="disableRendering">
-                            <fmt:message key="widget.disableRendering"/>
-                        </form:label>
-                        <form:checkbox path="disableRendering" id="disableRendering"/>
-                        <form:errors path="disableRendering" cssClass="error"/>
-                    </p>
+                        <p>
+                            <form:label path="disableRendering">
+                                <fmt:message key="widget.disableRendering"/>
+                            </form:label>
+                            <form:checkbox path="disableRendering" id="disableRendering"/>
+                            <form:errors path="disableRendering" cssClass="error"/>
+                        </p>
 
-                    <p>
-                        <form:label path="disableRenderingMessage">
-                            <fmt:message key="widget.disableRenderingMessage"/>
-                        </form:label>
-                        <form:input path="disableRenderingMessage" cssClass="long"
-                                    autofocus="autofocus"/>
-                        <form:errors path="disableRenderingMessage" cssClass="error"/>
-                    </p>
+                        <p>
+                            <form:label path="disableRenderingMessage">
+                                <fmt:message key="widget.disableRenderingMessage"/>
+                            </form:label>
+                            <form:input path="disableRenderingMessage" cssClass="long"
+                                        autofocus="autofocus"/>
+                            <form:errors path="disableRenderingMessage" cssClass="error"/>
+                        </p>
 
-                    <p>
-                        <form:label path="widgetStatus">
-                            <fmt:message key="widget.widgetStatus"/>
-                        </form:label>
-                        <form:select path="widgetStatus" items="${widgetStatus}"/>
-                    </p>
+                        <p>
+                            <form:label path="widgetStatus">
+                                <fmt:message key="widget.widgetStatus"/>
+                            </form:label>
+                            <form:select path="widgetStatus" items="${widgetStatus}"/>
+                        </p>
 
-                    <p>
-                        <form:label path="categories">
-                            <fmt:message key="widget.categories"/>
-                        </form:label>
-                        <form:select path="categories" items="${categories}" multiple="true" itemLabel="text" size="10"/>
-                    </p>
+                        <p>
+                            <form:label path="categories">
+                                <fmt:message key="widget.categories"/>
+                            </form:label>
+                            <form:select path="categories" items="${categories}" multiple="true" itemLabel="text" size="10"/>
+                        </p>
 
-                    <p>
-                        <spring:bind path="thumbnailUrl">
-                            <label for="thumbnailUrl"><fmt:message
-                                    key="widget.thumbnailUrl"/> </label>
-                            <input type="url" name="thumbnailUrl" id="thumbnailUrl"
-                                   placeholder="http://example.com/thumbnail.png" class="long"
-                                   value="<c:out value="${widget.thumbnailUrl}"/>"/>
-                        </spring:bind>
-                        <form:errors path="thumbnailUrl" cssClass="error"/>
-                    </p>
+                        <p>
+                            <spring:bind path="thumbnailUrl">
+                                <label for="thumbnailUrl"><fmt:message
+                                        key="widget.thumbnailUrl"/> </label>
+                                <input type="url" name="thumbnailUrl" id="thumbnailUrl"
+                                       placeholder="http://example.com/thumbnail.png" class="long"
+                                       value="<c:out value="${widget.thumbnailUrl}"/>"/>
+                            </spring:bind>
+                            <form:errors path="thumbnailUrl" cssClass="error"/>
+                        </p>
 
-                    <p>
-                        <spring:bind path="screenshotUrl">
-                            <label for="screenshotUrl"><fmt:message
-                                    key="widget.screenshotUrl"/> </label>
-                            <input type="url" name="screenshotUrl" id="screenshotUrl"
-                                   placeholder="http://example.com/screenshot.png" class="long"
-                                   value="<c:out value="${widget.screenshotUrl}"/>"/>
-                        </spring:bind>
-                        <form:errors path="screenshotUrl" cssClass="error"/>
-                    </p>
+                        <p>
+                            <spring:bind path="screenshotUrl">
+                                <label for="screenshotUrl"><fmt:message
+                                        key="widget.screenshotUrl"/> </label>
+                                <input type="url" name="screenshotUrl" id="screenshotUrl"
+                                       placeholder="http://example.com/screenshot.png" class="long"
+                                       value="<c:out value="${widget.screenshotUrl}"/>"/>
+                            </spring:bind>
+                            <form:errors path="screenshotUrl" cssClass="error"/>
+                        </p>
 
-                    <p>
-                        <spring:bind path="titleUrl">
-                            <label for="titleUrl"><fmt:message key="widget.titleUrl"/>
-                            </label>
-                            <input type="url" name="titleUrl" id="titleUrl" class="long"
-                                   value="<c:out value="${widget.titleUrl}"/>"/>
-                        </spring:bind>
-                        <form:errors path="titleUrl" cssClass="error"/>
-                    </p>
+                        <p>
+                            <spring:bind path="titleUrl">
+                                <label for="titleUrl"><fmt:message key="widget.titleUrl"/>
+                                </label>
+                                <input type="url" name="titleUrl" id="titleUrl" class="long"
+                                       value="<c:out value="${widget.titleUrl}"/>"/>
+                            </spring:bind>
+                            <form:errors path="titleUrl" cssClass="error"/>
+                        </p>
 
-                    <p>
-                        <form:label path="author">
-                            <fmt:message key="widget.author"/>
-                        </form:label>
-                        <form:input path="author" cssClass="long"/>
-                        <form:errors path="author" cssClass="error"/>
-                    </p>
-                    <p>
-                        <spring:bind path="authorEmail">
-                            <label for="authorEmail"><fmt:message
-                                    key="widget.authorEmail"/> </label>
-                            <input type="email" name="authorEmail" id="authorEmail"
-                                   class="long" value="<c:out value="${widget.authorEmail}"/>"/>
-                        </spring:bind>
-                        <form:errors path="titleUrl" cssClass="error"/>
-                    </p>
+                        <p>
+                            <form:label path="author">
+                                <fmt:message key="widget.author"/>
+                            </form:label>
+                            <form:input path="author" cssClass="long"/>
+                            <form:errors path="author" cssClass="error"/>
+                        </p>
+                        <p>
+                            <spring:bind path="authorEmail">
+                                <label for="authorEmail"><fmt:message
+                                        key="widget.authorEmail"/> </label>
+                                <input type="email" name="authorEmail" id="authorEmail"
+                                       class="long" value="<c:out value="${widget.authorEmail}"/>"/>
+                            </spring:bind>
+                            <form:errors path="titleUrl" cssClass="error"/>
+                        </p>
 
-                </fieldset>
-                <fieldset>
-                    <fmt:message key="admin.widgetdetail.updatebutton"
-                                 var="updateButtonText"/>
-                    <button class="btn btn-primary" type="submit" value="${updateButtonText}">${updateButtonText}</button>
-                </fieldset>
-            </form:form></section>
+                    </fieldset>
+                    <fieldset>
+                        <fmt:message key="admin.widgetdetail.updatebutton"
+                                     var="updateButtonText"/>
+                        <button class="btn btn-primary" type="submit" value="${updateButtonText}">${updateButtonText}</button>
+                    </fieldset>
+                </form:form></section>
 
-    </div>
+            </div>
 
-    <div class="clear-float"></div>
+            <div class="clear-float"></div>
-
-
-</article>
+        </article>
+    </div>
 </div>
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp	(revision 1328116)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp	(revision )
@@ -27,8 +27,10 @@
     <div class="span2">
         <rave:admin_tabsheader/>
     </div>
-    <article class="span8">
+    <div class="span10">
+        <article>
-        <h2><fmt:message key="admin.home.subtitle"/></h2>
-        <fmt:message key="admin.home.intro"/>
-    </article>
+            <h2><fmt:message key="admin.home.subtitle"/></h2>
+            <fmt:message key="admin.home.intro"/>
+        </article>
+    </div>
 </div>
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp	(revision 1328116)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp	(revision )
@@ -24,49 +24,51 @@
 <rave:header pageTitle="${pagetitle}"/>
 
 <div class="container-fluid">
-    <div class="span3">
+    <div class="span2">
         <rave:admin_tabsheader/>
     </div>
-    <article class="span12">
+    <div class="span10">
+        <article>
-        <%--@elvariable id="actionresult" type="java.lang.String"--%>
-        <c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
-            <div class="alert alert-info">
-                <fmt:message key="admin.preferencedetail.action.${actionresult}.success"/>
-            </div>
-        </c:if>
+            <%--@elvariable id="actionresult" type="java.lang.String"--%>
+            <c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
+                <div class="alert alert-info">
+                    <fmt:message key="admin.preferencedetail.action.${actionresult}.success"/>
+                </div>
+            </c:if>
 
-        <h2><fmt:message key="admin.preferences.shorttitle"/></h2>
+            <h2><fmt:message key="admin.preferences.shorttitle"/></h2>
 
-        <spring:url value="/app/admin/preferencedetail/edit" var="detaillink"/>
-        <%--@elvariable id="preferenceMap" type="java.util.Map<java.lang.String, org.apache.rave.portal.model.PortalPreference>"--%>
-        <c:choose>
-            <c:when test="${fn:length(preferenceMap) eq 0}">
-                <a class="btn btn-primary" href="<c:out value="${detaillink}"/>"><fmt:message key="admin.preferences.edit"/></a>
-            </c:when>
-            <c:otherwise>
-                <table class="table table-striped table-bordered table-condensed">
-                    <tbody>
-                    <c:forEach items="${preferenceMap}" var="entry">
-                        <c:set value="${entry.value}" var="portalPreference"/>
-                        <tr data-detaillink="<c:out value="${detaillink}"/>">
-                            <th scope="row">
-                                <a href="${detaillink}"><fmt:message key="admin.preferencedetail.${portalPreference.key}"/></a>
-                            </th>
-                            <td>
-                                <ul>
-                                    <c:forEach items="${portalPreference.values}" var="value">
-                                        <li><c:out value="${value}"/></li>
-                                    </c:forEach>
-                                </ul>
-                            </td>
-                        </tr>
-                    </c:forEach>
-                    </tbody>
-                </table>
-            </c:otherwise>
-        </c:choose>
+            <spring:url value="/app/admin/preferencedetail/edit" var="detaillink"/>
+            <%--@elvariable id="preferenceMap" type="java.util.Map<java.lang.String, org.apache.rave.portal.model.PortalPreference>"--%>
+            <c:choose>
+                <c:when test="${fn:length(preferenceMap) eq 0}">
+                    <a class="btn btn-primary" href="<c:out value="${detaillink}"/>"><fmt:message key="admin.preferences.edit"/></a>
+                </c:when>
+                <c:otherwise>
+                    <table class="table table-striped table-bordered table-condensed">
+                        <tbody>
+                        <c:forEach items="${preferenceMap}" var="entry">
+                            <c:set value="${entry.value}" var="portalPreference"/>
+                            <tr data-detaillink="<c:out value="${detaillink}"/>">
+                                <th scope="row">
+                                    <a href="${detaillink}"><fmt:message key="admin.preferencedetail.${portalPreference.key}"/></a>
+                                </th>
+                                <td>
+                                    <ul>
+                                        <c:forEach items="${portalPreference.values}" var="value">
+                                            <li><c:out value="${value}"/></li>
+                                        </c:forEach>
+                                    </ul>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </table>
+                </c:otherwise>
+            </c:choose>
 
-    </article>
+        </article>
+    </div>
 </div>
 
 <portal:register-init-script location="${'AFTER_RAVE'}">
\ No newline at end of file
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp	(revision 1328116)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp	(revision )
@@ -27,73 +27,76 @@
     <div class="span2">
         <rave:admin_tabsheader/>
     </div>
-    <article class="span8">
+    <div class="span10">
+        <article>
-        <h2><fmt:message key="admin.category.shortTitle"/></h2>
-        <%--@elvariable id="actionresult" type="java.lang.String"--%>
-        <c:if test="${actionresult eq 'delete' or actionresult eq 'update' or actionresult eq 'create'}">
-            <div class="alert alert-info">
-                <fmt:message key="admin.categoryDetail.action.${actionresult}.success"/>
-            </div>
-        </c:if>
+            <h2><fmt:message key="admin.category.shortTitle"/></h2>
+            <%--@elvariable id="actionresult" type="java.lang.String"--%>
+            <c:if test="${actionresult eq 'delete' or actionresult eq 'update' or actionresult eq 'create'}">
+                <div class="alert alert-info">
+                    <fmt:message key="admin.categoryDetail.action.${actionresult}.success"/>
+                </div>
+            </c:if>
 
-        <table class="table table-striped table-bordered table-condensed">
-            <thead>
-            <tr>
-                <th><fmt:message key="admin.categoryData.text"/></th>
-                <th><fmt:message key="admin.categoryData.createdBy"/></th>
-                <th><fmt:message key="admin.categoryData.createdDate"/></th>
-                <th><fmt:message key="admin.categoryData.modifiedBy"/></th>
-                <th><fmt:message key="admin.categoryData.modifiedDate"/></th>
-            </tr>
-            </thead>
-            <tbody>
-            <c:forEach items="${categories}" var="category">
-                <spring:url value="/app/admin/category/edit?id=${category.entityId}" var="detaillink"/>
+            <table class="table table-striped table-bordered table-condensed">
+                <thead>
+                <tr>
+                    <th><fmt:message key="admin.categoryData.text"/></th>
+                    <th><fmt:message key="admin.categoryData.createdBy"/></th>
+                    <th><fmt:message key="admin.categoryData.createdDate"/></th>
+                    <th><fmt:message key="admin.categoryData.modifiedBy"/></th>
+                    <th><fmt:message key="admin.categoryData.modifiedDate"/></th>
+                </tr>
+                </thead>
+                <tbody>
+                <c:forEach items="${categories}" var="category">
+                    <spring:url value="/app/admin/category/edit?id=${category.entityId}" var="detaillink"/>
 
-                <tr data-detaillink="${detaillink}">
-                    <td>
-                        <a href="${detaillink}"><c:out value="${category.text}"/></a>
-                    </td>
-                    <td>
-                        <c:out value="${category.createdUser.username}"/>
-                    </td>
-                    <td>
-                        <c:out value="${category.createdDate}"/>
-                    </td>
-                    <td>
-                        <c:out value="${category.lastModifiedUser.username}"/>
-                    </td>
-                    <td>
-                        <c:out value="${category.lastModifiedDate}"/>
-                    </td>
-                </tr>
-            </c:forEach>
-            </tbody>
-        </table>
+                    <tr data-detaillink="${detaillink}">
+                        <td>
+                            <a href="${detaillink}"><c:out value="${category.text}"/></a>
+                        </td>
+                        <td>
+                            <c:out value="${category.createdUser.username}"/>
+                        </td>
+                        <td>
+                            <c:out value="${category.createdDate}"/>
+                        </td>
+                        <td>
+                            <c:out value="${category.lastModifiedUser.username}"/>
+                        </td>
+                        <td>
+                            <c:out value="${category.lastModifiedDate}"/>
+                        </td>
+                    </tr>
+                </c:forEach>
+                </tbody>
+            </table>
 
 
-    </article>
+        </article>
-    <div class="span4">
-        <form:form cssClass="form-horizontal" commandName="category" action="category/create" method="POST">
+        <div>
+            <form:form cssClass="form-inline" commandName="category" action="category/create" method="POST">
-            <form:errors cssClass="error" element="p"/>
-            <fieldset>
-                <legend><fmt:message key="admin.category.create"/></legend>
-                <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+                <form:errors cssClass="error" element="p"/>
+                <fieldset>
+                    <legend><fmt:message key="admin.category.create"/></legend>
+                    <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+                    <br/>
-                <div class="control-group">
-                    <label class="control-label" for="text"><fmt:message key="admin.categoryDetail.label.text"/></label>
-                    <div class="controls">
-                        <form:input cssClass="input-medium" id="text" path="text" required="required" autofocus="autofocus"/>
-                        <form:errors path="text" cssClass="error"/></div>
-                </div>
-            </fieldset>
-            <fieldset>
-                <fmt:message key="admin.category.create" var="createCategoryMsg"/>
-                <div class="controls">
-                    <button class="btn btn-primary" type="submit" value="${createCategoryMsg}">${createCategoryMsg}</button>
-                </div>
+                    <div class="control-group">
+                        <label class="control-label" for="text"><fmt:message key="admin.categoryDetail.label.text"/></label>
+                        <div class="controls">
+                            <form:input cssClass="input-medium" id="text" path="text" required="required" autofocus="autofocus"/>
+                            <form:errors path="text" cssClass="error"/></div>
+                    </div>
+                </fieldset>
+                <fieldset>
+                    <fmt:message key="admin.category.create" var="createCategoryMsg"/>
+                    <div class="controls">
+                        <button class="btn btn-primary" type="submit" value="${createCategoryMsg}">${createCategoryMsg}</button>
+                    </div>
 
-            </fieldset>
-        </form:form>
+                </fieldset>
+            </form:form>
+        </div>
     </div>
 </div>
 <portal:register-init-script location="${'AFTER_RAVE'}">
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp	(revision 1328116)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp	(revision )
@@ -23,59 +23,61 @@
 <fmt:message key="${pageTitleKey}" var="pagetitle"/>
 <rave:header pageTitle="${pagetitle}"/>
 <div class="container-fluid">
-    <div class="span3">
+    <div class="span2">
         <rave:admin_tabsheader/>
     </div>
-    <article class="span12">
+    <div class="span10">
+        <article>
-        <ul class="pager">
-            <li class="previous">
-                <a href="<spring:url value="/app/admin/preferences"/>"><fmt:message key="admin.preferencedetail.goback"/></a>
-            </li>
-        </ul>
+            <ul class="pager">
+                <li class="previous">
+                    <a href="<spring:url value="/app/admin/preferences"/>"><fmt:message key="admin.preferencedetail.goback"/></a>
+                </li>
+            </ul>
 
-        <h2><fmt:message key="admin.preferences.shorttitle"/></h2>
+            <h2><fmt:message key="admin.preferences.shorttitle"/></h2>
 
-        <section class="span6">
-            <spring:url value="/app/admin/preferencedetail/update" var="formAction"/>
-            <form:form action="${formAction}" method="POST" modelAttribute="preferenceForm">
-                <form:errors cssClass="error" element="p"/>
-                <fieldset>
-                    <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
-                    <p><fmt:message key="form.some.fields.required"/></p>
+            <section class="span6">
+                <spring:url value="/app/admin/preferencedetail/update" var="formAction"/>
+                <form:form action="${formAction}" method="POST" modelAttribute="preferenceForm">
+                    <form:errors cssClass="error" element="p"/>
+                    <fieldset>
+                        <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+                        <p><fmt:message key="form.some.fields.required"/></p>
 
-                    <p>
-                        <form:label path="titleSuffix.value"><fmt:message key="admin.preferencedetail.titleSuffix"/></form:label>
-                        <form:input path="titleSuffix.value"/>
-                        <form:errors path="titleSuffix.value" cssClass="error"/>
-                    </p>
-                </fieldset>
-                <fieldset>
-                    <p>
-                        <spring:bind path="pageSize.value">
-                            <label for="pageSize"><fmt:message key="admin.preferencedetail.pageSize"/> *</label>
-                            <input id="pageSize" name="pageSize.value" type="number" step="1" value="<c:out value="${status.value}"/>"/>
-                        </spring:bind>
-                        <form:errors path="pageSize.value" cssClass="error"/>
-                    </p>
-                </fieldset>
-                <fieldset>
-                    <p>
-                        <spring:bind path="javaScriptDebugMode.value">
-                            <form:label path="javaScriptDebugMode.value"><fmt:message key="admin.preferencedetail.javaScriptDebugMode"/> *</form:label>
-                            <form:select id="javaScriptDebugMode" path="javaScriptDebugMode.value">
-                                <form:option value="0"><fmt:message key="admin.preferencedetail.javaScriptDebugMode.false"/></form:option>
-                                <form:option value="1"><fmt:message key="admin.preferencedetail.javaScriptDebugMode.true"/></form:option>
-                            </form:select>
-                            <form:errors path="javaScriptDebugMode.value" cssClass="error"/>
-                        </spring:bind>
-                    </p>
-                </fieldset>
-                <fieldset>
-                    <fmt:message key="admin.preferencedetail.updateButton" var="updateButtonText"/>
-                    <button class="btn btn-primary" type="submit" value="${updateButtonText}">${updateButtonText}</button>
-                </fieldset>
-            </form:form>
-        </section>
+                        <p>
+                            <form:label path="titleSuffix.value"><fmt:message key="admin.preferencedetail.titleSuffix"/></form:label>
+                            <form:input path="titleSuffix.value"/>
+                            <form:errors path="titleSuffix.value" cssClass="error"/>
+                        </p>
+                    </fieldset>
+                    <fieldset>
+                        <p>
+                            <spring:bind path="pageSize.value">
+                                <label for="pageSize"><fmt:message key="admin.preferencedetail.pageSize"/> *</label>
+                                <input id="pageSize" name="pageSize.value" type="number" step="1" value="<c:out value="${status.value}"/>"/>
+                            </spring:bind>
+                            <form:errors path="pageSize.value" cssClass="error"/>
+                        </p>
+                    </fieldset>
+                    <fieldset>
+                        <p>
+                            <spring:bind path="javaScriptDebugMode.value">
+                                <form:label path="javaScriptDebugMode.value"><fmt:message key="admin.preferencedetail.javaScriptDebugMode"/> *</form:label>
+                                <form:select id="javaScriptDebugMode" path="javaScriptDebugMode.value">
+                                    <form:option value="0"><fmt:message key="admin.preferencedetail.javaScriptDebugMode.false"/></form:option>
+                                    <form:option value="1"><fmt:message key="admin.preferencedetail.javaScriptDebugMode.true"/></form:option>
+                                </form:select>
+                                <form:errors path="javaScriptDebugMode.value" cssClass="error"/>
+                            </spring:bind>
+                        </p>
+                    </fieldset>
+                    <fieldset>
+                        <fmt:message key="admin.preferencedetail.updateButton" var="updateButtonText"/>
+                        <button class="btn btn-primary" type="submit" value="${updateButtonText}">${updateButtonText}</button>
+                    </fieldset>
+                </form:form>
+            </section>
 
-    </article>
+        </article>
+    </div>
 </div>
\ No newline at end of file