You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/04/10 18:56:13 UTC
svn commit: r1311865 [3/7] - in /rave/branches/bootstrap: ./
rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/
rave-portal-resources/src/main/resources/
rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/
rave-portal-reso...
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp Tue Apr 10 16:56:11 2012
@@ -19,10 +19,10 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-
-<header>
- <nav class="topnav">
- <ul class="horizontal-list">
+<header class="navbar navbar-fixed-top">
+ <nav>
+ <a class="brand" href="#">${pagetitle}</a>
+ <ul class="nav pull-right">
<li>
<a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}"/>"><fmt:message
key="page.addwidget.title"/></a>
@@ -38,6 +38,7 @@
</c:choose>
<a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
</li>
+
<sec:authorize url="/app/admin/">
<li>
<a href="<spring:url value="/app/admin/"/>">
@@ -49,33 +50,246 @@
<a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
<fmt:message key="page.general.logout"/></a>
</li>
+
</ul>
</nav>
- <h1>${pagetitle}</h1>
</header>
-<div id="content" class="pageContent">
-<section class="storeSearch">
- <form action="<c:url value="/app/store/search"/>" method="GET">
+<div class="container-fluid navbar-spacer">
+<section class="span8">
+<c:choose>
+ <c:when test="${empty searchTerm and (empty widgets or widgets.totalResults eq 0)}">
+ <%-- Empty db --%>
+ <fmt:message key="page.store.list.noresult" var="listheader"/>
+ </c:when>
+ <c:when test="${empty searchTerm}">
+ <fmt:message key="page.store.list.result.x.to.y" var="listheader">
+ <fmt:param value="${widgets.offset + 1}"/>
+ <fmt:param value="${widgets.offset + fn:length(widgets.resultSet)}"/>
+ <fmt:param value="${widgets.totalResults}"/>
+ </fmt:message>
+ </c:when>
+ <c:when test="${not empty searchTerm and widgets.totalResults eq 0}">
+ <fmt:message key="page.store.list.search.noresult" var="listheader">
+ <fmt:param><c:out value="${searchTerm}"/></fmt:param>
+ </fmt:message>
+ </c:when>
+ <c:otherwise>
+ <fmt:message key="page.store.list.search.result.x.to.y" var="listheader">
+ <fmt:param value="${widgets.offset + 1}"/>
+ <fmt:param value="${widgets.offset + fn:length(widgets.resultSet)}"/>
+ <fmt:param value="${widgets.totalResults}"/>
+ <fmt:param><c:out value="${searchTerm}"/></fmt:param>
+ </fmt:message>
+ </c:otherwise>
+</c:choose>
+<h2>${listheader}</h2>
+<%--@elvariable id="widgets" type="org.apache.rave.portal.model.util.SearchResult"--%>
+<c:if test="${widgets.totalResults gt 0}">
+ <c:if test="${widgets.numberOfPages gt 1}">
+ <div>
+ <ul class="pagination">
+ <c:forEach var="i" begin="1" end="${widgets.numberOfPages}">
+ <c:url var="pageUrl" value="">
+ <c:param name="referringPageId" value="${referringPageId}"/>
+ <c:param name="searchTerm" value="${searchTerm}"/>
+ <c:param name="offset" value="${(i - 1) * widgets.pageSize}"/>
+ </c:url>
+ <c:choose>
+ <c:when test="${i eq widgets.currentPage}">
+ <li class="active"><a href="#">${i}</a></li>
+ </c:when>
+ <c:otherwise>
+ <li><a href="<c:out value="${pageUrl}"/>">${i}</a></li>
+ </c:otherwise>
+ </c:choose>
+
+ </c:forEach>
+ </ul>
+ </div>
+
+ </c:if>
+ <ul class="storeItems">
+ <%--@elvariable id="widget" type="org.apache.rave.portal.model.Widget"--%>
+ <c:forEach var="widget" items="${widgets.resultSet}">
+ <%--@elvariable id="widgetsStatistics" type="org.apache.rave.portal.model.util.WidgetStatistics"--%>
+ <c:set var="widgetStatistics" value="${widgetsStatistics[widget.entityId]}"/>
+ <c:choose>
+ <c:when test='${widget.featured == "true"}'>
+ <li class="storeItem storeItemFeatured">
+ </c:when>
+ <c:otherwise>
+ <li class="storeItem">
+ </c:otherwise>
+ </c:choose>
+
+ <div class="storeItemLeft">
+ <c:if test="${not empty widget.thumbnailUrl}">
+ <img class="storeWidgetThumbnail" src="${widget.thumbnailUrl}"
+ title="<c:out value="${widget.title}"/>" alt=""
+ width="120" height="60"/>
+ </c:if>
+
+ <div id="widgetAdded_${widget.entityId}" class="storeButton">
+ <button class="btn btn-small btn-primary" id="addWidget_${widget.entityId}"
+ onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.entityId}, pageId: ${referringPageId}, buttonId: this.id});">
+ <fmt:message key="page.widget.addToPage"/>
+ </button>
+ </div>
+
+ </div>
+
+ <div class="storeItemCenter">
+
+ <a id="widget-${widget.entityId}-title"
+ class="secondaryPageItemTitle"
+ href="<spring:url value="/app/store/widget/${widget.entityId}" />?referringPageId=${referringPageId}">
+ <c:out value="${widget.title}"/>
+ </a>
+ <c:if test="${widget.disableRendering}">
+ <div class="storeWidgetDisabled">
+ <span class="widget-disabled-icon-store ui-icon ui-icon-alert"
+ title="<fmt:message key="widget.chrome.disabled"/>"></span>
+ <c:out value="${widget.disableRenderingMessage}" escapeXml="true"/>
+ </div>
+ </c:if>
+ <c:if test="${not empty widget.author}">
+ <div class="storeWidgetAuthor"><fmt:message key="widget.author"/>: <c:out
+ value="${widget.author}"/></div>
+ </c:if>
+ <c:if test="${not empty widget.description}">
+ <div class="storeWidgetDesc"><c:out
+ value="${fn:substring(widget.description, 0, 200)}..."/></div>
+ </c:if>
+ <div class="widgetRating">
+ <fmt:message key="page.widget.rate"/>
+
+ <div id="rating-${widget.entityId}" class="ratingButtons">
+ <form>
+ <input type="hidden" id="rate-${widget.entityId}" value="${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].userRating:"-1"}">
+ </form>
+ <input type="radio" id="like-${widget.entityId}" class="widgetLikeButton"
+ name="rating-${widget.entityId}"${widgetsStatistics[widget.entityId].userRating==10?" checked='true'":""}>
+ <label for="like-${widget.entityId}"></label>
+ <input type="radio" id="dislike-${widget.entityId}" class="widgetDislikeButton"
+ name="rating-${widget.entityId}"${widgetsStatistics[widget.entityId].userRating==0?" checked='true'":""}>
+ <label for="dislike-${widget.entityId}"> </label>
+
+ <!-- Displaying the likes and dislikes rating along with total votes -->
+
+ </div>
+ </div>
+ <c:if test="${not empty widget.tags}">
+ <table class="widgetTags">
+ <tr>
+ <td>
+ <fmt:message key="page.widget.tags.title"/>
+ </td>
+ <c:forEach var="tag" items="${widget.tags}">
+ <td class="storeWidgetDesc"><c:out value="${tag.tag.keyword}"/></td>
+ </c:forEach>
+ </tr>
+ </table>
+ </c:if>
+ <c:if test="${not empty widget.categories}">
+ <table class="widgetCategories">
+ <tr>
+ <td>
+ <fmt:message key="widget.categories"/>
+ </td>
+ <c:forEach var="category" items="${widget.categories}">
+ <td class="storeWidgetDesc"><c:out value="${category.text}"/></td>
+ </c:forEach>
+ </tr>
+ </table>
+ </c:if>
+ <ul class="horizontal-list">
+ <!-- display total likes -->
+ <li>
+ <c:set var="widgetLikes">
+ ${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].totalLike:"0"}
+ </c:set>
+ <fmt:message key="page.widget.rate.likes"/><label id="totalLikes-${widget.entityId}"
+ data-rave-widget-likes="${widgetLikes}">${widgetLikes}</label>
+ </li>
+ <!-- display total dislikes -->
+ <li>
+ <c:set var="widgetDislikes">
+ ${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].totalDislike:"0"}
+ </c:set>
+ <fmt:message key="page.widget.rate.dislikes"/><label
+ id="totalDislikes-${widget.entityId}"
+ data-rave-widget-dislikes="${widgetDislikes}">${widgetDislikes}</label>
+ </li>
+ <li class="widgetUserCount">
+ <c:set var="widgetUserCountGreaterThanZero"
+ value="${widgetStatistics != null && widgetStatistics.totalUserCount > 0}"/>
+ <c:if test="${widgetUserCountGreaterThanZero}"><a href="javascript:void(0);"
+ onclick="rave.displayUsersOfWidget(${widget.entityId});"></c:if>
+ <fmt:formatNumber groupingUsed="true"
+ value="${widgetStatistics!=null?widgetStatistics.totalUserCount:0}"/> <fmt:message
+ key="page.widget.usercount"/>
+ <c:if test="${widgetUserCountGreaterThanZero}"></a></c:if>
+ </li>
+ </ul>
+ </div>
+
+ <div class="clear-float"></div>
+ </li>
+ </c:forEach>
+ </ul>
+
+ <c:if test="${widgets.numberOfPages gt 1}">
+
+ <div >
+ <ul class="pagination">
+ <c:forEach var="i" begin="1" end="${widgets.numberOfPages}">
+ <c:url var="pageUrl" value="">
+ <c:param name="referringPageId" value="${referringPageId}"/>
+ <c:param name="searchTerm" value="${searchTerm}"/>
+ <c:param name="offset" value="${(i - 1) * widgets.pageSize}"/>
+ </c:url>
+
+
+ <c:choose>
+ <c:when test="${i eq widgets.currentPage}">
+ <li class="active"><a href="#">${i}</a></li>
+ </c:when>
+ <c:otherwise>
+ <li > <a href="<c:out value="${pageUrl}"/>">${i}</a></li>
+ </c:otherwise>
+ </c:choose>
+
+ </c:forEach>
+ </ul>
+ </div>
+
+ </c:if>
+</c:if>
+</section>
+<section class="span5">
+ <form class="form-horizontal" action="<c:url value="/app/store/search"/>" method="GET">
<fieldset>
<input type="hidden" name="referringPageId" value="${referringPageId}">
- <h2>
- <label for="searchTerm"><fmt:message key="page.store.search"/></label>
- </h2>
- <p>
- <input type="search" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>"/>
+ <legend><fmt:message key="page.store.search"/></legend>
+ <div class="control-group">
+ <input class="search-query" type="search" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>"/>
<fmt:message key="page.store.search.button" var="searchButtonText"/>
- <input type="submit" value="${searchButtonText}"/>
- <c:if test="${not empty searchTerm}">
- <a href="<spring:url value="/app/store?referringPageId=${referringPageId}"/>">
+ <button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
+ </div>
+ <c:if test="${not empty searchTerm}">
+ <div class="control-group">
+
+ <a class="btn btn-warning" href="<spring:url value="/app/store?referringPageId=${referringPageId}"/>">
<fmt:message key="admin.clearsearch"/></a>
- </c:if>
- </p>
+
+ </div>
+ </c:if>
<c:if test="${not empty tags}">
- <div>
+ <div class="control-group">
<fmt:message key="page.store.list.widgets.tag"/>
- <select name="tagList" id="tagList" style="min-width:100px" >
+ <select name="tagList" id="tagList" style="min-width:100px">
<option value=" "></option>
<c:forEach var="tag" items="${tags}">
<c:choose>
@@ -94,9 +308,9 @@
</c:if>
<c:if test="${not empty categories}">
- <div>
- <fmt:message key="page.store.list.widgets.category"/>
- <select name="categoryList" id="categoryList" style="min-width:100px" >
+ <div class="control-group">
+ <label cssClass="control-label" for="categoryList"><fmt:message key="page.store.list.widgets.category"/></label>
+ <select name="categoryList" id="categoryList" style="min-width:100px">
<option value="0"></option>
<c:forEach var="category" items="${categories}">
<c:choose>
@@ -116,230 +330,10 @@
</fieldset>
</form>
- <div>
- <a href="<spring:url value="/app/store/mine?referringPageId=${referringPageId}"/>"><fmt:message
- key="page.store.list.widgets.mine"/></a>
- </div>
- <div>
- <a href="<spring:url value="/app/store?referringPageId=${referringPageId}"/>"><fmt:message
- key="page.store.list.widgets.all"/></a>
- </div>
-</section>
-
-<section class="storeBox">
- <c:choose>
- <c:when test="${empty searchTerm and (empty widgets or widgets.totalResults eq 0)}">
- <%-- Empty db --%>
- <fmt:message key="page.store.list.noresult" var="listheader"/>
- </c:when>
- <c:when test="${empty searchTerm}">
- <fmt:message key="page.store.list.result.x.to.y" var="listheader">
- <fmt:param value="${widgets.offset + 1}"/>
- <fmt:param value="${widgets.offset + fn:length(widgets.resultSet)}"/>
- <fmt:param value="${widgets.totalResults}"/>
- </fmt:message>
- </c:when>
- <c:when test="${not empty searchTerm and widgets.totalResults eq 0}">
- <fmt:message key="page.store.list.search.noresult" var="listheader">
- <fmt:param><c:out value="${searchTerm}"/></fmt:param>
- </fmt:message>
- </c:when>
- <c:otherwise>
- <fmt:message key="page.store.list.search.result.x.to.y" var="listheader">
- <fmt:param value="${widgets.offset + 1}"/>
- <fmt:param value="${widgets.offset + fn:length(widgets.resultSet)}"/>
- <fmt:param value="${widgets.totalResults}"/>
- <fmt:param><c:out value="${searchTerm}"/></fmt:param>
- </fmt:message>
- </c:otherwise>
- </c:choose>
- <h2>${listheader}</h2>
- <%--@elvariable id="widgets" type="org.apache.rave.portal.model.util.SearchResult"--%>
- <c:if test="${widgets.totalResults gt 0}">
- <c:if test="${widgets.numberOfPages gt 1}">
-
- <ul class="paging">
- <c:forEach var="i" begin="1" end="${widgets.numberOfPages}">
- <c:url var="pageUrl" value="">
- <c:param name="referringPageId" value="${referringPageId}"/>
- <c:param name="searchTerm" value="${searchTerm}"/>
- <c:param name="offset" value="${(i - 1) * widgets.pageSize}"/>
- </c:url>
-
- <li>
- <c:choose>
- <c:when test="${i eq widgets.currentPage}">
- <span class="currentPage">${i}</span>
- </c:when>
- <c:otherwise>
- <a href="<c:out value="${pageUrl}"/>">${i}</a>
- </c:otherwise>
- </c:choose>
- </li>
- </c:forEach>
- </ul>
-
- </c:if>
-
- <ul class="storeItems">
- </br>
- <%--@elvariable id="widget" type="org.apache.rave.portal.model.Widget"--%>
- <c:forEach var="widget"
- items="${widgets.resultSet}">
- <%--@elvariable id="widgetsStatistics" type="org.apache.rave.portal.model.util.WidgetStatistics"--%>
- <c:set var="widgetStatistics" value="${widgetsStatistics[widget.entityId]}"/>
- <c:choose>
- <c:when test='${widget.featured == "true"}' >
- <li class="storeItem storeItemFeatured">
- </c:when>
- <c:otherwise>
- <li class="storeItem">
- </c:otherwise>
- </c:choose>
-
- <div class="storeItemLeft">
- <c:if test="${not empty widget.thumbnailUrl}">
- <img class="storeWidgetThumbnail" src="${widget.thumbnailUrl}"
- title="<c:out value="${widget.title}"/>" alt=""
- width="120" height="60"/>
- </c:if>
-
- <div id="widgetAdded_${widget.entityId}" class="storeButton">
- <button class="storeItemButton"
- id="addWidget_${widget.entityId}"
- onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.entityId}, pageId: ${referringPageId}, buttonId: this.id});">
- <fmt:message key="page.widget.addToPage"/>
- </button>
- </div>
-
- </div>
-
- <div class="storeItemCenter">
-
- <a id="widget-${widget.entityId}-title"
- class="secondaryPageItemTitle"
- href="<spring:url value="/app/store/widget/${widget.entityId}" />?referringPageId=${referringPageId}">
- <c:out value="${widget.title}"/>
- </a>
- <c:if test="${widget.disableRendering}">
- <div class="storeWidgetDisabled">
- <span class="widget-disabled-icon-store ui-icon ui-icon-alert"
- title="<fmt:message key="widget.chrome.disabled"/>"></span>
- <c:out value="${widget.disableRenderingMessage}" escapeXml="true"/>
- </div>
- </c:if>
- <c:if test="${not empty widget.author}">
- <div class="storeWidgetAuthor"><fmt:message key="widget.author"/>: <c:out
- value="${widget.author}"/></div>
- </c:if>
- <c:if test="${not empty widget.description}">
- <div class="storeWidgetDesc"><c:out
- value="${fn:substring(widget.description, 0, 200)}..."/></div>
- </c:if>
- <div class="widgetRating">
- <fmt:message key="page.widget.rate"/>
-
- <div id="rating-${widget.entityId}" class="ratingButtons">
- <form>
- <input type="hidden" id="rate-${widget.entityId}"
- value="${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].userRating:"-1"}">
- </form>
- <input type="radio" id="like-${widget.entityId}" class="widgetLikeButton"
- name="rating-${widget.entityId}"${widgetsStatistics[widget.entityId].userRating==10?" checked='true'":""}>
- <label for="like-${widget.entityId}"></label>
- <input type="radio" id="dislike-${widget.entityId}" class="widgetDislikeButton"
- name="rating-${widget.entityId}"${widgetsStatistics[widget.entityId].userRating==0?" checked='true'":""}>
- <label for="dislike-${widget.entityId}"> </label>
-
- <!-- Displaying the likes and dislikes rating along with total votes -->
-
- </div>
- </div>
- <c:if test="${not empty widget.tags}">
- <table class="widgetTags">
- <tr>
- <td>
- <fmt:message key="page.widget.tags.title"/>
- </td>
- <c:forEach var="tag" items="${widget.tags}">
- <td class="storeWidgetDesc"><c:out value="${tag.tag.keyword}"/></td>
- </c:forEach>
- </tr>
- </table>
- </c:if>
- <c:if test="${not empty widget.categories}">
- <table class="widgetCategories">
- <tr>
- <td>
- <fmt:message key="widget.categories"/>
- </td>
- <c:forEach var="category" items="${widget.categories}">
- <td class="storeWidgetDesc"><c:out value="${category.text}"/></td>
- </c:forEach>
- </tr>
- </table>
- </c:if>
- <ul class="horizontal-list">
- <!-- display total likes -->
- <li>
- <c:set var="widgetLikes">
- ${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].totalLike:"0"}
- </c:set>
- <fmt:message key="page.widget.rate.likes"/><label id="totalLikes-${widget.entityId}"
- data-rave-widget-likes="${widgetLikes}">${widgetLikes}</label>
- </li>
- <!-- display total dislikes -->
- <li>
- <c:set var="widgetDislikes">
- ${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].totalDislike:"0"}
- </c:set>
- <fmt:message key="page.widget.rate.dislikes"/><label
- id="totalDislikes-${widget.entityId}"
- data-rave-widget-dislikes="${widgetDislikes}">${widgetDislikes}</label>
- </li>
- <li class="widgetUserCount">
- <c:set var="widgetUserCountGreaterThanZero"
- value="${widgetStatistics != null && widgetStatistics.totalUserCount > 0}"/>
- <c:if test="${widgetUserCountGreaterThanZero}"><a href="javascript:void(0);"
- onclick="rave.displayUsersOfWidget(${widget.entityId});"></c:if>
- <fmt:formatNumber groupingUsed="true"
- value="${widgetStatistics!=null?widgetStatistics.totalUserCount:0}"/> <fmt:message
- key="page.widget.usercount"/>
- <c:if test="${widgetUserCountGreaterThanZero}"></a></c:if>
- </li>
- </ul>
- </div>
-
- <div class="clear-float"></div>
- </li>
- </c:forEach>
- </ul>
+ <a class="btn btn-info" href="<spring:url value="/app/store/mine?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.mine"/></a>
- <c:if test="${widgets.numberOfPages gt 1}">
+ <a class="btn btn-info" href="<spring:url value="/app/store?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.all"/></a>
- <ul class="paging">
- <c:forEach var="i" begin="1" end="${widgets.numberOfPages}">
- <c:url var="pageUrl" value="">
- <c:param name="referringPageId" value="${referringPageId}"/>
- <c:param name="searchTerm" value="${searchTerm}"/>
- <c:param name="offset" value="${(i - 1) * widgets.pageSize}"/>
- </c:url>
-
- <li>
- <c:choose>
- <c:when test="${i eq widgets.currentPage}">
- <span class="currentPage">${i}</span>
- </c:when>
- <c:otherwise>
- <a href="<c:out value="${pageUrl}"/>">${i}</a>
- </c:otherwise>
- </c:choose>
- </li>
- </c:forEach>
- </ul>
-
- </c:if>
- </c:if>
</section>
</div>
@@ -350,4 +344,4 @@
rave.store.init('<c:out value="${referringPageId}"/>');
});
</script>
-</portal:register-init-script>
\ No newline at end of file
+</portal:register-init-script>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag Tue Apr 10 16:56:11 2012
@@ -23,40 +23,42 @@ under the License.
<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult"--%>
<c:if test="${searchResult.pageSize lt searchResult.totalResults}">
<%-- offset is 0 based, pages 1 based --%>
- <ul class="paging">
- <c:if test="${searchResult.currentPage gt 1}">
- <c:url var="pageUrl" value="">
- <c:if test="${not empty searchTerm}"><c:param name="searchTerm" value="${searchTerm}"/></c:if>
- <c:if test="${not empty selectedWidgetType}"><c:param name="widgettype" value="${selectedWidgetType}"/></c:if>
- <c:if test="${not empty selectedWidgetStatus}"><c:param name="widgetstatus" value="${selectedWidgetStatus}"/></c:if>
- <c:param name="offset" value="${(searchResult.currentPage - 2) * searchResult.pageSize}"/>
- </c:url>
- <li><a href="<c:out value="${pageUrl}"/>"><</a></li>
- </c:if>
- <c:forEach var="i" begin="1" end="${searchResult.numberOfPages}">
- <c:choose>
- <c:when test="${i eq searchResult.currentPage}">
- <li><span class="currentPage">${i}</span></li>
- </c:when>
- <c:otherwise>
- <c:url var="pageUrl" value="">
- <c:if test="${not empty searchTerm}"><c:param name="searchTerm" value="${searchTerm}"/></c:if>
- <c:if test="${not empty selectedWidgetType}"><c:param name="widgettype" value="${selectedWidgetType}"/></c:if>
- <c:if test="${not empty selectedWidgetStatus}"><c:param name="widgetstatus" value="${selectedWidgetStatus}"/></c:if>
- <c:param name="offset" value="${(i - 1) * searchResult.pageSize}"/>
- </c:url>
- <li><a href="<c:out value="${pageUrl}"/>">${i}</a></li>
- </c:otherwise>
- </c:choose>
- </c:forEach>
- <c:if test="${searchResult.currentPage lt searchResult.numberOfPages}">
- <c:url var="pageUrl" value="">
- <c:if test="${not empty searchTerm}"><c:param name="searchTerm" value="${searchTerm}"/></c:if>
- <c:if test="${not empty selectedWidgetType}"><c:param name="widgettype" value="${selectedWidgetType}"/></c:if>
- <c:if test="${not empty selectedWidgetStatus}"><c:param name="widgetstatus" value="${selectedWidgetStatus}"/></c:if>
- <c:param name="offset" value="${(searchResult.currentPage) * searchResult.pageSize}"/>
- </c:url>
- <li><a href="<c:out value="${pageUrl}"/>">></a></li>
- </c:if>
- </ul>
+ <div class="pagination">
+ <ul>
+ <c:if test="${searchResult.currentPage gt 1}">
+ <c:url var="pageUrl" value="">
+ <c:if test="${not empty searchTerm}"><c:param name="searchTerm" value="${searchTerm}"/></c:if>
+ <c:if test="${not empty selectedWidgetType}"><c:param name="widgettype" value="${selectedWidgetType}"/></c:if>
+ <c:if test="${not empty selectedWidgetStatus}"><c:param name="widgetstatus" value="${selectedWidgetStatus}"/></c:if>
+ <c:param name="offset" value="${(searchResult.currentPage - 2) * searchResult.pageSize}"/>
+ </c:url>
+ <li><a href="<c:out value="${pageUrl}"/>"><</a></li>
+ </c:if>
+ <c:forEach var="i" begin="1" end="${searchResult.numberOfPages}">
+ <c:choose>
+ <c:when test="${i eq searchResult.currentPage}">
+ <li class="active"><a href="#">${i}</a></li>
+ </c:when>
+ <c:otherwise>
+ <c:url var="pageUrl" value="">
+ <c:if test="${not empty searchTerm}"><c:param name="searchTerm" value="${searchTerm}"/></c:if>
+ <c:if test="${not empty selectedWidgetType}"><c:param name="widgettype" value="${selectedWidgetType}"/></c:if>
+ <c:if test="${not empty selectedWidgetStatus}"><c:param name="widgetstatus" value="${selectedWidgetStatus}"/></c:if>
+ <c:param name="offset" value="${(i - 1) * searchResult.pageSize}"/>
+ </c:url>
+ <li><a href="<c:out value="${pageUrl}"/>">${i}</a></li>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
+ <c:if test="${searchResult.currentPage lt searchResult.numberOfPages}">
+ <c:url var="pageUrl" value="">
+ <c:if test="${not empty searchTerm}"><c:param name="searchTerm" value="${searchTerm}"/></c:if>
+ <c:if test="${not empty selectedWidgetType}"><c:param name="widgettype" value="${selectedWidgetType}"/></c:if>
+ <c:if test="${not empty selectedWidgetStatus}"><c:param name="widgetstatus" value="${selectedWidgetStatus}"/></c:if>
+ <c:param name="offset" value="${(searchResult.currentPage) * searchResult.pageSize}"/>
+ </c:url>
+ <li><a href="<c:out value="${pageUrl}"/>">></a></li>
+ </c:if>
+ </ul>
+ </div>
</c:if>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_tabsheader.tag
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_tabsheader.tag?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_tabsheader.tag (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_tabsheader.tag Tue Apr 10 16:56:11 2012
@@ -20,32 +20,27 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<fmt:setBundle basename="messages"/>
-<div id="tabsHeader">
+<%--@elvariable id="tabs" type="org.apache.rave.portal.web.model.NavigationMenu"--%>
+<c:if test="${not empty tabs}">
<nav>
- <%--@elvariable id="tabs" type="org.apache.rave.portal.web.model.NavigationMenu"--%>
- <c:if test="${not empty tabs}">
- <ul id="tabs" class="rave-ui-tabs">
+ <div class="tabbable tabs-left">
+ <ul class="nav nav-tabs">
<c:forEach items="${tabs.navigationItems}" var="navItem">
<c:choose>
<c:when test="${navItem.selected}">
- <li class="rave-ui-tab rave-ui-tab-selected">
- <div class="page-title">
- <a href="<spring:url value="${navItem.url}"/>"><fmt:message
- key="${navItem.name}"/></a>
- </div>
+ <li class="active">
+ <a href="<spring:url value="${navItem.url}"/>"><fmt:message key="${navItem.name}"/></a>
</li>
</c:when>
<c:otherwise>
- <li class="rave-ui-tab">
- <div class="page-title">
- <a href="<spring:url value="${navItem.url}"/>"><fmt:message
- key="${navItem.name}"/></a>
- </div>
+ <li>
+ <a href="<spring:url value="${navItem.url}"/>"><fmt:message key="${navItem.name}"/></a>
</li>
</c:otherwise>
</c:choose>
</c:forEach>
</ul>
- </c:if>
+ </div>
</nav>
-</div>
\ No newline at end of file
+</c:if>
+
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag Tue Apr 10 16:56:11 2012
@@ -21,17 +21,18 @@
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ attribute name="pageTitle" required="false" description="The title of the page" %>
<fmt:setBundle basename="messages"/>
-
<header>
- <nav class="topnav">
+ <nav>
<%--@elvariable id="topnav" type="org.apache.rave.portal.web.model.NavigationMenu"--%>
<c:if test="${not empty topnav}">
- <ul class="horizontal-list">
- <c:forEach items="${topnav.navigationItems}" var="navItem">
- <li><a href="<spring:url value="${navItem.url}"/>"><fmt:message key="${navItem.name}"/></a></li>
- </c:forEach>
- </ul>
+ <div class="navbar navbar-fixed-top">
+ <a class="brand" href="#"><c:out value="${pageTitle}"/></a>
+ <ul class="nav pull-right">
+ <c:forEach items="${topnav.navigationItems}" var="navItem">
+ <li><a href="<spring:url value="${navItem.url}"/>"><fmt:message key="${navItem.name}"/></a></li>
+ </c:forEach>
+ </ul>
+ </div>
</c:if>
</nav>
- <h1><c:out value="${pageTitle}"/></h1>
</header>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag Tue Apr 10 16:56:11 2012
@@ -19,4 +19,6 @@
--%>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<rave:third_party_css />
-<link rel="stylesheet" href="<c:url value="/css/default.css" />"/>
\ No newline at end of file
+<link rel="stylesheet" href="<c:url value="/css/default.css" />"/>
+<link rel="stylesheet" href="<c:url value="/css/bootstrap/css/bootstrap.css" />"/>
+<link rel="stylesheet" href="<c:url value="/css/rave.css" />"/>
\ No newline at end of file
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag Tue Apr 10 16:56:11 2012
@@ -41,6 +41,8 @@
</c:otherwise>
</c:choose>
<script src="<spring:url value="/app/messagebundle/rave_client_messages.js"/>"></script>
+<%-- bootstrap --%>
+<script src="<spring:url value="/css/bootstrap/js/bootstrap.js"/>"></script>
<portal:render-script location="${'AFTER_RAVE'}" />
<%-- common javascript to execute on all pages --%>
<script>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_css.tag
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_css.tag?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_css.tag (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_css.tag Tue Apr 10 16:56:11 2012
@@ -22,4 +22,4 @@
Overlay this file in custom extensions of Rave if you host these files internally and don't need
to pull them in externally.
--%>
-<link rel="stylesheet" href="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/themes/base/jquery-ui.css"/>
+<link rel="stylesheet" href="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/themes/base/jquery-ui.css"/>
\ No newline at end of file
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag Tue Apr 10 16:56:11 2012
@@ -31,4 +31,4 @@
<%-- google css3 mediaqueries script --%>
<!--[if lt IE 9]><script src=//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js></script><![endif]-->
<%-- google html5 script --%>
-<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
\ No newline at end of file
Added: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.css
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.css?rev=1311865&view=auto
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.css (added)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.css Tue Apr 10 16:56:11 2012
@@ -0,0 +1,581 @@
+/*!
+ * Bootstrap Responsive v2.0.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+.clearfix {
+ *zoom: 1;
+}
+.clearfix:before, .clearfix:after {
+ display: table;
+ content: "";
+}
+.clearfix:after {
+ clear: both;
+}
+.hidden {
+ display: none;
+ visibility: hidden;
+}
+@media (max-width: 480px) {
+ .nav-collapse {
+ -webkit-transform: translate3d(0, 0, 0);
+ }
+ .page-header h1 small {
+ display: block;
+ line-height: 18px;
+ }
+ input[class*="span"],
+ select[class*="span"],
+ textarea[class*="span"],
+ .uneditable-input {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ /* Make inputs at least the height of their button counterpart */
+
+ /* Makes inputs behave like true block-level elements */
+
+ -webkit-box-sizing: border-box;
+ /* Older Webkit */
+
+ -moz-box-sizing: border-box;
+ /* Older FF */
+
+ -ms-box-sizing: border-box;
+ /* IE8 */
+
+ box-sizing: border-box;
+ /* CSS3 spec*/
+
+ }
+ .input-prepend input[class*="span"], .input-append input[class*="span"] {
+ width: auto;
+ }
+ input[type="checkbox"], input[type="radio"] {
+ border: 1px solid #ccc;
+ }
+ .form-horizontal .control-group > label {
+ float: none;
+ width: auto;
+ padding-top: 0;
+ text-align: left;
+ }
+ .form-horizontal .controls {
+ margin-left: 0;
+ }
+ .form-horizontal .control-list {
+ padding-top: 0;
+ }
+ .form-horizontal .form-actions {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+ .modal {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ right: 10px;
+ width: auto;
+ margin: 0;
+ }
+ .modal.fade.in {
+ top: auto;
+ }
+ .modal-header .close {
+ padding: 10px;
+ margin: -10px;
+ }
+ .carousel-caption {
+ position: static;
+ }
+}
+@media (max-width: 767px) {
+ .container {
+ width: auto;
+ padding: 0 20px;
+ }
+ .row-fluid {
+ width: 100%;
+ }
+ .row {
+ margin-left: 0;
+ }
+ .row > [class*="span"], .row-fluid > [class*="span"] {
+ float: none;
+ display: block;
+ width: auto;
+ margin: 0;
+ }
+}
+@media (min-width: 768px) and (max-width: 979px) {
+ .row {
+ margin-left: -20px;
+ *zoom: 1;
+ }
+ .row:before, .row:after {
+ display: table;
+ content: "";
+ }
+ .row:after {
+ clear: both;
+ }
+ [class*="span"] {
+ float: left;
+ margin-left: 20px;
+ }
+ .span1 {
+ width: 42px;
+ }
+ .span2 {
+ width: 104px;
+ }
+ .span3 {
+ width: 166px;
+ }
+ .span4 {
+ width: 228px;
+ }
+ .span5 {
+ width: 290px;
+ }
+ .span6 {
+ width: 352px;
+ }
+ .span7 {
+ width: 414px;
+ }
+ .span8 {
+ width: 476px;
+ }
+ .span9 {
+ width: 538px;
+ }
+ .span10 {
+ width: 600px;
+ }
+ .span11 {
+ width: 662px;
+ }
+ .span12, .container {
+ width: 724px;
+ }
+ .offset1 {
+ margin-left: 82px;
+ }
+ .offset2 {
+ margin-left: 144px;
+ }
+ .offset3 {
+ margin-left: 206px;
+ }
+ .offset4 {
+ margin-left: 268px;
+ }
+ .offset5 {
+ margin-left: 330px;
+ }
+ .offset6 {
+ margin-left: 392px;
+ }
+ .offset7 {
+ margin-left: 454px;
+ }
+ .offset8 {
+ margin-left: 516px;
+ }
+ .offset9 {
+ margin-left: 578px;
+ }
+ .offset10 {
+ margin-left: 640px;
+ }
+ .offset11 {
+ margin-left: 702px;
+ }
+ .row-fluid {
+ width: 100%;
+ *zoom: 1;
+ }
+ .row-fluid:before, .row-fluid:after {
+ display: table;
+ content: "";
+ }
+ .row-fluid:after {
+ clear: both;
+ }
+ .row-fluid > [class*="span"] {
+ float: left;
+ margin-left: 2.762430939%;
+ }
+ .row-fluid > [class*="span"]:first-child {
+ margin-left: 0;
+ }
+ .row-fluid > .span1 {
+ width: 5.801104972%;
+ }
+ .row-fluid > .span2 {
+ width: 14.364640883%;
+ }
+ .row-fluid > .span3 {
+ width: 22.928176794%;
+ }
+ .row-fluid > .span4 {
+ width: 31.491712705%;
+ }
+ .row-fluid > .span5 {
+ width: 40.055248616%;
+ }
+ .row-fluid > .span6 {
+ width: 48.618784527%;
+ }
+ .row-fluid > .span7 {
+ width: 57.182320438000005%;
+ }
+ .row-fluid > .span8 {
+ width: 65.74585634900001%;
+ }
+ .row-fluid > .span9 {
+ width: 74.30939226%;
+ }
+ .row-fluid > .span10 {
+ width: 82.87292817100001%;
+ }
+ .row-fluid > .span11 {
+ width: 91.436464082%;
+ }
+ .row-fluid > .span12 {
+ width: 99.999999993%;
+ }
+ input.span1, textarea.span1, .uneditable-input.span1 {
+ width: 32px;
+ }
+ input.span2, textarea.span2, .uneditable-input.span2 {
+ width: 94px;
+ }
+ input.span3, textarea.span3, .uneditable-input.span3 {
+ width: 156px;
+ }
+ input.span4, textarea.span4, .uneditable-input.span4 {
+ width: 218px;
+ }
+ input.span5, textarea.span5, .uneditable-input.span5 {
+ width: 280px;
+ }
+ input.span6, textarea.span6, .uneditable-input.span6 {
+ width: 342px;
+ }
+ input.span7, textarea.span7, .uneditable-input.span7 {
+ width: 404px;
+ }
+ input.span8, textarea.span8, .uneditable-input.span8 {
+ width: 466px;
+ }
+ input.span9, textarea.span9, .uneditable-input.span9 {
+ width: 528px;
+ }
+ input.span10, textarea.span10, .uneditable-input.span10 {
+ width: 590px;
+ }
+ input.span11, textarea.span11, .uneditable-input.span11 {
+ width: 652px;
+ }
+ input.span12, textarea.span12, .uneditable-input.span12 {
+ width: 714px;
+ }
+}
+@media (max-width: 979px) {
+ body {
+ padding-top: 0;
+ }
+ .navbar-fixed-top {
+ position: static;
+ margin-bottom: 18px;
+ }
+ .navbar-fixed-top .navbar-inner {
+ padding: 5px;
+ }
+ .navbar .container {
+ width: auto;
+ padding: 0;
+ }
+ .navbar .brand {
+ padding-left: 10px;
+ padding-right: 10px;
+ margin: 0 0 0 -5px;
+ }
+ .navbar .nav-collapse {
+ clear: left;
+ }
+ .navbar .nav {
+ float: none;
+ margin: 0 0 9px;
+ }
+ .navbar .nav > li {
+ float: none;
+ }
+ .navbar .nav > li > a {
+ margin-bottom: 2px;
+ }
+ .navbar .nav > .divider-vertical {
+ display: none;
+ }
+ .navbar .nav .nav-header {
+ color: #999999;
+ text-shadow: none;
+ }
+ .navbar .nav > li > a, .navbar .dropdown-menu a {
+ padding: 6px 15px;
+ font-weight: bold;
+ color: #999999;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+ }
+ .navbar .dropdown-menu li + li a {
+ margin-bottom: 2px;
+ }
+ .navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover {
+ background-color: #222222;
+ }
+ .navbar .dropdown-menu {
+ position: static;
+ top: auto;
+ left: auto;
+ float: none;
+ display: block;
+ max-width: none;
+ margin: 0 15px;
+ padding: 0;
+ background-color: transparent;
+ border: none;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ }
+ .navbar .dropdown-menu:before, .navbar .dropdown-menu:after {
+ display: none;
+ }
+ .navbar .dropdown-menu .divider {
+ display: none;
+ }
+ .navbar-form, .navbar-search {
+ float: none;
+ padding: 9px 15px;
+ margin: 9px 0;
+ border-top: 1px solid #222222;
+ border-bottom: 1px solid #222222;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+ }
+ .navbar .nav.pull-right {
+ float: none;
+ margin-left: 0;
+ }
+ .navbar-static .navbar-inner {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+ .btn-navbar {
+ display: block;
+ }
+ .nav-collapse {
+ overflow: hidden;
+ height: 0;
+ }
+}
+@media (min-width: 980px) {
+ .nav-collapse.collapse {
+ height: auto !important;
+ }
+}
+@media (min-width: 1200px) {
+ .row {
+ margin-left: -30px;
+ *zoom: 1;
+ }
+ .row:before, .row:after {
+ display: table;
+ content: "";
+ }
+ .row:after {
+ clear: both;
+ }
+ [class*="span"] {
+ float: left;
+ margin-left: 30px;
+ }
+ .span1 {
+ width: 70px;
+ }
+ .span2 {
+ width: 170px;
+ }
+ .span3 {
+ width: 270px;
+ }
+ .span4 {
+ width: 370px;
+ }
+ .span5 {
+ width: 470px;
+ }
+ .span6 {
+ width: 570px;
+ }
+ .span7 {
+ width: 670px;
+ }
+ .span8 {
+ width: 770px;
+ }
+ .span9 {
+ width: 870px;
+ }
+ .span10 {
+ width: 970px;
+ }
+ .span11 {
+ width: 1070px;
+ }
+ .span12, .container {
+ width: 1170px;
+ }
+ .offset1 {
+ margin-left: 130px;
+ }
+ .offset2 {
+ margin-left: 230px;
+ }
+ .offset3 {
+ margin-left: 330px;
+ }
+ .offset4 {
+ margin-left: 430px;
+ }
+ .offset5 {
+ margin-left: 530px;
+ }
+ .offset6 {
+ margin-left: 630px;
+ }
+ .offset7 {
+ margin-left: 730px;
+ }
+ .offset8 {
+ margin-left: 830px;
+ }
+ .offset9 {
+ margin-left: 930px;
+ }
+ .offset10 {
+ margin-left: 1030px;
+ }
+ .offset11 {
+ margin-left: 1130px;
+ }
+ .row-fluid {
+ width: 100%;
+ *zoom: 1;
+ }
+ .row-fluid:before, .row-fluid:after {
+ display: table;
+ content: "";
+ }
+ .row-fluid:after {
+ clear: both;
+ }
+ .row-fluid > [class*="span"] {
+ float: left;
+ margin-left: 2.564102564%;
+ }
+ .row-fluid > [class*="span"]:first-child {
+ margin-left: 0;
+ }
+ .row-fluid > .span1 {
+ width: 5.982905983%;
+ }
+ .row-fluid > .span2 {
+ width: 14.529914530000001%;
+ }
+ .row-fluid > .span3 {
+ width: 23.076923077%;
+ }
+ .row-fluid > .span4 {
+ width: 31.623931624%;
+ }
+ .row-fluid > .span5 {
+ width: 40.170940171000005%;
+ }
+ .row-fluid > .span6 {
+ width: 48.717948718%;
+ }
+ .row-fluid > .span7 {
+ width: 57.264957265%;
+ }
+ .row-fluid > .span8 {
+ width: 65.81196581200001%;
+ }
+ .row-fluid > .span9 {
+ width: 74.358974359%;
+ }
+ .row-fluid > .span10 {
+ width: 82.905982906%;
+ }
+ .row-fluid > .span11 {
+ width: 91.45299145300001%;
+ }
+ .row-fluid > .span12 {
+ width: 100%;
+ }
+ input.span1, textarea.span1, .uneditable-input.span1 {
+ width: 60px;
+ }
+ input.span2, textarea.span2, .uneditable-input.span2 {
+ width: 160px;
+ }
+ input.span3, textarea.span3, .uneditable-input.span3 {
+ width: 260px;
+ }
+ input.span4, textarea.span4, .uneditable-input.span4 {
+ width: 360px;
+ }
+ input.span5, textarea.span5, .uneditable-input.span5 {
+ width: 460px;
+ }
+ input.span6, textarea.span6, .uneditable-input.span6 {
+ width: 560px;
+ }
+ input.span7, textarea.span7, .uneditable-input.span7 {
+ width: 660px;
+ }
+ input.span8, textarea.span8, .uneditable-input.span8 {
+ width: 760px;
+ }
+ input.span9, textarea.span9, .uneditable-input.span9 {
+ width: 860px;
+ }
+ input.span10, textarea.span10, .uneditable-input.span10 {
+ width: 960px;
+ }
+ input.span11, textarea.span11, .uneditable-input.span11 {
+ width: 1060px;
+ }
+ input.span12, textarea.span12, .uneditable-input.span12 {
+ width: 1160px;
+ }
+ .thumbnails {
+ margin-left: -30px;
+ }
+ .thumbnails > li {
+ margin-left: 30px;
+ }
+}
Added: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.min.css
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.min.css?rev=1311865&view=auto
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.min.css (added)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.min.css Tue Apr 10 16:56:11 2012
@@ -0,0 +1,4 @@
+.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
+.clearfix:after{clear:both;}
+.hidden{display:none;visibility:hidden;}
+@media (max-width:480px){.nav-collapse{-webkit-transform:translate3d(0, 0, 0);} .page-header h1 small{display:block;line-height:18px;} input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} .input-prepend input[class*="span"],.input-append input[class*="span"]{width:auto;} input[type="checkbox"],input[type="radio"]{border:1px solid #ccc;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:10px;padding-right:10px;} .modal{position:absolute;top:10px;left:10px;right:10px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;margin:-10px;} .carousel-caption{position:static;}}@media (max-width:767px){.conta
iner{width:auto;padding:0 20px;} .row-fluid{width:100%;} .row{margin-left:0;} .row>[class*="span"],.row-fluid>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:20px;} .span1{width:42px;} .span2{width:104px;} .span3{width:166px;} .span4{width:228px;} .span5{width:290px;} .span6{width:352px;} .span7{width:414px;} .span8{width:476px;} .span9{width:538px;} .span10{width:600px;} .span11{width:662px;} .span12,.container{width:724px;} .offset1{margin-left:82px;} .offset2{margin-left:144px;} .offset3{margin-left:206px;} .offset4{margin-left:268px;} .offset5{margin-left:330px;} .offset6{margin-left:392px;} .offset7{margin-left:454px;} .offset8{margin-left:516px;} .offset9{margin-left:578px;} .offset10{margin-left:640px;} .offset11{margin-left:702px;} .row-fluid{width:100%;*zoom:1;}.
row-fluid:before,.row-fluid:after{display:table;content:"";} .row-fluid:after{clear:both;} .row-fluid>[class*="span"]{float:left;margin-left:2.762430939%;} .row-fluid>[class*="span"]:first-child{margin-left:0;} .row-fluid>.span1{width:5.801104972%;} .row-fluid>.span2{width:14.364640883%;} .row-fluid>.span3{width:22.928176794%;} .row-fluid>.span4{width:31.491712705%;} .row-fluid>.span5{width:40.055248616%;} .row-fluid>.span6{width:48.618784527%;} .row-fluid>.span7{width:57.182320438000005%;} .row-fluid>.span8{width:65.74585634900001%;} .row-fluid>.span9{width:74.30939226%;} .row-fluid>.span10{width:82.87292817100001%;} .row-fluid>.span11{width:91.436464082%;} .row-fluid>.span12{width:99.999999993%;} input.span1,textarea.span1,.uneditable-input.span1{width:32px;} input.span2,textarea.span2,.uneditable-input.span2{width:94px;} input.span3,textarea.span3,.uneditable-input.span3{width:156px;} input.span4,textarea.span4,.uneditable-input.span4{width:218px;} input.span5,textarea.sp
an5,.uneditable-input.span5{width:280px;} input.span6,textarea.span6,.uneditable-input.span6{width:342px;} input.span7,textarea.span7,.uneditable-input.span7{width:404px;} input.span8,textarea.span8,.uneditable-input.span8{width:466px;} input.span9,textarea.span9,.uneditable-input.span9{width:528px;} input.span10,textarea.span10,.uneditable-input.span10{width:590px;} input.span11,textarea.span11,.uneditable-input.span11{width:652px;} input.span12,textarea.span12,.uneditable-input.span12{width:714px;}}@media (max-width:979px){body{padding-top:0;} .navbar-fixed-top{position:static;margin-bottom:18px;} .navbar-fixed-top .navbar-inner{padding:5px;} .navbar .container{width:auto;padding:0;} .navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px;} .navbar .nav-collapse{clear:left;} .navbar .nav{float:none;margin:0 0 9px;} .navbar .nav>li{float:none;} .navbar .nav>li>a{margin-bottom:2px;} .navbar .nav>.divider-vertical{display:none;} .navbar .nav .nav-header{color:#9
99999;text-shadow:none;} .navbar .nav>li>a,.navbar .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .navbar .dropdown-menu li+li a{margin-bottom:2px;} .navbar .nav>li>a:hover,.navbar .dropdown-menu a:hover{background-color:#222222;} .navbar .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .dropdown-menu:before,.navbar .dropdown-menu:after{display:none;} .navbar .dropdown-menu .divider{display:none;} .navbar-form,.navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222222;border-bottom:1px solid #222222;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 25
5, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);} .navbar .nav.pull-right{float:none;margin-left:0;} .navbar-static .navbar-inner{padding-left:10px;padding-right:10px;} .btn-navbar{display:block;} .nav-collapse{overflow:hidden;height:0;}}@media (min-width:980px){.nav-collapse.collapse{height:auto !important;}}@media (min-width:1200px){.row{margin-left:-30px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:30px;} .span1{width:70px;} .span2{width:170px;} .span3{width:270px;} .span4{width:370px;} .span5{width:470px;} .span6{width:570px;} .span7{width:670px;} .span8{width:770px;} .span9{width:870px;} .span10{width:970px;} .span11{width:1070px;} .span12,.container{width:1170px;} .offset1{margin-left:130px;} .offset2{margin-left:230px;} .offset3{margin-left:330px;} .offset4{margin-left:430px;} .offset5{margin-left:530px;} .offset
6{margin-left:630px;} .offset7{margin-left:730px;} .offset8{margin-left:830px;} .offset9{margin-left:930px;} .offset10{margin-left:1030px;} .offset11{margin-left:1130px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} .row-fluid:after{clear:both;} .row-fluid>[class*="span"]{float:left;margin-left:2.564102564%;} .row-fluid>[class*="span"]:first-child{margin-left:0;} .row-fluid>.span1{width:5.982905983%;} .row-fluid>.span2{width:14.529914530000001%;} .row-fluid>.span3{width:23.076923077%;} .row-fluid>.span4{width:31.623931624%;} .row-fluid>.span5{width:40.170940171000005%;} .row-fluid>.span6{width:48.717948718%;} .row-fluid>.span7{width:57.264957265%;} .row-fluid>.span8{width:65.81196581200001%;} .row-fluid>.span9{width:74.358974359%;} .row-fluid>.span10{width:82.905982906%;} .row-fluid>.span11{width:91.45299145300001%;} .row-fluid>.span12{width:100%;} input.span1,textarea.span1,.uneditable-input.span1{width:60px;} input.span2,text
area.span2,.uneditable-input.span2{width:160px;} input.span3,textarea.span3,.uneditable-input.span3{width:260px;} input.span4,textarea.span4,.uneditable-input.span4{width:360px;} input.span5,textarea.span5,.uneditable-input.span5{width:460px;} input.span6,textarea.span6,.uneditable-input.span6{width:560px;} input.span7,textarea.span7,.uneditable-input.span7{width:660px;} input.span8,textarea.span8,.uneditable-input.span8{width:760px;} input.span9,textarea.span9,.uneditable-input.span9{width:860px;} input.span10,textarea.span10,.uneditable-input.span10{width:960px;} input.span11,textarea.span11,.uneditable-input.span11{width:1060px;} input.span12,textarea.span12,.uneditable-input.span12{width:1160px;} .thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;}}