[jboss-cvs] jboss-seam/examples/contactlist/view ...
Gavin King
gavin.king at jboss.com
Sat Oct 7 13:38:54 EDT 2006
User: gavin
Date: 06/10/07 13:38:54
Modified: examples/contactlist/view editContact.xhtml screen.css
search.xhtml viewContact.xhtml
Log:
improved css, take advantage of view parameters in command links
Revision Changes Path
1.4 +10 -13 jboss-seam/examples/contactlist/view/editContact.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: editContact.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/contactlist/view/editContact.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- editContact.xhtml 6 Oct 2006 00:23:41 -0000 1.3
+++ editContact.xhtml 7 Oct 2006 17:38:54 -0000 1.4
@@ -12,7 +12,7 @@
</head>
<body>
- <div class="menuButton">
+ <div class="menuButtons">
<s:link view="/search.xhtml" value="Search Contacts"/>
<s:link view="/editContact.xhtml" value="Create New Contact">
<f:param name="contactId"/> <!-- suppress propagation of contact id page parameter -->
@@ -85,18 +85,15 @@
</s:validateAll>
<!-- actions -->
- <div class="actionButton">
- <h:commandLink action="#{contactActions.update}" value="Update Contact" rendered="#{contactActions.managed}">
- <f:param name="contactId" value="#{contact.id}"/>
- </h:commandLink>
- <h:outputText rendered="#{contactActions.managed}" value="  "/>
- <h:commandLink action="#{contactActions.remove}" value="Delete Contact" rendered="#{contactActions.managed}">
- <f:param name="contactId" value="#{contact.id}"/>
- </h:commandLink>
- <h:commandLink action="#{contactActions.persist}" value="Create Contact" rendered="#{!contactActions.managed}"/>
-   
+ <div class="actionButtons">
+
+ <h:commandLink action="#{contactActions.update}" value="Update Contact" rendered="#{contactActions.managed}"/>
+ <s:link action="#{contactActions.remove}" value="Delete Contact" rendered="#{contactActions.managed}"/>
<s:link view="/viewContact.xhtml" value="Cancel" rendered="#{contactActions.managed}"/>
+
+ <h:commandLink action="#{contactActions.persist}" value="Create Contact" rendered="#{!contactActions.managed}"/>
<s:link view="/search.xhtml" value="Cancel" rendered="#{!contactActions.managed}"/>
+
</div>
</h:form>
1.3 +64 -60 jboss-seam/examples/contactlist/view/screen.css
(In the diff below, changes in quantity of whitespace are not shown.)
Index: screen.css
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/contactlist/view/screen.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- screen.css 6 Oct 2006 01:20:24 -0000 1.2
+++ screen.css 7 Oct 2006 17:38:54 -0000 1.3
@@ -1,60 +1,67 @@
-a:active,a:link,a:visited,a:hover {
- color:#0D5798;
+a:active, a:link, a:visited {
+ color: #0D5798;
+}
+a:hover {
+ color: #8CAFCD;
}
-.menuButton {
- background-color:#8CAFCD;
- padding-top:10px;
- padding-bottom:10px;
-}
-.menuButton a {
- font-weight:bold;
- text-decoration:none;
- padding-left:25px;
- padding-right:25px;
-}
-.menuButton a:active,.menuButton a:link,.menuButton a:visited {
- font-family:Arial,sans-serif;
- background-color:#8CAFCD;
+.menuButtons {
+ background-color: #8CAFCD;
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
+.menuButtons a {
+ font-weight: bold;
+ text-decoration: none;
+ padding-left: 25px;
+ padding-right: 25px;
+}
+.menuButtons a:active, .menuButtons a:link, .menuButtons a:visited {
+ font-family: Arial,sans-serif;
+ background-color: #8CAFCD;
color: white;
border-right: 1px solid white;
}
-.menuButton a:hover {
- font-family:Arial,sans-serif;
+.menuButtons a:hover {
+ font-family: Arial,sans-serif;
background-color: white;
- color:#8CAFCD;
+ color: #8CAFCD;
}
-.actionButton {
- width:100%;
- text-align:center;
+.actionButtons {
+ width: 100%;
+ text-align: center;
+ padding-top: 10px;
}
.tableControl {
- width:100%;
- text-align:right;
+ width: 100%;
+ text-align: right;
+ padding-top: 15px;
}
-.actionButton a, .tableControl a {
- font-family:Arial,sans-serif;
- font-weight:bold;
+.actionButtons a, .tableControl a {
+ font-family: Arial,sans-serif;
+ font-weight: bold;
color: #578BB8;
border: 1px solid #578BB8;
- text-decoration:none;
- padding:5px;
+ text-decoration: none;
+ padding: 5px;
+ margin: 5px;
}
-.actionButton a:hover, .tableControl a:hover {
+.actionButtons a:hover, .tableControl a:hover {
color: white;
background-color: #578BB8;
+ margin: 5px;
}
h1 {
- font-family:Arial,sans-serif;
- color:#578BB8;
- font-size:1.6em;
+ font-family: Arial,sans-serif;
+ color: #578BB8;
+ font-size: 1.6em;
}
body {
- margin:0px;
- font-family:Arial,sans-serif;
+ margin: 0px;
+ font-family: Arial,sans-serif;
color: #616161;
}
@@ -65,38 +72,36 @@
table {
width: 100%;
- margin-bottom: 20px;
}
th {
- background-color:#578BB8;
- color:white;
- width:30px;
- font-family:Arial,sans-serif;
- padding:5px;
+ background-color: #578BB8;
+ color: white;
+ font-family: Arial,sans-serif;
+ padding: 5px;
}
td {
- background-color:#F0F0F0;
- text-align:center;
+ background-color: #F0F0F0;
+ text-align: center;
}
.narrow {
- width:20%;
+ width: 20%;
}
.wide {
- width:80%;
+ width: 80%;
}
.first td {
- background-color:#F0F0F0;
+ background-color: #F0F0F0;
}
.second td {
- background-color:white;
+ background-color: white;
}
.dialog
{
padding: 15px;
- background-color:#F0F0F0;
- margin:20px;
+ background-color: #F0F0F0;
+ margin: 10px;
}
.dialog label{
@@ -105,33 +110,32 @@
}
.dialog .textfield {
width: 180px;
- margin-bottom: 5px;
}
.message {
border: 1px solid #FFCC00;
padding: 5px;
- margin-top:10px;
- margin-bottom:10px;
- background-color:#F0F0F0;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ background-color: #F0F0F0;
}
.prop {
padding: 5px;
}
.prop .name {
- font-weight:bold;
- text-align:left;
- width:110px;
+ font-weight: bold;
+ text-align: left;
+ width: 110px;
}
.prop .value {
- text-align:left;
- width:200px;
+ text-align: left;
+ width: 200px;
}
.value input {
width:190px;
}
.prop .errors {
color: red;
- text-align:left;
+ text-align: left;
}
1.5 +6 -3 jboss-seam/examples/contactlist/view/search.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: search.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/contactlist/view/search.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- search.xhtml 6 Oct 2006 02:58:44 -0000 1.4
+++ search.xhtml 7 Oct 2006 17:38:54 -0000 1.5
@@ -12,7 +12,7 @@
</head>
<body>
- <div class="menuButton">
+ <div class="menuButtons">
<s:link view="/search.xhtml" value="Search Contacts"/>
<s:link view="/editContact.xhtml" value="Create New Contact"/>
</div>
@@ -70,20 +70,23 @@
<!-- pagination control -->
<div class="tableControl">
+
<s:link view="/search.xhtml" rendered="#{contacts.previousExists}" value="<< First Page">
<f:param name="firstResult" value="0"/>
</s:link>
- <h:outputText rendered="#{contacts.previousExists}" value="  "/>
+
<s:link view="/search.xhtml" rendered="#{contacts.previousExists}" value="< Previous Page">
<f:param name="firstResult" value="#{contacts.previousFirstResult}"/>
</s:link>
- <h:outputText rendered="#{contacts.previousExists}" value="  "/>
+
<s:link view="/search.xhtml" rendered="#{contacts.nextExists}" value="Next Page >">
<f:param name="firstResult" value="#{contacts.nextFirstResult}"/>
</s:link>
+
<s:link view="/search.xhtml" rendered="#{contacts.nextExists}" value="Last Page >>">
<f:param name="firstResult" value="#{contacts.lastFirstResult}"/>
</s:link>
+
</div>
</div>
1.5 +5 -10 jboss-seam/examples/contactlist/view/viewContact.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: viewContact.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/contactlist/view/viewContact.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- viewContact.xhtml 6 Oct 2006 01:20:24 -0000 1.4
+++ viewContact.xhtml 7 Oct 2006 17:38:54 -0000 1.5
@@ -12,7 +12,7 @@
</head>
<body>
- <div class="menuButton">
+ <div class="menuButtons">
<s:link view="/search.xhtml" value="Search Contacts"/>
<s:link view="/editContact.xhtml" value="Create New Contact">
<f:param name="contactId"/> <!-- suppress propagation of contact id page parameter -->
@@ -79,12 +79,9 @@
</div>
<!-- actions -->
- <div class="actionButton">
+ <div class="actionButtons">
<s:link view="/editContact.xhtml" value="Edit Contact"/>
-   
- <s:link action="#{contactActions.remove}" value="Delete Contact" rendered="#{contactActions.managed}">
- <f:param name="contactId" value="#{contact.id}"/>
- </s:link>
+ <s:link action="#{contactActions.remove}" value="Delete Contact" rendered="#{contactActions.managed}"/>
</div>
<!-- associations -->
@@ -125,10 +122,8 @@
</div>
<!-- actions -->
- <div class="actionButton">
- <h:commandLink action="#{commentActions.persist}" value="Create Comment">
- <f:param name="contactId" value="#{contact.id}"/>
- </h:commandLink>
+ <div class="actionButtons">
+ <h:commandLink action="#{commentActions.persist}" value="Create Comment"/>
</div>
</h:form>
More information about the jboss-cvs-commits
mailing list