You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2006/11/02 10:01:31 UTC
svn commit: r470283 - in /myfaces/tobago/trunk/example/demo: ./
src/main/java/org/apache/myfaces/tobago/example/demo/overview/
src/main/webapp/WEB-INF/ src/main/webapp/WEB-INF/classes/
src/main/webapp/overview/
Author: weber
Date: Thu Nov 2 01:01:30 2006
New Revision: 470283
URL: http://svn.apache.org/viewvc?view=rev&rev=470283
Log:
working on TOBAGO-167 (Enable rendering popups by ajax request)
undoing accidencial commit on example/demo
Modified:
myfaces/tobago/trunk/example/demo/pom.xml
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/classes/log4j.xml
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tobago-config.xml
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheetControl.jsp
Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/pom.xml?view=diff&rev=470283&r1=470282&r2=470283
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Thu Nov 2 01:01:30 2006
@@ -74,14 +74,6 @@
<artifactId>tobago-theme-richmond</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>de.inexso.erm</groupId>
- <artifactId>tobago-theme-inexso</artifactId>
- <version>3.5.2-SNAPSHOT</version>
- </dependency>
-
-
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-standard</artifactId>
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java?view=diff&rev=470283&r1=470282&r2=470283
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java Thu Nov 2 01:01:30 2006
@@ -21,16 +21,11 @@
* $Id: $
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.faces.model.SelectItem;
public class SheetConfig {
- private static final Log LOG = LogFactory.getLog(SheetConfig.class);
-
private static final String[] SHEET_PAGER_POSITION_KEYS = {
"none",
"left",
@@ -72,21 +67,11 @@
}
- public String openConfig() {
- sheetConfigPopup = true;
+ public String configSheet() {
+ sheetConfigPopup = !sheetConfigPopup;
return null;
}
- public String closeConfig() {
- sheetConfigPopup = false;
- return null;
- }
-
- public String applyConfig() {
- sheetConfigPopup = false;
- return "";
- }
-
private SelectItem[] createSheetItems(Object[] values) {
SelectItem[] items = new SelectItem[values.length];
@@ -128,12 +113,10 @@
}
public boolean isSheetConfigPopup() {
- LOG.info("isSheetConfigPopup = \"" + sheetConfigPopup + "\"");
return sheetConfigPopup;
}
public void setSheetConfigPopup(boolean sheetConfigPopup) {
- LOG.info("setSheetConfigPopup to \"" + sheetConfigPopup + "\"");
this.sheetConfigPopup = sheetConfigPopup;
}
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/classes/log4j.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/classes/log4j.xml?view=diff&rev=470283&r1=470282&r2=470283
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/classes/log4j.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/classes/log4j.xml Thu Nov 2 01:01:30 2006
@@ -21,7 +21,7 @@
<log4j:configuration>
<appender name="logfile" class="org.apache.log4j.FileAppender">
- <param name="File" value="/tmp/tobago-example-demo.log" />
+ <param name="File" value="tobago-example-demo.log" />
<param name="Append" value="true" />
<param name="Encoding" value="UTF-8" />
<layout class="org.apache.log4j.PatternLayout">
@@ -102,7 +102,7 @@
</category>-->
<root>
- <priority value="info" />
+ <priority value="error" />
<appender-ref ref="logfile" />
</root>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tobago-config.xml?view=diff&rev=470283&r1=470282&r2=470283
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tobago-config.xml Thu Nov 2 01:01:30 2006
@@ -22,8 +22,7 @@
<tobago-config>
<theme-config>
- <default-theme>inexso</default-theme>
- <supported-theme>speyside</supported-theme>
+ <default-theme>speyside</default-theme>
<supported-theme>scarborough</supported-theme>
<supported-theme>richmond</supported-theme>
<supported-theme>charlotteville</supported-theme>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp?view=diff&rev=470283&r1=470282&r2=470283
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp Thu Nov 2 01:01:30 2006
@@ -43,7 +43,7 @@
suggestMethod="#{overviewController.getInputSuggestItems}" />
<tx:date value="#{overviewController.basicDate}"
label="#{overviewBundle.basic_dateLabel}" required="true" >
- <f:convertDateTime pattern="dd.MM.yyyy HH:mm" />
+ <f:convertDateTime pattern="dd.MM.yyyy" />
</tx:date>
<tx:time label="#{overviewBundle.basic_timeLabel}"
value="#{overviewController.basicTime}" />
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheetControl.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheetControl.jsp?view=diff&rev=470283&r1=470282&r2=470283
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheetControl.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheetControl.jsp Thu Nov 2 01:01:30 2006
@@ -33,15 +33,12 @@
</f:facet>
<f:facet name="toolBar" >
<tc:toolBar >
- <tc:toolBarCommand action="#{overviewController.sheetConfig.openConfig}"
- onclick="Tobago.openPopupWithAction('page:sheetConfigPopup', '@autoId')"
+ <tc:toolBarCommand action="#{overviewController.sheetConfig.configSheet}"
label="#"
tip="#{overviewBundle.sheet_configTip}" />
<f:facet name="popup" >
<tc:popup width="300" height="270"
- rendered="#{overviewController.sheetConfig.sheetConfigPopup}"
- id="sheetConfigPopup"
- reset="true">
+ rendered="#{overviewController.sheetConfig.sheetConfigPopup}">
<tc:box label="#{overviewBundle.sheet_configTitle}" >
<f:facet name="layout">
<tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;1*;fixed"/>
@@ -100,13 +97,12 @@
<tc:gridLayout columns="100px;1*;100px"
marginLeft="10px" marginRight="10px"/>
</f:facet>
- <tc:button onclick="Tobago.closePopup('page:sheetConfigPopup')"
- id="cancel"
+ <tc:button action="#{overviewController.sheetConfig.configSheet}"
immediate="true"
label="Cancel" />
<tc:cell />
- <tc:button action="#{overviewController.sheetConfig.applyConfig}"
+ <tc:button action="#{overviewController.sheetConfig.configSheet}"
label="Ok" />
</tc:cell>
@@ -117,7 +113,7 @@
</f:facet>
<tc:sheet value="#{demo.solarList}" id="sheet"
- columns="fixed;3*;1*;3*;3*;3*;3*" var="luminary"
+ columns="3*;1*;3*;3*;3*;3*" var="luminary"
state="#{demo.sheetState}"
showHeader="#{overviewController.sheetConfig.sheetShowHeader}"
showRowRange="#{overviewController.sheetConfig.sheetRowPagingPosition}"
@@ -129,10 +125,9 @@
stateChangeListener="#{demo.stateChangeListener}"
sortActionListener="#{overviewController.sheetSorter}"
selectable="#{overviewController.sheetConfig.selectable}">
- <%--<f:facet name="reload">--%>
- <%--<tc:reload frequency="5000" /> --%>
- <%--</f:facet>--%>
- <tc:columnSelector/>
+ <f:facet name="reload">
+ <tc:reload frequency="5000" />
+ </f:facet>
<tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
<tc:out value="#{luminary.name}" id="t_name" />
</tc:column>