Author: alexsmirnov
Date: 2007-11-27 19:50:15 -0500 (Tue, 27 Nov 2007)
New Revision: 4301
Added:
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/master.css
Modified:
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/AjaxPortletBridge.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ContextAttributesMap.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ContextMap.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/conversations.xhtml
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/screen.css
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/trailblazer_main.css
Log:
Fix some issues with Seam portlet sample
Modified:
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/AjaxPortletBridge.java
===================================================================
---
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/AjaxPortletBridge.java 2007-11-27
20:24:22 UTC (rev 4300)
+++
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/AjaxPortletBridge.java 2007-11-28
00:50:15 UTC (rev 4301)
@@ -148,8 +148,9 @@
AjaxContext ajaxContext = AjaxContext
.getCurrentInstance(facesContext);
Map commonAjaxParameters = ajaxContext.getCommonAjaxParameters();
+ String actionURL =
facesContext.getApplication().getViewHandler().getActionURL(facesContext,
facesContext.getViewRoot().getViewId());
commonAjaxParameters.put(AbstractExternalContext.ACTION__PARAMETER,
- response.createActionURL().toString());
+ facesContext.getExternalContext().encodeActionURL(actionURL));
commonAjaxParameters.put(
AbstractExternalContext.PORTLET_MODE_PARAMETER, request
.getPortletMode().toString());
Modified:
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ContextAttributesMap.java
===================================================================
---
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ContextAttributesMap.java 2007-11-27
20:24:22 UTC (rev 4300)
+++
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ContextAttributesMap.java 2007-11-28
00:50:15 UTC (rev 4301)
@@ -18,6 +18,13 @@
return getAttribute(key.toString());
}
+ public boolean containsKey(Object key) {
+ if (null == key) {
+ throw new NullPointerException();
+ }
+ return null != getAttribute(key.toString());
+ }
+
public Object put(Object key, Object value) {
if (null == key) {
throw new NullPointerException();
Modified:
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ContextMap.java
===================================================================
---
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ContextMap.java 2007-11-27
20:24:22 UTC (rev 4300)
+++
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/ContextMap.java 2007-11-28
00:50:15 UTC (rev 4301)
@@ -23,6 +23,7 @@
import java.util.AbstractMap;
import java.util.AbstractSet;
import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
@@ -44,7 +45,10 @@
*
*/
abstract class ContextMap extends AbstractMap {
+
private transient volatile Set keySet;
+
+ private transient volatile Set entrySet;
/*
*
@@ -56,14 +60,41 @@
*
*/
public Set entrySet() {
- Set entries = new HashSet();
- for (Enumeration e = getEnumeration(); e.hasMoreElements();) {
- String paramName = (String) e.nextElement();
- if (isValidParameter(paramName)) {
- entries.add(new Entry(paramName, get(paramName)));
- }
+ if(this.entrySet == null){
+ this.entrySet = new AbstractSet<Entry>(){
+
+ @Override
+ public Iterator<org.ajax4jsf.portlet.context.ContextMap.Entry> iterator() {
+ return new Iterator<Entry>(){
+
+ private Enumeration enumeration = getEnumeration();
+
+ public boolean hasNext() {
+ return enumeration.hasMoreElements();
+ }
+
+ public org.ajax4jsf.portlet.context.ContextMap.Entry next() {
+ Object key = enumeration.nextElement();
+ return new Entry(key, get(key));
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+
+ };
+ }
+
+ @Override
+ public int size() {
+ return ContextMap.this.size();
+ }
+
+
+ };
}
- return entries;
+
+ return this.entrySet;
}
protected boolean isValidParameter(String paramName) {
@@ -78,14 +109,7 @@
}
public int size() {
- Enumeration enumeration = getEnumeration();
- int size = 0;
- while (enumeration.hasMoreElements()) {
- enumeration.nextElement();
- size++;
- }
- ;
- return size;
+ return ContextMap.this.size();
}
};
}
@@ -152,28 +176,6 @@
throw new UnsupportedOperationException();
}
- public int hashCode() {
- return ((this.key == null ? 0 : this.key.hashCode()) ^ (this.value == null ? 0
- : this.value.hashCode()));
- }
-
- public boolean equals(Object obj) {
- if ((obj == null) || !(obj instanceof Map.Entry)) {
- return false;
- }
- Map.Entry input = (Map.Entry) obj;
- Object inputKey = input.getKey();
- Object inputValue = input.getValue();
- if ((inputKey == this.key)
- || ((inputKey != null) && inputKey.equals(this.key))) {
- if ((inputValue == this.value)
- || ((inputValue != null) && inputValue
- .equals(this.value))) {
- return true;
- }
- }
- return false;
- }
}
public boolean equals(Object obj) {
@@ -182,4 +184,18 @@
}
return super.equals(obj);
}
+
+ /**
+ * @return
+ */
+ public int size() {
+ Enumeration enumeration = getEnumeration();
+ int size = 0;
+ while (enumeration.hasMoreElements()) {
+ enumeration.nextElement();
+ size++;
+ }
+ ;
+ return size;
+ }
}
\ No newline at end of file
Modified:
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java
===================================================================
---
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java 2007-11-27
20:24:22 UTC (rev 4300)
+++
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/context/PortletContextImpl.java 2007-11-28
00:50:15 UTC (rev 4301)
@@ -30,6 +30,7 @@
import javax.portlet.PortletSession;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.portlet.faces.Bridge;
import org.ajax4jsf.webapp.WebXml;
@@ -306,6 +307,9 @@
if (null == url) {
throw new NullPointerException("Path to redirect is null");
}
- ((ActionResponse) getResponse()).sendRedirect(url);
+ PortalActionURL actionURL = new PortalActionURL(url);
+ if(url.startsWith("#") || (!actionURL.isInContext(getRequestContextPath()))
|| "true".equalsIgnoreCase(actionURL.getParameter(Bridge.DIRECT_LINK))){
+ ((ActionResponse) getResponse()).sendRedirect(url);
+ }
}
}
Modified:
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml
===================================================================
---
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml 2007-11-27
20:24:22 UTC (rev 4300)
+++
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml 2007-11-28
00:50:15 UTC (rev 4301)
@@ -5,5 +5,8 @@
"http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"><portlet-app>
<portlet>
<portlet-name>seamBookingPortlet</portlet-name>
+ <header-content>
+ <link rel="stylesheet" type="text/css"
href="/css/screen.css" media="screen"/>
+ </header-content>
</portlet>
</portlet-app>
\ No newline at end of file
Modified:
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/conversations.xhtml
===================================================================
---
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/conversations.xhtml 2007-11-27
20:24:22 UTC (rev 4300)
+++
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/conversations.xhtml 2007-11-28
00:50:15 UTC (rev 4301)
@@ -3,12 +3,14 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
-
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:a4j="http://richfaces.org/a4j"
+
xmlns:rich="http://richfaces.org/rich"
xmlns:s="http://jboss.com/products/seam/taglib">
- <div>
+ <a4j:outputPanel ajaxRendered="true">
<div class="section">
- <h1><h:outputText rendered="#{not empty conversationList}"
value="Workspaces"/></h1>
+ <h1><h:outputText value="Workspaces"/></h1>
</div>
<div class="section">
@@ -32,5 +34,5 @@
</h:form>
</div>
- </div>
+ </a4j:outputPanel>
</ui:composition>
\ No newline at end of file
Added: trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/master.css
===================================================================
--- trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/master.css
(rev 0)
+++
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/master.css 2007-11-28
00:50:15 UTC (rev 4301)
@@ -0,0 +1,147 @@
+body {
+ font: normal 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
+}
+
+.align-center {
+ text-align: center;
+}
+
+.align-left {
+ text-align: left;
+}
+
+.align-center-margin {
+ margin: 0 auto 0 auto;
+}
+
+.float-left {
+ float: left;
+}
+
+.float-right {
+ float: right;
+}
+
+.align-left {
+ text-align: left;
+}
+
+.align-right {
+ text-align: right;
+}
+
+.half-width {
+ width: 49%;
+}
+
+.quarter-width {
+ width: 24.9%;
+}
+
+.three-quarter-width {
+ width: 74.9%;
+}
+
+.full-width {
+ width: 100%;
+}
+
+.third-width {
+ width: 32.9%;
+}
+
+.two-third-width {
+ width: 65.5%;
+}
+
+.tenpx-top-bottom {
+ margin: 10px 0 10px 0;
+}
+
+.relative {
+ position:relative
+}
+
+.absolute{
+ position:absolute
+}
+
+p.white-padded{
+ color:#fff;
+ padding:5px;
+}
+
+.clear {
+ clear: both;
+}
+
+img {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+
+ div,
+ form,
+ ul,
+ li{
+ margin: 0;
+ padding: 0;
+}
+
+ul{
+
+}
+
+/*--------------------------------Decoration*/
+
+h2 {
+ font-size: 1.9em;
+ color: #fff;
+ margin: 0;
+ padding: 0;
+}
+
+h3 {
+ font-size: 1.0em;
+ color: #fff;
+ margin: 0;
+ padding: 0;
+}
+
+a {
+ color: #e1d77e;
+}
+
+p {
+ margin: 0;
+ padding: 0;
+}
+
+.white-border {
+ border: 1px solid #fff;
+}
+
+.bold-black {
+ font-size: 1.0em;
+ color: #000;
+}
+
+.yellow {
+ background-color:#FFFF00;
+}
+
+.blue {
+ background-color:#3333CC;
+}
+
+.green {
+ background-color:#009933;
+}
+
+.white {
+ background-color:#fff;
+}
+
+/*---------------------------Main layout*/
+
Property changes on:
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/master.css
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/screen.css
===================================================================
---
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/screen.css 2007-11-27
20:24:22 UTC (rev 4300)
+++
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/screen.css 2007-11-28
00:50:15 UTC (rev 4301)
@@ -1,274 +1,274 @@
-/* Setup defaults since variable in browsers
------------------------------------------------ */
-body, div, span, dd, dt, dl, img, ul, ol, li, p, h1, h2, h3, h4, h5, form, hr, fieldset
{
- margin: 0;
- padding: 0;
-}
-/* Element Defaults
------------------------------------------------ */
-html {
- height: 100%;
- background-color: #DBD4C6;
-}
-img {
- border: 0;
-}
-body {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: small;
- line-height: 1.25em;
- color: #362F2D;
- position: relative;
- width: 760px;
- height: 100%;
- margin-left: auto;
- margin-right: auto;
-}
-.label {
- font-weight: bold;
- color: #5E5147;
-}
-input {
- border: 1px solid #C3BBB6;
- padding: 4px;
- margin: 5px 0;
- background: #fff url(../img/input.bg.gif) 0 0 repeat-x;
-}
-select {
- border: 1px solid #C3BBB6;
- padding: 4px;
- margin: 5px 0;
- background: #fff url(../img/input.bg.gif) 0 0 repeat-x;
-}
-ol, ul {
- margin: 10px 0px 10px 6px;
-}
-li {
- margin: 10px 12px;
-}
-fieldset {
- border: 0;
-}
-/* Layout
------------------------------------------------ */
-#document {
- padding: 0 1px;
- background: #fff url(../img/bg.gif) 0 0 repeat-y;
- float: left;
- border-bottom: 1px solid #C3BBB6;
-}
-#header {
- float: left;
- width: 758px;
- height: 46px;
- background: url(../img/hdr.bg.gif) 0 0 repeat-x;
-}
-#container {
- float: left;
- width: 758px;
- background: url(../img/hdr.bar.jpg) 0 0 repeat-x;
-}
-#sidebar {
- float: left;
- width: 190px;
- margin-top: 96px;
- padding: 20px 10px 0 10px;
- background: url(../img/sdb.bg.gif) 0 0 no-repeat;
-}
-#content {
- float: left;
- width: 548px;
- margin-top: 75px;
- padding-top: 5px;
- background: #fff url(../img/cnt.bg.gif) 0 0 repeat-x;
-}
-#footer {
- clear: both;
- margin-top: 40px;
- float: left;
- padding: 20px;
- border-top: 1px solid #C3BBB6;
- background-color: #fff;
- width: 718px;
- text-align: right;
-}
-/* General
------------------------------------------------ */
-input[type="submit"], input[type="button"] {
- font-weight: bold;
- color: #fff;
- border: 1px solid #5D1414;
- height: 26px;
- background: #fff url(../img/btn.bg.gif) 0 0 repeat-x;
- border-style: none;
-}
-.center {
- text-align: center;
-}
-.entry {
- clear: both;
- padding-top: 10px;
-}
-.entry .label {
- float: left;
- padding-right: 5px;
- font-weight: bold;
- width: 150px;
- text-align: right;
-}
-.entry .output {
- float: right;
- width: 360px;
- padding-top: 10px;
- text-align: left;
-}
-.entry .input {
- float: right;
- width: 360px;
- text-align: left;
-}
-.entry .error {
- float: right;
- width: 360px;
- text-align: left;
-}
-/* Sidebar
------------------------------------------------ */
-.notes {
- text-align: center;
- font-size: small;
-}
-.errors {
- font-size: small;
- font-weight: bold;
- text-align: center;
- color: #600;
-}
-.errors div {
- text-align: left;
-}
-.errors span {
- text-align: left;
-}
-.errors input {
- border: 1px solid #600;
-}
-.errors ul {
- list-style: none;
-}
-.buttonBox {
- text-align: center;
- padding: 5px 0;
- clear: both;
-}
-#sidebar p {
- font-size: small;
- color: #8B7869;
- line-height: 150%;
- padding-bottom: 10px;
-}
-#sidebar li {
- font-size: small;
- color: #8B7869;
-}
-#sidebar h1 {
- line-height: normal;
- font-weight: bold;
- font-size: small;
-}
-/*
-#sidebar p:hover {
- color: #362F2D;
-}
-*/
-/* Content
------------------------------------------------ */
-#content .section {
- float: left;
- width: 518px;
- padding: 15px 15px 0 15px;
-}
-#content .section h1 {
- font-family: "Trebuchet MS", Arial, sans-serif;
- line-height: normal;
- font-weight: normal;
- font-size: large;
-}
-#content .section p {
- line-height: 150%;
- padding: 10px 0;
- font-size: small;
-}
-#content table {
- width: 100%;
- border: 1px solid #D2C9C4;
- border-collapse: collapse;
-}
-#content table caption {
- padding-bottom: 6px;
- text-align: left;
- font-weight: bold;
-}
-#content table thead th {
- border-left: 1px solid #D2C9C4;
- background: #fff url(../img/th.bg.gif) 0 100% repeat-x;
- border-bottom: 1px solid #D2C9C4;
- padding: 6px;
- text-align: left;
- font-size: small;
-}
-#content table tbody td {
- border-left: 1px solid #E4DBD5;
- padding: 4px;
- border-bottom: 1px solid #D2C9C4;
- font-size: small;
-}
-#content dt {
- font-weight: bold;
- float: left;
- width: 33%;
-}
-#content dd {
- padding-left: 10px;
- float: left;
- width: 66%;
-}
-#content table.radio {
- border: 0px;
-}
-#content table.radio tbody tr td {
- border: 0px;
- border-left: 0px;
- border-bottom: 0px;
-}
-/* Header
------------------------------------------------ */
-#title {
- float: left;
- padding: 1px 0 6px 15px;
-}
-#status {
- color: #C7B299;
- float: right;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-weight: bold;
- font-size: x-small;
- text-align: right;
- padding-top: 14px;
- padding-right: 15px;
-}
-#status a {
- color: #C7B299;
- text-decoration: none;
-}
-/* Homepage Modifications
------------------------------------------------ */
-#pgHome #container {
- background: url(../img/hdr.ad.jpg) 0 0 repeat-x;
-}
-#pgHome #sidebar {
- margin-top: 207px;
-}
-#pgHome #content {
- margin-top: 183px;
-}
+/* Setup defaults since variable in browsers
+----------------------------------------------- */
+#document body, #document div, #document span, #document dd, #document dt, #document dl,
#document img, #document ul, #document ol, #document li, #document p, #document h1,
#document h2, #document h3, #document h4, #document h5, #document form, #document hr,
#document fieldset {
+ margin: 0;
+ padding: 0;
+}
+/* Element Defaults
+----------------------------------------------- */
+div#content-container html {
+ height: 100%;
+ background-color: #DBD4C6;
+}
+#document img {
+ border: 0;
+}
+#pgHome {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: small;
+ line-height: 1.25em;
+ color: #362F2D;
+ position: relative;
+ width: 760px;
+ height: 100%;
+ margin-left: auto;
+ margin-right: auto;
+}
+#document .label {
+ font-weight: bold;
+ color: #5E5147;
+}
+#document input {
+ border: 1px solid #C3BBB6;
+ padding: 4px;
+ margin: 5px 0;
+ background: #fff url(../img/input.bg.gif) 0 0 repeat-x;
+}
+#document select {
+ border: 1px solid #C3BBB6;
+ padding: 4px;
+ margin: 5px 0;
+ background: #fff url(../img/input.bg.gif) 0 0 repeat-x;
+}
+#document ol, #document ul {
+ margin: 10px 0px 10px 6px;
+}
+#document li {
+ margin: 10px 12px;
+}
+#document fieldset {
+ border: 0;
+}
+/* Layout
+----------------------------------------------- */
+#document {
+ padding: 0 1px;
+ background: #fff url(../img/bg.gif) 0 0 repeat-y;
+ float: left;
+ border-bottom: 1px solid #C3BBB6;
+}
+#document #header {
+ float: left;
+ width: 758px;
+ height: 46px;
+ background: url(../img/hdr.bg.gif) 0 0 repeat-x;
+}
+#document #container {
+ float: left;
+ width: 758px;
+ background: url(../img/hdr.bar.jpg) 0 0 repeat-x;
+}
+#document #sidebar {
+ float: left;
+ width: 190px;
+ margin-top: 96px;
+ padding: 20px 10px 0 10px;
+ background: url(../img/sdb.bg.gif) 0 0 no-repeat;
+}
+#document #content {
+ float: left;
+ width: 548px;
+ margin-top: 75px;
+ padding-top: 5px;
+ background: #fff url(../img/cnt.bg.gif) 0 0 repeat-x;
+}
+#document #footer {
+ clear: both;
+ margin-top: 40px;
+ float: left;
+ padding: 20px;
+ border-top: 1px solid #C3BBB6;
+ background-color: #fff;
+ width: 718px;
+ text-align: right;
+}
+/* General
+----------------------------------------------- */
+#document input[type="submit"], #document input[type="button"] {
+ font-weight: bold;
+ color: #fff;
+ border: 1px solid #5D1414;
+ height: 26px;
+ background: #fff url(../img/btn.bg.gif) 0 0 repeat-x;
+ border-style: none;
+}
+#document .center {
+ text-align: center;
+}
+#document .entry {
+ clear: both;
+ padding-top: 10px;
+}
+#document .entry .label {
+ float: left;
+ padding-right: 5px;
+ font-weight: bold;
+ width: 150px;
+ text-align: right;
+}
+#document .entry .output {
+ float: right;
+ width: 360px;
+ padding-top: 10px;
+ text-align: left;
+}
+#document .entry .input {
+ float: right;
+ width: 360px;
+ text-align: left;
+}
+#document .entry .error {
+ float: right;
+ width: 360px;
+ text-align: left;
+}
+/* Sidebar
+----------------------------------------------- */
+#document .notes {
+ text-align: center;
+ font-size: small;
+}
+#document .errors {
+ font-size: small;
+ font-weight: bold;
+ text-align: center;
+ color: #600;
+}
+#document .errors div {
+ text-align: left;
+}
+#document .errors span {
+ text-align: left;
+}
+#document .errors input {
+ border: 1px solid #600;
+}
+#document .errors ul {
+ list-style: none;
+}
+#document .buttonBox {
+ text-align: center;
+ padding: 5px 0;
+ clear: both;
+}
+#document #sidebar p {
+ font-size: small;
+ color: #8B7869;
+ line-height: 150%;
+ padding-bottom: 10px;
+}
+#document #sidebar li {
+ font-size: small;
+ color: #8B7869;
+}
+#document #sidebar h1 {
+ line-height: normal;
+ font-weight: bold;
+ font-size: small;
+}
+/*
+#sidebar p:hover {
+ color: #362F2D;
+}
+*/
+/* Content
+----------------------------------------------- */
+#document #content .section {
+ float: left;
+ width: 518px;
+ padding: 15px 15px 0 15px;
+}
+#document #content .section h1 {
+ font-family: "Trebuchet MS", Arial, sans-serif;
+ line-height: normal;
+ font-weight: normal;
+ font-size: large;
+}
+#document #content .section p {
+ line-height: 150%;
+ padding: 10px 0;
+ font-size: small;
+}
+#document #content table {
+ width: 100%;
+ border: 1px solid #D2C9C4;
+ border-collapse: collapse;
+}
+#document #content table caption {
+ padding-bottom: 6px;
+ text-align: left;
+ font-weight: bold;
+}
+#document #content table thead th {
+ border-left: 1px solid #D2C9C4;
+ background: #fff url(../img/th.bg.gif) 0 100% repeat-x;
+ border-bottom: 1px solid #D2C9C4;
+ padding: 6px;
+ text-align: left;
+ font-size: small;
+}
+#document #content table tbody td {
+ border-left: 1px solid #E4DBD5;
+ padding: 4px;
+ border-bottom: 1px solid #D2C9C4;
+ font-size: small;
+}
+#document #content dt {
+ font-weight: bold;
+ float: left;
+ width: 33%;
+}
+#document #content dd {
+ padding-left: 10px;
+ float: left;
+ width: 66%;
+}
+#document #content table.radio {
+ border: 0px;
+}
+#document #content table.radio tbody tr td {
+ border: 0px;
+ border-left: 0px;
+ border-bottom: 0px;
+}
+/* Header
+----------------------------------------------- */
+#document #title {
+ float: left;
+ padding: 1px 0 6px 15px;
+}
+#document #status {
+ color: #C7B299;
+ float: right;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: x-small;
+ text-align: right;
+ padding-top: 14px;
+ padding-right: 15px;
+}
+#document #status a {
+ color: #C7B299;
+ text-decoration: none;
+}
+/* Homepage Modifications
+----------------------------------------------- */
+#pgHome #container {
+ background: url(../img/hdr.ad.jpg) 0 0 repeat-x;
+}
+#pgHome #sidebar {
+ margin-top: 207px;
+}
+#pgHome #content {
+ margin-top: 183px;
+}
Modified:
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/trailblazer_main.css
===================================================================
---
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/trailblazer_main.css 2007-11-27
20:24:22 UTC (rev 4300)
+++
trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/css/trailblazer_main.css 2007-11-28
00:50:15 UTC (rev 4301)
@@ -1,148 +1,148 @@
-* {
- margin: 0px;
- padding: 0px;
- border: none;
-}
-
-body {
- font: 1em verdana, arial, sans-serif;
- background: #CCCCCC;
-}
-
-div#main {
- margin-left: 0px;
- width: 751px;
- background: #ecefdf;
-}
-
-div#top,div#pictures{
-}
-
-div#pictures img {
- float:left;
-}
-
-img#head1 {
- margin-right: 3px;
-}
-
-img#head2 {
- margin-right: 4px;
-}
-
-div.trail {
- clear:both;
- margin-left: 50px;
- margin-top: 0px;
- margin-right: 50px
-}
-
-div.foot {
- margin-left: 50px;
- margin-right: 50px;
- margin-top: 50px;
- text-align: center;
- font-size: .5em;
- height: 36px;
-}
-
-div.trail h1 {
- margin-top: -30px;
- margin-left: -50px;
- font-size: 1.2em;
- font-weight: bold;
- padding-left: .4em;
-}
-
-div.trail h2 {
- float: left;
- font-size: 1em;
- font-weight: bold;
- padding-left: .4em;
-}
-
-div.trail h3 {
- float: left;
- font-size: .8em;
- font-weight: bold;
- margin-left: -1.4em;
- margin-bottom: 1em;
-}
-
-
-div.trail p {
- clear: both;
- margin-top: 20px;
- font-size: .8em;
- text-decoration: none;
-}
-
-div#next_trail {
- margin-left: 36px;
-}
-
-div.numbox {
- border: thin solid black;
- margin-left: -.8em;
- float: left;
- background: #ffffff;
- padding: .2em .35em .3em;
- font-style: normal;
- font-weight: bold;
- font-size: 1.4em;
-}
-
-div.figure {
- text-align: center;
- font-size: .6em;
- margin-top: 30px;
-}
-
-div.figure img {
- display: block;
- margin-right: auto;
- margin-left: auto;
-}
-
-code {
- font: 1.1em "Courier New", Courier, mono;
-}
-
-code.block {
- white-space: pre;
- font: 10pt "Courier New", Courier, mono;
- display: block;
- border-style: dashed;
- border-width: thin;
- padding: .5em;
- background: #ffffff;
- margin: 20px;
-}
-
-div.foot_image {
- float: left;
- height: 86px;
-}
-
-a:active {
- color : #666666;
- text-decoration: none;
-}
-
-a:hover {
- color : #000000;
- background-color : #D6E0FE;
- text-decoration: none;
-}
-
-a:link {
- color : #005EB6;
- text-decoration: none;
-}
-
-a:visited {
- color : #888888;
- text-decoration: none;
-}
-
-
+* {
+ margin: 0px;
+ padding: 0px;
+ border: none;
+}
+
+body {
+ font: 1em verdana, arial, sans-serif;
+ background: #CCCCCC;
+}
+
+div#main {
+ margin-left: 0px;
+ width: 751px;
+ background: #ecefdf;
+}
+
+div#top,div#pictures{
+}
+
+div#pictures img {
+ float:left;
+}
+
+img#head1 {
+ margin-right: 3px;
+}
+
+img#head2 {
+ margin-right: 4px;
+}
+
+div.trail {
+ clear:both;
+ margin-left: 50px;
+ margin-top: 0px;
+ margin-right: 50px
+}
+
+div.foot {
+ margin-left: 50px;
+ margin-right: 50px;
+ margin-top: 50px;
+ text-align: center;
+ font-size: .5em;
+ height: 36px;
+}
+
+div.trail h1 {
+ margin-top: -30px;
+ margin-left: -50px;
+ font-size: 1.2em;
+ font-weight: bold;
+ padding-left: .4em;
+}
+
+div.trail h2 {
+ float: left;
+ font-size: 1em;
+ font-weight: bold;
+ padding-left: .4em;
+}
+
+div.trail h3 {
+ float: left;
+ font-size: .8em;
+ font-weight: bold;
+ margin-left: -1.4em;
+ margin-bottom: 1em;
+}
+
+
+div.trail p {
+ clear: both;
+ margin-top: 20px;
+ font-size: .8em;
+ text-decoration: none;
+}
+
+div#next_trail {
+ margin-left: 36px;
+}
+
+div.numbox {
+ border: thin solid black;
+ margin-left: -.8em;
+ float: left;
+ background: #ffffff;
+ padding: .2em .35em .3em;
+ font-style: normal;
+ font-weight: bold;
+ font-size: 1.4em;
+}
+
+div.figure {
+ text-align: center;
+ font-size: .6em;
+ margin-top: 30px;
+}
+
+div.figure img {
+ display: block;
+ margin-right: auto;
+ margin-left: auto;
+}
+
+code {
+ font: 1.1em "Courier New", Courier, mono;
+}
+
+code.block {
+ white-space: pre;
+ font: 10pt "Courier New", Courier, mono;
+ display: block;
+ border-style: dashed;
+ border-width: thin;
+ padding: .5em;
+ background: #ffffff;
+ margin: 20px;
+}
+
+div.foot_image {
+ float: left;
+ height: 86px;
+}
+
+a:active {
+ color : #666666;
+ text-decoration: none;
+}
+
+a:hover {
+ color : #000000;
+ background-color : #D6E0FE;
+ text-decoration: none;
+}
+
+a:link {
+ color : #005EB6;
+ text-decoration: none;
+}
+
+a:visited {
+ color : #888888;
+ text-decoration: none;
+}
+
+