[jboss-svn-commits] JBoss Portal SVN: r5175 - in trunk: core/src/bin/portal-core-war/layouts/generic core/src/bin/portal-core-war/themes/industrial core/src/bin/portal-core-war/themes/maple core/src/bin/portal-core-war/themes/mission-critical core/src/bin/portal-core-war/themes/phalanx core/src/bin/portal-core-war/themes/renaissance theme/src/main/org/jboss/portal/theme/render/region theme/src/main/org/jboss/portal/theme/tag
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 11 17:21:06 EDT 2006
Author: roy.russo at jboss.com
Date: 2006-09-11 17:21:04 -0400 (Mon, 11 Sep 2006)
New Revision: 5175
Added:
trunk/theme/src/main/org/jboss/portal/theme/render/region/UtilityNavigation.java
Modified:
trunk/core/src/bin/portal-core-war/layouts/generic/index.jsp
trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css
trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css
trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css
trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java
Log:
JBPORTAL-1030 - renamed region class and css calls to it.
Modified: trunk/core/src/bin/portal-core-war/layouts/generic/index.jsp
===================================================================
--- trunk/core/src/bin/portal-core-war/layouts/generic/index.jsp 2006-09-11 20:51:58 UTC (rev 5174)
+++ trunk/core/src/bin/portal-core-war/layouts/generic/index.jsp 2006-09-11 21:21:04 UTC (rev 5175)
@@ -24,7 +24,7 @@
<td align="center" valign="top" id="header">
<!-- TODO: Needs to be defined as a region for access control -->
- <p:region regionName='utilitynavigation' regionID='utilitynavigation'/>
+ <p:region regionName='UtilityNavigation' regionID='UtilityNavigation'/>
<p:region regionName='navigation' regionID='navigation'/>
<div id="spacer"></div>
</td>
Modified: trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css 2006-09-11 20:51:58 UTC (rev 5174)
+++ trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css 2006-09-11 21:21:04 UTC (rev 5175)
@@ -321,7 +321,7 @@
* Utility Navigation *
*****************************/
- #utilitynavigation {
+ #UtilityNavigation {
float: right;
font-size: 10px;
padding: 6px 12px 0px 0px;
@@ -329,11 +329,11 @@
z-index: 20;
}
- #utilitynavigation a {
+ #UtilityNavigation a {
color: #FFFFFF;
}
- #utilitynavigation .addcontent {
+ #UtilityNavigation .addcontent {
background-image: url( images/ico_addcontent.gif );
background-repeat: no-repeat;
background-position: left;
Modified: trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css 2006-09-11 20:51:58 UTC (rev 5174)
+++ trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css 2006-09-11 21:21:04 UTC (rev 5175)
@@ -315,7 +315,7 @@
* Utility Navigation *
*****************************/
-#utilitynavigation {
+#UtilityNavigation {
float: right;
font-size: 10px;
padding: 6px 12px 0px 0px;
@@ -323,11 +323,11 @@
z-index: 20;
}
-#utilitynavigation a {
+#UtilityNavigation a {
color: #FFFFFF;
}
-#utilitynavigation .addcontent {
+#UtilityNavigation .addcontent {
background-image: url( images/ico_addcontent.gif );
background-repeat: no-repeat;
background-position: left;
Modified: trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css 2006-09-11 20:51:58 UTC (rev 5174)
+++ trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css 2006-09-11 21:21:04 UTC (rev 5175)
@@ -317,7 +317,7 @@
* Utility Navigation *
*****************************/
- #utilitynavigation {
+ #UtilityNavigation {
float: right;
font-size: 10px;
padding: 6px 12px 0px 0px;
@@ -325,11 +325,11 @@
z-index: 20;
}
- #utilitynavigation a {
+ #UtilityNavigation a {
color: #FFFFFF;
}
- #utilitynavigation .addcontent {
+ #UtilityNavigation .addcontent {
background-image: url( images/ico_addcontent.gif );
background-repeat: no-repeat;
background-position: left;
Modified: trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css 2006-09-11 20:51:58 UTC (rev 5174)
+++ trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css 2006-09-11 21:21:04 UTC (rev 5175)
@@ -349,7 +349,7 @@
* Utility Navigation *
*****************************/
-#utilitynavigation {
+#UtilityNavigation {
float: right;
font-size: 10px;
padding: 6px 12px 0px 0px;
@@ -357,11 +357,11 @@
z-index: 20;
}
-#utilitynavigation a {
+#UtilityNavigation a {
color: #336699;
}
-#utilitynavigation .addcontent {
+#UtilityNavigation .addcontent {
background-image: url( images/ico_addcontent.gif );
background-repeat: no-repeat;
background-position: left;
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2006-09-11 20:51:58 UTC (rev 5174)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2006-09-11 21:21:04 UTC (rev 5175)
@@ -374,7 +374,7 @@
* Utility Navigation *
*****************************/
-#utilitynavigation {
+#UtilityNavigation {
float: right;
font-size: 10px;
padding: 6px 12px 0px 0px;
@@ -382,11 +382,11 @@
z-index: 20;
}
-#utilitynavigation a {
+#UtilityNavigation a {
color: #FFFFFF;
}
-#utilitynavigation .addcontent {
+#UtilityNavigation .addcontent {
background-image: url( images/ico_addcontent.gif );
background-repeat: no-repeat;
background-position: left;
Added: trunk/theme/src/main/org/jboss/portal/theme/render/region/UtilityNavigation.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/region/UtilityNavigation.java 2006-09-11 20:51:58 UTC (rev 5174)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/region/UtilityNavigation.java 2006-09-11 21:21:04 UTC (rev 5175)
@@ -0,0 +1,54 @@
+/*
+* 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.portal.theme.render.region;
+
+/**
+ * This is a static div region, that is not bound to a window.
+ *
+ * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
+ */
+
+public class UtilityNavigation
+{
+ /**
+ * Returns output for rendering in region tag.
+ *
+ * @param s
+ * @return output for rendering
+ */
+ public String render(String s)
+ {
+ if(s == null)
+ {
+ return "<a href=\"#\" class=\"addcontent\">Add Content</a>" +
+ " | " +
+ "<a href=\"#\">Edit Page</a>" +
+ " | " +
+ "<a href=\"#\" class=\"addcontent\">Add Page</a>";
+ }
+ else
+ {
+ return "";
+ }
+ }
+}
Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java 2006-09-11 20:51:58 UTC (rev 5174)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java 2006-09-11 21:21:04 UTC (rev 5175)
@@ -88,12 +88,6 @@
{
// create a new region obj, based on region name
Region newRegion = new Region(regionName, regionCssId, RegionOrientation.DEFAULT);
-/*
- if(regionName.equals("utility"))
- {
- out.write("<div id=\"utilitynavigation\"><a href=\"#\" class=\"addcontent\">Add Content</a></div>");
- }
-*/
RenderContext renderContext = (RenderContext) request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
renderContext = renderContext.getContext(newRegion, regionCssId, orientation);
try
More information about the jboss-svn-commits
mailing list