[jboss-cvs] JBossBlog SVN: r326 - in trunk/view: layout and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 2 12:30:50 EDT 2008
Author: adamw
Date: 2008-09-02 12:30:50 -0400 (Tue, 02 Sep 2008)
New Revision: 326
Modified:
trunk/view/common/post.xhtml
trunk/view/layout/menu.xhtml
trunk/view/layout/template.xhtml
trunk/view/stylesheet/blog.css
trunk/view/stylesheet/org_layout.css
trunk/view/stylesheet/org_main.css
trunk/view/view/post.xhtml
trunk/view/view/right_box.xhtml
Log:
Updated styles
Modified: trunk/view/common/post.xhtml
===================================================================
--- trunk/view/common/post.xhtml 2008-09-02 13:52:19 UTC (rev 325)
+++ trunk/view/common/post.xhtml 2008-09-02 16:30:50 UTC (rev 326)
@@ -8,9 +8,10 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j">
<h3>
- <s:link value="#{post.title}" view="/view/post.xhtml" propagation="none">
+ <!--<s:link value="#{post.title}" view="/view/post.xhtml" propagation="none">
<f:param name="post" value="#{post.titleAsId}" />
- </s:link>
+ </s:link>-->
+ <a href="#{linkService.generatePostLink(post)}">#{post.title}</a>
</h3>
<p class="blogauthortag">
@@ -35,7 +36,8 @@
<h:outputText value="#{post.content}" escape="false" rendered="#{!showSummary}" />
<h:outputText value="#{stringTools.createSummary(post.content)}" rendered="#{showSummary}" />
-
+
+ <br />
<s:fragment rendered="#{showPostTo and post.feed.showDzone}">
<img src="http://www.dzone.com/links/themes/reader/images/actions/icon-vote.gif" alt="" />
<a href="http://www.dzone.com/links/add.html?url=#{postToTools.encodeLink(post)}&title=#{postToTools.encodeTitleForDelicious(post)}">
@@ -58,4 +60,4 @@
</s:fragment>
<hr />
-</ui:composition>
\ No newline at end of file
+</ui:composition>
Modified: trunk/view/layout/menu.xhtml
===================================================================
--- trunk/view/layout/menu.xhtml 2008-09-02 13:52:19 UTC (rev 325)
+++ trunk/view/layout/menu.xhtml 2008-09-02 16:30:50 UTC (rev 326)
@@ -5,33 +5,26 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:rich="http://richfaces.org/rich">
- <div id="ORGLogo">
- <a href="/">
- <img src="http://labs.jboss.com/file-access/default/theme/images/common/jbossorg_logo.gif"
- alt="JBoss.org home" width="250" height="65" border="0"/>
- </a>
- </div>
-
- <div id='utilitynav'>
+ <div id="ORGLogo"><a href="http://www.jboss.org/"><img src="/file-access/default/theme/images/common/jbossorg_hdrlogo.gif" alt="JBoss.org home" width="110" height="65" border="0"/></a></div>
+ <div id='utilitynav' style="vertical-align: top">
<h:form styleClass="nomargin" id="TopSearch">
<ul>
- <li>
- <s:fragment rendered="#{!identity.loggedIn}">
- <s:link view="/security/login.xhtml" value="Login" />  |  
- </s:fragment>
- <s:fragment rendered="#{identity.loggedIn}">
- #{identity.username}   |  
- <s:link action="#{identity.logout}" value="Logout" />  |  
- </s:fragment>
- </li>
<li><a href="https://www.redhat.com/apps/store/jboss/">Subscribe</a>  |  </li>
<li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a>  |  </li>
+ <li><a href="http://jira.jboss.org/">Issue Tracking</a>  |  </li>
<li>
- Search:
+ <s:fragment rendered="#{!identity.loggedIn}">
+ <s:link view="/security/login.xhtml" value="Login" />
+   |   </s:fragment>
+ <s:fragment rendered="#{identity.loggedIn}"> #{identity.username}   |  
+ <s:link action="#{identity.logout}" value="Logout" />
+   |   </s:fragment>
+ </li>
+ <li> Search:
<h:inputText style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;"
value="#{postSearch.query}" />
<h:commandButton value="Search" action="/search/search.xhtml"
- image="http://labs.jboss.com/file-access/default/theme/images/common/ico_searcharrow.gif"
+ image="http://jboss.org/file-access/default/theme/images/common/ico_searcharrow.gif"
style="width:13px; height:13px">
<s:conversationPropagation value="none" />
</h:commandButton>
@@ -39,22 +32,19 @@
</ul>
</h:form>
</div>
-
<!-- Primary Navigation -->
<div id="primarynav">
<ul>
- <li>
- <a href="/">Home</a>
- </li>
- <li>
- <a href="/resources">Resources</a>
- </li>
- <li>
- <a href="/projects">Projects</a>
- </li>
- <li id='current'>
- <a href="/community">Community</a>
- </li>
+ <li> <a href="/">Home</a> </li>
+
+ <li> <a href="http://community.staging.jboss.org:8080">Community</a> </li>
+ <li> <a href="/projects">Projects</a> </li>
+ <li> <a href="/download">Downloads</a> </li>
+ <li> <a href="/docs">Documentation</a> </li>
+
+ <li> <a href="/forums">Forums & Lists </a></li>
+ <li> <a href="http://community.staging.jboss.org:8080/community/wiki">Wiki</a> </li>
+ <li id='current'> <a href="/feeds">Blogs</a> </li>
</ul>
</div>
</div>
Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml 2008-09-02 13:52:19 UTC (rev 325)
+++ trunk/view/layout/template.xhtml 2008-09-02 16:30:50 UTC (rev 326)
@@ -26,9 +26,9 @@
<mamut:let var="canViewManagement" value="#{identity.hasPermission('management', 'view')}">
<s:fragment rendered="#{canViewManagement}">
<div class="adminlinks">
- <s:fragment rendered="#{identity.hasPermission('useraccount', 'view')}">
+ <!--<s:fragment rendered="#{identity.hasPermission('useraccount', 'view')}">
<s:link view="/security/account.xhtml" value="User account" propagation="none" />   
- </s:fragment>
+ </s:fragment>-->
<s:link view="/home.xhtml" value="Feeds home" propagation="none" />   
<s:link view="/manage/index.xhtml" value="Manage home" propagation="none" />
</div>
@@ -58,21 +58,10 @@
</div>
<div class="footer">
- <p>
- <a href="http://www.redhat.com/">Red Hat.com</a> |
- <a href="http://www.jboss.com/">JBoss.com</a> |
- <a href="http://www.jboss.com/company/contact">Contact Us</a> |
- <a href="http://www.redhat.com/about/careers">Careers</a>
- </p>
- <p>
- Hosted on <a href="http://labs.jboss.com/jbosslabs">JBoss Labs</a>.
- Powered by <a href="http://labs.jboss.com/jbossas">JBoss AS</a>,
- <a href="http://labs.jboss.com/jbossportal">JBoss Portal</a>,
- <a href="http://labs.jboss.com/drools">Drools</a>and
- <a href="http://labs.jboss.com/jbossseam">JBoss Seam</a>.
- </p>
+ <p><a href="http://www.redhat.com/">Red Hat.com</a> | <a href="http://www.jboss.com/">JBoss.com</a> | <a href="http://www.jboss.com/company/contact">Contact Us</a> | <a href="http://www.redhat.com/about/careers">Careers</a></p>
+ <p>Hosted on <a href="http://www.magnolia.info">Magnolia</a> and <a href="http://www.jivesoftware.com/poweredby/">Clearspace</a>. Powered by <a href="http://www.jboss.com/products/platforms/application">JBoss EAP</a>.</p>
+ <p>Experiencing a <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=210">problem</a> or have a <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=210">suggestion</a> to make jboss.org better?</p></div>
</div>
- </div>
</div>
</body>
</html>
Modified: trunk/view/stylesheet/blog.css
===================================================================
--- trunk/view/stylesheet/blog.css 2008-09-02 13:52:19 UTC (rev 325)
+++ trunk/view/stylesheet/blog.css 2008-09-02 16:30:50 UTC (rev 326)
@@ -1,496 +1,524 @@
-.blogFeedNav {
-}
-
-.blogFeedNav_bottom {
- border: none 0;
- padding: 0 0 0 10px;
-}
-
-.blogFeedNav_top {
- border-bottom: 1px solid #8c8f91;
- padding: 11px 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;
-}
-
-/* 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(/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;
-}
-
-.adminlinks {
- float:right;
- margin-right: 20px;
- padding-top: 24px;
-}
-
-span.error {
- color: black;
- background-color: #fef9e6;
- border: 1px solid red;
- padding: 5px;
- display: block;
-}
-
-span.info {
- background-color:#FEF9E6;
- border:1px solid #F9BA82;
- color:#535353;
- font-size:10px;
- display:block;
- padding:12px;
-}
-
-span.required {
- color: red;
-}
-
-.bold {
- font-weight: bold;
-}
-
-.empty {
-
-}
-
-.adminforms .selectwide {
- width: 400px;
- margin-bottom: 8px;
-}
-
-.messages {
-
-}
-
-/* =Cheyenne's styles begin here 3/12/08 */
-
-
-.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;
- 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 0px 10px;
- float:right;
- margin: 10px 5px 0px -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: 0px;
-}
-
-.blogRightsidebox li {
- list-style: none;
- display: block;
- padding:.25em 0px;
-}
-
-/* Homepage css */
-
-#columnleftBLOG {
- float:left;
- margin: 10px;
- width:680px;
-}
-
-#columnleftBLOG h4{
- color: #cc0000;
- padding: 0px;
- margin: 0px;
-}
-
-#columnrightBLOG {
- float:right;
- width: 225px;
-}
-
-#columnrightBLOG img{
- border: none;
- margin-bottom:10px;
-
-}
-
-.laundrytable {
- width: 680px;
- text-align: left;
- line-height: 150%;
- margin: 0px 0px 20px 20px;
-}
-
-.laundrytable th {
- vertical-align: top;
- padding: 0px 5px 0px 0px;
- font-weight: bold;
-}
-
-.laundrytable td {
- vertical-align: top;
- padding: 0px 5px 5px 0px;
- 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(/file-access/default/theme/images/common/hdr_feed_gradient.gif);
- background-repeat: repeat-x;
- background-position:top;
- padding:0px 12px 12px 11px;
- margin:0 0 10px 0;
- width:200px;
-}
-
-.TwoColumnBlogSubnav h4{
- margin: 0;
- padding: 0;
-}
-
-.TwoColumnBlogSubnav dt{
- font-weight:bold;
- font-size: 14px;
- color: white;
- padding:6px 0px 12px 0px;
- margin:0px;
-}
-.TwoColumnBlogSubnav dd {
- background-image:url(/file-access/default/theme/images/common/ico_linkarrow_blue.gif);
- color: #233446;
- background-repeat: no-repeat;
- background-position: 0px 3px;
- padding:0 0 6px 15px;
- margin:0px;
-}
-
-.TwoColumnBlogSubnav ul {
- margin: 0px;
- padding:0px;
-}
-
-.TwoColumnBlogSubnav li {
- margin: 0;
- padding: 10px 10px 10px 10px;
- border-bottom: 1px solid #000000;
- list-style: none;
-}
-
-.TwoColumnBlogSubnav li.last {
- border-bottom: none;
-}
-
-
-/* Homepage: Right column - Blog Jelly Box */
-#TwoColumnBlogJelly {
- float: right;
- background-repeat:no-repeat;
- background-position:top;
- 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;
-}
-
-span.instructional_text p {
- background-color: #f6f6f6;
- color:#535353;
- font-size: 10px;
- padding: 12px;
- margin: 0px 0 10px 0;
-}
-
-/* Feeds Pages: Right column - Subnav list */
-
-.feedsRightsidebox {
- padding: 0px 20px 20px 40px;
- float:right;
- width:260px;
- height:100%;
-}
-
-.feedsRightsidebox img{
- margin:0px 0px 15px 10px;
- border: 0;
-}
-
-.feedsRightsidebox h4 {
- font-size:11px;
- font-weight:bold;
- padding:3px 0px 3px 10px;
- margin:10px 10px -10px 0px;
- border-bottom: 1px solid #8c8f91;
-}
-
-.feedsRightsidebox ul {
- padding-left: 13px;
-}
-
-.feedsRightsidebox li {
- list-style:none;
- padding:.25em 0px;
-}
-
-#feeds_subnav {
- margin:0px 0 10px 10px;
- padding:0px;
-}
-
-#feeds_subnav li{
- background-image:url(/file-access/default/theme/images/common/ico_linkarrow_blue.gif);
- padding:0px 0 6px 10px;
- background-repeat: no-repeat;
- background-position: 0px 3px;
- font-size: 11px;
- color: #333366;
- margin:0px 0px 0px -10px;
- list-style: none;
-}
-
-.feedsContent {
-/* spacing for when the archive is added margin: 0px 230px 0px 15px; */
- margin: 0px 325px 0px 15px;
- padding: 0px;
-}
-
-.feedsContent p {
- margin: .5em auto;
- padding: 0px;
-}
-
-#feedstblogentry {
- margin-top: 0px;
- border-top: 0px;
-}
-
-.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:0px Auto;
- padding-bottom: .5em;
- font-size:10px;
- font-weight:normal;
-}
-
-.feedsContent .blogcategorytag {
- margin:2em Auto 1.5em Auto;
- padding:0px;
- font-size:10px;
- font-weight:normal;
-}
-
-.feedsContent .blogcommentsheader {
- margin: 1.5em auto 0px auto;
- padding: 0px;
- 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;
-}
+/* ------------------- BASE STYLES --------------------- */
+
+
+.blogFeedNav {
+ margin-top: 6px;
+
+}
+
+.blogFeedNav_bottom {
+ border: none 0;
+ padding: 0 0 0 10px;
+}
+
+.blogFeedNav_top {
+ border-bottom: 1px solid #8c8f91;
+ padding: 11px 0 5px 10px;
+ margin-bottom: 1em;
+}
+
+.blogFeedNav ul {
+ padding-left: 0px;
+ margin-left: 0px;
+ display: block;
+ border-top: 1px dashed #94AEBD;
+ margin-top:10px;
+ margin-bottom: 0px;
+}
+
+ .blogFeedNav li, .TwoColumnBlogSubnav .blogFeedNav li {
+ list-style: none;
+ display: block;
+ padding: 4px 6px 0px 0px ;
+ border-bottom: 0px;
+}
+
+.feedsContent .blogFeedNav ul {
+ border-top: 0px;
+ margin-top: 0px;
+ display:inline;
+}
+
+.feedsContent .blogFeedNav li {
+ display:inline;
+}
+
+
+/* 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://www.jboss.org/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;
+}
+
+.adminlinks {
+ float:right;
+ margin-right: 20px;
+ padding-top: 24px;
+}
+
+span.error {
+ color: black;
+ background-color: #fef9e6;
+ border: 1px solid red;
+ padding: 5px;
+ display: block;
+}
+
+span.info {
+ background-color:#FEF9E6;
+ border:1px solid #F9BA82;
+ color:#535353;
+ font-size:10px;
+ display:block;
+ padding:12px;
+}
+
+span.required {
+ color: red;
+}
+
+.bold {
+ font-weight: bold;
+}
+
+.empty {
+
+}
+
+.adminforms .selectwide {
+ width: 400px;
+ margin-bottom: 8px;
+}
+
+.messages {
+
+}
+
+/* =Cheyenne's styles begin here 3/12/08 */
+
+
+.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;
+ 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 0px 10px;
+ float:right;
+ margin: 10px 5px 0px -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: 0px;
+}
+
+.blogRightsidebox li {
+ list-style: none;
+ display: block;
+ padding:.25em 0px;
+}
+
+/* Homepage css */
+
+#columnleftBLOG {
+ float:left;
+ margin: 10px;
+ width:680px;
+}
+
+#columnleftBLOG h4{
+ color: #cc0000;
+ padding: 0px;
+ margin: 0px;
+}
+
+#columnrightBLOG {
+ float:right;
+ width: 225px;
+}
+
+#columnrightBLOG img{
+ border: none;
+ margin-bottom:10px;
+
+}
+
+.laundrytable {
+ width: 680px;
+ text-align: left;
+ line-height: 150%;
+ margin: 0px 0px 20px 20px;
+}
+
+.laundrytable th {
+ vertical-align: top;
+ padding: 0px 5px 0px 0px;
+ font-weight: bold;
+}
+
+.laundrytable td {
+ vertical-align: top;
+ padding: 0px 5px 5px 0px;
+ 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(http://www.jboss.org/file-access/default/theme/images/common/hdr_feed_gradient.gif);
+ background-repeat: repeat-x;
+ background-position:top;
+ padding:0px 12px 12px 11px;
+ margin:0 0 10px 0;
+ width:200px;
+}
+
+.TwoColumnBlogSubnav hr {
+ border-top:1px dashed #94aebd;
+ color: #e1eef4;
+ border-bottom:0px;
+ border-left:0px;
+ border-right:0px;
+}
+
+.TwoColumnBlogSubnav h4{
+ margin: 0;
+ padding: 0;
+}
+
+.TwoColumnBlogSubnav dt{
+ font-weight:bold;
+ font-size: 14px;
+ color: white;
+ padding:6px 0px 12px 0px;
+ margin:0px;
+}
+.TwoColumnBlogSubnav dd {
+ background-image:url(http://www.jboss.org/file-access/default/theme/images/common/ico_linkarrow_blue.gif);
+ color: #233446;
+ background-repeat: no-repeat;
+ background-position: 0px 3px;
+ padding:0 0 6px 15px;
+ margin:0px;
+}
+
+.TwoColumnBlogSubnav ul {
+ margin: 0px;
+ padding:0px;
+}
+
+.TwoColumnBlogSubnav li {
+ margin: 0;
+ padding: 10px 10px 10px 10px;
+ border-bottom: 1px solid #000000;
+ list-style: none;
+}
+
+.TwoColumnBlogSubnav li.last {
+ border-bottom: none;
+}
+
+
+/* Homepage: Right column - Blog Jelly Box */
+#TwoColumnBlogJelly {
+ float: right;
+ background-repeat:no-repeat;
+ background-position:top;
+ 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;
+}
+
+span.instructional_text p {
+ background-color: #f6f6f6;
+ color:#535353;
+ font-size: 10px;
+ padding: 12px;
+ margin: 0px 0 10px 0;
+}
+
+/* Feeds Pages: Right column - Subnav list */
+
+.feedsRightsidebox {
+ padding: 0px 20px 20px 40px;
+ float:right;
+ width:260px;
+ height:100%;
+}
+
+.feedsRightsidebox img{
+ margin:0px 0px 15px 10px;
+ border: 0;
+}
+
+.feedsRightsidebox h4 {
+ font-size:11px;
+ font-weight:bold;
+ padding:3px 0px 3px 10px;
+ margin:10px 10px -10px 0px;
+ border-bottom: 1px solid #8c8f91;
+}
+
+.feedsRightsidebox ul {
+ padding-left: 13px;
+}
+
+.feedsRightsidebox li {
+ list-style:none;
+ padding:.25em 0px;
+}
+
+#feeds_subnav {
+ margin:0px 0 10px 10px;
+ padding:0px;
+}
+
+#feeds_subnav li{
+ background-image:url(http://www.jboss.org/file-access/default/theme/images/common/ico_linkarrow_blue.gif);
+ padding:0px 0 6px 10px;
+ background-repeat: no-repeat;
+ background-position: 0px 3px;
+ font-size: 11px;
+ color: #333366;
+ margin:0px 0px 0px -10px;
+ list-style: none;
+}
+
+.feedsContent {
+/* spacing for when the archive is added margin: 0px 230px 0px 15px; */
+ margin: 0px 325px 0px 15px;
+ padding: 0px;
+}
+
+.feedsContent p {
+ margin: .5em auto;
+ padding: 0px;
+}
+
+#feedstblogentry {
+ margin-top: 0px;
+ border-top: 0px;
+}
+
+.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:0px Auto;
+ padding-bottom: .5em;
+ font-size:10px;
+ font-weight:normal;
+}
+
+.feedsContent .blogcategorytag {
+ margin:2em Auto 1.5em Auto;
+ padding:0px;
+ font-size:10px;
+ font-weight:normal;
+}
+
+.feedsContent .blogcommentsheader {
+ margin: 1.5em auto 0px auto;
+ padding: 0px;
+ 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;
+}
Modified: trunk/view/stylesheet/org_layout.css
===================================================================
--- trunk/view/stylesheet/org_layout.css 2008-09-02 13:52:19 UTC (rev 325)
+++ trunk/view/stylesheet/org_layout.css 2008-09-02 16:30:50 UTC (rev 326)
@@ -41,6 +41,17 @@
width: 755px;
}
+#center4_6 {
+ float: left;
+ width: 510px;
+ margin-right: 15px;
+}
+
+#right1_6 {
+ float: left;
+ width: 225px;
+}
+
#orgmaximized {
width: 960px;
}
Modified: trunk/view/stylesheet/org_main.css
===================================================================
--- trunk/view/stylesheet/org_main.css 2008-09-02 13:52:19 UTC (rev 325)
+++ trunk/view/stylesheet/org_main.css 2008-09-02 16:30:50 UTC (rev 326)
@@ -1,3 +1,7 @@
+html {
+ background-color:#e6e7e8;
+}
+
body {
margin: 0px;
padding: 0px;
@@ -2,3 +6,2 @@
text-align: center;
- background-color:#e6e7e8;
background-image:url(http://labs.jboss.com/file-access/default/theme/images/common/bkgheader_left.gif);
@@ -39,11 +42,22 @@
float:left;
}
+#ORGLogo img {
+ display:block;
+}
+
/* --------------------- common elements -------------------------------------------- */
a {
color:#4a5d75;
}
+pre {
+ margin: 0px;
+ padding: 10px;
+ overflow:auto;
+ border: 1px solid #e6e7e8;
+ }
+
.clear { clear:both;}
.floatright {
@@ -84,7 +98,8 @@
/* ---------------- Multicolumn layout and specs ----------------------------------- */
-#ORGContent {
+#ORGContentHome {
+ overflow:hidden;
}
@@ -119,7 +134,7 @@
font-size:12px;
font-weight:bold;
color: white;
- padding: 5px 20px 3px 20px;
+ padding: 5px 15px 3px 15px;
background-repeat: no-repeat;
background-position: top left;
border:1px solid #4a5d75;
@@ -237,6 +252,12 @@
background-position:right;
}
+#columnleftHOME, #columnrightHOME {
+ padding-bottom: 30005px;
+ margin-bottom: -30000px;
+}
+
+
.knowledgebaseHome {
margin:0px;
padding:0px;
@@ -479,12 +500,13 @@
.TwoColumnSubnav dd {
margin-left:0px;
- padding:3px 0px 5px 5px;
+ padding:3px 0px 5px 10px;
}
.TwoColumnSubnav dd a {
background-image:url(http://labs.jboss.com/file-access/default/theme/images/common/ico_linkarrow_blue.gif);
color: #233446;
+ text-decoration:none;
background-repeat: no-repeat;
background-position: 3px 3px;
padding-left: 12px;
@@ -598,6 +620,7 @@
border-right: 1px solid #233345;
border-bottom: 1px solid #233345;
height:20px;
+ cursor: pointer;
}
.singlecolumn .submit {
@@ -891,6 +914,7 @@
border-right: 1px solid #233345;
border-bottom: 1px solid #233345;
height: 20px;
+ cursor: pointer;
}
/* --------------------- Code quotation styles ----------------------------- */
@@ -1057,4 +1081,145 @@
background-color: #CC3333;
border: 1px solid #7B1E1E;
list-style: none;
-}
\ No newline at end of file
+}
+
+/* ---------------------------------- Orange Callout Box -------------------------------------- */
+
+
+.CalloutBox {
+ clear:both;
+ border: 1px solid #ffcf82;
+ background-color: #faf8ed;
+ margin-top:60px;
+ padding-left: 10px;
+ padding-right: 10px;
+}
+
+
+.CalloutBox h4 {
+ font-weight:bold;
+ font-size: 12px;
+ margin: 0px;
+ padding-top: 6px;
+}
+
+.CalloutBox hr {
+ border-top:1px dashed #ffcf82;
+ color: #faf8ed;
+ border-bottom:0px;
+ border-left:0px;
+ border-right:0px;
+}
+
+.CalloutBox p {
+}
+
+
+/* -------------------- Rounded box styles (blue) ------------------------------------------ */
+.roundbox {
+ background: #4A5D75;
+}
+.roundboxtop {
+ background: url(http://www.jboss.org/file-access/default/theme/images/common/boxcorner_ne.gif) no-repeat top right;
+}
+.roundboxtop div {
+ font-size: 0;
+ height: 10px;
+ background: url(http://www.jboss.org/file-access/default/theme/images/common/boxcorner_nw.gif) no-repeat top left;
+}
+.roundboxbottom {
+ background: url(http://www.jboss.org/file-access/default/theme/images/common/boxcorner_se.gif) no-repeat bottom right;
+}
+.roundboxbottom div {
+ font-size: 0;
+ height: 10px;
+ background: url(http://www.jboss.org/file-access/default/theme/images/common/boxcorner_sw.gif) no-repeat bottom left;
+}
+.roundboxcontent {
+ padding: 0px 10px 0px 10px;
+}
+
+
+/* -------------------- Downloads modal dialog styles --------------------------------------- */
+
+#modallayer {
+ visibility: hidden;
+ position: absolute;
+ left: 0px;
+ top: 0px;
+ width:100%;
+ height:100%;
+ z-index: 1000;
+ background-image:url(http://www.jboss.org/file-access/default/theme/images/common/background_trans.png);
+
+}
+
+#modallayer #dialog {
+ width:400px;
+ margin: 100px auto;
+ background-color: #f3f3f3;
+ border:1px solid #94aebd;
+ background-image:url(http://www.jboss.org/file-access/default/theme/images/common/modaldialog_infoicon.gif);
+ background-position: 0px 40px;
+ background-repeat:no-repeat;
+ text-align:left;
+}
+
+#modallayer h4 {
+ background-image: url(http://www.jboss.org/file-access/default/theme/images/common/modaldialog_hdrbkg.gif);
+ background-repeat:repeat-x;
+ background-color: #d5d5d5;
+ font-weight:bold;
+ font-size:15px;
+ color:#243446;
+ height:28px;
+ text-indent: 110px;
+ margin:0px;
+ padding-top: 25px;
+
+}
+
+
+#modallayer p {
+ padding: 2px 10px 2px 110px;
+
+}
+
+#modallayer #buttonrow {
+ background-image: url(http://www.jboss.org/file-access/default/theme/images/common/modaldialog_footrbkg.gif);
+ background-repeat:repeat-x;
+ background-color: #d5d5d5;
+ color:#243446;
+ height:33px;
+ padding-left: 110px;
+ padding-top: 10px;
+ margin:0px;
+ border-top: none;
+
+}
+
+#modallayer #buttonrow ul {
+ padding-left: 0px;
+ margin-left: 0px;
+ display: inline;
+}
+
+#modallayer #buttonrow ul li {
+ list-style: none;
+ display: inline;
+ padding-right: 4px;
+}
+
+#modallayer #buttonrow .hrefbuttons {
+ background-color:#4A5D75;
+ border-color:#94AEBD #233345 #233345 #94AEBD;
+ border-style:solid;
+ border-width:1px;
+ color:#FFFFFF;
+ cursor:pointer;
+ font-size:10px;
+ font-weight:bold;
+ padding: 4px 10px;
+ text-decoration:none;
+
+}
Modified: trunk/view/view/post.xhtml
===================================================================
--- trunk/view/view/post.xhtml 2008-09-02 13:52:19 UTC (rev 325)
+++ trunk/view/view/post.xhtml 2008-09-02 16:30:50 UTC (rev 326)
@@ -23,10 +23,11 @@
<ul>
<li>
« Back to feed:  
- <s:link view="/view/feed.xhtml" value="#{postView.post.feed.title}"
+ <!--<s:link view="/view/feed.xhtml" value="#{postView.post.feed.title}"
propagation="none">
<f:param name="name" value="#{postView.post.feed.name}"/>
- </s:link>
+ </s:link>-->
+ <a href="#{linkService.generateFeedPageLink(postView.post.feed)}">#{postView.post.feed.title}</a>
</li>
<s:fragment rendered="#{identity.hasPermission('post', 'delete', post, post.feed, post.feed.group)}">
<li>
Modified: trunk/view/view/right_box.xhtml
===================================================================
--- trunk/view/view/right_box.xhtml 2008-09-02 13:52:19 UTC (rev 325)
+++ trunk/view/view/right_box.xhtml 2008-09-02 16:30:50 UTC (rev 326)
@@ -10,7 +10,8 @@
<div class="feedsRightsidebox">
<h4>Navigation</h4>
<ul>
- <li><s:link view="/home.xhtml" value="Feeds home" propagation="none" /></li>
+ <!--<li><s:link view="/home.xhtml" value="Feeds home" propagation="none" /></li>-->
+ <li><a href="/feeds/">Feeds home</a></li>
</ul>
<s:div rendered="#{not empty feed.group.header}">
@@ -41,11 +42,12 @@
<!-- TODO: configure the number of posts -->
<ui:repeat var="post" value="#{feedsService.getPosts(0, 10)}">
<li>
- <s:link view="/view/post.xhtml" value="#{post.title}" propagation="none">
+ <!--<s:link view="/view/post.xhtml" value="#{post.title}" propagation="none">
<f:param name="post" value="#{post.titleAsId}"/>
- </s:link>
+ </s:link>-->
+ <a href="#{linkService.generatePostLink(post)}">#{post.title}</a>
</li>
</ui:repeat>
</ul>
</div>
-</ui:composition>
\ No newline at end of file
+</ui:composition>
More information about the jboss-cvs-commits
mailing list