July 2010 - embjopr-commits - Jboss List Archives

EMBJOPR SVN: r971 - branches/EmbJopr_1_3.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-29 15:32:09 -0400 (Thu, 29 Jul 2010) New Revision: 971 Modified: branches/EmbJopr_1_3/pom.xml Log: make i18nlog provided, overriding compiled scope from rhq-parent pom, so that jar does not end up included in the admin-console war Modified: branches/EmbJopr_1_3/pom.xml =================================================================== --- branches/EmbJopr_1_3/pom.xml 2010-07-28 16:09:09 UTC (rev 970) +++ branches/EmbJopr_1_3/pom.xml 2010-07-29 19:32:09 UTC (rev 971) @@ -45,8 +45,8 @@ <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/EmbJopr_1_3/</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3/</developerConnection> - <url>http://git.fedorahosted.org/git/?p=rhq/rhq.git/jopr-embedded-parent</url> - </scm> + <url>http://git.fedorahosted.org/git/?p=rhq/rhq.git/jopr-embedded-parent</url> + </scm> <issueManagement> <system>jira</system> @@ -78,7 +78,15 @@ <facelets.version>1.1.15.B1</facelets.version> </properties> - + <dependencies> + <dependency> + <groupId>i18nlog</groupId> + <artifactId>i18nlog</artifactId> + <version>1.0.10</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> <plugins>

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r970 - branches/EmbJopr_1_3/jbas5.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-28 12:09:09 -0400 (Wed, 28 Jul 2010) New Revision: 970 Modified: branches/EmbJopr_1_3/jbas5/pom.xml Log: upgrade hornetq plugin from 1.0.0.CR2 to 1.0.0.Final Modified: branches/EmbJopr_1_3/jbas5/pom.xml =================================================================== --- branches/EmbJopr_1_3/jbas5/pom.xml 2010-07-28 13:28:04 UTC (rev 969) +++ branches/EmbJopr_1_3/jbas5/pom.xml 2010-07-28 16:09:09 UTC (rev 970) @@ -82,7 +82,7 @@ <artifactItem> <groupId>org.hornetq</groupId> <artifactId>hornetq-jopr-plugin</artifactId> - <version>1.0.0.CR2</version> + <version>1.0.0.Final</version> </artifactItem> </artifactItems> </configuration>

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r969 - in trunk: jbas6 and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-28 09:28:04 -0400 (Wed, 28 Jul 2010) New Revision: 969 Modified: trunk/jbas5/pom.xml trunk/jbas6/pom.xml Log: upgrade hornetq plugin from 1.0.0.CR2 to 1.0.0.Final Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2010-07-27 18:30:15 UTC (rev 968) +++ trunk/jbas5/pom.xml 2010-07-28 13:28:04 UTC (rev 969) @@ -82,7 +82,7 @@ <artifactItem> <groupId>org.hornetq</groupId> <artifactId>hornetq-jopr-plugin</artifactId> - <version>1.0.0.CR2</version> + <version>1.0.0.Final</version> </artifactItem> </artifactItems> </configuration> Modified: trunk/jbas6/pom.xml =================================================================== --- trunk/jbas6/pom.xml 2010-07-27 18:30:15 UTC (rev 968) +++ trunk/jbas6/pom.xml 2010-07-28 13:28:04 UTC (rev 969) @@ -82,7 +82,7 @@ <artifactItem> <groupId>org.hornetq</groupId> <artifactId>hornetq-jopr-plugin</artifactId> - <version>1.0.0.CR2</version> + <version>1.0.0.Final</version> </artifactItem> </artifactItems> </configuration>

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r968 - in trunk/core/src/main/webapp: js and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: lkrejci Date: 2010-07-27 14:30:15 -0400 (Tue, 27 Jul 2010) New Revision: 968 Modified: trunk/core/src/main/webapp/WEB-INF/facelets/layout.xhtml trunk/core/src/main/webapp/js/embedded.js Log: EMBJOPR-250, EMBJOPR-289 - Several fixes to the IEx rendering: navtree height correct in IE6, no content scrollbar in IE6, the tab bar and content borders match up (always in IE7+, almost always in IE6) Modified: trunk/core/src/main/webapp/WEB-INF/facelets/layout.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2010-07-27 18:00:15 UTC (rev 967) +++ trunk/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2010-07-27 18:30:15 UTC (rev 968) @@ -76,8 +76,10 @@ } h\tml #content { - height: 100%; - overflow: visible; + padding: 16px; /* replace the em units for padding with something we can compute with in the expressions below */ + overflow: auto; + height: expression((document.body.clientHeight - 2 * 31 - 49 + 1) + 'px'); /* 49 = header height, 31 = footer height, but why I have to substract it twice escapes me. 1 = so that it looks better.*/ + width: expression((document.body.clientWidth - 300 - 2 * 16) + 'px'); /* 300 = width of the sidebar, 16 = padding */ } #pageheader, #footer { @@ -85,11 +87,10 @@ } #sidebar-left { - height: expression(document.body.clientHeight - (parseInt(document.body.currentStyle.fontSize) * 1.3333333 * (8 + 5)) + 'px'); + height: expression((document.body.clientHeight - 31 - 49 + 2) + 'px'); /* 49 = header height, 31 = footer height, 2 = so it looks better. */ } </style> <![endif]--> - </head> <body> <div id="content"> @@ -124,6 +125,26 @@ <ui:include src="resourceNavigation.xhtml"/> <ui:include src="header.xhtml"/> <ui:include src="footer.xhtml"/> + +  +  +  </body> </f:view> </html> Modified: trunk/core/src/main/webapp/js/embedded.js =================================================================== --- trunk/core/src/main/webapp/js/embedded.js 2010-07-27 18:00:15 UTC (rev 967) +++ trunk/core/src/main/webapp/js/embedded.js 2010-07-27 18:30:15 UTC (rev 968) @@ -680,6 +680,32 @@ hidediv('end'); } +function getScrollBarWidth () { + var inner = document.createElement('p'); + inner.style.width = "100%"; + inner.style.height = "200px"; + + var outer = document.createElement('div'); + outer.style.position = "absolute"; + outer.style.top = "0px"; + outer.style.left = "0px"; + outer.style.visibility = "hidden"; + outer.style.width = "200px"; + outer.style.height = "150px"; + outer.style.overflow = "hidden"; + outer.appendChild (inner); + + document.body.appendChild (outer); + var w1 = inner.offsetWidth; + outer.style.overflow = 'scroll'; + var w2 = inner.offsetWidth; + if (w1 == w2) w2 = outer.clientWidth; + + document.body.removeChild (outer); + + return (w1 - w2); +}; + /** * WindowResizeTracker can be used by scripts that need to keep track * of the current window/page sizes and their changes.

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r967 - in trunk/core/src/main/webapp: css and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: lkrejci Date: 2010-07-27 14:00:15 -0400 (Tue, 27 Jul 2010) New Revision: 967 Modified: trunk/core/src/main/webapp/css/console-style.css trunk/core/src/main/webapp/login.xhtml Log: EMBJOPR-249 - fixing the login page layout in IEx Modified: trunk/core/src/main/webapp/css/console-style.css =================================================================== --- trunk/core/src/main/webapp/css/console-style.css 2010-07-27 15:06:00 UTC (rev 966) +++ trunk/core/src/main/webapp/css/console-style.css 2010-07-27 18:00:15 UTC (rev 967) @@ -229,9 +229,12 @@ /* ------------------------ Login styles -------------------------- */ +.LoginContainer { + padding-top: 80px; +} + .Loginbox { text-align: left; - margin-top: 80px; background: #ffffff; padding: 10px 60px 30px 60px; width: 180px; Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2010-07-27 15:06:00 UTC (rev 966) +++ trunk/core/src/main/webapp/login.xhtml 2010-07-27 18:00:15 UTC (rev 967) @@ -43,7 +43,7 @@ <link rel="apple-touch-icon" href="images/favicon.png"/> </head> <body onload="document.getElementById('login_form:name').focus();"> - <div align="center" class="container"> + <div align="center" class="LoginContainer"> <div id="pageheader"> <div class="floatleft"> <h:panelGrid columns="2">

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r966 - in branches/EmbJopr_1_3/core/src/main/webapp: js and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: lkrejci Date: 2010-07-27 11:06:00 -0400 (Tue, 27 Jul 2010) New Revision: 966 Modified: branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml branches/EmbJopr_1_3/core/src/main/webapp/js/embedded.js Log: EMBJOPR-250, EMBJOPR-289 - Several fixes to the IEx rendering: navtree height correct in IE6, no content scrollbar in IE6, the tab bar and content borders match up (always in IE7+, almost always in IE6) Modified: branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2010-07-27 11:13:46 UTC (rev 965) +++ branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2010-07-27 15:06:00 UTC (rev 966) @@ -77,8 +77,10 @@ } h\tml #content { - height: 100%; - overflow: visible; + padding: 16px; /* replace the em units for padding with something we can compute with in the expressions below */ + overflow: auto; + height: expression((document.body.clientHeight - 2 * 31 - 49 + 1) + 'px'); /* 49 = header height, 31 = footer height, but why I have to substract it twice escapes me. 1 = so that it looks better.*/ + width: expression((document.body.clientWidth - 300 - 2 * 16) + 'px'); /* 300 = width of the sidebar, 16 = padding */ } #pageheader, #footer { @@ -86,11 +88,10 @@ } #sidebar-left { - height: expression(document.body.clientHeight - (parseInt(document.body.currentStyle.fontSize) * 1.3333333 * (8 + 5)) + 'px'); + height: expression((document.body.clientHeight - 31 - 49 + 2) + 'px'); /* 49 = header height, 31 = footer height, 2 = so it looks better. */ } </style> <![endif]--> - </head> <body> <div id="content"> @@ -125,6 +126,26 @@ <ui:include src="resourceNavigation.xhtml"/> <ui:include src="header.xhtml"/> <ui:include src="footer.xhtml"/> + +  +  +  </body> </f:view> </html> Modified: branches/EmbJopr_1_3/core/src/main/webapp/js/embedded.js =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/js/embedded.js 2010-07-27 11:13:46 UTC (rev 965) +++ branches/EmbJopr_1_3/core/src/main/webapp/js/embedded.js 2010-07-27 15:06:00 UTC (rev 966) @@ -477,3 +477,29 @@ } } } + +function getScrollBarWidth () { + var inner = document.createElement('p'); + inner.style.width = "100%"; + inner.style.height = "200px"; + + var outer = document.createElement('div'); + outer.style.position = "absolute"; + outer.style.top = "0px"; + outer.style.left = "0px"; + outer.style.visibility = "hidden"; + outer.style.width = "200px"; + outer.style.height = "150px"; + outer.style.overflow = "hidden"; + outer.appendChild (inner); + + document.body.appendChild (outer); + var w1 = inner.offsetWidth; + outer.style.overflow = 'scroll'; + var w2 = inner.offsetWidth; + if (w1 == w2) w2 = outer.clientWidth; + + document.body.removeChild (outer); + + return (w1 - w2); +};

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r965 - in branches/EmbJopr_1_3/core/src/main/webapp: css and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: lkrejci Date: 2010-07-27 07:13:46 -0400 (Tue, 27 Jul 2010) New Revision: 965 Modified: branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css branches/EmbJopr_1_3/core/src/main/webapp/login.xhtml Log: EMBJOPR-249 - fixing the login page layout in IEx Modified: branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css 2010-07-23 14:04:14 UTC (rev 964) +++ branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css 2010-07-27 11:13:46 UTC (rev 965) @@ -228,9 +228,12 @@ /* ------------------------ Login styles -------------------------- */ +.LoginContainer { + padding-top: 80px; +} + .Loginbox { text-align: left; - margin-top: 80px; background: #ffffff; padding: 10px 60px 30px 60px; width: 180px; Modified: branches/EmbJopr_1_3/core/src/main/webapp/login.xhtml =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/login.xhtml 2010-07-23 14:04:14 UTC (rev 964) +++ branches/EmbJopr_1_3/core/src/main/webapp/login.xhtml 2010-07-27 11:13:46 UTC (rev 965) @@ -43,7 +43,7 @@ <link rel="apple-touch-icon" href="images/favicon.png"/> </head> <body onload="document.getElementById('login_form:name').focus();"> - <div align="center" class="container"> + <div align="center" class="LoginContainer"> <div id="pageheader"> <div class="floatleft"> <h:panelGrid columns="2">

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r964 - branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-23 10:04:14 -0400 (Fri, 23 Jul 2010) New Revision: 964 Modified: branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml Log: [EMBJOPR-250], [EMBJOPR-251] - fix the layout rendering issues in IE7 (part 2) Modified: branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2010-07-23 14:00:56 UTC (rev 963) +++ branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2010-07-23 14:04:14 UTC (rev 964) @@ -1,3 +1,5 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <!-- ~ Jopr Management Platform ~ Copyright (C) 2005-2010 Red Hat, Inc. @@ -126,3 +128,4 @@ </body> </f:view> </html> +

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r963 - in branches/EmbJopr_1_3/core/src/main/webapp: css and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-23 10:00:56 -0400 (Fri, 23 Jul 2010) New Revision: 963 Modified: branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css Log: [EMBJOPR-250], [EMBJOPR-251] - fix the layout rendering issues in IE7 Modified: branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2010-07-22 15:58:01 UTC (rev 962) +++ branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2010-07-23 14:00:56 UTC (rev 963) @@ -1,6 +1,6 @@  -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" Modified: branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css 2010-07-22 15:58:01 UTC (rev 962) +++ branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css 2010-07-23 14:00:56 UTC (rev 963) @@ -22,6 +22,7 @@ html { margin: 0; padding: 0; + overflow: auto; } body { @@ -63,10 +64,12 @@ } #content { - margin-top: 46px; - margin-left: 20em; - margin-right: 0; - margin-bottom: 20px; + position: absolute; + top: 46px; + left: 300px; + right: 0; + bottom: 31px; + overflow: auto; padding: 1em; background: #FFFFFF; } @@ -76,7 +79,7 @@ top: 46px; bottom: 31px; /* Operas 5 + 6 shouldn't see this property */ left: 0; - width: 20em; + width: 300px; overflow: auto; background: #eff2f4; border-right: 1px solid #dee6ee; @@ -92,7 +95,6 @@ font-size: 9px; text-align: center; background: #35485d; - } /*\*/

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r962 - branches/EmbJopr_1_3/core/src/main/webapp.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-22 11:58:01 -0400 (Thu, 22 Jul 2010) New Revision: 962 Modified: branches/EmbJopr_1_3/core/src/main/webapp/index.html branches/EmbJopr_1_3/core/src/main/webapp/index.xhtml Log: provide user with a link to the login page on index.html and index.xhtml in case the meta redirect does not work due to browser security settings (https://jira.jboss.org/browse/EMBJOPR-248) Modified: branches/EmbJopr_1_3/core/src/main/webapp/index.html =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/index.html 2010-07-21 20:56:47 UTC (rev 961) +++ branches/EmbJopr_1_3/core/src/main/webapp/index.html 2010-07-22 15:58:01 UTC (rev 962) @@ -1,6 +1,6 @@ <!-- ~ Embedded Jopr Project - ~ Copyright (C) 2006-2009 Red Hat, Inc. + ~ Copyright (C) 2006-2010 Red Hat, Inc. ~ All rights reserved. ~ ~ This program is free software; you can redistribute it and/or modify @@ -21,4 +21,11 @@ <head> <meta http-equiv="Refresh" content="0; URL=index.seam"/> </head> -</html> \ No newline at end of file + +<body> + <p>Redirecting to the start page. If you are not redirected within a few seconds, click + <a href="index.seam">here</a>.</p> +</body> + +</html> + Modified: branches/EmbJopr_1_3/core/src/main/webapp/index.xhtml =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/index.xhtml 2010-07-21 20:56:47 UTC (rev 961) +++ branches/EmbJopr_1_3/core/src/main/webapp/index.xhtml 2010-07-22 15:58:01 UTC (rev 962) @@ -2,7 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!-- ~ Embedded Jopr Project - ~ Copyright (C) 2006-2009 Red Hat, Inc. + ~ Copyright (C) 2006-2010 Red Hat, Inc. ~ All rights reserved. ~ ~ This program is free software; you can redistribute it and/or modify @@ -38,7 +38,11 @@ <meta http-equiv="Refresh" content="0; URL=secure/summary.seam"/> </head> - <body/> + <body> + <p>Redirecting to the login page. If you are not redirected within a few seconds, click + <a href="secure/summary.seam">here</a>.</p> + </body> </f:view> -</html> \ No newline at end of file +</html> +

14 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits July 2010