7:44 a.m.
Author: phuong_vu
Date: 2011-09-05 08:44:03 -0400 (Mon, 05 Sep 2011)
New Revision: 7302
Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/background/ViewPage.gif
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl
Log:
[DOM] UIPageBody optimization
Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css
===================================================================
---
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css 2011-09-05
12:42:55 UTC (rev 7301)
+++
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css 2011-09-05
12:44:03 UTC (rev 7302)
@@ -1,23 +1,23 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * 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.
- */
-
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * 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.
+ */
+
.UIWorkingWorkspace {
margin: 0px;
@@ -34,9 +34,17 @@
}
.UIWorkingWorkspace .UIPageBody {
+ background: #DEDFDF;
+}
+.UIWorkingWorkspace .UIPageBody .VIEW-PAGEBODY{
+background: #b5b6b6;
+ -moz-border-radius:0px 0px 9px 9px;
+ -webkit-border-radius:0px 0px 9px 9px;
+ border-radius:0px 0px 9px 9px;
+ padding: 0px 8px 8px;
}
-
+
.MaskLayer {
background: black;
text-align: center;
Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css
===================================================================
---
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css 2011-09-05
12:42:55 UTC (rev 7301)
+++
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css 2011-09-05
12:44:03 UTC (rev 7302)
@@ -20,80 +20,39 @@
/*##############################-Page Layout
Decorator-################################*/
.LAYOUT-BLOCK .PageLayoutDecorator {
- cursor: move;
+ cursor: move;
+ background: white;
}
-.UIPageBody .PageLayoutDecorator {
+.PageLayoutDecorator {
padding: 0px;
- margin: 0px 2px auto 2px;
}
-.UIPageBody .PageLayoutDecorator .MiddlePageBG {
- background: white;
- height: 80px;
-}
-
-.UIPageBody .PageLayoutDecorator .TopLeftPage {
- background: url('background/ViewPage.gif') no-repeat left -113px; /*
orientation=lt */
- background: url('background/ViewPage-rt.gif') no-repeat right -113px; /*
orientation=rt */
+.PageLayoutDecorator .LeftPage {
+ background: url('background/ViewPage.gif') no-repeat left top; /* orientation=lt
*/
+ background: url('background/ViewPage-rt.gif') no-repeat right top; /*
orientation=rt */
padding: 0px 0px 0px 143px; /* orientation=lt */
padding: 0px 143px 0px 0px; /* orientation=rt */
}
-.UIPageBody .PageLayoutDecorator .TopRightPage {
- background: url('background/ViewPage.gif') no-repeat right -226px; /*
orientation=lt */
- background: url('background/ViewPage-rt.gif') no-repeat left -226px; /*
orientation=rt */
- padding: 0px 47px 0px 0px; /* orientation=lt */
- padding: 0px 0px 0px 47px; /* orientation=rt */
+.PageLayoutDecorator .RightPage {
+ background: url('background/ViewPage.gif') no-repeat right -468px; /*
orientation=lt */
+ background: url('background/ViewPage-rt.gif') no-repeat left -468px; /*
orientation=rt */
+ padding: 0px 40px 0px 0px; /* orientation=lt */
+ padding: 0px 0px 0px 40px; /* orientation=rt */
}
-.UIPageBody .PageLayoutDecorator .TopCenterPage {
- height: 112px; line-height: 98px;
- background: url('background/ViewPage.gif') repeat-x center top;
+.PageLayoutDecorator .CenterPage {
+ height: 230px; line-height: 98px;
+ background: url('background/ViewPage.gif') repeat-x center -235px;
color: #525252; text-align: center;
font-weight: bold;
padding: 0px; white-space: nowrap;
}
-.UIPageBody .PageLayoutDecorator .MiddleLeftPage {
- background: url('background/ViewPageRepeat.gif') repeat-y left; /*
orientation=lt */
- background: url('background/ViewPageRepeat-rt.gif') repeat-y right; /*
orientation=rt */
- padding: 0px 0px 0px 22px; /* orientation=lt */
- padding: 0px 22px 0px 0px; /* orientation=rt */
-}
-.UIPageBody .PageLayoutDecorator .MiddleRightPage {
- background: url('background/ViewPageRepeat.gif') repeat-y right; /*
orientation=lt */
- background: url('background/ViewPageRepeat-rt.gif') repeat-y left; /*
orientation=rt */
- padding: 0px 23px 0px 0px; /* orientation=lt */
- padding: 0px 0px 0px 23px; /* orientation=rt */
-}
-
-.UIPageBody .PageLayoutDecorator .BottomLeftPage {
- background: url('background/ViewPage.gif') no-repeat left -378px; /*
orientation=lt */
- background: url('background/ViewPage-rt.gif') no-repeat right -378px; /*
orientation=rt */
- padding: 0px 0px 0px 46px; /* orientation=lt */
- padding: 0px 46px 0px 0px; /* orientation=rt */
-}
-
-.UIPageBody .PageLayoutDecorator .BottomRightPage {
- background: url('background/ViewPage.gif') no-repeat right -378px; /*
orientation=lt */
- background: url('background/ViewPage-rt.gif') no-repeat left -378px; /*
orientation=rt */
- padding: 0px 35px 0px 0px; /* orientation=lt */
- padding: 0px 0px 0px 35px; /* orientation=rt */
-}
-
-.UIPageBody .PageLayoutDecorator .BottomCenterPage {
- line-height: 38px;
- background: url('background/ViewPage.gif') repeat-x center -339px;
-}
-
-.UIPageBody .PageLayoutDecorator .BottomCenterPage .FixBug {
- height: 38px;
-}
-
.UIPageBody .VIEW-PAGEBODY .UIPage {
- padding: 0px 8px;
+
}
.UIPageBody .VIEW-PAGEBODY .UIPage .UIComponentBlock {
@@ -101,23 +60,8 @@
height: 100%;
}
-.UIPageBody .BLPagebody {
- background: url('background/BgPagebody.gif') no-repeat left top;
- padding-left: 6px;
- height: 16px;
-}
-.UIPageBody .BRPagebody {
- background: url('background/BgPagebody.gif') no-repeat right top;
- padding-right: 6px;
- height: 16px;
-}
-.UIPageBody .BMPagebody {
- background: url('background/BgPagebody.gif') repeat-x center bottom;
- height: 16px;
-}
-
.BottomDecoratorHome .BottomDecoratorLeft{
background: url('background/BottomDecoratorHome.gif') no-repeat left;
padding-left: 7px;
Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/background/ViewPage.gif
===================================================================
(Binary files differ)
Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css
===================================================================
---
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css 2011-09-05
12:42:55 UTC (rev 7301)
+++
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css 2011-09-05
12:44:03 UTC (rev 7302)
@@ -1,21 +1,21 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * 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.
- */
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * 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.
+ */
/*##########################################################*/
@@ -55,71 +55,44 @@
.UIPageBody .UIPortalWarning {
font-family: tahoma;
font-size: 12px;
+ margin: 30px auto;
+ width: 500px;
+ -moz-border-radius: 4px 4px 4px 4px;
+ -webkit-border-radius: 4px 4px 4px 4px;
+ border-radius: 4px 4px 4px 4px;
+ background: none repeat scroll 0 0 white;
+ border: 1px solid #d1d1d1;
+ padding: 1px 1px 40px 1px;
}
-.UIPageBody .UIPortalWarning .LeftTopWarning {
- background: url('/eXoResources/skin/sharedImages/LeftTopWarning7x58.gif')
no-repeat left top;
- height: 40px;
- padding-left: 7px;
+.UIPageBody .UIPortalWarning ul{
+ padding: 0px;
+ list-style: none;
}
-.UIPageBody .UIPortalWarning .RightTopWarning {
- background: url('/eXoResources/skin/sharedImages/RightTopWarning7x58.gif')
no-repeat right top;
- height: 40px;
- padding-right: 7px;
-}
-
-.UIPageBody .UIPortalWarning .CenterTopWaring {
- background: url('/eXoResources/skin/sharedImages/CenterTopWarning1x58.gif')
repeat-x top;
- height: 40px;
- line-height: 40px;
-}
-
-.UIPageBody .UIPortalWarning .CenterTopWaring .TitleWaring {
- background: url('/eXoResources/skin/sharedImages/WarningIcon.gif') no-repeat
left center;
- padding-left: 50px;
+.UIPageBody .UIPortalWarning .TitleWaring {
+ background:#dee0ee url('/eXoResources/skin/sharedImages/WarningIcon.gif')
no-repeat 22px center;/* orientation=lt */
+ background:#dee0ee url('/eXoResources/skin/sharedImages/WarningIcon.gif')
no-repeat 95% center;/* orientation=rt */
+ padding-left: 70px;/* orientation=lt */
+ padding-right: 70px;/* orientation=rt */
font-size: 15px;
font-weight: bold;
line-height: 40px;
text-align: left; /* orientation=lt */
text-align: right; /* orientation=rt */
- margin-left: 20px; /* orientation=lt */
- margin-right: 20px; /* orientation=rt */
+ -moz-border-radius: 4px 4px 0px 0px;
+ -webkit-border-radius: 4px 4px 0px 0px;
+ border-radius: 4px 4px 0px 0px;
+ margin: 0px 0px 30px 0px;
}
-.UIPageBody .UIPortalWarning .LeftMiddleWarning {
- background: white
url('/eXoResources/skin/sharedImages/LeftMiddleWarning7x1.gif') repeat-y left;
- padding-left: 7px;
-}
-
-.UIPageBody .UIPortalWarning .RightMiddleWarning {
- background: url('/eXoResources/skin/sharedImages/RightMiddleWarning7x1.gif')
repeat-y right;
- text-align: left;
- padding: 30px 30px 50px 30px;
-}
-
-.UIPageBody .UIPortalWarning .RightMiddleWarning .Icon {
+.UIPageBody .UIPortalWarning .Icon {
background: url('/eXoResources/skin/sharedImages/BlueNextArrow.gif') no-repeat
left 5px; /* orientation=lt */
- background: url('/eXoResources/skin/sharedImages/BlueNextArrow.gif') no-repeat
right 5px; /* orientation=rt */
+ background: url('/eXoResources/skin/sharedImages/BlueNextArrow-rt.gif')
no-repeat right 5px; /* orientation=rt */
padding: 6px 0px 6px 20px; /* orientation=lt */
padding: 6px 20px 6px 0px; /* orientation=rt */
text-align: left; /* orientation=lt */
text-align: right; /* orientation=rt */
+ margin-left: 50px;/* orientation=lt */
+ margin-right: 50px;/* orientation=rt */
}
-
-.UIPageBody .UIPortalWarning .LeftBottomWarning {
- background: url('/eXoResources/skin/sharedImages/LeftBottomWarning7x7.gif')
no-repeat left center;
- height: 7px;
- padding-left: 7px;
-}
-
-.UIPageBody .UIPortalWarning .RightBottomWarning {
- background: url('/eXoResources/skin/sharedImages/RightBottomWarning7x7.gif')
no-repeat right center;
- height: 7px;
- padding-right: 7px;
-}
-
-.UIPageBody .UIPortalWarning .CenterBottomWaring {
- background: url('/eXoResources/skin/sharedImages/CenterBottomWarning1x7.gif')
repeat-x center;
- height: 7px;
-}
\ No newline at end of file
Modified:
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl
===================================================================
---
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl 2011-09-05
12:42:55 UTC (rev 7301)
+++
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl 2011-09-05
12:44:03 UTC (rev 7302)
@@ -5,73 +5,33 @@
%>
<div class="UIPageBody" id="${uicomponent.id}">
<div class="UIComponent UIComponentBlock">
-
<%if(portalMode == UIPortalApplication.APP_BLOCK_EDIT_MODE || portalMode ==
UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE) {%>
- <div class="LAYOUT-BLOCK LAYOUT-PAGEBODY DragControlArea"
onmousedown="if(eXo.portal.portalMode ==
<%=UIPortalApplication.APP_BLOCK_EDIT_MODE%>){eXo.portal.PortalDragDrop.init.call(this,
event);} return false">
- <div class="PageLayoutDecorator"
onmouseover="if(eXo.portal.portalMode ==
<%=UIPortalApplication.APP_BLOCK_EDIT_MODE%>){this.style.cursor ='move';}
else this.style.cursor ='default';">
+ <div class="LAYOUT-BLOCK LAYOUT-PAGEBODY DragControlArea
PageLayoutDecorator" onmouseover="if(eXo.portal.portalMode ==
<%=UIPortalApplication.APP_BLOCK_EDIT_MODE%>){this.style.cursor ='move';}
else this.style.cursor ='default';"
onmousedown="if(eXo.portal.portalMode ==
<%=UIPortalApplication.APP_BLOCK_EDIT_MODE%>){eXo.portal.PortalDragDrop.init.call(this,
event);} return false">
<%/*Begin Top Decorator*/%>
- <div class="TopLeftPage">
- <div class="TopRightPage">
- <div class="TopCenterPage">
+ <div class="LeftPage">
+ <div class="RightPage">
+ <div class="CenterPage">
<%=_ctx.appRes("UIPage.label.pageContent")%>
</div>
</div>
- </div>
-
- <%/*Begin Middle Decorator*/%>
- <div class="MiddleLeftPage">
- <div class="MiddleRightPage">
- <div class="MiddlePageBG">
- <div class="FixBug"><span></span></div>
- </div>
- </div>
- </div>
-
- <%/*Begin Bottom Decorator*/%>
- <div class="BottomLeftPage">
- <div class="BottomRightPage">
- <div class="BottomCenterPage">
- <div class="FixBug"><span></span></div>
- </div>
- </div>
- </div>
-
- </div>
+ </div>
</div>
<%} else {%>
<div class="VIEW-PAGEBODY VIEW-BLOCK DragControlArea"
id="PAGEBODY-VIEW-BLOCK">
<% if(uicomponent.getUIComponent() == null){ %>
- <div class="Empty">
- <div class="UIPortalWarning">
- <div class="LeftTopWarning">
- <div class="RightTopWarning">
- <div class="CenterTopWaring">
- <div
class="TitleWaring"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine1")%></div>
- </div>
- </div>
- </div>
- <div class="LeftMiddleWarning">
- <div class="RightMiddleWarning">
- <div class="WarningContent">
- <div
class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine2")%></div>
- <div
class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine3")%></div>
- <div
class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine4")%></div>
- </div>
- </div>
- </div>
- <div class="LeftBottomWarning">
- <div class="RightBottomWarning">
- <div
class="CenterBottomWaring"><span></span></div>
- </div>
- </div>
+ <div class="UIPortalWarning Empty">
+
+ <h3
class="TitleWaring"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine1")%></h3>
+
+ <ul>
+ <li
class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine2")%></li>
+ <li
class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine3")%></li>
+ <li
class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine4")%></li>
+ </ul>
+
</div>
- </div>
+
<% } else { uicomponent.renderChildren(); }%>
- <div class="BLPagebody">
- <div class="BRPagebody">
- <div class="BMPagebody"><span></span></div>
- </div>
- </div>
<%if(portalMode != UIPortalApplication.NORMAL_MODE) {%>
<div class="MaskParent" style="height:
0px;position:relative;">
@@ -85,5 +45,5 @@
<div class="CONTROL-PAGEBODY CONTROL-BLOCK" style="display:
none"><span></span></div>
</div>
<%} %>
- </div>
</div>
+</div>