richfaces-svn-commits
March 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 552 discussions
JBoss Rich Faces SVN: r12985 - trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-03-17 12:15:49 -0400 (Tue, 17 Mar 2009)
New Revision: 12985
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/AjaxPushTestBean.java
Log:
fix test
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/AjaxPushTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/AjaxPushTestBean.java 2009-03-17 15:53:03 UTC (rev 12984)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/AjaxPushTestBean.java 2009-03-17 16:15:49 UTC (rev 12985)
@@ -23,22 +23,69 @@
import java.util.Date;
import java.util.EventListener;
import java.util.EventObject;
-import java.util.concurrent.atomic.AtomicInteger;
import org.ajax4jsf.event.PushEventListener;
-public class AjaxPushTestBean {
+public class AjaxPushTestBean implements Runnable {
private boolean enabled = false;
private PushEventListener listener;
- private EventGenerator generator;
-
private String content = "content";
+
+ private Date startDate;
+
+ private Thread thread;
+
+ private int eventsSent;
- private final Object lock = new Object();
-
+
+ public void start() {
+ if(thread == null) {
+ thread = new Thread(this);
+ thread.setDaemon(true);
+ setStartDate(new Date());
+ thread.start();
+ setEnabled(true);
+ }
+ }
+
+ public void stop() {
+ if(thread != null) {
+ thread = null;
+ setEnabled(false);
+ setStartDate(null);
+ }
+ }
+
+ public void run() {
+ while(thread != null) {
+ if (((new Date()).getTime() - getStartDate().getTime())>=10000) {
+ stop();
+ }
+
+ listener.onEvent(new EventObject(this));
+ eventsSent++;
+
+ try {
+ Thread.sleep(250);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ }
+ }
+
+ public void addListener(EventListener listener) {
+ synchronized (listener) {
+ if (this.listener != listener) {
+ this.listener = (PushEventListener) listener;
+ }
+ }
+ }
+
+
/**
* Gets value of content field.
*
@@ -64,40 +111,9 @@
* @return value of eventsSent field
*/
public int getEventsSent() {
- EventGenerator generator = getGenerator();
- return generator != null ? generator.getEventsSent() : 0;
- }
+ return eventsSent;
+ }
- public void addListener(EventListener listener) {
- synchronized (lock) {
- if (this.listener != listener) {
- this.listener = (PushEventListener) listener;
- }
- }
- }
-
- public void start() {
- synchronized (lock) {
- if (generator == null && listener != null) {
- generator = new EventGenerator(listener, 60000);
- Thread thread = new Thread(generator);
- thread.setDaemon(true);
- thread.start();
- setEnabled(true);
- }
- }
- }
-
- public void stop() {
- synchronized (lock) {
- if (generator != null) {
- generator.stop();
- setEnabled(false);
- generator = null;
- }
- }
- }
-
public boolean isEnabled() {
return enabled;
}
@@ -106,59 +122,14 @@
this.enabled = enabled;
}
- public void restart() {
- stop();
- start();
- }
+ public Date getStartDate() {
+ return startDate;
+ }
- private EventGenerator getGenerator() {
- return generator;
- }
+ public void setStartDate(Date startDate) {
+ synchronized (this) {
+ this.startDate = startDate;
+ }
+ }
- private static class EventGenerator implements Runnable {
-
- private final PushEventListener listener;
-
- private final long time;
-
- private AtomicInteger eventsSent = new AtomicInteger(0);
-
- private volatile boolean stopped;
-
- public EventGenerator(PushEventListener listener, long time) {
- this.listener = listener;
- this.time = time;
- }
-
- public void stop() {
- stopped = true;
- synchronized (this) {
- notify();
- }
- }
-
- public void run() {
- Date startDate = new Date();
- while (true) {
- try {
- long left = System.currentTimeMillis() - startDate.getTime();
- if (left >= time || stopped) {
- break;
- }
- listener.onEvent(new EventObject(this));
- eventsSent.incrementAndGet();
- synchronized (this) {
- wait(500);
- }
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- public int getEventsSent() {
- return eventsSent.get();
- }
- }
-
}
15 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r12984 - trunk/test-applications/jsp/src/main/java/colorPicker.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-03-17 11:53:03 -0400 (Tue, 17 Mar 2009)
New Revision: 12984
Modified:
trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java
Log:
Change colorMode to "rgb"
Modified: trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java 2009-03-17 15:48:38 UTC (rev 12983)
+++ trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java 2009-03-17 15:53:03 UTC (rev 12984)
@@ -31,7 +31,7 @@
private String bindLabel;
public ColorPicker() {
- colorMode = "hex";
+ colorMode = "rgb";
converterMessage = "custom converter message";
disabled = false;
flat = false;
15 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r12983 - trunk/test-applications/jsp/src/main/webapp/ColorPicker.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-03-17 11:48:38 -0400 (Tue, 17 Mar 2009)
New Revision: 12983
Modified:
trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp
Log:
Property page correction
Modified: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp 2009-03-17 15:26:00 UTC (rev 12982)
+++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp 2009-03-17 15:48:38 UTC (rev 12983)
@@ -16,43 +16,43 @@
<h:outputText value="converterMessage: "></h:outputText>
<h:inputText value="#{colorPicker.converterMessage}"
- onchange="submit();"></h:inputText>
+ onchange="submit"></h:inputText>
<h:outputText value="disabled" />
<h:selectBooleanCheckbox value="#{colorPicker.disabled}"
- onclick="submit();" />
+ onclick="submit" />
<h:outputText value="flat" />
<h:selectBooleanCheckbox value="#{colorPicker.flat}"
- onclick="submit();" />
+ onclick="submit" />
<h:outputText value="immediate" />
<h:selectBooleanCheckbox value="#{colorPicker.immediate}"
- onclick="submit();" />
+ onclick="submit" />
<h:outputText value="localValueSet" />
<h:selectBooleanCheckbox value="#{colorPicker.localValueSet}"
- onclick="submit();" />
+ onclick="submit" />
<h:outputText value="rendered" />
<h:selectBooleanCheckbox value="#{colorPicker.rendered}"
- onclick="submit();" />
+ onclick="submit" />
<h:outputText value="required" />
<h:selectBooleanCheckbox value="#{colorPicker.required}"
- onclick="submit();" />
+ onclick="submit" />
<h:outputText value="requiredMessage: "></h:outputText>
<h:inputText value="#{colorPicker.requiredMessage}"
- onchange="submit();"></h:inputText>
+ onchange="submit"></h:inputText>
<h:outputText value="valid" />
<h:selectBooleanCheckbox value="#{colorPicker.valid}"
- onclick="submit();" />
+ onclick="submit" />
<h:outputText value="validatorMessage: "></h:outputText>
<h:inputText value="#{colorPicker.validatorMessage}"
- onchange="submit();"></h:inputText>
+ onchange="submit;"></h:inputText>
<h:commandButton actionListener="#{colorPicker.checkBinding}"
value="Binding">
15 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r12982 - in trunk/test-applications/jsp/src/main: java/colorPicker and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-03-17 11:26:00 -0400 (Tue, 17 Mar 2009)
New Revision: 12982
Added:
trunk/test-applications/jsp/src/main/java/colorPicker/
trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java
trunk/test-applications/jsp/src/main/webapp/ColorPicker/
trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp
trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp
trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerStraightforward.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml
Modified:
trunk/test-applications/jsp/src/main/java/rich/RichBean.java
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
Log:
Add colorPicker to jsp test application
Added: trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java 2009-03-17 15:26:00 UTC (rev 12982)
@@ -0,0 +1,200 @@
+package colorPicker;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+
+import org.richfaces.component.html.HtmlColorPicker;
+
+import util.componentInfo.ComponentInfo;
+
+public class ColorPicker implements Validator, Converter {
+ private HtmlColorPicker component;
+ private String colorMode;// hex, rgb
+ private String converterMessage;
+ private boolean disabled;
+ private boolean flat;
+ private boolean immediate;
+ private boolean localValueSet;
+ private boolean rendered;
+ private boolean required;
+ private String requiredMessage;
+ private boolean valid;
+ private String validatorMessage;
+ private String value;
+ private String bindLabel;
+
+ public ColorPicker() {
+ colorMode = "hex";
+ converterMessage = "custom converter message";
+ disabled = false;
+ flat = false;
+ immediate = false;
+ localValueSet = true;
+ rendered = true;
+ required = false;
+ requiredMessage = "custom required message";
+ valid = true;
+ validatorMessage = "custom validator message";
+ value = "rgb(255, 250, 240)";
+ bindLabel = "Click Binding";
+ }
+
+ public void checkBinding(ActionEvent e){
+ FacesContext context = FacesContext.getCurrentInstance();
+ bindLabel = component.getClientId(context);
+ }
+
+ public void changeValue(ValueChangeEvent e) {
+ System.out.println("old value:" + e.getOldValue() + " new value:"
+ + e.getNewValue());
+ }
+
+ public void addColorPicker() {
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(component);
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public void validate(FacesContext context, UIComponent component,
+ Object value) throws ValidatorException {
+ String str = value.toString();
+ if (str.startsWith("rgb")) {
+ if (str.indexOf("100") != -1)
+ throw new ValidatorException(new FacesMessage(
+ "Test validator: 100 is restricted!"));
+ }
+ }
+
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException {
+ if (value.indexOf("100") != -1)
+ throw new ConverterException(new FacesMessage("Test converter(getAsObject): 100 is restricted!"));
+ return new String(value + " converted");
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException {
+ if (value.toString().indexOf("100") != -1)
+ throw new ConverterException(new FacesMessage("Test converter(getAsString): 100 is restricted!"));
+ return value.toString();
+ }
+
+ public HtmlColorPicker getComponent() {
+ return component;
+ }
+
+ public void setComponent(HtmlColorPicker component) {
+ this.component = component;
+ }
+
+ public String getColorMode() {
+ return colorMode;
+ }
+
+ public void setColorMode(String colorMode) {
+ this.colorMode = colorMode;
+ }
+
+ public String getConverterMessage() {
+ return converterMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ public boolean isFlat() {
+ return flat;
+ }
+
+ public void setFlat(boolean flat) {
+ this.flat = flat;
+ }
+
+ public boolean isImmediate() {
+ return immediate;
+ }
+
+ public void setImmediate(boolean immediate) {
+ this.immediate = immediate;
+ }
+
+ public boolean isLocalValueSet() {
+ return localValueSet;
+ }
+
+ public void setLocalValueSet(boolean localValueSet) {
+ this.localValueSet = localValueSet;
+ }
+
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public boolean isRequired() {
+ return required;
+ }
+
+ public void setRequired(boolean required) {
+ this.required = required;
+ }
+
+ public String getRequiredMessage() {
+ return requiredMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
+ public boolean isValid() {
+ return valid;
+ }
+
+ public void setValid(boolean valid) {
+ this.valid = valid;
+ }
+
+ public String getValidatorMessage() {
+ return validatorMessage;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public String getBindLabel() {
+ return bindLabel;
+ }
+
+ public void setBindLabel(String bindLabel) {
+ this.bindLabel = bindLabel;
+ }
+
+}
Modified: trunk/test-applications/jsp/src/main/java/rich/RichBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2009-03-17 15:18:12 UTC (rev 12981)
+++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2009-03-17 15:26:00 UTC (rev 12982)
@@ -26,6 +26,7 @@
// map.add( value, add( pages_path/name_pages, array<boolean>(Property, Straightforward) );
map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true, true, true}));
map.add("Calendar", add("/Calendar/Calendar", new boolean [] {true, true, true}));
+ map.add("ColorPicker", add("/ColorPicker/ColorPicker", new boolean [] {false, true, false}));
map.add("DataFilterSlider", add("/DataFilterSlider/DataFilterSlider", new boolean [] {true, true, false}));
map.add("DataScroller", add("/DataScroller/DataScroller", new boolean [] {true, true, true}));
map.add("DataTable", add("/DataTable/DataTable", new boolean [] {true, true, true}));
@@ -75,8 +76,8 @@
map.add("ExtendedDataTable", add("/ExtendedDataTable/ExtendedDataTable", new boolean [] {false, true, false}));
map.add("Editor", add("/Editor/Editor", new boolean [] {true, true, false}));
map.add("tTree", add("/tTree/tTree", new boolean [] {true, true, true}));
- map.add("Queue", add("/Queue/Queue", new boolean [] {false, true, true}));
- Iterator<String> iterator = map.getSet().iterator();
+ map.add("Queue", add("/Queue/Queue", new boolean [] {false, true, true}));
+ Iterator<String> iterator = map.getSet().iterator();
while(iterator.hasNext()){
list.add(new SelectItem(iterator.next()));
}
Added: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp 2009-03-17 15:26:00 UTC (rev 12982)
@@ -0,0 +1,26 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<f:subview id="colorPickerSubviewID">
+ <rich:colorPicker binding="#{colorPicker.component}"
+ colorMode="hex" converter="colorPickerConverter"
+ converterMessage="#{colorPicker.converterMessage}"
+ disabled="#{colorPicker.disabled}" flat="#{colorPicker.flat}"
+ id="colorPickerID" immediate="#{colorPicker.immediate}"
+ localValueSet="#{colorPicker.localValueSet}"
+ onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
+ onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}"
+ onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
+ onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"
+ rendered="#{colorPicker.rendered}" required="#{colorPicker.required}"
+ requiredMessage="#{colorPicker.requiredMessage}"
+ showEvent="onmouseover" valid="#{colorPicker.valid}"
+ validator="#{colorPicker.validate}"
+ validatorMessage="#{colorPicker.validatorMessage}"
+ value="#{colorPicker.value}"
+ valueChangeListener="#{colorPicker.changeValue}">
+ </rich:colorPicker>
+</f:subview>
Added: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp 2009-03-17 15:26:00 UTC (rev 12982)
@@ -0,0 +1,64 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<f:subview id="colorPickerPropertySubviewID">
+ <h:commandButton value="add test"
+ action="#{colorPicker.addColorPicker}"></h:commandButton>
+ <h:panelGrid columns="2">
+ <h:outputText value="colorMode" />
+ <h:selectOneRadio value="#{colorPicker.colorMode}"
+ onchange="submit">
+ <f:selectItem itemLabel="rgb" itemValue="rgb" />
+ <f:selectItem itemLabel="hex" itemValue="hex" />
+ </h:selectOneRadio>
+
+ <h:outputText value="converterMessage: "></h:outputText>
+ <h:inputText value="#{colorPicker.converterMessage}"
+ onchange="submit();"></h:inputText>
+
+ <h:outputText value="disabled" />
+ <h:selectBooleanCheckbox value="#{colorPicker.disabled}"
+ onclick="submit();" />
+
+ <h:outputText value="flat" />
+ <h:selectBooleanCheckbox value="#{colorPicker.flat}"
+ onclick="submit();" />
+
+ <h:outputText value="immediate" />
+ <h:selectBooleanCheckbox value="#{colorPicker.immediate}"
+ onclick="submit();" />
+
+ <h:outputText value="localValueSet" />
+ <h:selectBooleanCheckbox value="#{colorPicker.localValueSet}"
+ onclick="submit();" />
+
+ <h:outputText value="rendered" />
+ <h:selectBooleanCheckbox value="#{colorPicker.rendered}"
+ onclick="submit();" />
+
+ <h:outputText value="required" />
+ <h:selectBooleanCheckbox value="#{colorPicker.required}"
+ onclick="submit();" />
+
+ <h:outputText value="requiredMessage: "></h:outputText>
+ <h:inputText value="#{colorPicker.requiredMessage}"
+ onchange="submit();"></h:inputText>
+
+ <h:outputText value="valid" />
+ <h:selectBooleanCheckbox value="#{colorPicker.valid}"
+ onclick="submit();" />
+
+ <h:outputText value="validatorMessage: "></h:outputText>
+ <h:inputText value="#{colorPicker.validatorMessage}"
+ onchange="submit();"></h:inputText>
+
+ <h:commandButton actionListener="#{colorPicker.checkBinding}"
+ value="Binding">
+ <a4j:support event="onclick" reRender="bindLabelID"></a4j:support>
+ </h:commandButton>
+ <h:outputText value="#{colorPicker.bindLabel}" id="bindLabelID" />
+
+ </h:panelGrid>
+</f:subview>
\ No newline at end of file
Added: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerStraightforward.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerStraightforward.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerStraightforward.jsp 2009-03-17 15:26:00 UTC (rev 12982)
@@ -0,0 +1,8 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<f:subview id="colorPickerStraightforwardSubviewID">
+<div>ColorPicker straightforward...</div>
+</f:subview>
\ No newline at end of file
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml 2009-03-17 15:26:00 UTC (rev 12982)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>colorPicker</managed-bean-name>
+ <managed-bean-class>colorPicker.ColorPicker</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml 2009-03-17 15:18:12 UTC (rev 12981)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml 2009-03-17 15:26:00 UTC (rev 12982)
@@ -32,4 +32,8 @@
<converter-id>dateValueConverter</converter-id>
<converter-class>util.converter.DateValueConverter</converter-class>
</converter>
+ <converter>
+ <converter-id>colorPickerConverter</converter-id>
+ <converter-class>colorPicker.ColorPicker</converter-class>
+ </converter>
</faces-config>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2009-03-17 15:18:12 UTC (rev 12981)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2009-03-17 15:26:00 UTC (rev 12982)
@@ -22,14 +22,12 @@
<context-param>
<param-name>org.richfaces.CONTROL_SKINNING_LEVEL</param-name>
<param-value>extended</param-value>
- </context-param>
-
+ </context-param>
+
<context-param>
- <param-name>
- org.richfaces.CONTROL_SKINNING_CLASSES_LEVEL
- </param-name>
- <param-value>extended</param-value>
- </context-param>
+ <param-name>org.ajax4jsf.handleViewExpiredOnClient</param-name>
+ <param-value>true</param-value>
+ </context-param>
<context-param>
<description>
@@ -198,7 +196,7 @@
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
<param-value>
- /WEB-INF/faces-config-tTree.xml,/WEB-INF/faces-config-Queue.xml,/WEB-INF/faces-config-Editor.xml,/WEB-INF/faces-config-ExtendedDataTable.xml,/WEB-INF/faces-config-DataGrid.xml,/WEB-INF/faces-config-Validator.xml,/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-!
config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/W!
EB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFilter
ing.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml,/WEB-INF/faces-config-Custom.xml
+ /WEB-INF/faces-config-ColorPicker.xml,/WEB-INF/faces-config-tTree.xml,/WEB-INF/faces-config-Queue.xml,/WEB-INF/faces-config-Editor.xml,/WEB-INF/faces-config-ExtendedDataTable.xml,/WEB-INF/faces-config-DataGrid.xml,/WEB-INF/faces-config-Validator.xml,/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-confi!
g-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/W!
EB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,
/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml,/WEB-INF/faces-config-Custom.xml
</param-value>
</context-param>
@@ -273,7 +271,7 @@
</filter-mapping>
<session-config>
- <session-timeout>600</session-timeout>
+ <session-timeout>500</session-timeout>
</session-config>
<!-- Listener, to allow Jetty serving MyFaces apps -->
15 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r12981 - management/design/realWorldDemo/html.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2009-03-17 11:18:12 -0400 (Tue, 17 Mar 2009)
New Revision: 12981
Added:
management/design/realWorldDemo/html/login.html
management/design/realWorldDemo/html/register_edit_person.html
management/design/realWorldDemo/html/search_result_shelves.html
Modified:
management/design/realWorldDemo/html/pabm3.css
management/design/realWorldDemo/html/search_result_albums.html
management/design/realWorldDemo/html/search_result_photos.html
management/design/realWorldDemo/html/search_result_users.html
Log:
Added: management/design/realWorldDemo/html/login.html
===================================================================
--- management/design/realWorldDemo/html/login.html (rev 0)
+++ management/design/realWorldDemo/html/login.html 2009-03-17 15:18:12 UTC (rev 12981)
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+ <title>Untitled</title>
+ <link rel="STYLESHEET" type="text/css" href="pabm3.css">
+</head>
+
+<body>
+
+<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+ <tr>
+ <td align="center">
+
+ <table>
+ <tr>
+ <td>
+ Login
+ </td>
+ <td>
+ <input type="Text" style="border : 1px solid #909090; height : 19px; width : 155px">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Password
+ </td>
+ <td>
+ <input type="Text" style="border : 1px solid #909090; height : 19px; width : 155px">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <table style="margin-top : 10px">
+ <tr>
+ <td>
+ <div class="button_103">
+ <img src="images/shell/button.png" width="103" height="28" alt="" border="0">
+ <div style="font-weight : bold;">
+ Enter
+ </div>
+ <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0">
+ </div>
+ </td>
+ <td>
+ <div class="button_103">
+ <img src="images/shell/button.png" width="103" height="28" alt="" border="0">
+ <div>
+ Cancel
+ </div>
+ <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0">
+ </div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
+
+ </td>
+ </tr>
+</table>
+
+</body>
+</html>
Modified: management/design/realWorldDemo/html/pabm3.css
===================================================================
--- management/design/realWorldDemo/html/pabm3.css 2009-03-17 14:11:42 UTC (rev 12980)
+++ management/design/realWorldDemo/html/pabm3.css 2009-03-17 15:18:12 UTC (rev 12981)
@@ -76,4 +76,4 @@
.button_103 div {position : relative; color : #ffffff; top : 0px; left : 0px; width : 103px; text-align : center; margin-top : 7px;}
.button_103 input {position : absolute; top : 0px; left : 0px;"}
-
+.reg_table{padding : 0px 10px 10px 0px;}
Added: management/design/realWorldDemo/html/register_edit_person.html
===================================================================
--- management/design/realWorldDemo/html/register_edit_person.html (rev 0)
+++ management/design/realWorldDemo/html/register_edit_person.html 2009-03-17 15:18:12 UTC (rev 12981)
@@ -0,0 +1,579 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+ <title>Untitled</title>
+ <link rel="STYLESHEET" type="text/css" href="pabm3.css">
+</head>
+
+<body>
+
+<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+ <tr>
+ <td colspan="2">
+ <div class="top_part">
+ <div class="header_box">
+ <a href="#"><img src="images/shell/logo_top.gif" width="290" height="79" alt="" border="0" style="position : absolute;"></a>
+ <div class="auth_box">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+
+ <td class="auth_data">
+ Welcome, <span>Jhon Smith</span>
+ </td>
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+
+ <div class="about_toolbar">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+
+ <td class="about_toolbar_item">
+ <a href="#">User guide</a>
+ </td>
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+
+ <td class="about_toolbar_item">
+ <a href="#">F.A.Q.</a>
+ </td>
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+
+ <td class="about_toolbar_item">
+ <a href="#">About Demo at JBossWiki</a>
+ </td>
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+
+ <td class="about_toolbar_item">
+ <a href="#">About Demo at JBossForum</a>
+ </td>
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+ </div>
+ <div style="height : 37px; position : relative; background : url(images/shell/general_panelbar_bg.gif) repeat-x #A84807; padding-left : 15px; ">
+ <table height="37px" cellpadding="0" cellspacing="0" border="0" style="float:left">
+ <tr>
+
+ <td valign="middle">
+ <img src="images/shell/general_panelbar_bullet.gif" width="11" height="15" alt="" border="0"><br>
+ </td>
+ <td style="vertical-align : top; padding : 7px 5px 0px 14px">
+ <div>
+ <div style="height : 23px; float : left; width : 8px; overflow : hidden; position : relative;">
+ <img src="images/shell/informer_photo.png" width="31" height="23" alt="" border="0">
+ </div>
+ <div style="height : 23px; float : left; background : url(images/shell/informer_bg.png) top left no-repeat; color : #FFFFFF; padding : 4px 0px 0px 3px; white-space : nowrap;">
+ <a href="#" style="font-size : 11px; font-weight : bold; color : #ffffff; text-decoration : none;">My Album:</a>
+ </div>
+ <div style="height : 23px; float : left; width : 10px; overflow : hidden; position : relative;">
+ <img src="images/shell/informer_bg.png" width="163" height="23" alt="" border="0" style="position : absolute; top : 0px; right : 0px">
+ </div>
+ </div>
+
+ </td>
+
+ </tr>
+ </table>
+ <table height="37px" cellpadding="0" cellspacing="0" border="0" style="float:left">
+ <tr>
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <div style="cursor : pointer;">
+ <div style="height : 23px; float : left;">
+ <img src="images/shell/informer_shelf.png" width="31" height="23" alt="" border="0">
+ </div>
+ <div style="height : 23px; float : left; background : url(images/shell/informer_bg.png) top left no-repeat; color : #FFFFFF; padding : 4px 0px 0px 0px;">
+ 234
+ </div>
+ <div style="height : 23px; float : left; width : 10px; overflow : hidden; position : relative;">
+ <img src="images/shell/informer_bg.png" width="163" height="23" alt="" border="0" style="position : absolute; top : 0px; right : 0px">
+ </div>
+ </div>
+ </td>
+
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <div style="cursor : pointer;">
+ <div style="height : 23px; float : left;">
+ <img src="images/shell/informer_album.png" width="31" height="23" alt="" border="0">
+ </div>
+ <div style="height : 23px; float : left; background : url(images/shell/informer_bg.png) top left no-repeat; color : #FFFFFF; padding : 4px 0px 0px 0px;">
+ 234
+ </div>
+ <div style="height : 23px; float : left; width : 10px; overflow : hidden; position : relative;">
+ <img src="images/shell/informer_bg.png" width="163" height="23" alt="" border="0" style="position : absolute; top : 0px; right : 0px">
+ </div>
+ </div>
+ </td>
+
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <div style="cursor : pointer;">
+ <div style="height : 23px; float : left;">
+ <img src="images/shell/informer_photo.png" width="31" height="23" alt="" border="0">
+ </div>
+ <div style="height : 23px; float : left; background : url(images/shell/informer_bg.png) top left no-repeat; color : #FFFFFF; padding : 4px 0px 0px 0px;">
+ 234
+ </div>
+ <div style="height : 23px; float : left; width : 10px; overflow : hidden; position : relative;">
+ <img src="images/shell/informer_bg.png" width="163" height="23" alt="" border="0" style="position : absolute; top : 0px; right : 0px">
+ </div>
+ </div>
+ </td>
+
+ </tr>
+ </table>
+ <img src="images/shell/general_panelbar_bullet.gif" width="11" height="15" alt="" border="0" style="float:left; margin : 11px 15px 0px 15px;">
+ <table height="37px" cellpadding="0" cellspacing="0" border="0" style="float:left">
+ <tr>
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <a href="#"><img src="images/shell/icon_add_shelf.png" width="37" height="23" alt="" border="0"></a><br>
+ </td>
+
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <a href="#"><img src="images/shell/icon_add_album.png" width="37" height="23" alt="" border="0"></a><br>
+ </td>
+
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <a href="#"><img src="images/shell/icon_add_photo.png" width="37" height="23" alt="" border="0"></a><br>
+ </td>
+
+ </tr>
+ </table>
+ <img src="images/shell/general_panelbar_bullet.gif" width="11" height="15" alt="" border="0" style="float:left; margin : 11px 15px 0px 15px;">
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td height="100%" valign="top">
+ <div style="background : url(images/shell/general_panel_bg.gif) right top repeat-y; height : 100%;">
+ <div style="height : 15px; background : url(images/shell/general_panel_header_bg.gif) right top; font-size : 1px;">
+ <img src="images/shell/spacer.gif" width="300" height="1" alt="" border="0">
+ </div>
+
+ <div style="padding : 15px 35px 15px 15px;">
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/tree_icon_minus.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name'll be here. Maximal lenght is no limits
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px; background : #f1f1f1; border : 1px solid #FFFFFF">
+ <strong>Album name'll be here. Maximal lenght is no limits</strong>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name'll be here.
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name :: <a href="#"><strong>7</strong> new</a>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name'll be here.
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name'll be here. Maximal lenght is no limits
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Shelf name'll be here :: <a href="#"><strong>7</strong> new</a>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Shelf name
+ </td>
+ </tr>
+ </table>
+
+
+ </div>
+
+ </div>
+ </td>
+ <td height="100%" width="100%" valign="top"">
+ <div style="background : url(images/shell/general_panel_bg.gif) right top repeat-y; height : 100%;">
+ <div style="height : 15px; background : url(images/shell/general_panel_header_bg.gif) right top; font-size : 1px;">
+
+ </div>
+ <div class="content_box">
+
+ <h1 style="margin-bottom : 4px">New user registration</h1>
+ <br><br>
+<style>
+.reg_table{padding : 0px 10px 10px 0px;}
+</style>
+ <table cellpadding="0" cellspacing="0" border="0" class="reg_table">
+ <tr>
+ <td style="vertical-align : top;">
+ Avatar
+ </td>
+ <td style="padding-left : 2px; padding-bottom : 2px">
+ <div class="preview_box_photo_nav" style="margin-right : 5px">
+ <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/shell/avatar_default.png" width="80" height="80" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td style="vertical-align : top;">
+ </td>
+ <td style="padding-bottom : 20px">
+ <div class="button_103">
+ <img src="images/shell/button.png" width="103" height="28" alt="" border="0">
+ <div style="font-weight : bold;">
+ Change
+ </div>
+ <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Login
+ </td>
+ <td>
+ <input type="Text" style="border : 1px solid #909090; height : 19px; width : 155px">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Password
+ </td>
+ <td>
+ <input type="Text" style="border : 1px solid #909090; height : 19px; width : 155px">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Re-enter password
+ </td>
+ <td>
+ <input type="Text" style="border : 1px solid #909090; height : 19px; width : 155px">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <br>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ First name
+ </td>
+ <td>
+ <input type="Text" style="border : 1px solid #909090; height : 19px; width : 155px">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Last name
+ </td>
+ <td>
+ <input type="Text" style="border : 1px solid #909090; height : 19px; width : 155px">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Sex
+ </td>
+ <td>
+ <table>
+ <tr>
+ <td>
+ <input type="Radio">
+ </td>
+ <td>
+ Male
+ </td>
+ <td>
+ <input type="Radio">
+ </td>
+ <td>
+ Female
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Birthday
+ </td>
+ <td>
+ <input type="Text" style="border : 1px solid #909090; height : 19px; width : 155px">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Email
+ </td>
+ <td>
+ <input type="Text" style="border : 1px solid #909090; height : 19px; width : 155px">
+ </td>
+ </tr>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+ <table>
+ <tr>
+ <td>
+ <input type="Checkbox">
+ </td>
+ <td>
+ Show my info to all users
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td>
+ <table>
+ <tr>
+ <td>
+ <input type="Checkbox">
+ </td>
+ <td>
+ Inform me about all news
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <table style="margin-top : 10px">
+ <tr>
+ <td>
+ <div class="button_103">
+ <img src="images/shell/button.png" width="103" height="28" alt="" border="0">
+ <div style="font-weight : bold;">
+ Enter
+ </div>
+ <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0">
+ </div>
+ </td>
+ <td>
+ <div class="button_103">
+ <img src="images/shell/button.png" width="103" height="28" alt="" border="0">
+ <div>
+ Cancel
+ </div>
+ <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0">
+ </div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
+
+
+ <div style="width : 90%; height : 10px; float : left;"> <div>
+
+
+ </div>
+
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <div style="height : 82px; position : relative; background : url(images/shell/footer_bg.gif) repeat-x #000000;">
+ <img src="images/shell/logo_bottom.gif" width="160" height="55" alt="" border="0" style="position : absolute; right : 0px; top : 27px">
+ <div style="position : absolute; left : 8px; top : 51px">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+ <td style="vertical-align : top; padding : 0px 15px 0px 8px">
+ <a href="#" style="font-size : 11px; color : #ffffff; text-decoration : none;"> Terms And Conditions</a>
+ </td>
+
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+ <td style="vertical-align : top; padding : 0px 15px 0px 8px">
+ <a href="#" style="font-size : 11px; color : #ffffff; text-decoration : none;">Privacy Statement</a>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+ </div>
+ </td>
+ </tr>
+</table>
+
+<form style="margin : 0px">
+ <div style="height : 65px; width: 339px; position : absolute; top : 64px; right : 0px; margin-right : 0px;">
+ <img src="images/shell/search_bg.png" width="339" height="65" alt="" border="0" style="position : absolute; top : 0px; left: 0px">
+ <div style="position : absolute; color : #FFFFFF; font-weight : bold; top : 22px; left : 20px">
+ Search
+ </div>
+ <div style="position : absolute; color : #FFFFFF; font-weight : bold; top : 21px; left : 277px">
+ Find
+ </div>
+ <input type="Text" style="width : 176px; height : 17px; border : 0px; position : absolute; top : 20px; left : 73px; background : none; font-weight : bold;">
+ <input type="Image" src="images/shell/spacer.gif" border="0" style="width : 61px; height : 18px; position : absolute; top : 20px; left : 261px;">
+ <div style="position : absolute; top : 41px; left : 197px">
+ <a href="#" style="color : #FFFFFF; text-decoration : none">Options <img src="images/shell/bull_arr_down.gif" width="7" height="7" alt="" border="0"> </a>
+ </div>
+ </div>
+ <div style="height : 90px; width: 327px; position : absolute; top : 107px; right : 5px; background : none; display : none; overflow : hidden;">
+ <img src="images/shell/search_option_bg.png" width="327" height="153" alt="" border="0" style="position : absolute; bottom : 0px; left: 0px">
+ <div style="position : absolute; color : white; top : 7px; left : 45px">
+ in <input type="checkbox">in My Album <input type="checkbox">in Shared Albums
+ </div>
+ <div style="position : absolute; color : white; top : 32px; padding-top : 3px; left : 38px; border-top : 1px solid #383838">
+ for <input type="checkbox">Tags <input type="checkbox">Photos <input type="checkbox">Albums <input type="checkbox">Users
+ </div>
+ <div style="position : absolute; top : 70px; left : 163px">
+ <a href="#" style="color : #FFFFFF; text-decoration : none">Hide options <img src="images/shell/bull_arr_up.gif" width="7" height="7" alt="" border="0"> </a>
+ </div>
+ </div>
+</form>
+
+<div style="height : 52px; width: 79px; position : absolute; top : 0px; left : 278px; visibility : vidden;">
+ <img src="images/shell/ai.png" width="52" height="79" alt="" border="0" style="position : absolute; top : 0px; left: 0px">
+ <img src="images/shell/ai.gif" width="26" height="26" alt="" border="0" style="position : absolute; top : 26px; left: 13px">
+</div>
+</body>
+</html>
Modified: management/design/realWorldDemo/html/search_result_albums.html
===================================================================
--- management/design/realWorldDemo/html/search_result_albums.html 2009-03-17 14:11:42 UTC (rev 12980)
+++ management/design/realWorldDemo/html/search_result_albums.html 2009-03-17 15:18:12 UTC (rev 12981)
@@ -327,7 +327,7 @@
<h1 style="margin-bottom : 4px">Albums search result</h1>
</td>
<td style="padding-left : 20px">
- | <a href="#">Photos search result</a> | <a href="#">Users search result</a> |
+ | <a href="#">Shelves search result</a> | <a href="#">Photos search result</a> | <a href="#">Users search result</a> |
</td>
</tr>
</table>
Modified: management/design/realWorldDemo/html/search_result_photos.html
===================================================================
--- management/design/realWorldDemo/html/search_result_photos.html 2009-03-17 14:11:42 UTC (rev 12980)
+++ management/design/realWorldDemo/html/search_result_photos.html 2009-03-17 15:18:12 UTC (rev 12981)
@@ -327,7 +327,7 @@
<h1 style="margin-bottom : 4px">Photos search result</h1>
</td>
<td style="padding-left : 20px">
- | <a href="#">Albums search result</a> | <a href="#">Users search result</a> |
+ | <a href="#">Shelves search result</a> | <a href="#">Albums search result</a> | <a href="#">Users search result</a> |
</td>
</tr>
</table>
Added: management/design/realWorldDemo/html/search_result_shelves.html
===================================================================
--- management/design/realWorldDemo/html/search_result_shelves.html (rev 0)
+++ management/design/realWorldDemo/html/search_result_shelves.html 2009-03-17 15:18:12 UTC (rev 12981)
@@ -0,0 +1,781 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+ <title>Untitled</title>
+ <link rel="STYLESHEET" type="text/css" href="pabm3.css">
+</head>
+
+<body>
+
+<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+ <tr>
+ <td colspan="2">
+ <div class="top_part">
+ <div class="header_box">
+ <a href="#"><img src="images/shell/logo_top.gif" width="290" height="79" alt="" border="0" style="position : absolute;"></a>
+ <div class="auth_box">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+
+ <td class="auth_data">
+ Welcome, <span>Jhon Smith</span>
+ </td>
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+
+ <div class="about_toolbar">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+
+ <td class="about_toolbar_item">
+ <a href="#">User guide</a>
+ </td>
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+
+ <td class="about_toolbar_item">
+ <a href="#">F.A.Q.</a>
+ </td>
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+
+ <td class="about_toolbar_item">
+ <a href="#">About Demo at JBossWiki</a>
+ </td>
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+
+ <td class="about_toolbar_item">
+ <a href="#">About Demo at JBossForum</a>
+ </td>
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+ </div>
+ <div style="height : 37px; position : relative; background : url(images/shell/general_panelbar_bg.gif) repeat-x #A84807; padding-left : 15px; ">
+ <table height="37px" cellpadding="0" cellspacing="0" border="0" style="float:left">
+ <tr>
+
+ <td valign="middle">
+ <img src="images/shell/general_panelbar_bullet.gif" width="11" height="15" alt="" border="0"><br>
+ </td>
+ <td style="vertical-align : top; padding : 7px 5px 0px 14px">
+ <div>
+ <div style="height : 23px; float : left; width : 8px; overflow : hidden; position : relative;">
+ <img src="images/shell/informer_photo.png" width="31" height="23" alt="" border="0">
+ </div>
+ <div style="height : 23px; float : left; background : url(images/shell/informer_bg.png) top left no-repeat; color : #FFFFFF; padding : 4px 0px 0px 3px; white-space : nowrap;">
+ <a href="#" style="font-size : 11px; font-weight : bold; color : #ffffff; text-decoration : none;">My Album:</a>
+ </div>
+ <div style="height : 23px; float : left; width : 10px; overflow : hidden; position : relative;">
+ <img src="images/shell/informer_bg.png" width="163" height="23" alt="" border="0" style="position : absolute; top : 0px; right : 0px">
+ </div>
+ </div>
+
+ </td>
+
+ </tr>
+ </table>
+ <table height="37px" cellpadding="0" cellspacing="0" border="0" style="float:left">
+ <tr>
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <div style="cursor : pointer;">
+ <div style="height : 23px; float : left;">
+ <img src="images/shell/informer_shelf.png" width="31" height="23" alt="" border="0">
+ </div>
+ <div style="height : 23px; float : left; background : url(images/shell/informer_bg.png) top left no-repeat; color : #FFFFFF; padding : 4px 0px 0px 0px;">
+ 234
+ </div>
+ <div style="height : 23px; float : left; width : 10px; overflow : hidden; position : relative;">
+ <img src="images/shell/informer_bg.png" width="163" height="23" alt="" border="0" style="position : absolute; top : 0px; right : 0px">
+ </div>
+ </div>
+ </td>
+
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <div style="cursor : pointer;">
+ <div style="height : 23px; float : left;">
+ <img src="images/shell/informer_album.png" width="31" height="23" alt="" border="0">
+ </div>
+ <div style="height : 23px; float : left; background : url(images/shell/informer_bg.png) top left no-repeat; color : #FFFFFF; padding : 4px 0px 0px 0px;">
+ 234
+ </div>
+ <div style="height : 23px; float : left; width : 10px; overflow : hidden; position : relative;">
+ <img src="images/shell/informer_bg.png" width="163" height="23" alt="" border="0" style="position : absolute; top : 0px; right : 0px">
+ </div>
+ </div>
+ </td>
+
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <div style="cursor : pointer;">
+ <div style="height : 23px; float : left;">
+ <img src="images/shell/informer_photo.png" width="31" height="23" alt="" border="0">
+ </div>
+ <div style="height : 23px; float : left; background : url(images/shell/informer_bg.png) top left no-repeat; color : #FFFFFF; padding : 4px 0px 0px 0px;">
+ 234
+ </div>
+ <div style="height : 23px; float : left; width : 10px; overflow : hidden; position : relative;">
+ <img src="images/shell/informer_bg.png" width="163" height="23" alt="" border="0" style="position : absolute; top : 0px; right : 0px">
+ </div>
+ </div>
+ </td>
+
+ </tr>
+ </table>
+ <img src="images/shell/general_panelbar_bullet.gif" width="11" height="15" alt="" border="0" style="float:left; margin : 11px 15px 0px 15px;">
+ <table height="37px" cellpadding="0" cellspacing="0" border="0" style="float:left">
+ <tr>
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <a href="#"><img src="images/shell/icon_add_shelf.png" width="37" height="23" alt="" border="0"></a><br>
+ </td>
+
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <a href="#"><img src="images/shell/icon_add_album.png" width="37" height="23" alt="" border="0"></a><br>
+ </td>
+
+ <td style="vertical-align : top; padding : 7px 2px 0px 0px">
+ <a href="#"><img src="images/shell/icon_add_photo.png" width="37" height="23" alt="" border="0"></a><br>
+ </td>
+
+ </tr>
+ </table>
+ <img src="images/shell/general_panelbar_bullet.gif" width="11" height="15" alt="" border="0" style="float:left; margin : 11px 15px 0px 15px;">
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td height="100%" valign="top">
+ <div style="background : url(images/shell/general_panel_bg.gif) right top repeat-y; height : 100%;">
+ <div style="height : 15px; background : url(images/shell/general_panel_header_bg.gif) right top; font-size : 1px;">
+ <img src="images/shell/spacer.gif" width="300" height="1" alt="" border="0">
+ </div>
+
+ <div style="padding : 15px 35px 15px 15px;">
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/tree_icon_minus.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name'll be here. Maximal lenght is no limits
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px; background : #f1f1f1; border : 1px solid #FFFFFF">
+ <strong>Album name'll be here. Maximal lenght is no limits</strong>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name'll be here.
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name :: <a href="#"><strong>7</strong> new</a>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name'll be here.
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Album name'll be here. Maximal lenght is no limits
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Shelf name'll be here :: <a href="#"><strong>7</strong> new</a>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0">
+ <tr>
+ <td valign="top">
+ <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top">
+ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br>
+ </td>
+ <td valign="top" style="padding-left : 4px">
+ Shelf name
+ </td>
+ </tr>
+ </table>
+
+
+ </div>
+
+ </div>
+ </td>
+ <td height="100%" width="100%" valign="top"">
+ <div style="background : url(images/shell/general_panel_bg.gif) right top repeat-y; height : 100%;">
+ <div style="height : 15px; background : url(images/shell/general_panel_header_bg.gif) right top; font-size : 1px;">
+
+ </div>
+ <div class="content_box">
+
+ <table style="border-collapse : collapse; margin-bottom : 15px" cellpadding="0">
+ <tr>
+ <td>
+ <h1 style="margin-bottom : 4px">Shelves search result</h1>
+ </td>
+ <td style="padding-left : 20px">
+ | <a href="#">Albums search result</a> | <a href="#">Photos search result</a> | <a href="#">Users search result</a> |
+ </td>
+ </tr>
+ </table>
+ <span style="color : #666666">Search criteria: <strong>tags, albums, photos</strong></span><br>
+ <div style="font-size : 1px; height : 5px"></div>
+ <span style="color : #666666">Keywords: <a href="#">breathtaking</a>, <a href="#">bright</a>, <a href="#">clouds</a>, <a href="#">cloudy</a>, <a href="#">day</a>, <a href="#">grass</a>, <a href="#">lens flare</a>, <a href="#">low angle</a>, <a href="#">view</a>, <a href="#">nature</a>, <a href="#">nobody</a>, <a href="#">outdoor</a>, <a href="#">peaceful</a>, <a href="#">picturesque</a>, <a href="#">serenity</a>, <a href="#">sky</a>, <a href="#">sunny</a>, <a href="#">sun</a>, <a href="#">sunshine</a></span>
+
+
+ <br clear="all">
+ <table style="border-collapse : collapse; margin-bottom : 15px; margin-top: 35px" cellpadding="0">
+ <tr>
+ <td>
+ <h1 style="margin-bottom : 4px">Shelf name</h1>
+ </td>
+ <td style="padding-left : 20px">
+ | <a href="#">View all albums</a> →
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <span style="color : #666666">Author: <a href="#">Author Full Name</a></span>
+ </td>
+ </tr>
+ </table>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+
+
+ <br clear="all">
+ <table style="border-collapse : collapse; margin-bottom : 15px; margin-top: 35px" cellpadding="0">
+ <tr>
+ <td>
+ <h1 style="margin-bottom : 4px">Shelf name</h1>
+ </td>
+ <td style="padding-left : 20px">
+ | <a href="#">View all albums</a> →
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <span style="color : #666666">Author: <a href="#">Author Full Name</a></span>
+ </td>
+ </tr>
+ </table>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+
+
+
+ <br clear="all">
+ <table style="border-collapse : collapse; margin-bottom : 15px; margin-top: 35px" cellpadding="0">
+ <tr>
+ <td>
+ <h1 style="margin-bottom : 4px">Shelf name</h1>
+ </td>
+ <td style="padding-left : 20px">
+ | <a href="#">View all albums</a> →
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <span style="color : #666666">Author: <a href="#">Author Full Name</a></span>
+ </td>
+ </tr>
+ </table>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+
+
+
+ <br clear="all">
+ <table style="border-collapse : collapse; margin-bottom : 15px; margin-top: 35px" cellpadding="0">
+ <tr>
+ <td>
+ <h1 style="margin-bottom : 4px">Shelf name</h1>
+ </td>
+ <td style="padding-left : 20px">
+ | <a href="#">View all albums</a> →
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <span style="color : #666666">Author: <a href="#">Author Full Name</a></span>
+ </td>
+ </tr>
+ </table>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+ <div class="preview_box_album_120">
+ <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0">
+ <table cellpadding="0">
+ <tr>
+ <td>
+ <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br>
+ </td>
+ </tr>
+ </table>
+ <div class="album_name">
+ Album name'll be here
+ </div>
+ <div class="album_data">
+ 3 Mar 2009 | 290 photos
+ </div>
+ </div>
+
+
+
+
+ <div style="width : 90%; height : 10px; float : left;"> <div>
+
+
+ </div>
+
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <div style="height : 82px; position : relative; background : url(images/shell/footer_bg.gif) repeat-x #000000;">
+ <img src="images/shell/logo_bottom.gif" width="160" height="55" alt="" border="0" style="position : absolute; right : 0px; top : 27px">
+ <div style="position : absolute; left : 8px; top : 51px">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+ <td style="vertical-align : top; padding : 0px 15px 0px 8px">
+ <a href="#" style="font-size : 11px; color : #ffffff; text-decoration : none;"> Terms And Conditions</a>
+ </td>
+
+ <td valign="middle">
+ <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br>
+ </td>
+ <td style="vertical-align : top; padding : 0px 15px 0px 8px">
+ <a href="#" style="font-size : 11px; color : #ffffff; text-decoration : none;">Privacy Statement</a>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+ </div>
+ </td>
+ </tr>
+</table>
+
+<form style="margin : 0px">
+ <div style="height : 65px; width: 339px; position : absolute; top : 64px; right : 0px; margin-right : 0px;">
+ <img src="images/shell/search_bg.png" width="339" height="65" alt="" border="0" style="position : absolute; top : 0px; left: 0px">
+ <div style="position : absolute; color : #FFFFFF; font-weight : bold; top : 22px; left : 20px">
+ Search
+ </div>
+ <div style="position : absolute; color : #FFFFFF; font-weight : bold; top : 21px; left : 277px">
+ Find
+ </div>
+ <input type="Text" style="width : 176px; height : 17px; border : 0px; position : absolute; top : 20px; left : 73px; background : none; font-weight : bold;">
+ <input type="Image" src="images/shell/spacer.gif" border="0" style="width : 61px; height : 18px; position : absolute; top : 20px; left : 261px;">
+ <div style="position : absolute; top : 41px; left : 197px">
+ <a href="#" style="color : #FFFFFF; text-decoration : none">Options <img src="images/shell/bull_arr_down.gif" width="7" height="7" alt="" border="0"> </a>
+ </div>
+ </div>
+ <div style="height : 90px; width: 327px; position : absolute; top : 107px; right : 5px; background : none; display : none; overflow : hidden;">
+ <img src="images/shell/search_option_bg.png" width="327" height="153" alt="" border="0" style="position : absolute; bottom : 0px; left: 0px">
+ <div style="position : absolute; color : white; top : 7px; left : 45px">
+ in <input type="checkbox">in My Album <input type="checkbox">in Shared Albums
+ </div>
+ <div style="position : absolute; color : white; top : 32px; padding-top : 3px; left : 38px; border-top : 1px solid #383838">
+ for <input type="checkbox">Tags <input type="checkbox">Photos <input type="checkbox">Albums <input type="checkbox">Users
+ </div>
+ <div style="position : absolute; top : 70px; left : 163px">
+ <a href="#" style="color : #FFFFFF; text-decoration : none">Hide options <img src="images/shell/bull_arr_up.gif" width="7" height="7" alt="" border="0"> </a>
+ </div>
+ </div>
+</form>
+
+<div style="height : 52px; width: 79px; position : absolute; top : 0px; left : 278px; visibility : vidden;">
+ <img src="images/shell/ai.png" width="52" height="79" alt="" border="0" style="position : absolute; top : 0px; left: 0px">
+ <img src="images/shell/ai.gif" width="26" height="26" alt="" border="0" style="position : absolute; top : 26px; left: 13px">
+</div>
+</body>
+</html>
Modified: management/design/realWorldDemo/html/search_result_users.html
===================================================================
--- management/design/realWorldDemo/html/search_result_users.html 2009-03-17 14:11:42 UTC (rev 12980)
+++ management/design/realWorldDemo/html/search_result_users.html 2009-03-17 15:18:12 UTC (rev 12981)
@@ -327,7 +327,7 @@
<h1 style="margin-bottom : 4px">Users search result</h1>
</td>
<td style="padding-left : 20px">
- | <a href="#">Albums search result</a> | <a href="#">Photos search result</a> |
+ | <a href="#">Shelves search result</a> | <a href="#">Albums search result</a> | <a href="#">Photos search result</a> |
</td>
</tr>
</table>
15 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r12980 - trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-03-17 10:11:42 -0400 (Tue, 17 Mar 2009)
New Revision: 12980
Added:
trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf6267.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-6267
Added: trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf6267.xhtml
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf6267.xhtml (rev 0)
+++ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf6267.xhtml 2009-03-17 14:11:42 UTC (rev 12980)
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html 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"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<ui:composition template="/layout/layout.xhtml">
+ <ui:define name="template">
+ <h:form id="form">
+ <rich:dataTable value="#{rf6267.numbers}" var="n" id="table">
+ <rich:columns value="#{rf6267.numbers}" var="number" index="idx" id="columns#{idx}"
+ rendered="#{rf6267.isColumnRendered(number)}">
+ #{n} - #{number}
+ </rich:columns>
+ </rich:dataTable>
+ </h:form>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
15 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r12979 - in trunk/test-applications/regressionArea/regressionArea-tests/src: main and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-03-17 10:11:16 -0400 (Tue, 17 Mar 2009)
New Revision: 12979
Added:
trunk/test-applications/regressionArea/regressionArea-tests/src/main/
trunk/test-applications/regressionArea/regressionArea-tests/src/main/resources/
trunk/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6267/
trunk/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6267/Test.java
Modified:
trunk/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml
Log:
https://jira.jboss.org/jira/browse/RF-6267
Copied: trunk/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6267/Test.java (from rev 12931, trunk/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6035/Test.java)
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6267/Test.java (rev 0)
+++ trunk/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6267/Test.java 2009-03-17 14:11:16 UTC (rev 12979)
@@ -0,0 +1,50 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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 library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+package org.richfaces.testng.rf6267;
+
+import org.richfaces.SeleniumTestBase;
+
+/**
+ * @author Nick Belaevski
+ * @since 3.3.1
+ */
+public class Test extends SeleniumTestBase {
+
+ @org.testng.annotations.Test
+ public void testExecute() throws Exception {
+ renderPage();
+
+ AssertPresent("form:table:5:columns0");
+ AssertNotPresent("form:table:5:columns1");
+ AssertPresent("form:table:5:columns2");
+ AssertPresent("form:table:5:columns3");
+ AssertPresent("form:table:5:columns4");
+ AssertPresent("form:table:5:columns5");
+ }
+
+
+ @Override
+ public String getTestUrl() {
+ return "pages/rf6267.xhtml";
+ }
+}
Modified: trunk/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml 2009-03-17 14:10:58 UTC (rev 12978)
+++ trunk/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml 2009-03-17 14:11:16 UTC (rev 12979)
@@ -29,6 +29,7 @@
<package name="org.richfaces.testng.rf5948" />
<package name="org.richfaces.testng.rf5933" />
<package name="org.richfaces.testng.rf6035" />
+ <package name="org.richfaces.testng.rf6267" />
</packages>
</test>
</suite>
15 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r12978 - in trunk/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues: rf6267 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-03-17 10:10:58 -0400 (Tue, 17 Mar 2009)
New Revision: 12978
Added:
trunk/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6267/
trunk/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6267/Bean.java
Log:
https://jira.jboss.org/jira/browse/RF-6267
Added: trunk/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6267/Bean.java
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6267/Bean.java (rev 0)
+++ trunk/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6267/Bean.java 2009-03-17 14:10:58 UTC (rev 12978)
@@ -0,0 +1,50 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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 library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.regressionarea.issues.rf6267;
+
+import java.util.Arrays;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+/**
+ * This test case for: <a href="https://jira.jboss.org/jira/browse/RF-6267">RF-6267 -
+ * Columns: NPE when use rendered attribute</a>
+ *
+ * @author Nick Belaevski
+ * @since 3.3.1
+ */
+@Name("rf6267")
+(a)Scope(ScopeType.SESSION)
+public class Bean {
+
+ private static final Object numbers = Arrays.asList(0, 1, 2, 3, 4, 5);
+
+ public Object getNumbers() {
+ return numbers;
+ }
+
+ public boolean isColumnRendered(Object columnNumber) {
+ return ((Integer) columnNumber).intValue() != 1;
+ }
+}
15 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r12977 - trunk/ui/columns/src/main/java/org/richfaces/taglib.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-03-17 09:45:36 -0400 (Tue, 17 Mar 2009)
New Revision: 12977
Modified:
trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java
trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java
Log:
https://jira.jboss.org/jira/browse/RF-6267
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java 2009-03-17 13:32:59 UTC (rev 12976)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java 2009-03-17 13:45:36 UTC (rev 12977)
@@ -95,9 +95,6 @@
/** end attribute */
private TagAttribute end;
- /** rendered attribute */
- private boolean rendered = true;
-
class IterationContext {
/** Iterator for columns's tag value attribute */
@@ -468,17 +465,6 @@
}
}
- private void initRendered(FaceletContext ctx) {
- TagAttribute renderedAttribute = getAttribute("rendered");
- if (renderedAttribute != null) {
- try {
- this.rendered = (Boolean) renderedAttribute.getObject(ctx);
- } catch (ClassCastException e) {
- this.rendered = true;
- }
- }
- }
-
/*
* (non-Javadoc)
*
@@ -489,11 +475,6 @@
public void apply(FaceletContext ctx, UIComponent parent)
throws IOException, FacesException, ELException {
- initRendered(ctx);
- if(!rendered){
- return;
- }
-
IterationContext iterationContext = new IterationContext();
iterationContextLocal.set(iterationContext);
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2009-03-17 13:32:59 UTC (rev 12976)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2009-03-17 13:45:36 UTC (rev 12977)
@@ -35,7 +35,6 @@
import javax.el.ValueExpression;
import javax.el.VariableMapper;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.webapp.UIComponentClassicTagBase;
import javax.servlet.jsp.JspException;
@@ -245,9 +244,6 @@
*/
private ValueExpression _rendered;
- /** boolean value of rendered attr */
- private boolean rendered = true;
-
/**
* SortOrder is an enumeration of the possible sort orderings. Setter for
* sortOrder
@@ -290,10 +286,6 @@
public int doStartTag() throws JspException {
pageId = getId();
- initRendered();
- if(!rendered){
- return SKIP_BODY;
- }
prepare();
if (hasNext()) {
@@ -343,9 +335,6 @@
*/
@Override
public int doEndTag() throws JspException {
- if(!rendered){
- return EVAL_PAGE;
- }
if (!atFirst()) {
return super.doEndTag();
}
@@ -687,20 +676,6 @@
}
/**
- * Extracts boolean value from index rendered
- */
- private void initRendered() {
- if (_rendered != null) {
- try {
- rendered = (Boolean) _rendered.getValue(getELContext());
- } catch (ClassCastException e) {
- rendered = true;
- }
-
- }
- }
-
- /**
* Return true if we didn't complete column's count
*
* @return
15 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r12976 - in trunk/test-applications/realworld2/web/src/main/webapp: stylesheet and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-17 09:32:59 -0400 (Tue, 17 Mar 2009)
New Revision: 12976
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
Log:
Realworld: correct pages
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-17 13:26:51 UTC (rev 12975)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-17 13:32:59 UTC (rev 12976)
@@ -24,8 +24,8 @@
position: absolute;
font-weight: bold;
color: #ffffff;
- right: 25px;
- top: 49px;
+ right: 20px;
+ top: 45px;
}
.top-right-menu {
@@ -110,7 +110,8 @@
}
.logged-user {
- color: #FF7D2A
+ color: #FF7D2A;
+ padding:0 8px 0 0;
}
.main-menu-toolbar {
@@ -703,4 +704,17 @@
color : #DF6400;
text-decoration: underline;
cursor: pointer;
+}
+
+.top-right-bottom-menu-item {
+ vertical-align: top;
+ padding: 0px;
+}
+
+.top-right-bottom-menu-item-link a{
+ font-size: 11px;
+ color: #ffffff;
+ text-decoration: none;
+ font-weight: normal;
+ padding: 0px 0px 0px 15px;
}
\ No newline at end of file
15 years, 6 months
- 1
- 0