Author: chris.laprun(a)jboss.com
Date: 2009-02-28 11:37:59 -0500 (Sat, 28 Feb 2009)
New Revision: 12912
Modified:
tags/JBoss_Portal_2_7_2/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css
tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java
tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java
tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
Log:
Modified:
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
---
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28
16:27:59 UTC (rev 12911)
+++
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28
16:37:59 UTC (rev 12912)
@@ -1,6 +1,5 @@
-
@import url("/portal-core/themes/common/portlet-editor.css");
-@import url( "../common/tooltip.css" );
+@import url("../common/tooltip.css");
/* *************************************************** */
/* Default for JBoss Portal */
@@ -13,11 +12,10 @@
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: #656565;
- background-image: url( images/header-bg2.gif );
+ background-image: url(images/header-bg2.gif);
background-repeat: repeat-x;
}
-
/*****************
* Portal Header *
******************/
@@ -42,8 +40,7 @@
/* Header background */
#header {
- height: 64px;
- /*background-image: url( 'images/header-bg-left-shadow.gif' );*/
+ height: 64px; /*background-image: url( 'images/header-bg-left-shadow.gif'
);*/
background-position: top left;
background-repeat: no-repeat;
width: 100%;
@@ -54,7 +51,7 @@
}
#logoName {
- background-image: url( images/JBP-logo-white.gif );
+ background-image: url(images/JBP-logo-white.gif);
background-repeat: no-repeat;
float: left;
width: 250px;
@@ -73,8 +70,8 @@
#portal-container {
/* part of below IE hack to preserve min-width for portlet regions */
/*width: 100%;*/
- /*margin: 4px 2% 0px 2%;*/
- background-image: url( 'images/header-bg-left-shadow2.gif' );
+/*margin: 4px 2% 0px 2%;*/
+ background-image: url('images/header-bg-left-shadow2.gif');
background-position: top left;
background-repeat: no-repeat;
padding: 0 350px 0 350px;
@@ -175,8 +172,7 @@
width: 35%;
float: left;
margin: 0px;
- padding: 0px;
-/*height: 300px;*/
+ padding: 0px; /*height: 300px;*/
}
#regionB {
@@ -228,7 +224,7 @@
*****************************/
div#navigation {
- position:relative;
+ position: relative;
width: 100%;
height: 64px;
}
@@ -237,7 +233,7 @@
list-style: none;
margin: 0 0 -5px 0;
padding: 0;
- position:absolute;
+ position: absolute;
bottom: 0px;
left: 0;
min-width: 550px;
@@ -248,7 +244,7 @@
list-style: none;
margin: 0 0 -5px 0;
padding: 0;
- position:absolute;
+ position: absolute;
bottom: -5px;
left: 0;
min-width: 550px;
@@ -267,12 +263,12 @@
}
ul#tabsHeader li,
-ul#tabsHeader li#current{
+ ul#tabsHeader li#current {
background-position: top right;
background-repeat: no-repeat;
}
-ul#tabsHeader li a{
+ul#tabsHeader li a {
background-position: top left;
background-repeat: no-repeat;
padding: 5px 15px 0 15px;
@@ -283,8 +279,7 @@
white-space: nowrap;
}
-
-ul#tabsHeader li#current a{
+ul#tabsHeader li#current a {
background-position: top left;
background-repeat: no-repeat;
padding: 5px 15px 0 15px;
@@ -294,23 +289,21 @@
white-space: nowrap;
}
-
-
ul#tabsHeader li#current {
- background-image: url( 'images/nav-active-right2.gif' );
+ background-image: url('images/nav-active-right2.gif');
}
-ul#tabsHeader li#current a{
- background-image: url( 'images/nav-active-left.gif' );
+ul#tabsHeader li#current a {
+ background-image: url('images/nav-active-left.gif');
color: #2c2c2c;
}
ul#tabsHeader li {
- background-image: url( 'images/nav-inactive-right2.gif' );
+ background-image: url('images/nav-inactive-right2.gif');
}
-ul#tabsHeader li a{
- background-image: url( 'images/nav-inactive-left.gif' );
+ul#tabsHeader li a {
+ background-image: url('images/nav-inactive-left.gif');
color: #113266;
}
@@ -382,14 +375,13 @@
background: #C0D3DC;
}
-
/* End Submenu selectors */
/* -------- These are new selectors for the admin and add page styles ------- */
ul#tabsHeader #admin {
display: inline;
- background-image: url( images/tab_right_admin.gif );
+ background-image: url(images/tab_right_admin.gif);
background-repeat: no-repeat;
background-position: right top;
padding-top: -3px;
@@ -454,9 +446,9 @@
*****************************/
#dashboardnav {
- /*float: right;*/
- position:absolute;
- top:0;
+/*float: right;*/
+ position: absolute;
+ top: 0;
right: 15px;
font-size: 10px;
padding: 6px 12px 0px 0px;
@@ -469,7 +461,7 @@
}
#dashboardnav .addcontent {
- background-image: url( images/ico_addcontent.gif );
+ background-image: url(images/ico_addcontent.gif);
background-repeat: no-repeat;
background-position: left;
height: 20px;
@@ -488,16 +480,14 @@
/* wrapper for floating portlet window modes */
.portlet-mode-container {
white-space: nowrap;
- float:right;
- position:relative;
- z-index:1;
+ float: right;
}
.mode-button {
- /*position:absolute;*/
+/*position:absolute;*/
margin-right: 3px;
- /*padding-top:5px;*/
- float:left;
+ padding-top: 5px;
+ float: left;
}
.portlet-titlebar-title {
@@ -506,65 +496,47 @@
font-size: 12px;
font-weight: bold;
white-space: nowrap;
- line-height: 3px;
+ line-height: 100%;
float: left;
text-indent: 5px;
padding-top: 5px;
padding-bottom: 6px;
- display:block;
- margin-right:10px;
+ display: block;
+ margin-right: 10px;
}
-.portlet-titlebar-dyna {
- color: #656565;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- white-space: nowrap;
- line-height: 3px;
- float: left;
- text-indent: 5px;
- padding-top: 5px;
- padding-bottom: 6px;
- display:block;
- margin-right:10px;
- position:absolute;
- width: 100%;
- z-index: 1;
-}
-
/* ------ NOT CURRENTLY IN USE FOR NEW 2.6 FUNCTIONALITY -------
.portlet-titlebar-decoration {}
*/
.portlet-titlebar-left {
- background-image: url( images/portlet-top-left2.gif );
+ background-image: url(images/portlet-top-left2.gif);
background-repeat: no-repeat;
width: 9px;
height: 29px;
min-width: 9px;
- background-position: 0 0;
+ background-position: 0 1px;
}
.portlet-titlebar-center {
- background-image: url( images/portlet-top-middle2.gif );
+ background-image: url(images/portlet-top-middle2.gif);
background-repeat: repeat-x;
height: 29px;
- background-position: top;
- /*position:relative;*/
+ background-position: bottom;
+ position: relative;
}
.portlet-titlebar-right {
- background-image: url( images/portlet-top-right2.gif );
+ background-image: url(images/portlet-top-right2.gif);
background-repeat: no-repeat;
width: 10px;
height: 30px;
min-width: 10px;
- background-position: -1px 0;
+ background-position: -1px 1px;
}
.portlet-content-left {
- background-image: url( images/portlet-left-vertical.gif );
+ background-image: url(images/portlet-left-vertical.gif);
background-repeat: repeat-y;
width: 9px;
min-width: 9px;
@@ -588,7 +560,7 @@
}
.portlet-content-right {
- background-image: url( images/portlet-right-vertical.gif );
+ background-image: url(images/portlet-right-vertical.gif);
height: 100%;
background-repeat: repeat-y;
background-position: left;
@@ -604,7 +576,7 @@
}
.portlet-footer-left {
- background-image: url( images/portlet-bottom-left.gif );
+ background-image: url(images/portlet-bottom-left.gif);
width: 9px;
height: 4px;
background-repeat: no-repeat;
@@ -621,7 +593,7 @@
}
.portlet-footer-center {
- background-image: url( images/portlet-bottom-middle.gif );
+ background-image: url(images/portlet-bottom-middle.gif);
height: 4px;
background-repeat: repeat-x;
/* background-color:#FFFFFF;
@@ -631,7 +603,7 @@
}
.portlet-footer-right {
- background-image: url( images/portlet-bottom-right.gif );
+ background-image: url(images/portlet-bottom-right.gif);
width: 5px;
height: 4px;
background-repeat: no-repeat;
@@ -648,7 +620,7 @@
* Portlet Window Modes *
************************/
.portlet-mode-maximized {
- background-image: url( images/ico_16_maximize.gif );
+ background-image: url(images/ico_16_maximize.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -663,7 +635,7 @@
}
.portlet-mode-minimized {
- background-image: url( images/ico_16_minimize.gif );
+ background-image: url(images/ico_16_minimize.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -678,7 +650,7 @@
}
.portlet-mode-normal {
- background-image: url( images/ico_16_normal.gif );
+ background-image: url(images/ico_16_normal.gif);
width: 16px;
height: 16px;
background-repeat: no-repeat;
@@ -693,7 +665,7 @@
}
.portlet-mode-help {
- background-image: url( images/ico_16_help.gif );
+ background-image: url(images/ico_16_help.gif);
width: 16px;
height: 16px;
background-repeat: no-repeat;
@@ -708,7 +680,7 @@
}
.portlet-mode-edit {
- background-image: url( images/ico_edit.gif );
+ background-image: url(images/ico_edit.gif);
background-repeat: no-repeat;
width: 28px;
height: 16px;
@@ -723,7 +695,7 @@
}
.portlet-mode-admin {
- background-image: url( images/ico_admin.gif );
+ background-image: url(images/ico_admin.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -738,7 +710,7 @@
}
.portlet-mode-remove {
- background-image: url( images/ico_16_remove.gif );
+ background-image: url(images/ico_16_remove.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -753,7 +725,7 @@
}
.portlet-mode-view {
- background-image: url( images/ico_cancel.gif );
+ background-image: url(images/ico_cancel.gif);
background-repeat: no-repeat;
width: 28px;
height: 16px;
@@ -769,7 +741,7 @@
}
.portlet-mode-reload {
- background-image: url( images/ico_16_reload.gif );
+ background-image: url(images/ico_16_reload.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -784,7 +756,7 @@
}
.portlet-mode-hide {
- background-image: url( images/ico_16_swizzleclosed.gif );
+ background-image: url(images/ico_16_swizzleclosed.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -955,14 +927,14 @@
}
/* Text for form field labels */
-.portlet-form-field-label{
+.portlet-form-field-label {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
color: #000;
white-space: nowrap
}
-.provider-menu-container{
- padding:10px;
+.provider-menu-container {
+ padding: 10px;
}
/* Text for a form field */
@@ -1255,7 +1227,7 @@
a.addicon {
font-weight: bold;
- background-image: url( images/ico_addcontent.gif );
+ background-image: url(images/ico_addcontent.gif);
background-repeat: no-repeat;
background-position: left;
padding-left: 16px;
@@ -1330,7 +1302,7 @@
.pagination li.nextpage {
font-weight: bold;
- background-image: url( images/ico_arrow_blue_right.gif );
+ background-image: url(images/ico_arrow_blue_right.gif);
background-repeat: no-repeat;
background-position: left;
margin-left: 3px;
@@ -1340,7 +1312,7 @@
.pagination li.nextpagedisabled {
color: #656565;
font-weight: bold;
- background-image: url( images/ico_arrow_grey_right.gif );
+ background-image: url(images/ico_arrow_grey_right.gif);
background-repeat: no-repeat;
background-position: left;
margin-left: 3px;
@@ -1350,7 +1322,7 @@
.pagination li.previouspage {
font-weight: bold;
- background-image: url( images/ico_arrow_blue_left.gif );
+ background-image: url(images/ico_arrow_blue_left.gif);
background-repeat: no-repeat;
background-position: right;
padding-left: 10px;
@@ -1361,7 +1333,7 @@
.pagination li.previouspagedisabled {
font-weight: bold;
color: #656565;
- background-image: url( images/ico_arrow_grey_left.gif );
+ background-image: url(images/ico_arrow_grey_left.gif);
background-repeat: no-repeat;
background-position: right;
padding-left: 12px;
Modified:
tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java
===================================================================
---
tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2009-02-28
16:27:59 UTC (rev 12911)
+++
tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2009-02-28
16:37:59 UTC (rev 12912)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -22,24 +22,24 @@
******************************************************************************/
package org.jboss.portal.core.controller.portlet;
+import org.jboss.portal.core.CoreConstants;
+import org.jboss.portal.core.controller.coordination.CoordinationManager;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.navstate.NavigationalStateContext;
import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState;
import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState;
import org.jboss.portal.portlet.info.NavigationInfo;
import org.jboss.portal.portlet.info.ParameterInfo;
import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.core.CoreConstants;
-import org.jboss.portal.core.navstate.NavigationalStateContext;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.controller.coordination.CoordinationManager;
-import javax.xml.namespace.QName;
import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import java.util.Collection;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
@@ -102,12 +102,10 @@
this.implicitMode =
getCoordinationManager().resolveParameterBindingImplicitModeEnabled(controllerContext.getPage());
}
- /**
- * Flush all updates to the navigational state context.
- */
+ /** Flush all updates to the navigational state context. */
public void flushUpdates()
{
-
+
if (windowPublicNavigationalStateUpdate != null && updates != null)
{
for (Map.Entry<String, HashMap<QName, String[]>> entry :
windowPublicNavigationalStateUpdate.entrySet())
@@ -125,7 +123,7 @@
{
Map<String, String[]> parameters = new HashMap<String,
String[]>();
-
+
for (Map.Entry<QName, String[]> value :
entry.getValue().entrySet())
{
parameters.put(value.getKey().toString(), value.getValue());
@@ -140,7 +138,7 @@
windowPublicNavigationalStateUpdate.clear();
}
-
+
if (updates != null)
{
for (Map.Entry<String,
org.jboss.portal.core.model.portal.navstate.WindowNavigationalState> entry :
updates.entrySet())
@@ -195,11 +193,10 @@
}
-
}
/**
- *
+ *
*/
public Set<String> getPortletWindowIds()
{
@@ -207,7 +204,7 @@
}
/**
- *
+ *
*/
public PortletWindowNavigationalState getPortletWindowNavigationalState(String
windowName) throws IllegalArgumentException
{
@@ -250,7 +247,7 @@
}
/**
- *
+ *
*/
public void setPortletWindowNavigationalState(String windowName,
PortletWindowNavigationalState windowNavigationalState) throws IllegalArgumentException,
IllegalStateException
{
@@ -286,13 +283,11 @@
initiateWindowPublicNavigationalStateUpdate();
}
- //
if (windowPublicNavigationalStateUpdate.get(windowName) == null)
{
windowPublicNavigationalStateUpdate.put(windowName, new HashMap<QName,
String[]>());
}
- //
windowPublicNavigationalStateUpdate.get(windowName).put(name, value);
}
@@ -307,13 +302,13 @@
{
value = windowPublicNavigationalStateUpdate.get(windowName).get(name);
}
-
+
}
-
+
//
if (value == null)
{
-
+
Window window = controllerContext.getWindow(windowName);
org.jboss.portal.core.model.portal.navstate.WindowNavigationalState wns =
navigationalStateContext.getWindowNavigationalState(window.getId().toString());
@@ -332,9 +327,7 @@
return value != null && value.length > 0 ? value : null;
}
- /**
- * For now we do not implement any kind of mapping between qnames, it's the basic
straightforward 1-1 mapping.
- */
+ /** For now we do not implement any kind of mapping between qnames, it's the basic
straightforward 1-1 mapping. */
public Map<String, String[]> getPortletPublicNavigationalState(String
windowName) throws IllegalArgumentException
{
PortletInfo info = controllerContext.getPortletInfo(windowName);
@@ -347,70 +340,77 @@
initiateWindowPublicNavigationalStateUpdate();
}
- //
- if (info != null && info.getNavigation() != null)
+ if (info != null)
{
- Map<String, String[]> publicNavigationalState = new HashMap<String,
String[]>();
- for (ParameterInfo parameterInfo : info.getNavigation().getPublicParameters())
+ NavigationInfo navigation = info.getNavigation();
+ if (navigation != null)
{
-
- Collection<String> bindings =
manager.getBindingNames(getWindow(windowName), parameterInfo.getName());
-
- // Don't store the URI as a page scoped public render parameter but
window scoped
- // Also for explicit and parameter with no bindings
- if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(parameterInfo.getName()) ||
(!implicitMode && bindings.size() == 0))
+ Map<String, String[]> publicNavigationalState = new HashMap<String,
String[]>();
+ for (ParameterInfo parameterInfo : navigation.getPublicParameters())
{
- String[] parameterValue = getWindowPublicNavigationalState(windowName,
parameterInfo.getName());
- //
- if (parameterValue != null)
+ QName parameterName = parameterInfo.getName();
+ Collection<String> bindings =
manager.getBindingNames(getWindow(windowName), parameterName);
+
+ // Don't store the URI as a page scoped public render parameter but
window scoped
+ // Also for explicit and parameter with no bindings
+ if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(parameterName) ||
(!implicitMode && bindings.size() == 0))
{
- String parameterId = parameterInfo.getId();
+ String[] parameterValue = getWindowPublicNavigationalState(windowName,
parameterName);
- // We clone the value here so we keep the internal state not
potentially changed
- publicNavigationalState.put(parameterId, parameterValue.clone());
+ if (parameterValue != null)
+ {
+ String parameterId = parameterInfo.getId();
+ // We clone the value here so we keep the internal state not
potentially changed
+ publicNavigationalState.put(parameterId, parameterValue.clone());
+ }
}
- }
- else
- {
- String[] parameterValue =
getPublicNavigationalState(parameterInfo.getName());
+ else
+ {
+ String[] parameterValue = getPublicNavigationalState(parameterName);
- // Explicit binding
- String[] explicitParameterValue = null;
+ // Explicit binding
+ String[] explicitParameterValue = null;
- // Check all bindings for this window/qname pair
- // If this window/qname is binded several times with different updated
params value will be unpredictable...
- for (String binding : bindings)
- {
- explicitParameterValue = getPublicNavigationalState(new
QName(XMLConstants.DEFAULT_NS_PREFIX, binding));
- }
+ // Check all bindings for this window/qname pair
+ // If this window/qname is bound several times with different updated
params value will be unpredictable...
+ for (String binding : bindings)
+ {
+ explicitParameterValue = getPublicNavigationalState(new
QName(XMLConstants.DEFAULT_NS_PREFIX, binding));
- //
- String parameterId = parameterInfo.getId();
+ // if a PNS has been found for a binding, use it and do not look
further
+ if (explicitParameterValue != null)
+ {
+ break;
+ }
+ }
- //
- if (explicitParameterValue != null)
- {
- // We clone the value here so we keep the internal state not
potentially changed
- publicNavigationalState.put(parameterId,
explicitParameterValue.clone());
+ //
+ String parameterId = parameterInfo.getId();
+
+ //
+ if (explicitParameterValue != null)
+ {
+ // We clone the value here so we keep the internal state not
potentially changed
+ publicNavigationalState.put(parameterId,
explicitParameterValue.clone());
+ }
+ else if (implicitMode && parameterValue != null)
+ {
+ // We clone the value here so we keep the internal state not
potentially changed
+ publicNavigationalState.put(parameterId, parameterValue.clone());
+ }
}
- else if (implicitMode && parameterValue != null)
- {
- // We clone the value here so we keep the internal state not
potentially changed
- publicNavigationalState.put(parameterId, parameterValue.clone());
- }
}
- }
- //
- return publicNavigationalState;
+ //
+ return publicNavigationalState;
+ }
}
//
return null;
}
-
public String getPublicNavigationalParameterId(String windowName, QName name)
@@ -434,7 +434,7 @@
}
/**
- *
+ *
*/
public void setPortletPublicNavigationalState(String windowName, Map<String,
String[]> update)
{
@@ -472,7 +472,7 @@
// Don't store the URI as a page scoped public render parameter but
window scoped
// Also for explicit and parameter with no bindings
if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(name)
- || (!implicitMode && bindings.size() == 0))
+ || (!implicitMode && bindings.size() == 0))
{
if (value.length > 0)
{
@@ -509,7 +509,7 @@
}
/**
- *
+ *
*/
public Set<QName> getPublicNames()
{
@@ -523,7 +523,7 @@
}
/**
- *
+ *
*/
public String[] getPublicNavigationalState(QName name) throws
IllegalArgumentException
{
@@ -552,7 +552,7 @@
}
/**
- *
+ *
*/
public void setPublicNavigationalState(QName name, String[] value) throws
IllegalArgumentException, IllegalStateException
{
@@ -572,7 +572,7 @@
}
/**
- *
+ *
*/
public void removePublicNavigationalState(QName name) throws IllegalArgumentException,
IllegalStateException
{
@@ -592,7 +592,7 @@
}
/**
- *
+ *
*/
public HashMap<QName, String[]> getWindowPublicContentStateParameters(String
windowName)
{
@@ -617,13 +617,11 @@
}
}
}
-
+
return params;
}
- /**
- * @throws IllegalStateException if the public navigational state of the window is
already initialized
- */
+ /** @throws IllegalStateException if the public navigational state of the window is
already initialized */
private void initiateWindowPublicNavigationalStateUpdate() throws
IllegalStateException
{
if (windowPublicNavigationalStateUpdate != null)
@@ -653,5 +651,4 @@
}
-
}
Modified:
tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java
===================================================================
---
tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-02-28
16:27:59 UTC (rev 12911)
+++
tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-02-28
16:37:59 UTC (rev 12912)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,26 +20,26 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.model.portal.command.view;
+import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.ControllerException;
import org.jboss.portal.core.controller.ControllerResponse;
-import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.command.info.CommandInfo;
import org.jboss.portal.core.controller.command.info.ViewCommandInfo;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.PortalObjectId;
-import org.jboss.portal.core.model.portal.navstate.PageNavigationalState;
import org.jboss.portal.core.model.portal.command.PageCommand;
import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse;
+import org.jboss.portal.core.model.portal.navstate.PageNavigationalState;
import org.jboss.portal.core.navstate.NavigationalStateContext;
-import org.jboss.portal.common.util.ParameterMap;
-import javax.xml.namespace.QName;
import javax.xml.XMLConstants;
-import java.util.Map;
+import javax.xml.namespace.QName;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Map;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -52,7 +52,7 @@
private static final CommandInfo info = new ViewCommandInfo();
/** . */
- private static final Map<String,String[]> EMPTY_PARAMETERS =
Collections.emptyMap();
+ private static final Map<String, String[]> EMPTY_PARAMETERS =
Collections.emptyMap();
/** . */
private Map<String, String[]> parameters;
@@ -101,17 +101,8 @@
String pageId = getPage().getId().toString();
//
- PageNavigationalState previousPNS = nsContext.getPageNavigationalState(pageId);
-
- //
Map<QName, String[]> state = new HashMap<QName, String[]>();
- // Clone the previous state if needed
- if (previousPNS != null)
- {
- state.putAll(previousPNS.getParameters());
- }
-
//
for (Map.Entry<String, String[]> entry : parameters.entrySet())
{
Modified:
tags/JBoss_Portal_2_7_2/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
===================================================================
---
tags/JBoss_Portal_2_7_2/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-02-28
16:27:59 UTC (rev 12911)
+++
tags/JBoss_Portal_2_7_2/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-02-28
16:37:59 UTC (rev 12912)
@@ -1,46 +1,69 @@
-<div
xmlns:ui="http://java.sun.com/jsf/facelets"
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<div
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<h:form id="common-edit-theme-form">
<table class="full-width datatable">
<thead class="portlet-section-header">
- <tr>
- <th>#{bundle.COMMON_NAME}</th>
- <th>#{bundle.COMMON_DESCRIPTION}</th>
- <th>#{bundle.COMMON_SETTING}</th>
- </tr>
+ <tr>
+ <th>#{bundle.COMMON_NAME}</th>
+ <th>#{bundle.COMMON_DESCRIPTION}</th>
+ <th>#{bundle.COMMON_SETTING}</th>
+ </tr>
</thead>
<tbody>
- <tr class="portlet-section-body">
- <td>#{bundle.COMMON_LAYOUT}</td>
- <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td>
- <td>
- <h:selectOneMenu id="layout"
value="#{theme.layoutName}">
- <f:selectItems
value="#{applicationScope.LayoutService.layoutItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr class="portlet-section-alternate">
- <td>#{bundle.COMMON_THEME}</td>
- <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td>
- <td>
- <h:selectOneMenu id="theme"
value="#{theme.themeName}">
- <f:selectItems
value="#{applicationScope.ThemeService.themeItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr class="portlet-section-body">
- <td>#{bundle.COMMON_RENDERSET}</td>
- <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td>
- <td>
- <h:selectOneMenu id="renderSet"
value="#{theme.renderSetName}">
- <f:selectItems
value="#{applicationScope.LayoutService.renderSetItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
+ <tr class="portlet-section-body">
+ <td>#{bundle.COMMON_LAYOUT}</td>
+ <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td>
+ <td>
+ <h:selectOneMenu id="layout"
value="#{theme.layoutName}">
+ <f:selectItems
value="#{applicationScope.LayoutService.layoutItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr class="portlet-section-alternate">
+ <td>#{bundle.COMMON_THEME}</td>
+ <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td>
+ <td>
+ <h:selectOneMenu id="theme"
value="#{theme.themeName}">
+ <f:selectItems
value="#{applicationScope.ThemeService.themeItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr class="portlet-section-body">
+ <td>#{bundle.COMMON_RENDERSET}</td>
+ <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td>
+ <td>
+ <h:selectOneMenu id="renderSet"
value="#{theme.renderSetName}">
+ <f:selectItems
value="#{applicationScope.LayoutService.renderSetItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
</tbody>
</table>
- <br />
+ <br/>
<ui:insert name="form_submit"/>
</h:form>
</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css
===================================================================
--- tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-28
16:27:59 UTC (rev 12911)
+++ tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-28
16:37:59 UTC (rev 12912)
@@ -1,18 +1,24 @@
/* We need the min-height in order to have a region that is never empty and can receive
draggables
min-height doees not work on IE6 and the 2 other lines are there to make it work in
that situation.
- 32 pixels is the height of the region when it is empty. */
+ 32 pixels is the height of the region when it is empty. */
.dnd-region {
- min-height:32px;
- height:auto !important;
- height:32px;
+ min-height: 32px;
+ height: auto !important;
+ height: 32px;
}
+/*
+Add height to handle div so that we can drag from the whole bar instead of just the
title. Should work in IE as well,
+though it hasn't been tested.
+*/
.dnd-handle {
cursor: move;
- position:relative;
+ position: relative;
+ min-height: 1.2em;
+ height: auto !important;
+ height: 1.2em;
}
-
.dnd-droppable {
border: red 1px dashed;
background-color: Transparent;
Modified:
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
===================================================================
---
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2009-02-28
16:27:59 UTC (rev 12911)
+++
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2009-02-28
16:37:59 UTC (rev 12912)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.theme.impl.render.div;
import org.jboss.portal.Mode;
@@ -30,8 +31,6 @@
import org.jboss.portal.theme.render.renderer.ActionRendererContext;
import org.jboss.portal.theme.render.renderer.DecorationRenderer;
import org.jboss.portal.theme.render.renderer.DecorationRendererContext;
-import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
-import org.jboss.portal.theme.impl.render.dynamic.DynaConstants;
import java.io.PrintWriter;
import java.util.Collection;
@@ -55,13 +54,9 @@
public void render(RendererContext rendererContext, DecorationRendererContext drc)
throws RenderException
{
- DynaRenderOptions options =
(DynaRenderOptions)rendererContext.getAttribute(DynaConstants.RENDER_OPTIONS);
PrintWriter markup = rendererContext.getWriter();
- //Don't want title if this is DND, we already have it in
DynaDecorationRenderer
- if (DynaRenderOptions.NO_AJAX.equals(options)){
- renderTitle(rendererContext, drc);
- }
+ renderTitle(rendererContext, drc);
markup.print("<div class=\"portlet-mode-container\">");
renderTriggerableActions(rendererContext, drc, ActionRendererContext.MODES_KEY);
Modified:
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
===================================================================
---
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-02-28
16:27:59 UTC (rev 12911)
+++
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-02-28
16:37:59 UTC (rev 12912)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.theme.impl.render.dynamic;
import org.jboss.portal.theme.render.AbstractObjectRenderer;
@@ -27,7 +28,6 @@
import org.jboss.portal.theme.render.RendererContext;
import org.jboss.portal.theme.render.renderer.DecorationRenderer;
import org.jboss.portal.theme.render.renderer.DecorationRendererContext;
-import org.jboss.portal.theme.impl.render.div.DivDecorationRenderer;
import java.io.PrintWriter;
@@ -69,26 +69,22 @@
markup.print("<div class=\"dnd-handle\">");
markup.print("<div class=\"dyna-decoration\">\n");
- //We need the title inside of the dnd-handle
- markup.print("<div
class=\"portlet-titlebar-decoration\"></div>");
- markup.print("<span
class=\"portlet-titlebar-dyna\">");
- markup.print(drc.getTitle());
- markup.print("</span>");
-
- // Close dnd-region
+ delegate.render(rendererContext, drc);
+
+ // Close dnd-decoration
markup.print("</div>");
- // Close dyna-region
+ // Close dnd-handle
markup.print("</div>");
- delegate.render(rendererContext, drc);
-
}
else
{
markup.print("<div class=\"dyna-decoration\">\n");
+
delegate.render(rendererContext, drc);
- //end element in DivDecorationRenderer
- //markup.print("</div>\n");
+
+ // Close dyna-decoration
+ markup.print("</div>");
}
}
else