You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2009/11/03 00:53:01 UTC
svn commit: r832207 - in /portals/jetspeed-2:
applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/
applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/
portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jet...
Author: ate
Date: Mon Nov 2 23:53:00 2009
New Revision: 832207
URL: http://svn.apache.org/viewvc?rev=832207&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1057
- replacing JetspeedNavigator with separate PageNavigator and SpaceNavigator portlets
- integrating SpaceNavigator as yui3 menu widget
TODO: more "blended" styling of yui horizontal menu widget
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/styles.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/styles.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/styles.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/styles.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java?rev=832207&r1=832206&r2=832207&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java Mon Nov 2 23:53:00 2009
@@ -76,9 +76,8 @@
{
request.getPortletSession().removeAttribute("spaces");
request.getPortletSession().removeAttribute("pages");
- request.getPortletSession().setAttribute("space", newSpace);
+ request.getPortletSession().removeAttribute("space");
}
- Space space = (Space)request.getPortletSession().getAttribute("space");
List<Space> spaces = (List<Space>)request.getPortletSession().getAttribute("spaces");
if (spaces == null)
{
@@ -86,9 +85,21 @@
spaces = spacesService.listSpaces();
}
request.getPortletSession().setAttribute("spaces", spaces);
+ Space space = (Space)request.getPortletSession().getAttribute("space");
if (space == null)
{
space = spaces.get(0);
+ if (newSpace != null)
+ {
+ for (Space sp: spaces)
+ {
+ if (sp.getName().equals(newSpace))
+ {
+ space = sp;
+ break;
+ }
+ }
+ }
request.getPortletSession().setAttribute("space", space);
}
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp?rev=832207&r1=832206&r2=832207&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp Mon Nov 2 23:53:00 2009
@@ -26,42 +26,36 @@
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<portlet:defineObjects/>
-
- <%
- String title = (String)renderRequest.getAttribute("title");
- %>
-<form id='jsPages' method="POST" action='<portlet:actionURL/>'>
<table style="border-collapse: collapse; width: 100%; margin-top: 0px; float: left;">
- <tr>
- <th class="portlet-section-header" colspan="1"><%= title %> Space</th>
- </tr>
- <tr>
- <th class="portlet-section-subheader">Page Name</th>
- </tr>
+ <tr>
+ <th class="portlet-section-header"><%= ((Space)renderRequest.getPortletSession().getAttribute("space")).getName() %> Space</th>
+ </tr>
<%
List<Page> pages = (List<Page>)renderRequest.getAttribute("pages");
for (Page pg : pages)
{
%>
-
<tr>
- <td class="portlet-section-body"><a href="<portlet:actionURL><portlet:param name='page' value='<%=pg.getPath()%>'/></portlet:actionURL>"><%=pg.getTitle() %></a></td>
+ <td class="portlet-section-body"><a href="<portlet:actionURL><portlet:param name='page' value='<%=pg.getPath()%>'/></portlet:actionURL>"><%=pg.getTitle() %></a></td>
</tr>
<%
}
%>
- <tr>
- <th class="portlet-section-header" colspan="1"></th>
- </tr>
+ <tr>
+ <th class="portlet-section-header" colspan="1"></th>
+ </tr>
<%
Object princ2 = renderRequest.getUserPrincipal();
if (princ2 != null) {
%>
- <tr><td class="portlet-section-subheader" colspan='10'><input type="text" name="addPage" size="15" value="" ><input type="submit" value="Add Page" /></td></tr>
+ <tr>
+ <td class="portlet-section-subheader">
+ <form id='jsPages' method="POST" action='<portlet:actionURL/>'>
+ <input type="text" name="addPage" size="15" value="" ><input type="submit" value="Add Page" />
+ </form>
+ </td>
+ </tr>
<%
}
%>
-
-
-</table>
-</form>
+</table>
\ No newline at end of file
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp?rev=832207&r1=832206&r2=832207&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp Mon Nov 2 23:53:00 2009
@@ -27,41 +27,33 @@
<portlet:defineObjects/>
- <%
- String title = (String)renderRequest.getAttribute("title");
- %>
-<form id='<jsSpaces' method="POST" action='<portlet:actionURL/>'>
-<table style="border-collapse: collapse; width: 100%; margin-top: 0px; float: left;">
- <tr>
- <th class="portlet-section-header" colspan="3"><%= title %></th>
- </tr>
- <tr>
- <th class="portlet-section-subheader">Space Name</th>
- <th class="portlet-section-subheader">Owner</th>
- <th class="portlet-section-subheader">Path</th>
- </tr>
+ <div class="yui-menu-content">
+ <ul class="first-of-type">
+ <li><a class="yui-menu-label" href="#intranet-spaces-menu"><em>Intranet</em></a>
+ <div id="intranet-spaces-menu" class="yui-menu">
+ <div class="yui-menu-content">
+ <ul class="first-of-type">
<%
-List<Space> spaces = (List<Space>)renderRequest.getAttribute("spaces");
-for (Space space : spaces)
-{
+ List<Space> spaces = (List<Space>)renderRequest.getAttribute("spaces");
+ for (Space space : spaces) {
%>
-
- <tr>
- <td class="portlet-section-body"><a href="<portlet:actionURL><portlet:param name='space' value='<%=space.getName()%>'/></portlet:actionURL>"><%=space.getName() %></a></td>
- <td class="portlet-section-body"><%=space.getOwner()%></td>
- <td class="portlet-section-body"><%=space.getPath()%></td>
- </tr>
+ <li class="yui-menuitem">
+ <a class="yui-menuitem-content" href="<portlet:actionURL><portlet:param name='space' value='<%=space.getName()%>'/></portlet:actionURL>"><%=space.getName() %></a>
+ </li>
+<%}%>
+ </ul>
<%
-}
+ Object princ = renderRequest.getUserPrincipal();
+ if (princ != null) {
%>
- <tr>
- <th class="portlet-section-header" colspan="3"></th>
- </tr>
-<%
-Object princ = renderRequest.getUserPrincipal();
-if (princ != null) {
-%>
- <tr><td class="portlet-section-subheader" colspan="3"><a href="<portlet:actionURL><portlet:param name='navAction' value='addSpace'/></portlet:actionURL>">Add Space...</a></td></tr>
-<% } %>
-</table>
-</form>
+ <ul>
+ <li class="yui-menuitem">
+ <a class="yui-menuitem-content" href="<portlet:actionURL><portlet:param name='navAction' value='addSpace'/></portlet:actionURL>">Add Space...</a>
+ </li>
+ </ul>
+<%}%>
+ </div>
+ </div>
+ </li>
+ </ul>
+ </div>
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=832207&r1=832206&r2=832207&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp Mon Nov 2 23:53:00 2009
@@ -34,7 +34,8 @@
RequestContext rc = (RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
Page portalPage = rc.getPage();
ColumnLayout columnLayout = (ColumnLayout)request.getAttribute("columnLayout");
- String navContent = jetui.renderPortletWindow("_JetspeedNavigator", "j2-admin::JetspeedNavigator", rc);
+ String navContent = jetui.renderPortletWindow("_PageNavigator", "j2-admin::PageNavigator", rc);
+ String spacesNavContent = jetui.renderPortletWindow("_SpaceNavigator", "j2-admin::SpaceNavigator", rc);
String tbContent = jetui.renderPortletWindow("_JetspeedToolbox", "j2-admin::JetspeedToolbox", rc);
String encoding = "text/html";
if (response.getCharacterEncoding() != null)
@@ -66,16 +67,17 @@
<%}
%>
-<body>
+<body class="yui-skin-sam">
<div id='jetspeedZone'>
<div id="layout-<%=pageDec%>" class="layout-<%=pageDec%>" >
<div class="header">
<h1 class="logo">Jetspeed 2</h1>
+<span id="environments-menu" class="layout-horizontal-menu yui-menu yui-menu-horizontal yui-menubuttonnav"><%=spacesNavContent%></span>
<div class="menu">
<span style='position: absolute; left: 0px' id='jstbLeftToggle' class='jstbToggle1'></span><span id='jstbRightToggle' class='jstbToggle2' style='position: absolute; right: 0px'></span>
</div>
<%if (request.getUserPrincipal() != null) {%>
-<span class="layout-statusarea">David Sean Taylor | Profile | Tasks (5) | Notifications (2) | <a href="<%=request.getContextPath()%>/login/logout">Log out</a></span>
+<span class="layout-statusarea"><b>David Sean Taylor</b> | Profile | Tasks (5) | Notifications (2) | <a href="<%=request.getContextPath()%>/login/logout">Log out</a></span>
<% } %>
<!-- <span class="layout-search"><input type='text' size='14'/></span><span class="layout-search2"><img height='18' src="<%=request.getContextPath()%>/images/search.png"/></span> -->
</div> <!-- end header -->
@@ -98,59 +100,59 @@
<td id='jsMainarea' class='jsMainarea'>
<div id="jsFragments" class="portal-nested-layout portal-nested-layout-TwoColumns">
<%
- ContentFragment maximized = (ContentFragment)request.getAttribute(PortalReservedParameters.MAXIMIZED_FRAGMENT_ATTRIBUTE);
- if (maximized != null)
- {
- String content = jetui.getRenderedContent(maximized, rc);
- request.setAttribute("content", content);
- request.setAttribute("pageDec", pageDec);
- request.setAttribute("fragment", maximized);
+ ContentFragment maximized = (ContentFragment)request.getAttribute(PortalReservedParameters.MAXIMIZED_FRAGMENT_ATTRIBUTE);
+ if (maximized != null)
+ {
+ String content = jetui.getRenderedContent(maximized, rc);
+ request.setAttribute("content", content);
+ request.setAttribute("pageDec", pageDec);
+ request.setAttribute("fragment", maximized);
request.setAttribute("coordinate", columnLayout.getCoordinate(maximized));
%>
<div id="column_id_0>"
class="portal-layout-column"
style="float:left; width:100%; background-color: #ffffff;">
<jsp:include page="jetui-portlet.jsp"/>
-</div>
-<%
- }
- else
- {
- int index = 0;
- for (Collection<Fragment> collections : columnLayout.getColumns())
- {
- String columnFloat = columnLayout.getColumnFloat(index);
- String columnWidth = columnLayout.getColumnWidth(index);
- // class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}"
+</div>
+<%
+ }
+ else
+ {
+ int index = 0;
+ for (Collection<Fragment> collections : columnLayout.getColumns())
+ {
+ String columnFloat = columnLayout.getColumnFloat(index);
+ String columnWidth = columnLayout.getColumnWidth(index);
+ // class="portal-layout-column portal-layout-column-${layoutType}-${columnIndex}"
%>
<div id="column_id_<%=index%>"
class="portal-layout-column" column='<%=index%>'
style="float:<%=columnFloat%>; min-height: 100px; width:<%=columnWidth%>; background-color: #ffffff;">
-<%
- int subindex = 0;
- for (Fragment fragment : collections)
- {
- if (!(fragment.getName().equals("j2-admin::JetspeedToolbox") || fragment.getName().equals("j2-admin::JetspeedNavigator")))
- {
- //String content = jetui.renderPortletWindow(fragment.getId(), fragment.getName(), rc);
- String content = jetui.getRenderedContent((ContentFragment)fragment, rc);
- request.setAttribute("content", content);
- request.setAttribute("pageDec", pageDec);
- request.setAttribute("fragment", fragment);
- request.setAttribute("coordinate", columnLayout.getCoordinate(fragment));
+<%
+ int subindex = 0;
+ for (Fragment fragment : collections)
+ {
+ if (!(fragment.getName().equals("j2-admin::JetspeedToolbox") || fragment.getName().equals("j2-admin::JetspeedNavigator")))
+ {
+ //String content = jetui.renderPortletWindow(fragment.getId(), fragment.getName(), rc);
+ String content = jetui.getRenderedContent((ContentFragment)fragment, rc);
+ request.setAttribute("content", content);
+ request.setAttribute("pageDec", pageDec);
+ request.setAttribute("fragment", fragment);
+ request.setAttribute("coordinate", columnLayout.getCoordinate(fragment));
%>
<jsp:include page="jetui-portlet.jsp"/>
-<%
- subindex++;
- }
- }
- index++;
+<%
+ subindex++;
+ }
+ }
+ index++;
%>
</div>
<%
- }
- }
+ }
+ }
%>
</div>
</td>
@@ -179,4 +181,4 @@
</script>
<script src="<%=request.getContextPath()%>/jetui/engine/portal.js"></script>
-</html>
+</html>
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/styles.css?rev=832207&r1=832206&r2=832207&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/styles.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/styles.css Mon Nov 2 23:53:00 2009
@@ -436,9 +436,16 @@
right: 3px; top: 21px;
}
+.layout-greenearth .layout-horizontal-menu {
+position:absolute;
+display:none;
+left:300px;
+top:10px;
+}
+
.layout-greenearth .layout-statusarea {
position: absolute;
-right: 2px; top: 0px;
+right: 2px; top: 10px;
color: #fff;
padding:2px;
text-decoration:none;
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/styles.css?rev=832207&r1=832206&r2=832207&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/styles.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/styles.css Mon Nov 2 23:53:00 2009
@@ -16,43 +16,43 @@
*/
@import url("../../css/portal-standard.css");
-
-
-* { margin:0; padding:0; }
-
-body, div, span, a, form, li, ul, ol, input, select, textarea, button, pre, blockquote, label, h1, h2, h3, h4, td, tr, th, tbody, table, p, iframe, img {
- padding:0px;margin:0px;
- white-space:normal;
- font-weight:normal;
+
+
+* { margin:0; padding:0; }
+
+body, div, span, a, form, li, ul, ol, input, select, textarea, button, pre, blockquote, label, h1, h2, h3, h4, td, tr, th, tbody, table, p, iframe, img {
+ padding:0px;margin:0px;
+ white-space:normal;
+ font-weight:normal;
font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;
voice-family: "\"}\"";
- voice-family: inherit;
- font-size:7pt;
-}
+ voice-family: inherit;
+ font-size:7pt;
+}
body {
background: #fff;;
-}
-
-textarea, button, select, form {
- padding:1px;
-}
-
-p {
- margin-top:4px;
- margin-bottom:4px;
-}
-
-h2 {
- margin-bottom:6px;
- color:#12293f;
- font-size:9pt;
- font-weight:bold;
-}
-
-h3 {
- margin-bottom:4px;
- text-decoration:underline;
+}
+
+textarea, button, select, form {
+ padding:1px;
+}
+
+p {
+ margin-top:4px;
+ margin-bottom:4px;
+}
+
+h2 {
+ margin-bottom:6px;
+ color:#12293f;
+ font-size:9pt;
+ font-weight:bold;
+}
+
+h3 {
+ margin-bottom:4px;
+ text-decoration:underline;
}
/**
@@ -179,38 +179,38 @@
width:10px;
padding-left: 0px;
padding-right: 9px;
-}
-
-.layout-jetspeed .menu {
- background:url(../images/blue_gradient.gif) #05549c;
- padding:1px;
- border-top:1px solid #033563;
-}
-
-.layout-jetspeed .menu a {
- color:#ced7dc;
- text-decoration:none;
-}
-
-.layout-jetspeed .menu a:hover {
- color:#f5f7f8;
- text-decoration:underline;
-}
+}
+
+.layout-jetspeed .menu {
+ background:url(../images/blue_gradient.gif) #05549c;
+ padding:1px;
+ border-top:1px solid #033563;
+}
+
+.layout-jetspeed .menu a {
+ color:#ced7dc;
+ text-decoration:none;
+}
+
+.layout-jetspeed .menu a:hover {
+ color:#f5f7f8;
+ text-decoration:underline;
+}
.layout-jetspeed .tabs {
- list-style-type:none;
- list-style-position:inside;
+ list-style-type:none;
+ list-style-position:inside;
display:table;
-}
-
-.layout-jetspeed .tabs li {
- float:left;
- display:inline;
- border-collapse:collapse;
- margin-right:10px;
- padding: 3px;
- color:#fff;
-}
+}
+
+.layout-jetspeed .tabs li {
+ float:left;
+ display:inline;
+ border-collapse:collapse;
+ margin-right:10px;
+ padding: 3px;
+ color:#fff;
+}
.layout-jetspeed #banner h1 {
font-size: 1.25em;
@@ -267,7 +267,7 @@
}
.layout-jetspeed #leftcol a:active, .layout-jetspeed #leftcol a:hover {
- color: #000000 !important;
+ color: #000000 !important;
text-decoration: underline;
}
@@ -389,26 +389,26 @@
{
font-family: Verdana,sans-serif;
font-size: 7pt;
-}
+}
.layout-jetspeed td{
font-size:7pt;
font-family: Verdana,sans-serif;
vertical-align: top;
}
-
-.layout-jetspeed .header {
- width:100%;
- background:#000;
- border-bottom:4px solid #eef0f0;
- margin:0px;
-}
+
+.layout-jetspeed .header {
+ width:100%;
+ background:#000;
+ border-bottom:4px solid #eef0f0;
+ margin:0px;
+}
.layout-jetspeed .logo {
text-indent: -9999px;
-background: url("../images/jetspeed-logo.gif") no-repeat;
-background-position: 8px 8px;
-height:35px;
+background: url("../images/jetspeed-logo.gif") no-repeat;
+background-position: 8px 8px;
+height:35px;
padding:3px;
}
@@ -418,11 +418,11 @@
position: absolute;
right: 5px; top: 5px;
z-index: 10;
-color: #fff;
-padding:2px;
+color: #fff;
+padding:2px;
text-decoration:none;
font-size:8pt;
-}
+}
.layout-jetspeed .layout-search {
position: absolute;
@@ -437,9 +437,16 @@
right: 3px; top: 21px;
}
+.layout-jetspeed .layout-horizontal-menu {
+position:absolute;
+display:none;
+left:300px;
+top:10px;
+}
+
.layout-jetspeed .layout-statusarea {
position: absolute;
-right: 2px; top: 0px;
+right: 2px; top: 10px;
color: #fff;
padding:2px;
text-decoration:none;
@@ -451,7 +458,7 @@
font-size:8pt;
}
-.layout-jetspeed .layout-jetspeed-logout:hover{
+.layout-jetspeed .layout-jetspeed-logout:hover{
text-decoration: underline;
}
@@ -597,4 +604,3 @@
margin-left: 0px;
clear: both;
}
-
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/styles.css?rev=832207&r1=832206&r2=832207&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/styles.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/styles.css Mon Nov 2 23:53:00 2009
@@ -16,43 +16,43 @@
*/
@import url("../../css/portal-standard.css");
-
-
-* { margin:0; padding:0; }
-
-body, div, span, a, form, li, ul, ol, input, select, textarea, button, pre, blockquote, label, h1, h2, h3, h4, td, tr, th, tbody, table, p, iframe, img {
- padding:0px;margin:0px;
- white-space:normal;
- font-weight:normal;
+
+
+* { margin:0; padding:0; }
+
+body, div, span, a, form, li, ul, ol, input, select, textarea, button, pre, blockquote, label, h1, h2, h3, h4, td, tr, th, tbody, table, p, iframe, img {
+ padding:0px;margin:0px;
+ white-space:normal;
+ font-weight:normal;
font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;
voice-family: "\"}\"";
- voice-family: inherit;
- font-size:7pt;
-}
+ voice-family: inherit;
+ font-size:7pt;
+}
body {
background: #fff;;
-}
-
-textarea, button, select, form {
- padding:1px;
-}
-
-p {
- margin-top:4px;
- margin-bottom:4px;
-}
-
-h2 {
- margin-bottom:6px;
- color:#12293f;
- font-size:9pt;
- font-weight:bold;
-}
-
-h3 {
- margin-bottom:4px;
- text-decoration:underline;
+}
+
+textarea, button, select, form {
+ padding:1px;
+}
+
+p {
+ margin-top:4px;
+ margin-bottom:4px;
+}
+
+h2 {
+ margin-bottom:6px;
+ color:#12293f;
+ font-size:9pt;
+ font-weight:bold;
+}
+
+h3 {
+ margin-bottom:4px;
+ text-decoration:underline;
}
/**
@@ -179,38 +179,38 @@
width:10px;
padding-left: 0px;
padding-right: 9px;
-}
-
-.layout-purpleplanet .menu {
- background:url(../images/blue_gradient.png) #3A0058;
- padding:1px;
- border-top:1px solid #fff;
-}
-
-.layout-purpleplanet .menu a {
- color:#fff;
- text-decoration:none;
-}
-
-.layout-purpleplanet .menu a:hover {
- color:#fff;
- text-decoration:underline;
-}
+}
+
+.layout-purpleplanet .menu {
+ background:url(../images/blue_gradient.png) #3A0058;
+ padding:1px;
+ border-top:1px solid #fff;
+}
+
+.layout-purpleplanet .menu a {
+ color:#fff;
+ text-decoration:none;
+}
+
+.layout-purpleplanet .menu a:hover {
+ color:#fff;
+ text-decoration:underline;
+}
.layout-purpleplanet .tabs {
- list-style-type:none;
- list-style-position:inside;
+ list-style-type:none;
+ list-style-position:inside;
display:table;
-}
-
-.layout-purpleplanet .tabs li {
- float:left;
- display:inline;
- border-collapse:collapse;
- margin-right:10px;
- padding: 3px;
- color:#fff;
-}
+}
+
+.layout-purpleplanet .tabs li {
+ float:left;
+ display:inline;
+ border-collapse:collapse;
+ margin-right:10px;
+ padding: 3px;
+ color:#fff;
+}
.layout-purpleplanet #banner h1 {
font-size: 1.25em;
@@ -267,7 +267,7 @@
}
.layout-purpleplanet #leftcol a:active, .layout-purpleplanet #leftcol a:hover {
- color: #000000 !important;
+ color: #000000 !important;
text-decoration: underline;
}
@@ -389,26 +389,26 @@
{
font-family: Verdana,sans-serif;
font-size: 7pt;
-}
+}
.layout-purpleplanet td{
font-size:7pt;
font-family: Verdana,sans-serif;
vertical-align: top;
}
-
-.layout-purpleplanet .header {
- width:100%;
- background:#32004b;
- border-bottom:4px solid #9933ff;
- margin:0px;
-}
+
+.layout-purpleplanet .header {
+ width:100%;
+ background:#32004b;
+ border-bottom:4px solid #9933ff;
+ margin:0px;
+}
.layout-purpleplanet .logo {
text-indent: -9999px;
background: url("../images/Jetspeed_white_med.png") no-repeat;
-background-position: 8px 8px;
-height:35px;
+background-position: 8px 8px;
+height:35px;
padding:3px;
}
@@ -418,10 +418,10 @@
position: absolute;
right: 5px; top: 5px;
z-index: 10;
-color: #fff;
-padding:2px;
+color: #fff;
+padding:2px;
text-decoration:none;
-}
+}
.layout-purpleplanet .layout-search {
position: absolute;
@@ -436,9 +436,16 @@
right: 3px; top: 21px;
}
+.layout-purpleplanet .layout-horizontal-menu {
+position:absolute;
+display:none;
+left:300px;
+top:10px;
+}
+
.layout-purpleplanet .layout-statusarea {
position: absolute;
-right: 2px; top: 0px;
+right: 2px; top: 10px;
color: #fff;
padding:2px;
text-decoration:none;
@@ -450,7 +457,7 @@
font-size:8pt;
}
-.layout-purpleplanet .layout-purpleplanet-logout:hover{
+.layout-purpleplanet .layout-purpleplanet-logout:hover{
text-decoration: underline;
}
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/styles.css?rev=832207&r1=832206&r2=832207&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/styles.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/styles.css Mon Nov 2 23:53:00 2009
@@ -436,9 +436,16 @@
right: 3px; top: 21px;
}
+.layout-turbo .layout-horizontal-menu {
+position:absolute;
+display:none;
+left:300px;
+top:10px;
+}
+
.layout-turbo .layout-statusarea {
position: absolute;
-right: 2px; top: 0px;
+right: 2px; top: 10px;
color: #fff;
padding:2px;
text-decoration:none;
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=832207&r1=832206&r2=832207&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js Mon Nov 2 23:53:00 2009
@@ -1,5 +1,18 @@
//Use loader to grab the modules needed
-YUI(yuiConfig).use('console', 'dd', 'anim', 'io', 'datatype-xml', 'dataschema-xml', 'node-base', function(Y) {
+YUI(yuiConfig).use('console', 'dd', 'anim', 'io', 'datatype-xml', 'dataschema-xml', 'node-base', 'node-menunav', function(Y) {
+
+ // Retrieve the Node instance representing the root menu
+ // (<div id="environments-menu">) and call the "plug" method
+ // passing in a reference to the MenuNav Node Plugin.
+
+ var menu = Y.one("#environments-menu");
+
+ menu.plug(Y.Plugin.NodeMenuNav);
+
+ // Show the menu now that it is ready
+
+ menu.setStyle("display","inline");
+
//new Y.Console().render();
//Make this an Event Target so we can bubble to it
var Portal = function() {
@@ -73,8 +86,8 @@
////////////////////////////////////////////////////
// Create Navigator Portlet
var navigator = new Portlet();
- navigator.set("name", "j2-admin::JetspeedNavigator");
- navigator.set("id", "_JetspeedNavigator");
+ navigator.set("name", "j2-admin::PageNavigator");
+ navigator.set("id", "_PageNavigator");
navigator.set("toolbar", true);
navigator.set("detached", false);
var toolbox = new Portlet();
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org