You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by es...@apache.org on 2007/06/29 00:38:03 UTC
svn commit: r551726 - in
/portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main:
resources/pluto-portal-driver-config.xml
webapp/WEB-INF/themes/navigation.jsp webapp/pluto.css
Author: esm
Date: Thu Jun 28 15:37:59 2007
New Revision: 551726
URL: http://svn.apache.org/viewvc?view=rev&rev=551726
Log:
[PLUTO-385]: Implement CSS-based tab navigation in Pluto Portal.
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/resources/pluto-portal-driver-config.xml
portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/pluto.css
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/resources/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/resources/pluto-portal-driver-config.xml?view=diff&rev=551726&r1=551725&r2=551726
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/resources/pluto-portal-driver-config.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/resources/pluto-portal-driver-config.xml Thu Jun 28 15:37:59 2007
@@ -42,7 +42,11 @@
<!-- Render configuration which defines the portal pages. -->
- <render-config default="Test Page">
+ <render-config default="About Apache Pluto">
+ <page name="About Apache Pluto" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+ <portlet context="/pluto" name="AboutPortlet"/>
+ <portlet context="/testsuite" name="TestPortlet1"/>
+ </page>
<page name="Test Page" uri="/WEB-INF/themes/pluto-default-theme.jsp">
<portlet context="/testsuite" name="TestPortlet1"/>
<portlet context="/testsuite" name="TestPortlet2"/>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp?view=diff&rev=551726&r1=551725&r2=551726
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp Thu Jun 28 15:37:59 2007
@@ -19,26 +19,18 @@
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
-<div id="navigation">
- <h2>Navigation:</h2>
- <ul>
- <li>
- <a href='<c:out value="${pageContext.request.contextPath}"/>/about.jsp'>About Pluto</a>
- </li>
+<div id="nav">
+ <ul id="navigation" >
<c:forEach var="page" items="${driverConfig.pages}">
<c:choose>
<c:when test="${page == currentPage}">
<li class="selected">
- <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'>
- <c:out value="${page.name}"/>
- </a>
+ <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><c:out value="${page.name}"/></a>
</li>
</c:when>
<c:otherwise>
<li>
- <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'>
- <c:out value="${page.name}"/>
- </a>
+ <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><c:out value="${page.name}"/></a>
</li>
</c:otherwise>
</c:choose>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/pluto.css
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/pluto.css?view=diff&rev=551726&r1=551725&r2=551726
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/pluto.css (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/pluto.css Thu Jun 28 15:37:59 2007
@@ -86,7 +86,7 @@
}
/** 'navigation' block **/
-
+/**
#navigation {
clear: both;
}
@@ -126,8 +126,11 @@
text-decoration: underline;
}
+**/
+
#navigation .selected, #navigation .selected a {
- color: #6D97BF;
+ /** color: #6D97BF; **/
+ color: #FFFFFF;
font-weight: bold;
}
@@ -265,7 +268,46 @@
border-color: #2E6794;
}
+/* navigation tabs */
-
-
-
+#navigation {
+ position:relative;
+ float:left;
+ width:100%;
+ padding:0 0 1.75em 1em;
+ margin:0;
+ list-style:none;
+ line-height:1em;
+}
+
+#navigation LI {
+ float:left;
+ margin:0;
+ padding:0;
+}
+
+#navigation A {
+ display:block;
+ color:#444;
+ text-decoration:none;
+ font-weight:bold;
+ background:#8DB7DF;
+ margin:0;
+ padding:0.25em 1em;
+ border-left:1px solid #fff;
+ border-top:1px solid #fff;
+ border-right:1px solid #aaa;
+}
+
+#navigation A:hover,
+#navigation A:active,
+#navigation A.here:link,
+#navigation A.here:visited {
+ background:#bbb;
+}
+
+#navigation A.here:link,
+#navigation A.here:visited {
+ position:relative;
+ z-index:102;
+}