You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ck...@apache.org on 2010/03/31 09:33:34 UTC
svn commit: r929410 - in /myfaces/trinidad/trunk:
trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/navigation/train/
trinidad-examples/trinidad-components-showcase/src/main/webapp/components/naviga...
Author: ckormos
Date: Wed Mar 31 07:33:34 2010
New Revision: 929410
URL: http://svn.apache.org/viewvc?rev=929410&view=rev
Log:
Patch applied for [TRINIDAD-1766] - Train look and feel improvement (Thanks to Adonis Raduca)
Modified:
myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/navigation/train/TrainBean.java
myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/companyInfo.xhtml
myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/generalInfo.xhtml
myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/jsfSurvey.xhtml
myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/trinidadSurvey.xhtml
myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/youAreDone.xhtml
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/navigation/train/TrainBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/navigation/train/TrainBean.java?rev=929410&r1=929409&r2=929410&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/navigation/train/TrainBean.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/navigation/train/TrainBean.java Wed Mar 31 07:33:34 2010
@@ -52,15 +52,15 @@ public class TrainBean extends ProcessMe
}
public void addList() {
- TrainNavigationItem page1 = new TrainNavigationItem("General info", "trainGeneralInfo");
+ TrainNavigationItem page1 = new TrainNavigationItem("1. General info", "trainGeneralInfo");
page1.setViewId("/components/navigation/train/generalInfo.xhtml");
- TrainNavigationItem page2 = new TrainNavigationItem("Company info", "trainCompanyInfo");
+ TrainNavigationItem page2 = new TrainNavigationItem("2. Company info", "trainCompanyInfo");
page2.setViewId("/components/navigation/train/companyInfo.xhtml");
- TrainNavigationItem page3 = new TrainNavigationItem("JSF survey", "trainJsfSurvey");
+ TrainNavigationItem page3 = new TrainNavigationItem("3. JSF survey", "trainJsfSurvey");
page3.setViewId("/components/navigation/train/jsfSurvey.xhtml");
- TrainNavigationItem page4 = new TrainNavigationItem("Trinidad survey", "trainTrinidadSurvey");
+ TrainNavigationItem page4 = new TrainNavigationItem("4. Trinidad survey", "trainTrinidadSurvey");
page4.setViewId("/components/navigation/train/trinidadSurvey.xhtml");
- TrainNavigationItem page5 = new TrainNavigationItem("You are done!", "trainYouAreDone");
+ TrainNavigationItem page5 = new TrainNavigationItem("5. You are done!", "trainYouAreDone");
page5.setViewId("/components/navigation/train/youAreDone.xhtml");
arrayList.add(page1);
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/companyInfo.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/companyInfo.xhtml?rev=929410&r1=929409&r2=929410&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/companyInfo.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/companyInfo.xhtml Wed Mar 31 07:33:34 2010
@@ -42,26 +42,26 @@
</f:facet>
</tr:train>
- <tr:spacer height="10px"/>
+ <tr:spacer height="20px"/>
<tr:panelHorizontalLayout>
<tr:outputText value="Company Name"/>
<tr:inputText/>
</tr:panelHorizontalLayout>
<tr:panelHorizontalLayout>
<tr:outputText value="Activity Domain"/>
- <tr:spacer width="1" height="40"/>
+ <tr:spacer width="3" height="40"/>
<tr:inputText/>
</tr:panelHorizontalLayout>
<tr:panelHorizontalLayout>
<tr:outputText value="Your Title"/>
- <tr:spacer width="36" height="10"/>
+ <tr:spacer width="38" height="10"/>
<tr:inputText/>
</tr:panelHorizontalLayout>
- <tr:spacer height="20px"/>
+ <tr:spacer height="10px"/>
<tr:panelHorizontalLayout>
<tr:commandButton text="< Back" action="trainGeneralInfo"/>
- <tr:spacer height="10" width="200px"/>
+ <tr:spacer width="5px"/>
<tr:commandButton text="Next >" action="trainJsfSurvey"/>
</tr:panelHorizontalLayout>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/generalInfo.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/generalInfo.xhtml?rev=929410&r1=929409&r2=929410&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/generalInfo.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/generalInfo.xhtml Wed Mar 31 07:33:34 2010
@@ -42,7 +42,7 @@
</f:facet>
</tr:train>
- <tr:spacer height="10px"/>
+ <tr:spacer height="20px"/>
<tr:panelHorizontalLayout>
<tr:outputText value="Your Name"/>
<tr:spacer width="10" height="10"/>
@@ -59,10 +59,9 @@
<tr:selectBooleanRadio group="Gender" text="male" selected="true"/>
<tr:selectBooleanRadio group="Gender" text="female"/>
</tr:panelHorizontalLayout>
- <tr:spacer height="20px"/>
+ <tr:spacer height="10px"/>
<tr:panelHorizontalLayout>
- <tr:spacer height="10" width="268px"/>
<tr:commandButton text="Next >" action="trainCompanyInfo"/>
</tr:panelHorizontalLayout>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/jsfSurvey.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/jsfSurvey.xhtml?rev=929410&r1=929409&r2=929410&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/jsfSurvey.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/jsfSurvey.xhtml Wed Mar 31 07:33:34 2010
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-
+
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
@@ -42,10 +42,10 @@
</f:facet>
</tr:train>
- <tr:spacer height="10px"/>
+ <tr:spacer height="20px"/>
<tr:panelHorizontalLayout>
<tr:outputText value="Your JSF knowledge level"/>
- <tr:spacer width="53" height="10"/>
+ <tr:spacer width="55" height="10"/>
<tr:selectOneChoice>
<f:selectItem itemLabel="Beginner"/>
<f:selectItem itemLabel="Medium"/>
@@ -54,18 +54,18 @@
</tr:panelHorizontalLayout>
<tr:panelHorizontalLayout>
<tr:outputText value="How often do you use JSF"/>
- <tr:spacer width="50" height="40"/>
+ <tr:spacer width="52" height="40"/>
<tr:inputText/>
</tr:panelHorizontalLayout>
<tr:panelHorizontalLayout>
<tr:outputText value="Your favorite JSF component library"/>
<tr:inputText/>
</tr:panelHorizontalLayout>
- <tr:spacer height="20px"/>
+ <tr:spacer height="10px"/>
<tr:panelHorizontalLayout>
<tr:commandButton text="< Back" action="trainCompanyInfo"/>
- <tr:spacer height="10" width="200px"/>
+ <tr:spacer width="5px"/>
<tr:commandButton text="Next >" action="trainTrinidadSurvey"/>
</tr:panelHorizontalLayout>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/trinidadSurvey.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/trinidadSurvey.xhtml?rev=929410&r1=929409&r2=929410&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/trinidadSurvey.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/trinidadSurvey.xhtml Wed Mar 31 07:33:34 2010
@@ -42,14 +42,14 @@
</f:facet>
</tr:train>
- <tr:spacer height="10px"/>
+ <tr:spacer height="20px"/>
<tr:panelHorizontalLayout>
<tr:outputText value="How did you learn about Trinidad"/>
<tr:inputText/>
</tr:panelHorizontalLayout>
<tr:panelHorizontalLayout>
<tr:outputText value="Your Trinidad knowledge level"/>
- <tr:spacer width="18" height="40"/>
+ <tr:spacer width="21" height="40"/>
<tr:selectOneChoice>
<f:selectItem itemLabel="Beginner"/>
<f:selectItem itemLabel="Medium"/>
@@ -60,11 +60,11 @@
<tr:outputText value="Your opinion regarding this framework"/>
<tr:inputText rows="5"/>
</tr:panelGroupLayout>
- <tr:spacer height="20px"/>
+ <tr:spacer height="10px"/>
<tr:panelHorizontalLayout>
<tr:commandButton text="< Back" action="trainJsfSurvey"/>
- <tr:spacer height="10" width="200px"/>
+ <tr:spacer width="5px"/>
<tr:commandButton text="Next >" action="trainYouAreDone"/>
</tr:panelHorizontalLayout>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/youAreDone.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/youAreDone.xhtml?rev=929410&r1=929409&r2=929410&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/youAreDone.xhtml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/navigation/train/youAreDone.xhtml Wed Mar 31 07:33:34 2010
@@ -42,13 +42,13 @@
</f:facet>
</tr:train>
- <tr:spacer height="10px"/>
+ <tr:spacer height="20px"/>
<tr:outputFormatted styleUsage="instruction"
value="<b>Thanks for your feedback!</b>"/>
<tr:spacer height="15"/>
<tr:outputFormatted styleUsage="instruction"
value="and enjoy using <b>Trinidads</b> component library"/>
- <tr:spacer height="20px"/>
+ <tr:spacer height="10px"/>
<tr:commandButton text="< Back" action="trainTrinidadSurvey"/>
</ui:define>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css?rev=929410&r1=929409&r2=929410&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css Wed Mar 31 07:33:34 2010
@@ -290,6 +290,14 @@
-tr-rule-ref: selector(".CBBorderSolidLook:alias");
border-color: #699ABB;
}
+.CBBorderAccentedSolidLookVisited:alias {
+ -tr-rule-ref: selector(".CBBorderSolidLook:alias");
+ border-color: #B5ABA2;
+}
+.CBBorderAccentedSolidLookVisitedHover:alias {
+ -tr-rule-ref: selector(".CBBorderSolidLook:alias");
+ border-color: #9A8D84;
+}
/* Strong borders -------------------------------------- */
.CBBorderStrongSolidLook:alias {
@@ -458,6 +466,16 @@
-tr-rule-ref: selector(".CBBorderAccentedSolidLookSelectedHover:alias");
background: white url(/adf/images/casablanca/backgrounds/buttonLikeHeadSelectedHover.png) repeat-x top left;
}
+.CBButtonLookVisited:alias {
+ -tr-rule-ref: selector(".CBButtonLookCommon:alias");
+ -tr-rule-ref: selector(".CBBorderAccentedSolidLookVisited:alias");
+ background: white url(/adf/images/casablanca/backgrounds/buttonLikeHeadVisited.png) repeat-x top left;
+}
+.CBButtonLookVisitedHover:alias {
+ -tr-rule-ref: selector(".CBButtonLookCommon:alias");
+ -tr-rule-ref: selector(".CBBorderAccentedSolidLookVisitedHover:alias");
+ background: white url(/adf/images/casablanca/backgrounds/buttonLikeHeadVisitedHover.png) repeat-x top left;
+}
.CBButtonLookDisabled:alias {
-tr-rule-ref: selector(".CBButtonLookCommon:alias");
-tr-rule-ref: selector(".CBBorderNormalSolidLook:alias");
@@ -759,7 +777,7 @@
.CBButtonCommon:alias {
-tr-rule-ref: selector(".CBRoundedAllCornersLook:alias");
}
-@agent ie and (version: 5), ie and (version: 6), ie and (version: 7) {
+@agent ie and (version: 5), ie and (version: 6) {
.CBButtonCommon:alias {
width: 1%;
overflow: visible;
@@ -1191,10 +1209,12 @@
/* Train Control ---------------------------------------------------------------------------------------------------- */
.CBTrain:alias {
-
+ background: white url(/adf/images/casablanca/backgrounds/trainConnector.png) repeat-x center left;
}
.CBTrainStopCommon:alias {
-tr-rule-ref: selector(".CBRoundedAllCornersLook:alias");
+ padding: 8px 8px;
+ white-space: nowrap;
}
.CBTrainStopUnvisited:alias {
-tr-rule-ref: selector(".CBButtonLook:alias");
@@ -1205,11 +1225,11 @@
-tr-rule-ref: selector(".CBTrainStopCommon:alias");
}
.CBTrainStopVisited:alias {
- -tr-rule-ref: selector(".CBButtonLookSelected:alias");
+ -tr-rule-ref: selector(".CBButtonLookVisited:alias");
-tr-rule-ref: selector(".CBTrainStopCommon:alias");
}
.CBTrainStopVisitedHover:alias {
- -tr-rule-ref: selector(".CBButtonLookSelectedHover:alias");
+ -tr-rule-ref: selector(".CBButtonLookVisitedHover:alias");
-tr-rule-ref: selector(".CBTrainStopCommon:alias");
}
.CBTrainStopSelected:alias {
@@ -3440,8 +3460,11 @@ af|singleStepButtonBar af|singleStepButt
-tr-rule-ref: selector(".CBTrainStopSelectedHover:alias");
}
/* Inject CasaBlanca styles */
+af|train {
+ -tr-rule-ref: selector(".CBTrain");
+}
af|train::stop {
- -tr-rule-ref: selector(".CBTrainStop");
+ -tr-rule-ref: selector(".CBTrainStop");
}
.p_AFSelected af|train::link {
-tr-rule-ref: selector(".CBTrainStopSelected");
@@ -3461,6 +3484,16 @@ af|train::stop {
.p_AFUnvisited af|train::link:hover {
-tr-rule-ref: selector(".CBTrainStopUnvisitedHover");
}
+/* Clear some legacy stuff */
+af|train::join {
+ display: none ! important;
+}
+af|train::stop-icon-cell {
+ display: none ! important;
+}
+af|train table {
+ width: auto ! important;
+}
/* Table component -------------------------------------------------------------------------------------------------- */
/* CasaBlanca styles */