Author: thomas.heute(a)jboss.com
Date: 2009-04-20 03:05:37 -0400 (Mon, 20 Apr 2009)
New Revision: 13230
Modified:
tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/bin/portal-admin-war/css/boxes.css
tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml
Log:
[theute@localhost core-admin]$ svn merge -r 13227:13228
https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7
Skipped missing target: 'core-admin/src/bin/portal-admin-war/css/boxes.css'
Skipped missing target: 'core-admin/src/bin/portal-admin-war/css'
Skipped missing target: 'core-admin/src/bin/portal-admin-war'
Skipped missing target: 'core-admin/src/bin'
Skipped missing target:
'core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml'
Skipped missing target: 'core-admin/src/resources/portal-admin-war/WEB-INF/tags'
Skipped missing target: 'core-admin/src/resources/portal-admin-war/WEB-INF'
Skipped missing target: 'core-admin/src/resources/portal-admin-war'
Skipped missing target: 'core-admin/src/resources'
Skipped missing target: 'core-admin/src'
Skipped missing target: 'core-admin'
[theute@localhost core-admin]$ svn merge -r 13227:13228
https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-...
--- Merging r13228 into '.':
U src/bin/portal-admin-war/css/boxes.css
U src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml
[theute@localhost core-admin]$ svn commit
Sending core-admin/src/bin/portal-admin-war/css/boxes.css
Sending core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml
cd Transmitting file data ..../..
Committed revision 13229.
s[theute@localhost core-admin]$ cd ../..
[theute@localhost tmp]$ cd Enterprise_Portal_Platform_4_3_GA_CP01/
[theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ svn update
U core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectTestCase.java
Updated to revision 13229.
[theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ svn merge -r 13227:13228
https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-...
^Csvn: OPTIONS of
'https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-admin':
SSL negotiation failed: SSL error: Function was interrupted. (
https://svn.jboss.org)
[theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$
[theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ cd core-admin
[theute@localhost core-admin]$ svn merge -r 13227:13228
https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7
Skipped missing target: 'core-admin/src/bin/portal-admin-war/css/boxes.css'
Skipped missing target: 'core-admin/src/bin/portal-admin-war/css'
Skipped missing target: 'core-admin/src/bin/portal-admin-war'
Skipped missing target: 'core-admin/src/bin'
Skipped missing target:
'core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml'
Skipped missing target: 'core-admin/src/resources/portal-admin-war/WEB-INF/tags'
Skipped missing target: 'core-admin/src/resources/portal-admin-war/WEB-INF'
Skipped missing target: 'core-admin/src/resources/portal-admin-war'
Skipped missing target: 'core-admin/src/resources'
Skipped missing target: 'core-admin/src'
Skipped missing target: 'core-admin'
[theute@localhost core-admin]$ svn merge -r 13227:13228
https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-...
--- Merging r13228 into '.':
U src/bin/portal-admin-war/css/boxes.css
U src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml
[theute@localhost core-admin]$ svn commit
Sending core-admin/src/bin/portal-admin-war/css/boxes.css
Sending core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml
cd Transmitting file data ..../..
Committed revision 13229.
s[theute@localhost core-admin]$ cd ../..
[theute@localhost tmp]$ cd Enterprise_Portal_Platform_4_3_GA_CP01/
[theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ svn update
U core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectTestCase.java
Updated to revision 13229.
[theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ svn merge -r 13227:13228
https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-...
^Csvn: OPTIONS of
'https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-admin':
SSL negotiation failed: SSL error: Function was interrupted. (
https://svn.jboss.org)
[theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$
[theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ cd core-admin
JBQA-2181: Portlet Definition page looks bad in IE6
Modified:
tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/bin/portal-admin-war/css/boxes.css
===================================================================
---
tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/bin/portal-admin-war/css/boxes.css 2009-04-20
06:52:54 UTC (rev 13229)
+++
tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/bin/portal-admin-war/css/boxes.css 2009-04-20
07:05:37 UTC (rev 13230)
@@ -19,8 +19,7 @@
.whiteWithLtGreyHeader .box-header,
.whiteWithLtGreyHeader .box-footer{
- padding: 0 7px 0 7px;
- position: relative;
+ /*padding: 0 7px 0 7px;*/
}
.whiteWithLtGreyHeader .img-top-left{
@@ -51,7 +50,6 @@
border-top:1px solid #a5a5a5;
background-color:#ececec;
width: 100%;
- height:6px;
}
.whiteWithLtGreyHeader .box-content{
@@ -62,7 +60,7 @@
.whiteWithLtGreyHeader .box-footer-content{
border-bottom:1px solid #a5a5a5;
width: 100%;
- height:6px;
+ /*height:6px;*/
}
Modified:
tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml
===================================================================
---
tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2009-04-20
06:52:54 UTC (rev 13229)
+++
tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2009-04-20
07:05:37 UTC (rev 13230)
@@ -5,19 +5,19 @@
<div class="#{class == null ? 'greyRounded' : class}">
<div class="box-header">
- <img src="/portal-core/images/corners/7px/corner-left-top-grey.gif"
alt="" class="img-top-left"/>
+ <!--<img
src="/portal-core/images/corners/7px/corner-left-top-grey.gif" alt=""
class="img-top-left"/>-->
<div class="box-header-content">
</div>
- <img
src="/portal-core/images/corners/7px/corner-right-top-grey.gif" alt=""
class="img-top-right"/>
+ <!--<img
src="/portal-core/images/corners/7px/corner-right-top-grey.gif" alt=""
class="img-top-right"/>-->
</div>
<div class="box-content">
<ui:insert/>
</div>
<div class="box-footer">
- <img
src="/portal-core/images/corners/7px/corner-left-bottom-white.gif"
alt="" class="img-bottom-left"/>
+ <!--<img
src="/portal-core/images/corners/7px/corner-left-bottom-white.gif"
alt="" class="img-bottom-left"/>-->
<div class="box-footer-content">
</div>
- <img
src="/portal-core/images/corners/7px/corner-right-bottom-white.gif"
alt="" class="img-bottom-right"/>
+ <!--<img
src="/portal-core/images/corners/7px/corner-right-bottom-white.gif"
alt="" class="img-bottom-right"/>-->
</div>
</div>