Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp?rev=1360381&r1=1360380&r2=1360381&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp Wed Jul 11 20:18:09 2012 @@ -23,89 +23,98 @@ <fmt:message key="${pageTitleKey}" var="pagetitle"/> <rave:navbar pageTitle="${pagetitle}"/> <div class="container-fluid"> - <div class="span2"> - <rave:admin_tabsheader/> - </div> - <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> - - <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.id}" 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/> - - </article> - <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> - - </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 class="row-fluid"> + <div class="span2"> + <div class="tabs-respond"> + <rave:admin_tabsheader/> + </div> + </div> + <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> + + <rave:admin_listheader/> + + <div class="searchHeading paginationHeading"> + <rave:admin_paging/> + <form class="form-horizontal search-form" action="<spring:url value="/app/admin/widgets/search"/>" method="get"> + <fieldset> + <div class="input-append"> + <input class="input-medium" type="search" id="searchTerm" name="searchTerm" + value="<c:out value="${searchTerm}"/>" + placeholder='<fmt:message key="admin.widgets.search"/>' + /><fmt:message key="page.store.search.button" var="searchButtonText" + /><button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button> + + </div> + + <p> + <c:if test="${not empty searchTerm or not empty selectedWidgetType or not empty selectedWidgetStatus}"> + <a href="<spring:url value="/app/admin/widgets"/>" ><i class="icon-remove"></i> <fmt:message key="admin.clearsearch"/></a> + </c:if> + <a href="#" data-toggle="collapse" data-target="#searchFilters"> + <fmt:message key="admin.widgets.search.options"/> + </a> + + </p> + <div id="searchFilters" class="collapse"> + <select name="widgettype" id="widgettype" class="input-medium"> + <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> + <select name="widgetstatus" id="widgetstatus" class="input-medium"> + <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> + </div> + </fieldset> + </form> + </div> + + <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.id}" 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/> + </article> + </div> + </div> </div> - <portal:register-init-script location="${'AFTER_RAVE'}"> <script> $(function() { rave.admin.initAdminUi(); }); </script> -</portal:register-init-script> \ No newline at end of file +</portal:register-init-script>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less?rev=1360381&r1=1360380&r2=1360381&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less Wed Jul 11 20:18:09 2012 @@ -792,6 +792,11 @@ span.error, label.error { /* admin interface */ +.admin-ui{ + .form-horizontal .control-label{ + padding-right: 10px; + } +} .admincontent { margin: 0 auto; width: 80%; @@ -851,6 +856,27 @@ span.error, label.error { width: 300px } +.searchHeading.paginationHeading{ + .pagination{ + float: left; + } + .search-form{ + float: right; + margin-top: 8px; + margin-bottom: 0; + text-align: right; + } + p{ + margin:9px 0 0; + } + #searchFilters{ + + select{ + margin: 3px 0 15px; + } + } +} + /* user profile */ .profile-submenu ul { height: 2.5em; @@ -889,7 +915,20 @@ span.error, label.error { .profile-info-visible { display: inline; } +#deleteUserProfile{ + margin-bottom: 0; +} +/* END profile */ +.checkboxlist{ + label{ + display: inline-block; + } + input[type="checkbox"]{ + display: inline-block; + margin:0 5px 0 0; + } +} @media all and (max-width: 900px) { .storeSearch { width: 100%; @@ -1101,3 +1140,40 @@ footer { font-size: 9pt; font-style: italic; } + + +/* RESPONSIVE */ +@media (max-width: 767px){ + .tabs-respond{ + .tabs-left{ + & > .nav-tabs{ + float: none; + margin-right: 0; + border-bottom: 1px solid #ddd; + border-right: none; + + & > li{ + float: left; + + & > a{ + margin-right: 2px; + margin-bottom: 0; + .border-radius(4px 4px 0 0); + line-height: normal; + min-width: inherit; + + &:hover{ + border-color: #EEE #EEE #DDD #EEE; + } + } + &.active > a, + &.active > a:hover{ + border-color: #DDD #DDD transparent #DDD; + } + } + } + } + } +} +@media (min-width: 768px) and (max-width: 979px) { } +@media (min-width: 1200px) { } \ No newline at end of file Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_admin.js URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_admin.js?rev=1360381&r1=1360380&r2=1360381&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_admin.js (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_admin.js Wed Jul 11 20:18:09 2012 @@ -31,8 +31,28 @@ rave.admin = rave.admin || (function() { }); } + //Resize bootstrap modal & adjust margins to size of image. + function resizeImageModal(){ + $('#thumbnailModal, #screenshotModal').on('shown', function () { + if(!$(this).hasClass("sized")){ + var imageWidth = $(this).find("img").width(), + imageHeight = $(this).find("img").height(), + footerHeight = $(this).find(".modal-footer").outerHeight(), + headerHeight = $(this).find(".modal-header").outerHeight(), + totalHeight = imageHeight + footerHeight + headerHeight; + + $(this).css({ + width: imageWidth + "px", + 'margin-top': "-" + Math.round(totalHeight/2) + "px", + 'margin-left': "-" + Math.round(imageWidth/2) + "px" + }).addClass("sized"); + } + }); + } + function init() { datatableClick(); + resizeImageModal(); } return {
