Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1098 - in trunk/forge/portal-extensions: binaries/maven-repo-addons binaries/maven-repo-addons/taglibs binaries/maven-repo-addons/taglibs/jars forge-navigation forge-navigation/src/java/org/jbosslabs/portlet/navigation forge-theme/jbossForgeLayout.war
|
From: <jbo...@li...> - 2005-09-13 18:06:13
|
Author: adamw
Date: 2005-09-13 14:05:51 -0400 (Tue, 13 Sep 2005)
New Revision: 1098
Added:
trunk/forge/portal-extensions/binaries/maven-repo-addons/taglibs/
trunk/forge/portal-extensions/binaries/maven-repo-addons/taglibs/jars/
trunk/forge/portal-extensions/binaries/maven-repo-addons/taglibs/jars/jstl.jar
trunk/forge/portal-extensions/binaries/maven-repo-addons/taglibs/jars/standard.jar
Modified:
trunk/forge/portal-extensions/forge-navigation/project.xml
trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java
trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css
trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/print.css
trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/screen.css
Log:
JBLAB-384: Project menu in-lined
Added: trunk/forge/portal-extensions/binaries/maven-repo-addons/taglibs/jars/jstl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/forge/portal-extensions/binaries/maven-repo-addons/taglibs/jars/jstl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/forge/portal-extensions/binaries/maven-repo-addons/taglibs/jars/standard.jar
===================================================================
(Binary files differ)
Property changes on: trunk/forge/portal-extensions/binaries/maven-repo-addons/taglibs/jars/standard.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/forge/portal-extensions/forge-navigation/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-navigation/project.xml 2005-09-13 15:31:30 UTC (rev 1097)
+++ trunk/forge/portal-extensions/forge-navigation/project.xml 2005-09-13 18:05:51 UTC (rev 1098)
@@ -36,5 +36,25 @@
<artifactId>forge-common</artifactId>
<version>1.0</version>
</dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0</version>
+ <jar>jstl.jar</jar>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.0</version>
+ <jar>standard.jar</jar>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
</dependencies>
</project>
Modified: trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java 2005-09-13 15:31:30 UTC (rev 1097)
+++ trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java 2005-09-13 18:05:51 UTC (rev 1098)
@@ -27,16 +27,10 @@
public class NavigationPortlet extends JBossPortlet {
private final static String MAIN_JSP = "navigation/main.jsp";
- private final static String PROJECT_JSP = "navigation/project.jsp";
-
- private final static String FOOTER_JSP = "navigation/footer.jsp";
-
public void doView(JBossRenderRequest request, JBossRenderResponse response)
throws IOException, PortletException {
response.setContentType("text/html");
- String projectId = ProjectsHelper.getSelectedProjectId(request);
-
String portalName = ForgeHelper.getPortalName(request);
Projects projects = ProjectsHelper.getProjects(portalName);
@@ -63,19 +57,5 @@
rd = getPortletContext().getRequestDispatcher(
ForgeHelper.createRepoAccessPath(portalName, MAIN_JSP));
rd.include(request, response);
-
- if (projectId != null) {
- context = projects.getProjectContext(pc, projectId);
- request.setAttribute(PortalJsp.CTX_REQUEST, context);
- request.setAttribute(ProjectsHelper.PROJECT_NAME, projects
- .getProjectName(projectId));
- rd = getPortletContext().getRequestDispatcher(
- ForgeHelper.createRepoAccessPath(portalName, PROJECT_JSP));
- rd.include(request, response);
- }
-
- rd = getPortletContext().getRequestDispatcher(
- ForgeHelper.createRepoAccessPath(portalName, FOOTER_JSP));
- rd.include(request, response);
}
}
\ No newline at end of file
Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css
===================================================================
--- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css 2005-09-13 15:31:30 UTC (rev 1097)
+++ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css 2005-09-13 18:05:51 UTC (rev 1098)
@@ -1,15 +1,15 @@
-/* some of the things need to be cleaned not needed for portal */
-
body { font: 11px Helvetica, Arial, sans-serif; }
-a:link { color: #005EB6; }
-a:active { color: #666666; }
-a:visited { color: #888888; }
+a:link { color: #005EB6; text-decoration: none; }
+a:active { color: #666666; text-decoration: none; }
+a:visited { color: #005EB6/*#888888*/; text-decoration: none; }
a:hover { }
h1 { color: #000000; line-height: 22px; font: 20px Helvetica, Arial, sans-serif; }
-h2 { color: #000000; line-height: 18px; font: 16px Helvetica, Arial, sans-serif; margin-top: 16px; }
-h3 { color: #000000; line-height: 13px; font: bold 12px Helvetica, Arial, sans-serif; margin-top: 8px; }
+h2 { color: #000000; line-height: 18px; font: bold 16px Helvetica, Arial, sans-serif; margin-top: 16px; }
+h3 { color: #000000; line-height: 16px; font: bold 14px Helvetica, Arial, sans-serif; margin-top: 8px; }
+h4 { color: #000000; line-height: 16px; font: 14px Helvetica, Arial, sans-serif; margin-top: 8px; }
+h5 { color: #000000; line-height: 14px; font: 12px Helvetica, Arial, sans-serif; margin-top: 8px; }
strong { font-weight: bold; }
em { font-style: italic; }
@@ -17,12 +17,13 @@
p { line-height: 150%; }
pre { font-family: Andale Mono, Courier New, Courier, monospace; }
-
hr { color: #6e6e6e; }
+dl {}
+dl dt { font-weight: bold; }
+dl dd { margin-top: 10px; margin-bottom: 20px; margin-left: 20px;}
-
/* FOOTER ----------------------------------------------*/
#PageFooter #Copyright { font: 9px Verdana, Helvetica, Arial, sans-serif;}
#PageFooter a { color: #0044AA; }
@@ -42,7 +43,18 @@
.infotable td { padding: 5px; background-color: #efefef; color: #000000; font: 11px Helvetica, Arial, sans-serif; }
.infotable th { padding: 5px; background-color: #efefef; color: white; font: bold 13px Helvetica, Arial, sans-serif; }
+table.infotable2 {}
+table.infotable2 td { padding: 10px 10px 10px 10px; background-color: #eaeaea; border-top: solid 1px #777777; line-height: 150% }
+table.infotable2 td:first-child { padding-top: 15px; padding-right: 20px; background-color: transparent; }
+table.infotable2 p { padding: 10px; }
+table.infotable2 p:first-child { padding-top: 0px; }
+table.infotable2 table {border-bottom: none;}
+table.infotable2 table td, table.infotable2 table td:first-child { padding: 5px; background-color: transparent; border: none; line-height: 100% }
+table.infotable2 table p, table.infotable2 table p:first-child { padding: 0px; }
+table.infotable2 h2 {margin: 0px;}
+
+
/* DEFINITION TABLE ---------------------------------------*/
.deftable { border-spacing: 5px; text-align: left; color: #ffffff; line-height: 150%; }
.deftable .term { border: none; vertical-align: top; padding: 5px; background-color: #aaaaaa; color: #ffffff; font-weight: bold; }
@@ -91,7 +103,7 @@
.title { font: 26px Arial, Helvetica, sans-serif; color: #FF9900; text-decoration: none; }
.intro { font: 12px Arial, Helvetica, sans-serif; color: #FF9900; text-decoration: none; }
.orangeTd { background-color: #FF9900; }
-ul { list-style-image: url(../img/reiter/ul.gif); }
+ul { list-style-image: url(images/reiter/ul.gif); }
h4 { font: 14px Arial, Helvetica, sans-serif; color: #000000; }
.url { color: #996600; }
Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/print.css
===================================================================
--- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/print.css 2005-09-13 15:31:30 UTC (rev 1097)
+++ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/print.css 2005-09-13 18:05:51 UTC (rev 1098)
@@ -6,6 +6,8 @@
h1 { }
h2 { }
h3 { }
+h4 { }
+h5 { }
strong { }
em { }
Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/screen.css
===================================================================
--- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/screen.css 2005-09-13 15:31:30 UTC (rev 1097)
+++ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/screen.css 2005-09-13 18:05:51 UTC (rev 1098)
@@ -1,4 +1,4 @@
-body { margin: 0px; padding: 0px; }
+body { background-color: white; margin: 0px; padding: 0px; }
a:link { text-decoration: none; }
a:active { text-decoration: none; }
@@ -8,6 +8,8 @@
h1 { }
h2 { }
h3 { }
+h4 { }
+h5 { }
strong { }
em { }
@@ -57,11 +59,11 @@
/* BODY ------------------------------------------------*/
-#BodyTable { width: 100%; margin-bottom: 119px; }
+#BodyTable { width: 100%; }
#BodyTable td { vertical-align: top; }
#BodyTable td.topheader { height: 102px; }
-#BodyTable td.leftside { width: 219px; }
-#BodyTable td.bodycell { font: 11px Verdana, Helvetica, Arial, sans-serif; padding: 0px 30px 0px 0px; }
+#BodyTable td.leftside { width: 219px; padding-bottom: 119px; }
+#BodyTable td.bodycell { font: 11px Verdana, Helvetica, Arial, sans-serif; padding: 0px 30px 119px 0px; }
#ContentContainer { }
#ContentContainer h1:first-child { margin-top: 5px; }
@@ -69,17 +71,112 @@
/* LEFT MENU -------------------------------------------*/
/*1 10/179/0, 20/166/3, +45 = 226 */
/*2 8/167/0, 18/154/3, +44 = 219 */
+/* deprecated
#LeftMenu { margin-right: 44px; border-right: solid 1px white; padding-bottom: 13px; }
#LeftMenu ul { padding: 0px; margin: 0px; }
#LeftMenu li { list-style: none; }
#LeftMenu ul li a { width: 167px; font-weight: bold; padding: 4px 0px 4px 8px; border-top: solid 1px white; }
#LeftMenu ul ul li a { width: 154px; font-weight: normal; padding: 3px 3px 3px 18px; border-top: none;}
-#LeftMenu ul ul { padding-bottom: 0px; }
+#LeftMenu ul ul { padding-bottom: 8px; }
#LeftMenu a { display: block; font: 11px Verdana, Helvetica, Arial, sans-serif; text-decoration: none; }
#LeftMenu a:link, #LeftMenu a:visited { color: #ffffff; }
#LeftMenu a:hover { background-color: #cccccc; color: #000000; }
+*/
+/* core */
+#LeftMenu { margin-right: 44px; padding-bottom: 13px; }
+#LeftMenu li { list-style: none; font: 11px Verdana, Helvetica, Arial, sans-serif; }
+#LeftMenu a { display: block; text-decoration: none; color: #ffffff;}
+/* 1st level */
+#LeftMenu ul {
+ padding: 0px;
+ margin: 0px;
+}
+#LeftMenu ul li {
+ border-top: solid 1px white;
+}
+#LeftMenu ul li a {
+ width: 167px;
+ padding: 4px 0px 4px 8px;
+ /* 0 + 8 + 167 = 175px */
+ font-weight: bold;
+}
+#LeftMenu ul li a:hover {
+ background-color: #cccccc;
+ color: black;
+}
+#LeftMenu ul li.current {
+ background-color: #cccccc;
+}
+#LeftMenu ul li.current a {
+ color: black;
+}
+#LeftMenu ul li.current a:hover {
+ background-color: #F0F0F0;
+}
+
+
+/* 2nd level */
+#LeftMenu ul li ul {
+ padding: 0px 0px 8px 0px;
+ margin: 0px;
+}
+#LeftMenu ul li ul li {
+ border-top: none;
+}
+#LeftMenu ul li ul li a {
+ width: 154px;
+ padding: 3px 3px 3px 18px;
+ /* 3 + 18 + 154 = 175px */
+ color: white;
+ font-weight: normal;
+}
+#LeftMenu ul li ul li a:hover {
+ background-color: #cccccc;
+}
+#LeftMenu ul li.current ul li a:hover {
+ background-color: #F0F0F0;
+}
+#LeftMenu ul li.current ul li.current {
+ margin: 3px 10px 3px 10px;
+ background-color: #F0F0F0;
+}
+#LeftMenu ul li.current ul li.current a {
+ padding: 5px 3px 2px 8px;
+ width: 144px;
+ /* 3 + 8 + 144 + 10 + 10 = 175px */
+ color: black;
+ font-weight: bold;
+ font-size: 10px;
+}
+#LeftMenu ul li ul li.current a:hover {
+ text-decoration: underline;
+}
+
+/* 3rd level */
+#LeftMenu ul li.current ul li.current ul {
+ padding: 5px;
+ margin-left: 20px;
+}
+#LeftMenu ul li.current ul li.current ul li {
+ border-top: none;
+ list-style: square;
+}
+#LeftMenu ul li.current ul li.current ul li a {
+ padding: 3px 3px 3px 3px;
+ width: 119px;
+ /* 3 + 3 + 5 + 25 + 10 + 10 = 56 - 175px = 119 */
+ color: black;
+ font-weight: normal;
+ font-size: 10px;
+}
+#LeftMenu ul li.current ul li.current ul li a:hover {
+ text-decoration: underline;
+}
+
+
+
/* ADS ------------------------------------------------*/
#LeftAds {}
#LeftAds .item { margin-top: 10px; margin-bottom: 10px; }
@@ -87,7 +184,7 @@
/* FOOTER ----------------------------------------------*/
#PageFooter { position: absolute; bottom: 0px; padding-top: 114px; z-index:0}
-#PageFooter #Copyright { margin-bottom: 20px; margin-left: 220px; text-align: center; }
+#PageFooter #Copyright { margin-bottom: 20px; margin-left: 220px; }
#PageFooter a { text-decoration: none; }
@@ -103,9 +200,9 @@
div.brand_JEMS #PageFooter { background: transparent url(images/bg_bottom_blue.gif) bottom left no-repeat; }
div.brand_JEMS #LeftMenu { background: #777777 url(images/bg_side_btm_blue.gif) bottom right no-repeat; }
div.brand_JEMS #TopSearch input.searchbutton { background: #ffffff url(images/btn_go_blue.gif) right no-repeat; }
-div.brand_DOTCOM #BodyTable { background: transparent url(images/bg_top_yellow.gif) top left no-repeat; }
-div.brand_DOTCOM #PageFooter { background: transparent url(images/bg_bottom_yellow.gif) bottom left no-repeat; }
-div.brand_DOTCOM #LeftMenu { background: #777777 url(images/bg_side_btm_yellow.gif) bottom right no-repeat; }
+div.brand_DOTCOM #BodyTable { background: transparent url(images/bg_top_green.gif) top left no-repeat; }
+div.brand_DOTCOM #PageFooter { background: transparent url(images/bg_bottom_green.gif) bottom left no-repeat; }
+div.brand_DOTCOM #LeftMenu { background: #777777 url(images/bg_side_btm_green.gif) bottom right no-repeat; }
div.brand_DOTCOM #TopSearch input.searchbutton { background: #ffffff url(images/btn_go_green.gif) right no-repeat; }
div.brand_FED #BodyTable { background: transparent url(images/bg_top_yellow.gif) top left no-repeat; }
div.brand_FED #PageFooter { background: transparent url(images/bg_bottom_yellow.gif) bottom left no-repeat; }
|
