[jboss-cvs] JBossBlog SVN: r260 - in trunk: lib and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 13 03:54:20 EDT 2008
Author: adamw
Date: 2008-03-13 03:54:20 -0400 (Thu, 13 Mar 2008)
New Revision: 260
Added:
trunk/src/shotoku/org/jboss/shotoku/
trunk/src/shotoku/org/jboss/shotoku/web/
trunk/src/shotoku/org/jboss/shotoku/web/ShotokuFilesystemResourceResolver.java
trunk/src/shotoku/org/jboss/shotoku/web/ShotokuResourcesFilter.java
trunk/view/stylesheet/blog.css
Removed:
trunk/view/stylesheet/blog_styles.css
trunk/view/stylesheet/more_blog.css
Modified:
trunk/build.properties
trunk/lib/shotoku-base.jar
trunk/resources-portlet/WEB-INF/web.xml
trunk/resources/WEB-INF/web-prod.xml
trunk/view-portlet/view.jsp
trunk/view-portlet/view_main.jsp
trunk/view/layout/template.xhtml
Log:
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2008-03-12 16:17:38 UTC (rev 259)
+++ trunk/build.properties 2008-03-13 07:54:20 UTC (rev 260)
@@ -1,6 +1,6 @@
#jboss.home = /Users/adamwarski/portal-extensions/feeds/binaries
-jboss.home = /Users/adamwarski/jboss/jboss-4.2
-#jboss.home = /Users/adamwarski/jboss/jboss-4.0.5
-profile = dev
-#profile = prod
+#jboss.home = /Users/adamwarski/jboss/jboss-4.2
+jboss.home = /Users/adamwarski/jboss/jboss-4.0.5
+#profile = dev
+profile = prod
#jboss.home = /Users/adamwarski/jboss/jboss-design
\ No newline at end of file
Modified: trunk/lib/shotoku-base.jar
===================================================================
(Binary files differ)
Modified: trunk/resources/WEB-INF/web-prod.xml
===================================================================
--- trunk/resources/WEB-INF/web-prod.xml 2008-03-12 16:17:38 UTC (rev 259)
+++ trunk/resources/WEB-INF/web-prod.xml 2008-03-13 07:54:20 UTC (rev 260)
@@ -30,6 +30,22 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <!-- Resources filter -->
+
+ <filter>
+ <filter-name>Resources Filter</filter-name>
+ <filter-class>org.jboss.shotoku.web.ShotokuResourcesFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Resources Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
<!-- Seam -->
<listener>
@@ -59,13 +75,24 @@
<servlet-name>Seam Resource Servlet</servlet-name>
<url-pattern>/seam/resource/*</url-pattern>
</servlet-mapping>
+
<!-- Facelets development mode (disable in production) -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
- <param-value>false</param-value>
+ <param-value>true</param-value>
</context-param>
+ <context-param>
+ <param-name>facelets.REFRESH_PERIOD</param-name>
+ <param-value>0</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.RESOURCE_RESOLVER</param-name>
+ <param-value>org.jboss.shotoku.web.ShotokuFilesystemResourceResolver</param-value>
+ </context-param>
+
<!-- JSF -->
<context-param>
Modified: trunk/resources-portlet/WEB-INF/web.xml
===================================================================
--- trunk/resources-portlet/WEB-INF/web.xml 2008-03-12 16:17:38 UTC (rev 259)
+++ trunk/resources-portlet/WEB-INF/web.xml 2008-03-13 07:54:20 UTC (rev 260)
@@ -3,14 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
- <!--<context-param>
- <param-name>sourceBasePath</param-name>
- <param-value>/Users/adamwarski/blog/view-portlet</param-value>
- </context-param>
-
<filter>
<filter-name>Resources Filter</filter-name>
- <filter-class>org.jboss.shotoku.web.ResourcesFilter</filter-class>
+ <filter-class>org.jboss.shotoku.web.ShotokuResourcesFilter</filter-class>
</filter>
<filter-mapping>
@@ -20,5 +15,5 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>INCLUDE</dispatcher>
<dispatcher>REQUEST</dispatcher>
- </filter-mapping>-->
+ </filter-mapping>
</web-app>
Copied: trunk/src/shotoku/org/jboss/shotoku/web/ShotokuFilesystemResourceResolver.java (from rev 240, trunk/src/action/org/jboss/shotoku/web/FilesystemResourceResolver.java)
===================================================================
--- trunk/src/shotoku/org/jboss/shotoku/web/ShotokuFilesystemResourceResolver.java (rev 0)
+++ trunk/src/shotoku/org/jboss/shotoku/web/ShotokuFilesystemResourceResolver.java 2008-03-13 07:54:20 UTC (rev 260)
@@ -0,0 +1,33 @@
+package org.jboss.shotoku.web;
+
+import com.sun.facelets.impl.ResourceResolver;
+
+import javax.faces.context.FacesContext;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.jboss.shotoku.ContentManager;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+public class ShotokuFilesystemResourceResolver implements ResourceResolver {
+ private String sourceBasePath;
+
+ public String getSourceBasePath() {
+ if (sourceBasePath == null) {
+ sourceBasePath = ContentManager.getProperty("shotoku.default.localpath") + "/feeds/view";
+ }
+
+ return sourceBasePath;
+ }
+
+ public URL resolveUrl(String s) {
+ try {
+ return new URL("file", "", getSourceBasePath() + s);
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+}
\ No newline at end of file
Copied: trunk/src/shotoku/org/jboss/shotoku/web/ShotokuResourcesFilter.java (from rev 240, trunk/src/action/org/jboss/shotoku/web/ResourcesFilter.java)
===================================================================
--- trunk/src/shotoku/org/jboss/shotoku/web/ShotokuResourcesFilter.java (rev 0)
+++ trunk/src/shotoku/org/jboss/shotoku/web/ShotokuResourcesFilter.java 2008-03-13 07:54:20 UTC (rev 260)
@@ -0,0 +1,186 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software 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 software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.shotoku.web;
+
+import org.jboss.shotoku.ContentManager;
+import org.jboss.shotoku.Node;
+import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Arrays;
+import java.util.logging.Logger;
+
+/**
+ * A filter, which reads resources from the filesystem and makes them visible to the
+ * application as deployed files --- useful for development. Specifically,
+ * the <code>sourceBasePath</code> init-parameter value
+ * is prepended to the path. The file referenced by the path is then included
+ * in the request. To specify for which file extensions the filter is enabled,
+ * set the <code>extensions</code> init parameter. If not set, it defaults to:
+ * <code>jsp,css,html,htm,gif,jpg,jpeg,png,txt,xhtml</code>.
+ *
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+public class ShotokuResourcesFilter implements Filter {
+ private final static Logger log = Logger.getLogger(ResourcesFilter.class.getName());
+
+ /**
+ * A list of extensions, which are filtered by default, if nothing is
+ * specified in the filter configuration.
+ */
+ private final static String DEFAULT_EXTENSIONS = "jsp,css,html,htm,gif,jpg,jpeg,png,txt";
+
+ /**
+ * Base path to a directory where files will
+ * be copied; it's a subdirectory of a deployment directory created by the
+ * app server.
+ */
+ private String destBasePath;
+
+ /**
+ * A set of <code>java.lang.String</code>s, which are extensions, that are filtered.
+ */
+ private Set<String> extensions;
+
+ private ContentManager cm;
+
+ /**
+ * Transfers all bytes from the given input stream to the given output
+ * stream.
+ *
+ * @param is
+ * Input stream to read from.
+ * @param os
+ * Output stream to write to.
+ * @throws java.io.IOException In case of an IO exception.
+ */
+ private void transfer(InputStream is, OutputStream os) throws IOException {
+ byte[] buffer = new byte[1024];
+ int read;
+ while ((read = is.read(buffer)) != -1) {
+ os.write(buffer, 0, read);
+ }
+ }
+
+ public void init(FilterConfig conf) {
+ cm = ContentManager.getContentManager("default", "/feeds/view");
+
+ destBasePath = conf.getServletContext().getRealPath("");
+
+ extensions = new HashSet<String>();
+ String filteredExtensionsString = DEFAULT_EXTENSIONS;
+ String[] tokens = filteredExtensionsString.split(",");
+ extensions.addAll(Arrays.asList(tokens));
+ }
+
+ private String safeToString(Object o) {
+ if (o == null) {
+ return null;
+ }
+
+ return o.toString();
+ }
+
+ private boolean checkExtension(String path) {
+ int dotIndex = path.lastIndexOf('.');
+
+ if (dotIndex != -1) {
+ String extension = path.substring(dotIndex + 1);
+ return extensions.contains(extension);
+ } else {
+ return false;
+ }
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+
+ /* Getting the name of the requested resource; first checking if
+ * it is an included, then forwarded resource. Finally, checking
+ * the request uri itself. */
+ String requestedResource;
+ requestedResource = safeToString(httpRequest.getAttribute("javax.servlet.include.servlet_path"));
+
+ if (requestedResource == null) {
+ requestedResource = httpRequest.getServletPath();
+ }
+
+ // JSF check - we have to replace .jsf with .jsp.
+ String realRequestedResource = requestedResource;
+ if (realRequestedResource.endsWith(".jsf")) {
+ realRequestedResource = realRequestedResource.replace(".jsf", ".jsp");
+ }
+
+ // Filtering only some file extensions. Not filtering Seam's debug.xhtml.
+ if (!checkExtension(realRequestedResource)) {
+ chain.doFilter(request, response);
+ return;
+ }
+
+ Node sourceNode;
+ try {
+ sourceNode = cm.getNode(realRequestedResource);
+ } catch (ResourceDoesNotExist resourceDoesNotExist) {
+ chain.doFilter(request, response);
+ return;
+ }
+
+ File destFile = new File(destBasePath + realRequestedResource);
+
+ InputStream in = null;
+ OutputStream out = null;
+
+ try {
+ destFile.getParentFile().mkdirs();
+ destFile.setLastModified(System.currentTimeMillis());
+
+ in = sourceNode.getContentInputStream();
+ out = new FileOutputStream(destFile);
+
+ transfer(in, out);
+ } catch (Exception e) {
+ log.warning("Cannot copy resource: " + sourceNode);
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+
+ if (out != null) {
+ out.close();
+ }
+ }
+ }
+
+ chain.doFilter(request, response);
+ }
+
+ public void destroy() {
+
+ }
+}
\ No newline at end of file
Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml 2008-03-12 16:17:38 UTC (rev 259)
+++ trunk/view/layout/template.xhtml 2008-03-13 07:54:20 UTC (rev 260)
@@ -11,8 +11,7 @@
<title>JBoss.ORG Feeds</title>
<link href="/blogs/stylesheet/org_main.css" rel="stylesheet" type="text/css" />
<link href="/blogs/stylesheet/org_layout.css" rel="stylesheet" type="text/css" />
- <link href="/blogs/stylesheet/more_blog.css" rel="stylesheet" type="text/css" />
- <link href="/blogs/stylesheet/blog_styles.css" rel="stylesheet" type="text/css" />
+ <link href="/blogs/stylesheet/blog.css" rel="stylesheet" type="text/css" />
<ui:insert name="additional_headers" />
</head>
Copied: trunk/view/stylesheet/blog.css (from rev 252, trunk/view/stylesheet/more_blog.css)
===================================================================
--- trunk/view/stylesheet/blog.css (rev 0)
+++ trunk/view/stylesheet/blog.css 2008-03-13 07:54:20 UTC (rev 260)
@@ -0,0 +1,524 @@
+.blogFeedNav {
+}
+
+.blogFeedNav_bottom {
+ border: none 0;
+ padding: 0 0 0 10px;
+}
+
+.blogFeedNav_top {
+ border-bottom: 1px solid #8c8f91;
+ padding: 15px 0 5px 10px;
+ margin-bottom: 1em;
+}
+
+.blogFeedNav ul {
+ padding-left: 0;
+ margin-left: 0;
+ display: inline;
+}
+
+.blogFeedNav li {
+ list-style: none;
+ display: inline;
+ padding-right: 6px;
+}
+
+.blogRightsidebox {
+ padding: 20px;
+ float:right;
+ width:200px;
+}
+
+.blogRightsidebox h4 {
+ font-size:11px;
+ font-weight:bold;
+ padding-left:10px;
+ padding-bottom: 5px;
+ border-bottom: 1px solid #8c8f91;
+}
+
+.blogRightsidebox ul {
+ padding-left: 10px;
+ margin-left: 0px;
+}
+
+.blogRightsidebox li {
+ list-style: none;
+ display: block;
+ padding:.25em 0px;
+}
+
+/* MY CHANGES START HERE */
+/* --------------------- Admin list ------------------------ */
+
+.adminlist {
+ width: 200px;
+ margin-bottom: 0;
+}
+
+.adminlist h3 {
+ font-size:12px;
+ font-weight: bold;
+ margin:9px auto 9px auto;
+}
+
+.adminlist p {
+ margin:0 auto;
+ padding-bottom:1em;
+ }
+
+.adminlist dl {
+ margin-right:20px;
+}
+
+.adminlist dt {
+ font-size:12px;
+ font-weight:bold;
+ color:#CC0000;
+ margin:12px 0 1px 0;
+ padding:0;
+}
+
+.adminlist dd {
+ margin:0 0 3px 0;
+}
+
+.adminlist dt a {
+ color:#CC0000;
+ text-decoration:none;
+ background-image:none;
+ padding-left:0;
+}
+
+.adminlist dd a {
+ background-image:url(http://labs.jboss.com/file-access/default/theme/images/common/ico_linkarrow_blue.gif);
+ background-repeat: no-repeat;
+ background-position: 3px 3px;
+ padding-left: 12px;
+ white-space:nowrap;
+}
+
+.adminlist hr {
+ border-top:1px dashed #d5d5d5;
+ color: #ffffff;
+ border-bottom:0;
+ border-left:0;
+ border-right:0;
+ margin-bottom:6px;
+}
+
+span.error {
+ color: black;
+ background-color: #fef9e6;
+ border: 1px solid red;
+ padding: 5px;
+ display: block;
+}
+
+span.required {
+ color: red;
+}
+
+.bold {
+ font-weight: bold;
+}
+
+.empty {
+
+}
+
+.adminforms .selectwide {
+ width: 400px;
+ margin-bottom: 8px;
+}
+
+.messages {
+
+}
+
+.adminlinks {
+ float:right;
+ margin-right: 20px;
+ padding-top: 24px;
+}
+
+/* Cheyenne's new styles begin here */
+
+
+.globalOps ul{
+ list-style: none;
+}
+
+.globalOps li{
+ margin: -20px 5px 10px 0px;
+ float: right;
+}
+
+.feedTable .basetablestyle th {
+ height:20px;
+ padding-left: 6px;
+ padding-right: 30px;
+}
+
+.feedheader h4{
+ color: #FFFFFF;
+ font-size:14px;
+ margin: 5px 0px 5px 3px;
+ padding:10px 0px 0px 0px;
+}
+
+.feedTable{
+ margin: 25px 0px 15px 0px;
+}
+
+.feedTable .mainHeader2 {
+ float:left;
+}
+
+.feedTable .formbuttons {
+ float:right;
+}
+
+
+.feedOps {
+ background-color:#FFFFFF;
+}
+
+.newFeed {
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #4a5d75;
+ border-top: 1px solid #94aebd;
+ border-left: 1px solid #94aebd;
+ border-right: 1px solid #233345;
+ border-bottom: 1px solid #233345;
+ height:15px;
+ padding:5px 10px 0px 10px;
+ color:CC3333;
+ float:right;
+ margin: 10px -24px 0px 1px;
+}
+
+.newFeed a{
+ color: #FFFFFF;
+ text-decoration: none;
+}
+
+.newGroup {
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #4a5d75;
+ border-top: 1px solid #94aebd;
+ border-left: 1px solid #94aebd;
+ border-right: 1px solid #233345;
+ border-bottom: 1px solid #233345;
+ height:15px;
+ padding:5px 10px 0 10px;
+ float:right;
+ margin: 10px 5px 0 -10px;
+
+}
+
+.newGroup a{
+ color: #FFFFFF;
+ text-decoration: none;
+}
+
+.rowline select {
+ width: 120px;
+}
+
+/* Archive List css from blog_styles.css */
+
+.blogRightsidebox {
+ padding: 20px;
+ float:right;
+ width:200px;
+}
+
+.blogRightsidebox h4 {
+ font-size:11px;
+ font-weight:bold;
+ padding-left:10px;
+ padding-bottom: 5px;
+ border-bottom: 1px solid #8c8f91;
+}
+
+.blogRightsidebox ul {
+ padding-left: 10px;
+ margin-left: 0;
+}
+
+.blogRightsidebox li {
+ list-style: none;
+ display: block;
+ padding:.25em 0;
+}
+
+
+
+/* Homepage css */
+
+#columnleftBLOG {
+ float:left;
+ margin: 10px;
+ width:680px;
+}
+
+#columnleftBLOG h4{
+ color: #cc0000;
+}
+
+#columnrightBLOG {
+ float:right;
+ width: 225px;
+}
+
+.laundrytable {
+ width: 680px;
+ text-align: left;
+ line-height: 150%;
+ margin: 0 0 20px 20px;
+}
+
+
+.laundrytable th {
+ vertical-align: top;
+ padding: 5px 5px 5px 0;
+ font-weight: bold;
+
+
+}
+
+.laundrytable td {
+ vertical-align: top;
+ padding: 5px 5px 5px 0;
+ color: #000000;
+ border-bottom-color: #e1e1e1;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+
+}
+
+/* Homepage: Right column - Blog Subnav */
+
+.TwoColumnBlogSubnav {
+ float: right;
+ border: 1px solid #94aebd;
+ background-color: #e1eef4;
+ background-image: url(/blogs/images/hdr_feed_gradient.gif);
+ background-repeat: repeat-x;
+ background-position: top;
+ padding:0 12px 12px 11px;
+ margin:0 0 10px 0;
+ width:200px;
+}
+.TwoColumnBlogSubnav dt{
+ font-weight:bold;
+ font-size: 14px;
+ color: white;
+ padding:6px 0 12px 0;
+}
+.TwoColumnBlogSubnav dd {
+ background-image: url(/blogs/images/ico_linkarrow_blue.gif);
+ color: #233446;
+ background-repeat: no-repeat;
+ background-position: 0px 3px;
+ padding:0 0 6px 15px;
+}
+
+.TwoColumnBlogSubnav li {
+ padding: 10px;
+ border-bottom: 1px solid #000000;
+}
+.TwoColumnBlogSubnav li.last {
+ border-bottom: none;
+}
+
+
+/* Homepage: Right column - Blog Jelly Box */
+#TwoColumnBlogJelly {
+ float: right;
+ margin-bottom: 10px;
+}
+
+/* Edit feeds page - additions to Admin List */
+
+.TwoColumnBlogSubnav h4 {
+ font-weight:bold;
+ font-size: 14px;
+ color: white;
+ padding:6px 0px 12px 0px;
+}
+
+hr.formSeparator {
+ margin: 10px 23px 25px auto;
+ border-top: 1px solid #d7d9d9;
+}
+
+.adminforms .checkbox{
+ margin-left:170px;
+}
+
+.submit_first {
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #e3a835;
+ border-top: 1px solid #fbdea4;
+ border-left: 1px solid #fbdea4;
+ border-right: 1px solid #976c18;
+ border-bottom: 1px solid #976c18;
+ height:20px;
+ padding:0 10px 0 10px;
+}
+
+/* Feeds Pages: Right column - Subnav list */
+
+
+.feedsRightsidebox {
+ padding: 0 20px 20px 40px;
+ float:right;
+ width:260px;
+ height:100%;
+}
+
+.feedsRightsidebox img{
+ margin:10px 0 20px 10px;
+}
+
+.feedsRightsidebox h4 {
+ font-size:11px;
+ font-weight:bold;
+ padding:15px 0px 5px 10px;
+ border-bottom: 1px solid #8c8f91;
+}
+
+.feedsRightsidebox ul {
+ padding-left: 10px;
+ margin-left: 0px;
+}
+
+.feedsRightsidebox li {
+ list-style: none;
+ display: block;
+ padding:.25em 0px;
+}
+
+#feeds_subnav li{
+ background-image:url(/blogs/images/ico_linkarrow_blue.gif);
+ padding:0 0 6px 10px;
+ background-repeat: no-repeat;
+ background-position: 0 3px;
+ font-size: 11px;
+ color: #333366;
+ margin:0 0 0 -10px;
+}
+
+.feedsContent {
+/* spacing for when the archive is added margin: 0px 230px 0px 15px; */
+ margin: 0 325px 0 15px;
+ padding: 0;
+}
+
+.feedsContent p {
+ margin: .5em auto;
+ padding: 0;
+}
+
+#feedstblogentry {
+ margin-top: 0;
+ border-top: 0;
+}
+
+.feedsContent h3 {
+ margin: auto auto 0 auto;
+ padding: 0;
+ line-height:2em;
+}
+
+.feedsContent hr {
+ border: none 0;
+ border-top: 1px solid #8c8f91;
+ height: 1px;
+ margin-bottom: 1em;
+}
+
+.feedsContent .blogauthortag {
+ margin:0 Auto;
+ padding-bottom: .5em;
+ font-size:10px;
+ font-weight:normal;
+}
+
+.feedsContent .blogcategorytag {
+ margin:2em Auto 1.5em Auto;
+ padding:0;
+ font-size:10px;
+ font-weight:normal;
+}
+
+.feedsContent .blogcommentsheader {
+ margin: 1.5em auto 0 auto;
+ padding: 0;
+ line-height:2em;
+ border-top: 1px dotted #a5a5a5;
+ background-color:#FFFFFF;
+ font-size:11px;
+ font-weight:bold;
+}
+.feedsContent .blogcommentsbody {
+ margin: 0px auto 1em auto;
+ padding-bottom: 6px;
+ border-bottom: 1px dashed #d5d5d5;
+ background-color:#FFFFFF;
+}
+
+/***********************************************/
+/* =Normalizes Browser Styles */
+/***********************************************/
+
+/*--Normalize margin, padding */
+body, div, dl, dt, dd, ul, ol, li, h3, h4, h5, h6, pre, form, fieldset, input, p, blockquote, th, td {
+ margin: 0;
+ padding: 0;
+ }
+
+/*--Normalize font-size for headers*/
+ h3, h4, h5, h6 {
+ font-size: 100%;
+ }
+
+/*--Removes list-style from lists */
+ol,ul {
+ list-style: none;
+ }
+
+/*--Normalizes font-style and font-weight to normal*/
+address, caption, cite, code, dfn, em, strong, th, var {
+ font-style: normal; font-weight: normal;
+ }
+
+/*--Removes list-style from lists*/
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+ }
+
+/*--Removes border from fieldset and img */
+fieldset, img {
+ border: 0;
+ }
+
+/*--Left-aligns text in caption and th*/
+caption, th {
+ text-align: left;
+ }
+
+/*--Removes Quotation marks from Q*/
+q: before, q: after {
+ content: '';
+ }
Deleted: trunk/view/stylesheet/blog_styles.css
===================================================================
--- trunk/view/stylesheet/blog_styles.css 2008-03-12 16:17:38 UTC (rev 259)
+++ trunk/view/stylesheet/blog_styles.css 2008-03-13 07:54:20 UTC (rev 260)
@@ -1,145 +0,0 @@
-.blogFeedNav {
-}
-
-.blogFeedNav_bottom {
- border: none 0;
- padding: 0 0 0 10px;
-}
-
-.blogFeedNav_top {
- border-bottom: 1px solid #8c8f91;
- padding: 15px 0 5px 10px;
- margin-bottom: 1em;
-}
-
-.blogFeedNav ul {
- padding-left: 0;
- margin-left: 0;
- display: inline;
-}
-
-.blogFeedNav li {
- list-style: none;
- display: inline;
- padding-right: 6px;
-}
-
-.blogRightsidebox {
- padding: 20px;
- float:right;
- width:200px;
-}
-
-.blogRightsidebox h4 {
- font-size:11px;
- font-weight:bold;
- padding-left:10px;
- padding-bottom: 5px;
- border-bottom: 1px solid #8c8f91;
-}
-
-.blogRightsidebox ul {
- padding-left: 10px;
- margin-left: 0px;
-}
-
-.blogRightsidebox li {
- list-style: none;
- display: block;
- padding:.25em 0px;
-}
-
-/* MY CHANGES START HERE */
-/* --------------------- Admin list ------------------------ */
-
-.adminlist {
- width: 200px;
- margin-bottom: 0;
-}
-
-.adminlist h3 {
- font-size:12px;
- font-weight: bold;
- margin:9px auto 9px auto;
-}
-
-.adminlist p {
- margin:0 auto;
- padding-bottom:1em;
- }
-
-.adminlist dl {
- margin-right:20px;
-}
-
-.adminlist dt {
- font-size:12px;
- font-weight:bold;
- color:#CC0000;
- margin:12px 0 1px 0;
- padding:0;
-}
-
-.adminlist dd {
- margin:0 0 3px 0;
-}
-
-.adminlist dt a {
- color:#CC0000;
- text-decoration:none;
- background-image:none;
- padding-left:0;
-}
-
-.adminlist dd a {
- background-image:url(http://labs.jboss.com/file-access/default/theme/images/common/ico_linkarrow_blue.gif);
- background-repeat: no-repeat;
- background-position: 3px 3px;
- padding-left: 12px;
- white-space:nowrap;
-}
-
-.adminlist hr {
- border-top:1px dashed #d5d5d5;
- color: #ffffff;
- border-bottom:0;
- border-left:0;
- border-right:0;
- margin-bottom:6px;
-}
-
-span.error {
- color: black;
- background-color: #fef9e6;
- border: 1px solid red;
- padding: 5px;
- display: block;
-}
-
-span.required {
- color: red;
-}
-
-.bold {
- font-weight: bold;
-}
-
-.empty {
-
-}
-
-.adminforms .selectwide {
- width: 400px;
- margin-bottom: 8px;
-}
-
-.messages {
-
-}
-
-.adminlinks {
- float:right;
- margin-right: 20px;
- padding-top: 24px;
-}
-
Deleted: trunk/view/stylesheet/more_blog.css
===================================================================
--- trunk/view/stylesheet/more_blog.css 2008-03-12 16:17:38 UTC (rev 259)
+++ trunk/view/stylesheet/more_blog.css 2008-03-13 07:54:20 UTC (rev 260)
@@ -1,381 +0,0 @@
-
-
-/* Cheyenne's new styles begin here */
-
-
-.globalOps ul{
- list-style: none;
-}
-
-.globalOps li{
- margin: -20px 5px 10px 0px;
- float: right;
-}
-
-.feedTable .basetablestyle th {
- height:20px;
- padding-left: 6px;
- padding-right: 30px;
-}
-
-.feedheader h4{
- color: #FFFFFF;
- font-size:14px;
- margin: 5px 0px 5px 3px;
- padding:10px 0px 0px 0px;
-}
-
-.feedTable{
- margin: 25px 0px 15px 0px;
-}
-
-.feedTable .mainHeader2 {
- float:left;
-}
-
-.feedTable .formbuttons {
- float:right;
-}
-
-
-.feedOps {
- background-color:#FFFFFF;
-}
-
-.newFeed {
- font-size: 10px;
- font-weight: bold;
- color: #FFFFFF;
- background-color: #4a5d75;
- border-top: 1px solid #94aebd;
- border-left: 1px solid #94aebd;
- border-right: 1px solid #233345;
- border-bottom: 1px solid #233345;
- height:15px;
- padding:5px 10px 0px 10px;
- color:CC3333;
- float:right;
- margin: 10px -24px 0px 1px;
-}
-
-.newFeed a{
- color: #FFFFFF;
- text-decoration: none;
-}
-
-.newGroup {
- font-size: 10px;
- font-weight: bold;
- color: #FFFFFF;
- background-color: #4a5d75;
- border-top: 1px solid #94aebd;
- border-left: 1px solid #94aebd;
- border-right: 1px solid #233345;
- border-bottom: 1px solid #233345;
- height:15px;
- padding:5px 10px 0 10px;
- float:right;
- margin: 10px 5px 0 -10px;
-
-}
-
-.newGroup a{
- color: #FFFFFF;
- text-decoration: none;
-}
-
-.rowline select {
- width: 120px;
-}
-
-/* Archive List css from blog_styles.css */
-
-.blogRightsidebox {
- padding: 20px;
- float:right;
- width:200px;
-}
-
-.blogRightsidebox h4 {
- font-size:11px;
- font-weight:bold;
- padding-left:10px;
- padding-bottom: 5px;
- border-bottom: 1px solid #8c8f91;
-}
-
-.blogRightsidebox ul {
- padding-left: 10px;
- margin-left: 0;
-}
-
-.blogRightsidebox li {
- list-style: none;
- display: block;
- padding:.25em 0;
-}
-
-
-
-/* Homepage css */
-
-#columnleftBLOG {
- float:left;
- margin: 10px;
- width:680px;
-}
-
-#columnleftBLOG h4{
- color: #cc0000;
-}
-
-#columnrightBLOG {
- float:right;
- width: 225px;
-}
-
-.laundrytable {
- width: 680px;
- text-align: left;
- line-height: 150%;
- margin: 0 0 20px 20px;
-}
-
-
-.laundrytable th {
- vertical-align: top;
- padding: 5px 5px 5px 0;
- font-weight: bold;
-
-
-}
-
-.laundrytable td {
- vertical-align: top;
- padding: 5px 5px 5px 0;
- color: #000000;
- border-bottom-color: #e1e1e1;
- border-bottom-width: 1px;
- border-bottom-style: solid;
-
-}
-
-/* Homepage: Right column - Blog Subnav */
-
-.TwoColumnBlogSubnav {
- float: right;
- border: 1px solid #94aebd;
- background-color: #e1eef4;
- background-image: url(/blogs/images/hdr_feed_gradient.gif);
- background-repeat: repeat-x;
- background-position: top;
- padding:0 12px 12px 11px;
- margin:0 0 10px 0;
- width:200px;
-}
-.TwoColumnBlogSubnav dt{
- font-weight:bold;
- font-size: 14px;
- color: white;
- padding:6px 0 12px 0;
-}
-.TwoColumnBlogSubnav dd {
- background-image: url(/blogs/images/ico_linkarrow_blue.gif);
- color: #233446;
- background-repeat: no-repeat;
- background-position: 0px 3px;
- padding:0 0 6px 15px;
-}
-
-.TwoColumnBlogSubnav li {
- padding: 10px;
- border-bottom: 1px solid #000000;
-}
-.TwoColumnBlogSubnav li.last {
- border-bottom: none;
-}
-
-
-/* Homepage: Right column - Blog Jelly Box */
-#TwoColumnBlogJelly {
- float: right;
- margin-bottom: 10px;
-}
-
-/* Edit feeds page - additions to Admin List */
-
-.TwoColumnBlogSubnav h4 {
- font-weight:bold;
- font-size: 14px;
- color: white;
- padding:6px 0px 12px 0px;
-}
-
-hr.formSeparator {
- margin: 10px 23px 25px auto;
- border-top: 1px solid #d7d9d9;
-}
-
-.adminforms .checkbox{
- margin-left:170px;
-}
-
-.submit_first {
- font-size: 10px;
- font-weight: bold;
- color: #FFFFFF;
- background-color: #e3a835;
- border-top: 1px solid #fbdea4;
- border-left: 1px solid #fbdea4;
- border-right: 1px solid #976c18;
- border-bottom: 1px solid #976c18;
- height:20px;
- padding:0 10px 0 10px;
-}
-
-/* Feeds Pages: Right column - Subnav list */
-
-
-.feedsRightsidebox {
- padding: 0 20px 20px 40px;
- float:right;
- width:260px;
- height:100%;
-}
-
-.feedsRightsidebox img{
- margin:10px 0 20px 10px;
-}
-
-.feedsRightsidebox h4 {
- font-size:11px;
- font-weight:bold;
- padding:15px 0px 5px 10px;
- border-bottom: 1px solid #8c8f91;
-}
-
-.feedsRightsidebox ul {
- padding-left: 10px;
- margin-left: 0px;
-}
-
-.feedsRightsidebox li {
- list-style: none;
- display: block;
- padding:.25em 0px;
-}
-
-#feeds_subnav li{
- background-image:url(/blogs/images/ico_linkarrow_blue.gif);
- padding:0 0 6px 10px;
- background-repeat: no-repeat;
- background-position: 0 3px;
- font-size: 11px;
- color: #333366;
- margin:0 0 0 -10px;
-}
-
-.feedsContent {
-/* spacing for when the archive is added margin: 0px 230px 0px 15px; */
- margin: 0 325px 0 15px;
- padding: 0;
-}
-
-.feedsContent p {
- margin: .5em auto;
- padding: 0;
-}
-
-#feedstblogentry {
- margin-top: 0;
- border-top: 0;
-}
-
-.feedsContent h3 {
- margin: auto auto 0 auto;
- padding: 0;
- line-height:2em;
-}
-
-.feedsContent hr {
- border: none 0;
- border-top: 1px solid #8c8f91;
- height: 1px;
- margin-bottom: 1em;
-}
-
-.feedsContent .blogauthortag {
- margin:0 Auto;
- padding-bottom: .5em;
- font-size:10px;
- font-weight:normal;
-}
-
-.feedsContent .blogcategorytag {
- margin:2em Auto 1.5em Auto;
- padding:0;
- font-size:10px;
- font-weight:normal;
-}
-
-.feedsContent .blogcommentsheader {
- margin: 1.5em auto 0 auto;
- padding: 0;
- line-height:2em;
- border-top: 1px dotted #a5a5a5;
- background-color:#FFFFFF;
- font-size:11px;
- font-weight:bold;
-}
-.feedsContent .blogcommentsbody {
- margin: 0px auto 1em auto;
- padding-bottom: 6px;
- border-bottom: 1px dashed #d5d5d5;
- background-color:#FFFFFF;
-}
-
-/***********************************************/
-/* =Normalizes Browser Styles */
-/***********************************************/
-
-/*--Normalize margin, padding */
-body, div, dl, dt, dd, ul, ol, li, h3, h4, h5, h6, pre, form, fieldset, input, p, blockquote, th, td {
- margin: 0;
- padding: 0;
- }
-
-/*--Normalize font-size for headers*/
- h3, h4, h5, h6 {
- font-size: 100%;
- }
-
-/*--Removes list-style from lists */
-ol,ul {
- list-style: none;
- }
-
-/*--Normalizes font-style and font-weight to normal*/
-address, caption, cite, code, dfn, em, strong, th, var {
- font-style: normal; font-weight: normal;
- }
-
-/*--Removes list-style from lists*/
-table {
- border-collapse: collapse;
- border-spacing: 0;
- }
-
-/*--Removes border from fieldset and img */
-fieldset, img {
- border: 0;
- }
-
-/*--Left-aligns text in caption and th*/
-caption, th {
- text-align: left;
- }
-
-/*--Removes Quotation marks from Q*/
-q: before, q: after {
- content: '';
- }
Modified: trunk/view-portlet/view.jsp
===================================================================
--- trunk/view-portlet/view.jsp 2008-03-12 16:17:38 UTC (rev 259)
+++ trunk/view-portlet/view.jsp 2008-03-13 07:54:20 UTC (rev 260)
@@ -12,8 +12,7 @@
<portlet:defineObjects />
<head>
- <link href="/blogs/stylesheet/blog_styles.css" rel="stylesheet" type="text/css" />
- <link href="/blogs/stylesheet/more_blog.css" rel="stylesheet" type="text/css" />
+ <link href="/blogs/stylesheet/blog.css" rel="stylesheet" type="text/css" />
</head>
<%
Modified: trunk/view-portlet/view_main.jsp
===================================================================
--- trunk/view-portlet/view_main.jsp 2008-03-12 16:17:38 UTC (rev 259)
+++ trunk/view-portlet/view_main.jsp 2008-03-13 07:54:20 UTC (rev 260)
@@ -12,8 +12,7 @@
<portlet:defineObjects />
<head>
- <link href="/blogs/stylesheet/blog_styles.css" rel="stylesheet" type="text/css" />
- <link href="/blogs/stylesheet/more_blog.css" rel="stylesheet" type="text/css" />
+ <link href="/blogs/stylesheet/blog.css" rel="stylesheet" type="text/css" />
</head>
<%
More information about the jboss-cvs-commits
mailing list