Author: trong.tran Date: 2011-09-01 08:42:22 -0400 (Thu, 01 Sep 2011) New Revision: 7273 Added: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/DarkGrayButton.gif Removed: portal/branches/dom/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/Button.gif Modified: portal/branches/dom/component/scripting/src/test/resources/UIPortalApplication.gtmpl portal/branches/dom/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationManagement.gtmpl portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl portal/branches/dom/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css portal/branches/dom/testsuite/webuibasedsamples/src/main/webapp/groovy/webui/component/UISampleDownloadUpload.gtmpl portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/Stylesheet.css portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle1.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css portal/branches/dom/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIAccessGroup.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupSelector.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIListPermissionSelector.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIPermissionSelector.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/UIForgetPasswordWizard.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIAccountSettingForm.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UISkinSelector.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormTabPane.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl Log: [DOM] UIPortalApplication optimization Modified: portal/branches/dom/component/scripting/src/test/resources/UIPortalApplication.gtmpl =================================================================== --- portal/branches/dom/component/scripting/src/test/resources/UIPortalApplication.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/component/scripting/src/test/resources/UIPortalApplication.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -92,33 +92,17 @@ <div class="$uicomponent.skin" id="UIPortalApplication" style="!height: 100%;"> <div class="AjaxLoadingMask" id="AjaxLoadingMask" style="display: none; margin: auto;"> - <div class="LoadingContainer"> - <div class="CenterLoadingContainer"> - <div class="LoadingText"><%=_ctx.appRes("UIPortalApplication.label.Loading")%></div> - <div class="LoadingProgressBar"><span></span></div> + <div class="LoadingContainer"> + <div class="LoadingText"><%=_ctx.appRes("UIPortalApplication.label.Loading")%></div> + <span class="LoadingProgressBar"></span> + + <div class="UIAction"> + <a href="javascript:ajaxAbort();" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIPortalApplication.label.Abort")%></a> + </div> + + </div> + </div> - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript:ajaxAbort();" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIPortalApplication.label.Abort")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> - </div> - - </div> - </div> - </div> - <%uicomponent.renderChildren();%> </div> Modified: portal/branches/dom/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml =================================================================== --- portal/branches/dom/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml 2011-09-01 12:42:22 UTC (rev 7273) @@ -98,52 +98,32 @@ height: 15px; } - .UIAction .ActionContainer { - width: auto; - margin: auto; - } - .UIAction .ActionButton { - display: block; - float: __BIDI_START_EDGE__; + display: inline-block; margin: 0px 3px; cursor: pointer; } - - .UIAction .SimpleStyle {} - - .UIAction .SimpleStyle .ButtonLeft { - background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif') no-repeat left top; - padding: 0px 0px 0px 10px; - height: 21px; - } - - .UIAction .SimpleStyle .ButtonRight { - background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif') no-repeat right top; - padding: 0px 10px 0px 0px ; - height: 21px; - } - - .UIAction .SimpleStyle .ButtonMiddle { - line-height: 21px; - background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif') repeat-x bottom; + + .UIAction .SimpleStyle { + line-height: 20px; + background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif') repeat-x center; text-align: center; padding: 0px 12px; - height: 21px; + white-space: nowrap; + border: 1px solid #c9c9c9; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + color: #313131; + margin: 0px 6px; + white-space: nowrap; + text-decoration: none; + font-size: 12px; } - - .UIAction .SimpleStyle a { - color: #353535; - margin: 0px 6px; - white-space: nowrap; - font-size: 11px; - text-decoration: none; - display: block; + + .UIAction .SimpleStyle:hover { + color: #1273df; } - - .UIAction .SimpleStyle a:hover { - color: #1273df; - } </style> <script type="text/javascript"> @@ -253,24 +233,10 @@ </div> -<div class="UIAction"> - <table class="ActionContainer"> - <tbody><tr> - <td> - <div class="ActionButton SimpleStyle" onclick="save();"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);">__MSG_save__</a> - </div> - </div> - </div> - </div> - </td> - </tr> - </tbody></table> - </div> - </div> + <div class="UIAction"> + <a href="javascript:void(0);" onclick="save();" class="ActionButton SimpleStyle">__MSG_save__</a> + </div> + </div> ]]> </Content> </Module> \ No newline at end of file Modified: portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl =================================================================== --- portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -9,21 +9,7 @@ if(uicomponent.userHasRightToAddNavigation()){ %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("AddNavigation")%>" class="ActionButton BlueButton"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".Action.Add")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("AddNavigation")%>" class="ActionButton DarkGrayButton"><%=_ctx.appRes(uicomponent.getId() + ".Action.Add")%></a> </div> <% } Modified: portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationManagement.gtmpl =================================================================== --- portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationManagement.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationManagement.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -24,33 +24,7 @@ uicomponent.renderChild(UINavigationNodeSelector.class); %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - - <td> - <div onclick="<%=uicomponent.event("AddRootNode")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.addNode")%></a> - </div> - </div> - </div> - </div> - </td> - <td> - <div onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a> - </div> - </div> - </div> - </div> - </td> - - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("AddRootNode")%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.addNode")%></a> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a> </div> </div> Modified: portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl =================================================================== --- portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -51,21 +51,7 @@ if(uicomponent.getPortalConfigs() != null && uicomponent.getPortalConfigs().size() > 0){ %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'CreatePortal', true))" class="ActionButton BlueButton"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.addNewPortal")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'CreatePortal', true))" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.addNewPortal")%></a> </div> <% } Modified: portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl =================================================================== --- portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -37,21 +37,7 @@ <%// start render action%> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'CreatePortal', true))" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a> </div> </div> Modified: portal/branches/dom/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css =================================================================== --- portal/branches/dom/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2011-09-01 12:42:22 UTC (rev 7273) @@ -126,32 +126,6 @@ background: url('background/MiniIcon-rt.gif') no-repeat right 2px; /* orientation=rt */ } -.UIManagement .UIAction .ButtonLeft { - background: url('background/Button.gif') no-repeat left top; - padding-left: 5px; -} - -.UIManagement .UIAction .ButtonRight { - background: url('background/Button.gif') no-repeat right top; - padding-right: 5px; -} - -.UIManagement .UIAction .ButtonMiddle { - background: url('background/Button.gif') repeat-x left -24px; - font-size: 11px; - line-height: 24px; - padding: 0px 10px; -} - -.UIManagement .UIAction .ButtonMiddle a { - font-weight: normal; -} - -.UIManagement .UIAction .ButtonMiddle a:hover { - color: #9b9b9b; -} - - /***********************UIAddGroupNavigation************************/ .UIAddGroupNavigation { Deleted: portal/branches/dom/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/Button.gif =================================================================== (Binary files differ) Modified: portal/branches/dom/testsuite/webuibasedsamples/src/main/webapp/groovy/webui/component/UISampleDownloadUpload.gtmpl =================================================================== --- portal/branches/dom/testsuite/webuibasedsamples/src/main/webapp/groovy/webui/component/UISampleDownloadUpload.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/testsuite/webuibasedsamples/src/main/webapp/groovy/webui/component/UISampleDownloadUpload.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -48,23 +48,8 @@ <tr> <td> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - - <div onclick="<%=uicomponent.event("Submit")%>" class="ActionButton LightBlueStyle" onmouseover="this.style.color = '#058ee6'" onmouseout="this.style.color='black'"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);">Save</a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> - </div> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Submit")%>" class="ActionButton LightBlueStyle">Save</a> + </div> </td> </tr> </table> Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css 2011-09-01 12:42:22 UTC (rev 7273) @@ -138,10 +138,6 @@ margin: auto; } -.AjaxLoadingMask .UIAction .ActionButton{ - float: none; -} - .FloatLeft { float: left; /* orientation=lt */ float: right; /* orientation=rt */ Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/Stylesheet.css 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/Stylesheet.css 2011-09-01 12:42:22 UTC (rev 7273) @@ -102,29 +102,6 @@ padding: 0px 0px 0px 10px; /* orientation=rt */ } -.UILoginForm .UIForm .SimpleStyle .ButtonLeft { - background: url('background/Login.gif') no-repeat left -150px; - padding-left: 5px; -} - -.UILoginForm .UIForm .SimpleStyle .ButtonRight { - background: url('background/Login.gif') no-repeat right -150px; - padding-right: 5px; -} - -.UILoginForm .UIForm .SimpleStyle .ButtonMiddle { - background: url('background/Login.gif') repeat-x center -150px; - line-height: 22px; -} - -.UILoginForm .UIForm .SimpleStyle .ButtonMiddle a { - color: #3f3f3f; -} - -.UILoginForm .UIForm .SimpleStyle .ButtonMiddle a:hover { - color: #058EE6; -} - /* ============================End LoginDecorator============================== */ /* * minh.js.exo @@ -187,9 +164,21 @@ .UILoginForm .UIForm .VerticalLayout .UIAction { padding: 15px 0px 0px 56px; /* orientation=lt */ - padding: 15px 56px 0px 0px; /* orientation=rt */ + padding: 15px 56px 0px 0px; /* orientation=rt */ + text-align: left; /* orientation=lt */ + text-align: right; /* orientation=rt */ +} + +.UILoginForm .UIAction .SimpleStyle { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + +.UILoginForm .UIAction .SimpleStyle a { + color: #3f3f3f; +} + +.UILoginForm .UIAction .SimpleStyle a:hover { + color: #058EE6; } - -.UILoginForm .UIForm .VerticalLayout .UIAction .ActionContainer { - margin: 0px; -} Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css 2011-09-01 12:42:22 UTC (rev 7273) @@ -17,139 +17,122 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -.UIAction { - padding: 8px 0px; -} - -.UIAction .ActionContainer { - width: auto; - margin: auto; -} - -.UIAction .ActionButton { - display: block; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 0px 3px; - cursor: pointer; -} - -.UIAction a { -} - -.UIAction a:hover { - color: #058ee6; -} - - -.UIAction .ActionButton .Icon { - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - width: auto; - height: auto; - background-position: left center; /* orientation=lt */ - background-position: right center; /* orientation=rt */ - background-repeat: no-repeat; -} - -/*##############################-LightBlueStyle ActionButton-################################*/ - -.UIAction .LightBlueStyle .ButtonLeft { - background: url('background/LightBlueStyle.gif') no-repeat left top; - padding: 0px 0px 0px 3px; -} - -.UIAction .LightBlueStyle .ButtonRight { - background: url('background/LightBlueStyle.gif') no-repeat right top; - padding: 0px 3px 0px 0px ; -} - -.UIAction .LightBlueStyle .ButtonMiddle { - line-height: 22px; text-align: center; - background: url('background/LightBlueStyle.gif') repeat-x bottom; - white-space: nowrap; - display: table-cell; - padding: 0px 12px; -} - -/*##############################-SimpleStyle ActionButton-################################*/ - -.UIAction .SimpleStyle { -} - -.UIAction .SimpleStyle .ButtonLeft { - background: url('background/SimpleStyle.gif') no-repeat left top; - padding: 0px 0px 0px 10px; -} - -.UIAction .SimpleStyle .ButtonRight { - background: url('background/SimpleStyle.gif') no-repeat right top; - padding: 0px 10px 0px 0px ; -} - -.UIAction .SimpleStyle .ButtonMiddle { - line-height: 21px; - background: url('background/SimpleStyle.gif') repeat-x bottom; - text-align: center; - padding: 0px 12px; - display: table-cell; - white-space: nowrap; -} - -.UIAction a.SimpleStyle { - color: #313131; - margin: 0px 6px; - white-space: nowrap; -} - -.UIAction a:hover.SimpleStyle { - color: #1273df; -} - -/*************************SimpleStyle1********************/ - -.UIAction .SimpleStyle1 .ButtonLeft { - background: transparent url(background/SimpleStyle1.gif) no-repeat left top; - padding-left: 3px; -} - -.UIAction .SimpleStyle1 .ButtonRight { - background: transparent url(background/SimpleStyle1.gif) no-repeat right top; - padding-right: 3px; -} - -.UIAction .SimpleStyle1 .ButtonMiddle { - background: transparent url(background/SimpleStyle1.gif) repeat-x left -20px; - line-height: 20px; - padding: 0px 4px; -} - -.UIAction .SimpleStyle1 .ButtonMiddle .PageProfileIcon { +.UIAction { + padding: 8px 0px; + text-align: center; +} + +.UIAction .ActionButton { + display: inline-block; + margin: 0px 3px; + cursor: pointer; +} + +.UIAction a { + display: inline-block; +} + +.UIAction .ActionButton:hover { + color: #058ee6; +} + +.UIAction .ActionButton .Icon { + padding-left: 20px; /* orientation=lt */ + padding-right: 20px; /* orientation=rt */ + width: auto; + height: auto; + background-position: left center; /* orientation=lt */ + background-position: right center; /* orientation=rt */ + background-repeat: no-repeat; +} + +/*##############################-LightBlueStyle ActionButton-################################*/ + +.UIAction .LightBlueStyle { + line-height: 19px; text-align: center; + background: url('background/LightBlueStyle.gif') repeat-x center; + white-space: nowrap; + padding: 0px 12px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + border: 1px solid #8a8a8a; + border-bottom: 1px solid #5d5d5d; +} + +/*##############################-SimpleStyle ActionButton-################################*/ + +.UIAction .SimpleStyle { +} + +.UIAction .SimpleStyle { + line-height: 20px; + background: url('background/SimpleStyle.gif') repeat-x center; + text-align: center; + padding: 0px 12px; + white-space: nowrap; + border: 1px solid #c9c9c9; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; +} + +.UIAction a.SimpleStyle { + color: #313131; + margin: 0px 6px; + white-space: nowrap; +} + +.UIAction .SimpleStyle:hover { + color: #1273df; +} + +/********************** DarkGrayButton **********************/ + +.UIAction .DarkGrayButton { + font-weight: normal; + background: url('background/DarkGrayButton.gif') repeat-x left center; + font-size: 11px; + line-height: 22px; + padding: 0px 10px; + border: 1px solid #e2e2e2; + border-bottom: 1px solid #d9d9d9; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + +.UIAction .DarkGrayButton:hover { + color: #9b9b9b; +} + + +/*************************SimpleStyle1********************/ + +.UIAction .SimpleStyle1 { + background: transparent url(background/SimpleStyle1.gif) repeat-x center; + line-height: 20px; + padding: 0px 4px; + border: 1px solid #b8babf; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} + +.UIAction .SimpleStyle1 .PageProfileIcon { background: transparent url(background/PageProfileIcon.gif) no-repeat left; /* orientation=lt */ background: transparent url(background/PageProfileIcon.gif) no-repeat right; /* orientation=rt */ line-height: 20px; padding-left: 22px; /* orientation=lt */ padding-right: 22px; /* orientation=rt */ - white-space: nowrap; + white-space: nowrap; } -.UIAction .SimpleStyle1 .ButtonMiddle .ViewAsBlockIcon { +.UIAction .SimpleStyle1 .ViewAsBlockIcon { background: transparent url(background/ViewAsBlockIcon.gif) no-repeat left; /* orientation=lt */ background: transparent url(background/ViewAsBlockIcon.gif) no-repeat right; /* orientation=rt */ line-height: 20px; padding-left: 22px; /* orientation=lt */ padding-right: 22px; /* orientation=rt */ - white-space: nowrap; + white-space: nowrap; } - -.UIAction .portlet-form-button { - -moz-border-radius: 0px; - background: none; - border: none; - display: block; - line-height: auto; - margin: 0px 3px; - padding: 0px; - text-align: center; - white-space: nowrap; -} Added: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/DarkGrayButton.gif =================================================================== (Binary files differ) Property changes on: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/DarkGrayButton.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif =================================================================== (Binary files differ) Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif =================================================================== (Binary files differ) Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle1.gif =================================================================== (Binary files differ) Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css 2011-09-01 12:42:22 UTC (rev 7273) @@ -159,18 +159,11 @@ padding-left: 7px; /* orientation=rt */ } .UIWizard .UIWizardContent .UIAction { - padding: 8px 0 0; + padding: 8px 0 0; + text-align: right; /* orientation=lt */ + text-align: left; /* orientation=rt */ } -.UIWizard .WizardControlBar .UIAction .ActionButton { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ -} - -.UIWizard .WizardControlBar .UIAction .ActionContainer { - width: 100%; -} - /*========================== Start UIWizard Welcome ==============================*/ .UIWizard .UIWizardWelcome { Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-09-01 12:42:22 UTC (rev 7273) @@ -187,7 +187,7 @@ .portlet-form-button { line-height: 18px; text-align: center; - background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif') repeat-x center -24px; + background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif') repeat-x center; white-space: nowrap; display: table-cell; padding: 0 12px; Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIAccessGroup.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIAccessGroup.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIAccessGroup.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -11,23 +11,9 @@ %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIFormPopupWindow.class).getId();%>');" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="Icon SmallGroup16x16Icon"> - <a href="javascript:void(0);">Select Access Group</a> - </div> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <span onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIFormPopupWindow.class).getId();%>');" class="ActionButton SimpleStyle"> + <a href="javascript:void(0);" class="Icon SmallGroup16x16Icon">Select Access Group</a> + </span> </div> </div> \ No newline at end of file Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupSelector.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupSelector.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupSelector.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -34,21 +34,7 @@ </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("SelectGroup");%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIGroupSelector.action.done")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("SelectGroup");%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIGroupSelector.action.done")%></a> </div> </div> \ No newline at end of file Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIListPermissionSelector.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIListPermissionSelector.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIListPermissionSelector.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -23,23 +23,9 @@ uicomponent.renderChild(UIFormPopupWindow.class); %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIFormPopupWindow.class).getId();%>');" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="Icon SmallGroup16x16Icon"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIListPermissionSelector.action.addPermission")%></a> - </div> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <span onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIFormPopupWindow.class).getId();%>');" class="ActionButton SimpleStyle"> + <a href="javascript:void(0);" class="Icon SmallGroup16x16Icon"><%=_ctx.appRes("UIListPermissionSelector.action.addPermission")%></a> + </span> </div> <%}%> </div> \ No newline at end of file Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIPermissionSelector.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIPermissionSelector.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIPermissionSelector.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -42,43 +42,24 @@ <% if(uicomponent.isEditable()) { %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <%/*Click on this action button will pop up the permission selector*/%> - <% - String deletePermissionEvent = "javascript:void(0)"; - String css = "FloatBlockHidden ActionButton SimpleStyle"; - if(permission.getExpression() != null && permission.getExpression().length() > 0) { - deletePermissionEvent = uiForm.event("DeletePermission", uicomponent.getId(), ""); - css = "ActionButton SimpleStyle"; - } - %> - <div onclick="<%=deletePermissionEvent%>" class="<%=css%>"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="DeletePermissionIcon"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.DeletePermission")%></a> - </div> - </div> - </div> - </div> - </div> - <div onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIPopupWindow.class).getId();%>', true);" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="SelectPermissionIcon"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.SelectPermission")%></a> - </div> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + + <%/*Click on this action button will pop up the permission selector*/%> + <% + String deletePermissionEvent = "#"; + String css = "FloatBlockHidden ActionButton SimpleStyle"; + if(permission.getExpression() != null && permission.getExpression().length() > 0) { + deletePermissionEvent = uiForm.event("DeletePermission", uicomponent.getId(), ""); + css = "ActionButton SimpleStyle"; + } + %> + + <span onclick="<%=deletePermissionEvent%>" class="<%=css%>"> + <a href="javascript:void(0);" class="DeletePermissionIcon"><%=_ctx.appRes(uicomponent.getId() + ".action.DeletePermission")%></a> + </span> + <span onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIPopupWindow.class).getId();%>', true);" class="ActionButton SimpleStyle"> + <a href="javascript:void(0);" class="SelectPermissionIcon"><%=_ctx.appRes(uicomponent.getId() + ".action.SelectPermission")%></a> + </span> + </div> <% } %> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -55,21 +55,7 @@ <% if(uicomponent.isAdminRole()) { %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td - <div onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIPopupWindow.class).getId();%>');" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.SelectPermission")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIPopupWindow.class).getId();%>');" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.SelectPermission")%></a> </div> <% }%> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/UIForgetPasswordWizard.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/UIForgetPasswordWizard.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/UIForgetPasswordWizard.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -33,23 +33,9 @@ %> </table> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <%for(action in uicomponent.getActions()) { %> - <div onclick="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle" > - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action." + action)%></a> - </div> - </div> - </div> - </div> - <%} %> - </td> - </tr> - </table> + <%for(action in uicomponent.getActions()) { %> + <a href="javascript:void(0);" onclick="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action." + action)%></a> + <%} %> </div> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -41,30 +41,8 @@ </table> <div class="ForgetPass"><a href="<%= uicomponent.event("ForgetPassword") %>"><%=_ctx.appRes("UILoginForm.label.forgot")%></a></div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="login(this);" id="UIPortalLoginFormAction" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="#"><%=_ctx.appRes("UILoginForm.label.Signin");%></a> - </div> - </div> - </div> - </div> - <div onclick="<%=uicomponent.event("Close");%>" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UILoginForm.label.Discard")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="login(this);" id="UIPortalLoginFormAction" class="ActionButton SimpleStyle"><%=_ctx.appRes("UILoginForm.label.Signin");%></a> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Close");%>" class="ActionButton SimpleStyle"><%=_ctx.appRes("UILoginForm.label.Discard")%></a> </div> </div> </form> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -8,21 +8,7 @@ uicomponent.renderChild(UIVirtualList.class); %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("Close")%>" class="ActionButton DarkGrayButton"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("word.cancel")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Close")%>" class="ActionButton DarkGrayButton"><%=_ctx.appRes("word.cancel")%></a> </div> <% uicomponent.renderChild(UIPopupWindow.class); %> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -8,21 +8,7 @@ <%if(uicomponent.isShowAddNewPage()) {%> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("AddNew")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.addNewPage")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("AddNew")%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.addNewPage")%></a> </div> <%}%> </div> \ No newline at end of file Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -70,58 +70,26 @@ </div> </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <% - String clearPageEvent = "javascript:void(0);"; - String css = "FloatBlockHidden ActionButton SimpleStyle"; - def uiForm = uicomponent.getAncestorOfType(UIForm.class); - createPageEvent = uiForm.event("CreatePage"); - if(page != null) { - clearPageEvent = uiForm.event("ClearPage"); - css = "ActionButton SimpleStyle"; - } - %> - <div onclick="<%=clearPageEvent%>" class="<%=css%>"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="DustBin16x16Icon Icon" title="<%=_ctx.appRes(uicomponent.getId()+".label.clearPage")%>"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".label.clearPage")%></a> - </div> - </div> - </div> - </div> - </div> - <% if(page == null) { %> - <div onclick="<%=createPageEvent%>" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="GreenPlusPage16x16Icon Icon" title="<%=_ctx.appRes(uicomponent.getId()+".label.createPage")%>"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".label.createPage")%></a> - </div> - </div> - </div> - </div> - </div> - <% } %> - - <div class="ActionButton SimpleStyle" onclick="<%=uicomponent.event("OpenSelectPagePopUp")%>"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="Icon SelectPageIcon" title="<%=_ctx.appRes(uicomponent.getId()+".label.searchandSelectPage")%>"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId()+".label.searchandSelectPage")%></a> - </div> - </div> - </div> - </div> - </div> - - </td> - </tr> - </table> + <% + String clearPageEvent = "javascript:void(0);"; + String css = "FloatBlockHidden ActionButton SimpleStyle"; + def uiForm = uicomponent.getAncestorOfType(UIForm.class); + createPageEvent = uiForm.event("CreatePage"); + if(page != null) { + clearPageEvent = uiForm.event("ClearPage"); + css = "ActionButton SimpleStyle"; + } + %> + <span onclick="<%=clearPageEvent%>" class="<%=css%>" title="<%=_ctx.appRes(uicomponent.getId()+".label.clearPage")%>"> + <a href="javascript:void(0);" class="DustBin16x16Icon Icon"><%=_ctx.appRes(uicomponent.getId() + ".label.clearPage")%></a> + </span> + <% if(page == null) { %> + <span onclick="<%=createPageEvent%>" class="ActionButton SimpleStyle" title="<%=_ctx.appRes(uicomponent.getId()+".label.createPage")%>"> + <a href="javascript:void(0);" class="GreenPlusPage16x16Icon Icon"><%=_ctx.appRes(uicomponent.getId() + ".label.createPage")%></a> + </span> + <% } %> + <span class="ActionButton SimpleStyle" onclick="<%=uicomponent.event("OpenSelectPagePopUp")%>" title="<%=_ctx.appRes(uicomponent.getId()+".label.searchandSelectPage")%>"> + <a href="javascript:void(0);" class="Icon SelectPageIcon"><%=_ctx.appRes(uicomponent.getId()+".label.searchandSelectPage")%></a> + </span> </div> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIAccountSettingForm.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIAccountSettingForm.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIAccountSettingForm.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -59,22 +59,8 @@ </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <%for(action in uicomponent.getActions()) { %> - <div onclick="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle" > - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action." + action)%></a> - </div> - </div> - </div> - </div> - <%} %> - </td> - </tr> - </table> + <%for(action in uicomponent.getActions()) { %> + <a href="javascript:void(0);" onclick="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action." + action)%></a> + <%} %> </div> </div> \ No newline at end of file Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -78,30 +78,8 @@ </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript:eXo.portal.UIPortal.changeLanguage('<%=uicomponent.url("Save");%>');" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="#"><%=_ctx.appRes("UIChangeLanguage.action.save");%></a> - </div> - </div> - </div> - </div> - <div onclick="<%=uicomponent.event("Close");%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIChangeLanguage.action.close");%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="javascript:eXo.portal.UIPortal.changeLanguage('<%=uicomponent.url("Save");%>');" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIChangeLanguage.action.save");%></a> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Close");%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIChangeLanguage.action.close");%></a> </div> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -17,8 +17,8 @@ <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="<%=uicomponent.event("CloseComposer")%>"><span></span></a> <% if (uicomponent.isUsedInWizard()) { %> <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.url("Finish")%>" onclick="eXo.core.DOMUtil.disableOnClick(this);" ><span></span></a> - <a class="BackButton"" title="<%=_ctx.appRes("word.back")%>" href="<%=uicomponent.event("Back")%>"> - <span></span> + <a class="BackButton" title="<%=_ctx.appRes("word.back")%>" href="<%=uicomponent.event("Back")%>"> + </a> <% } else {%> <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.event("Finish")%>"><span></span></a> @@ -47,39 +47,14 @@ <div class="BLPortalComposer" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>"> <div class="BRPortalComposer"> <div class="BCPortalComposer ClearFix"> - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - - <div onclick="<%= uicomponent.event("ViewProperties") %>;" class="ActionButton SimpleStyle1"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="PageProfileIcon"> - <a href="javascript:void(0);"><%=_ctx.appRes(popupId + ".action.ViewProperties")%></a> - </div> - </div> - </div> - </div> - </div> - - <% String changeEditMode = uicomponent.event("SwitchMode", null, null); %> - <div onclick="$changeEditMode" class="ActionButton SimpleStyle1" onmouseover="this.style.color = '#058ee6'" onmouseout="this.style.color='black'"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="ViewAsBlockIcon"> - <a href="javascript:void(0);"><%=_ctx.appRes(popupId + ".action.SwitchMode")%></a> - </div> - </div> - </div> - </div> - </div> - - </td> - </tr> - </table> + <div class="UIAction"> + <span onclick="<%= uicomponent.event("ViewProperties") %>;eXo.portal.UIPortal.changeComposerSaveButton()" class="ActionButton SimpleStyle1"> + <a href="javascript:void(0);" class="PageProfileIcon"><%=_ctx.appRes(popupId + ".action.ViewProperties")%></a> + </span> + <% String changeEditMode = uicomponent.event("SwitchMode", null, null); %> + <span onclick="$changeEditMode" class="ActionButton SimpleStyle1" onmouseover="this.style.color = '#058ee6'" onmouseout="this.style.color='black'"> + <a href="javascript:void(0);" class="ViewAsBlockIcon"><%=_ctx.appRes(popupId + ".action.SwitchMode")%></a> + </span> </div> <div class="ResizeButton"><span></span></div> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -92,38 +92,30 @@ %> </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> + <%for(action in uicomponent.getActions()) { String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action); String link = uicomponent.event(action); if(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode")) && action.contains("Save")) { %> - <div onclick="$link" class="ActionButton LightBlueStyle" style="display : none;"> + <%if(action.contains("Close")) { + String closeLabel = _ctx.appRes("word.close"); + %> + <a style="display: none;" class="ActionButton LightBlueStyle" href="$link" id="$action" closeLabel="$closeLabel" cancelLabel="$actionLabel"><%=(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode"))) ? closeLabel : actionLabel%></a> <%} else {%> - <div onclick="$link" class="ActionButton LightBlueStyle"> + <a style="display: none;" class="ActionButton LightBlueStyle" href="$link" id="$action" >$actionLabel</a> <%}%> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <%if(action.contains("Close")) { - String closeLabel = _ctx.appRes("word.close"); - %> - <div class="ButtonMiddle" id="$action" closeLabel="$closeLabel" cancelLabel="$actionLabel"> - <a href="javascript:void(0);"><%=(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode"))) ? closeLabel : actionLabel%></a> - </div> - <%} else {%> - <div class="ButtonMiddle" id="$action" > - <a href="javascript:void(0);">$actionLabel</a> - </div> + <%} else {%> + <%if(action.contains("Close")) { + String closeLabel = _ctx.appRes("word.close"); + %> + <a class="ActionButton LightBlueStyle" href="$link" id="$action" closeLabel="$closeLabel" cancelLabel="$actionLabel"><%=(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode"))) ? closeLabel : actionLabel%></a> + <%} else {%> + <a class="ActionButton LightBlueStyle" href="$link" id="$action" >$actionLabel</a> <%}%> - </div> - </div> - </div> + <%}%> <%}%> - </td> - </tr> - </table> + </div> </div> @@ -138,10 +130,10 @@ var workingArea = DOMUtil.findAncestorByClass(comp, "WorkingArea"); var horLayout = DOMUtil.findFirstChildByClass(workingArea, "div", "HorizontalLayout"); var uiAction = DOMUtil.findFirstChildByClass(horLayout, "div", "UIAction"); - var buttons = DOMUtil.findDescendantsByClass(uiAction, "div", "ButtonMiddle"); + var buttons = DOMUtil.findChildrenByClass(uiAction, "a", "ActionButton"); for (var i = 0; i < buttons.length; i++) { if (buttons[i].id.indexOf("Save") >= 0) { - DOMUtil.findAncestorByClass(buttons[i], "ActionButton").style.display = "none"; + buttons[i].style.display = "none"; } if (buttons[i].id.indexOf("Close") >= 0) { buttons[i].innerHTML = buttons[i].getAttribute("closeLabel"); @@ -154,10 +146,10 @@ var workingArea = DOMUtil.findAncestorByClass(comp, "WorkingArea"); var horLayout = DOMUtil.findFirstChildByClass(workingArea, "div", "HorizontalLayout"); var uiAction = DOMUtil.findFirstChildByClass(horLayout, "div", "UIAction"); - var buttons = DOMUtil.findDescendantsByClass(uiAction, "div", "ButtonMiddle"); + var buttons = DOMUtil.findChildrenByClass(uiAction, "a", "ActionButton"); for (var i = 0; i < buttons.length; i++) { if (buttons[i].id.indexOf("Save") >= 0) { - DOMUtil.findAncestorByClass(buttons[i], "ActionButton").style.display = "block"; + buttons[i].style.display = "inline-block"; } if (buttons[i].id.indexOf("Close") >= 0) { buttons[i].innerHTML = buttons[i].getAttribute("cancelLabel"); Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UISkinSelector.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UISkinSelector.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/portal/UISkinSelector.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -31,31 +31,9 @@ </div> </div> - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript:eXo.portal.UIPortal.changeSkin('<%=uicomponent.url("Save");%>');" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="#"><%=_ctx.appRes("UIChangeSkin.action.save");%></a> - </div> - </div> - </div> - </div> - <div onclick="<%=uicomponent.event("Close");%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIChangeSkin.action.close");%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <div class="UIAction"> + <a href="javascript:void(0);" onclick="javascript:eXo.portal.UIPortal.changeSkin('<%=uicomponent.url("Save");%>');" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIChangeSkin.action.save");%></a> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Close");%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIChangeSkin.action.close");%></a> </div> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -1,100 +1,98 @@ <!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <% - import org.exoplatform.portal.application.PortalRequestContext ; + import org.exoplatform.portal.application.PortalRequestContext ; import org.exoplatform.webui.core.UIComponent; import java.util.Iterator; import org.exoplatform.portal.webui.portal.UIPortal ; import org.exoplatform.portal.config.model.PortalProperties ; - def rcontext = _ctx.getRequestContext() ; - String docBase = rcontext.getRequestContextPath() ; - String skin = uicomponent.getSkin(); - def portalSkins = uicomponent.getPortalSkins() ; - def portletSkins = uicomponent.getPortletSkins() ; - def scriptsPaths = uicomponent.getJavascriptURLs(); - def lang = uicomponent.getLocale().getLanguage(); - def title = rcontext.getTitle(); - def metaInformation = rcontext.getMetaInformation(); + def rcontext = _ctx.getRequestContext() ; + String docBase = rcontext.getRequestContextPath() ; + String skin = uicomponent.getSkin(); + def portalSkins = uicomponent.getPortalSkins() ; + def portletSkins = uicomponent.getPortletSkins() ; + def scriptsPaths = uicomponent.getJavascriptURLs(); + def lang = uicomponent.getLocale().getLanguage(); + def title = rcontext.getTitle(); + def metaInformation = rcontext.getMetaInformation(); %> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="$lang" lang="$lang" dir="$dir"> - <head id="head"> - <title><%=title%></title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <% - if(metaInformation!= null) { - Iterator<String> keys = metaInformation.keySet().iterator(); - while(keys.hasNext()) { - String metaName = keys.next(); - String metaContent = metaInformation.get(metaName); - %> - <meta name="<%=metaName%>" content="<%=metaContent%>" /> - <% } } %> - - <link rel="shortcut icon" type="image/x-icon" href="<%=docBase%>/favicon.ico" /> - <%for(skinConfig in portalSkins) { - def url = skinConfig.createURL(); - url.setOrientation(orientation); - %> - <link id="${skinConfig.id}" rel="stylesheet" type="text/css" href="$url" /> - <%}%> - <%for(portletSkin in portletSkins) { - def url = portletSkin.createURL(); - url.setOrientation(orientation); - %> - <link id="${portletSkin.id}" rel="stylesheet" type="text/css" href= "$url" /> - <%}%> - <script type="text/javascript"> - <% - // This variable must be used only to initialize other variables otherwise - // please use eXo.env.portal.context or eXo.env.portal.context instead - // Those 2 last variables cannot be used to initialize variables because - // we cannot be sure that they will be initialized before initializing your script - %> - var currentContext = '<%=docBase%>' ; - </script> - <%if(org.exoplatform.commons.utils.PropertyManager.isDevelopping()) { - for(path in scriptsPaths) { %> - <script type="text/javascript" src="<%=path%>"></script> - <%}%> - <script type="text/javascript"> - eXo.developing = true ; - </script> + <head id="head"> + <title><%=title%></title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <% + if(metaInformation!= null) { + Iterator<String> keys = metaInformation.keySet().iterator(); + while(keys.hasNext()) { + String metaName = keys.next(); + String metaContent = metaInformation.get(metaName); + %> + <meta name="<%=metaName%>" content="<%=metaContent%>" /> + <% } } %> + + <link rel="shortcut icon" type="image/x-icon" href="<%=docBase%>/favicon.ico" /> + <%for(skinConfig in portalSkins) { + def url = skinConfig.createURL(); + url.setOrientation(orientation); + %> + <link id="${skinConfig.id}" rel="stylesheet" type="text/css" href="$url" /> + <%}%> + <%for(portletSkin in portletSkins) { + def url = portletSkin.createURL(); + url.setOrientation(orientation); + %> + <link id="${portletSkin.id}" rel="stylesheet" type="text/css" href= "$url" /> + <%}%> + <script type="text/javascript"> + // This variable must be used only to initialize other variables otherwise + // please use eXo.env.portal.context or eXo.env.portal.context instead + // Those 2 last variables cannot be used to initialize variables because + // we cannot be sure that they will be initialized before initializing your script + var currentContext = '<%=docBase%>' ; + </script> + <%if(org.exoplatform.commons.utils.PropertyManager.isDevelopping()) { + for(path in scriptsPaths) { %> + <script type="text/javascript" src="<%=path%>"></script> + <%}%> + <script type="text/javascript"> + eXo.developing = true ; + </script> - <%} else {%> - <script type="text/javascript" src="<%=docBase%>/javascript/merged.js"></script> - <% - for(path in scriptsPaths) { - if(path.startsWith("http") || path.startsWith("https")) {%> - <script type="text/javascript" src="<%=path%>"></script> - <%} - } - }%> - <script type="text/javascript"> - eXo.env.portal.context = "<%=docBase%>" ; - <%if(rcontext.getAccessPath() == 0) {%>eXo.env.portal.accessMode = "public" ;<%} - else - {%>eXo.env.portal.accessMode = "private" ;<%}%> - eXo.env.portal.portalName = "<%=rcontext.getPortalOwner()%>" ; - eXo.env.server.context = "<%=docBase%>" ; - eXo.env.server.portalBaseURL = "<%=rcontext.getRequest().getRequestURI()%>" ; - eXo.env.server.portalURLTemplate = "<%=uicomponent.getPortalURLTemplate()%>" ; - eXo.env.client.skin = "$skin" ; - <% - UIPortal portal = uicomponent.findFirstComponentOfType(UIPortal.class); - String sessionAliveLevel = (portal == null ? null : portal.sessionAlive) ; - boolean canKeepState = sessionAliveLevel == null ? false : !sessionAliveLevel.equals(PortalProperties.SESSION_NEVER) ; - %> - eXo.portal.portalMode = <%= uicomponent.getModeState() %>; - eXo.session.level = "$sessionAliveLevel"; - eXo.session.canKeepState = $canKeepState; - eXo.session.isOpen = $uicomponent.isSessionOpen ; - eXo.session.itvTime = ${((PortalRequestContext)rcontext).getRequest().getSession().getMaxInactiveInterval()} ; - </script> - <script type="text/javascript" src="/eXoResources/javascript/eXo/i18n/I18NMessage.js"></script> - <script type="text/javascript" src="/eXoResources/javascript/eXo/i18n/MessageResource_<%=lang%>.js"></script> + <%} else {%> + <script type="text/javascript" src="<%=docBase%>/javascript/merged.js"></script> + <% + for(path in scriptsPaths) { + if(path.startsWith("http") || path.startsWith("https")) {%> + <script type="text/javascript" src="<%=path%>"></script> + <%} + } + }%> + <script type="text/javascript"> + eXo.env.portal.context = "<%=docBase%>" ; + <%if(rcontext.getAccessPath() == 0) {%>eXo.env.portal.accessMode = "public" ;<%} + else + {%>eXo.env.portal.accessMode = "private" ;<%}%> + eXo.env.portal.portalName = "<%=rcontext.getPortalOwner()%>" ; + eXo.env.server.context = "<%=docBase%>" ; + eXo.env.server.portalBaseURL = "<%=rcontext.getRequest().getRequestURI()%>" ; + eXo.env.server.portalURLTemplate = "<%=uicomponent.getPortalURLTemplate()%>" ; + eXo.env.client.skin = "$skin" ; + <% + UIPortal portal = uicomponent.findFirstComponentOfType(UIPortal.class); + String sessionAliveLevel = (portal == null ? null : portal.sessionAlive) ; + boolean canKeepState = sessionAliveLevel == null ? false : !sessionAliveLevel.equals(PortalProperties.SESSION_NEVER) ; + %> + eXo.portal.portalMode = <%= uicomponent.getModeState() %>; + eXo.session.level = "$sessionAliveLevel"; + eXo.session.canKeepState = $canKeepState; + eXo.session.isOpen = <%=uicomponent.isSessionOpen()%> ; + eXo.session.itvTime = ${((PortalRequestContext)rcontext).getRequest().getSession().getMaxInactiveInterval()} ; + </script> + <script type="text/javascript" src="/eXoResources/javascript/eXo/i18n/I18NMessage.js"></script> + <script type="text/javascript" src="/eXoResources/javascript/eXo/i18n/MessageResource_<%=lang%>.js"></script> <% def headerElements = rcontext.getExtraMarkupHeadersAsStrings(); @@ -108,39 +106,24 @@ %> </head> - <body style="height: 100%;"> - <% - /*Hide All Popup Menu when click on document*/ - rcontext.getJavascriptManager().addOnLoadJavascript('eXo.core.DOMUtil.hideElements'); - //rcontext.getJavascriptManager().addOnResizeJavascript('eXo.core.UIMaskLayer.resizeMaskLayer'); - %> + <body style="height: 100%;"> + <% + /*Hide All Popup Menu when click on document*/ + rcontext.getJavascriptManager().addOnLoadJavascript('eXo.core.DOMUtil.hideElements'); + //rcontext.getJavascriptManager().addOnResizeJavascript('eXo.core.UIMaskLayer.resizeMaskLayer'); + %> <div class="$uicomponent.skin" id="UIPortalApplication" style="!height: 100%;"> - + <div class="AjaxLoadingMask" id="AjaxLoadingMask" style="display: none; margin: auto;"> - <div class="LoadingContainer"> - <div class="CenterLoadingContainer"> - <div class="LoadingText"><%=_ctx.appRes("UIPortalApplication.label.Loading")%></div> - <div class="LoadingProgressBar"><span></span></div> - - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript:ajaxAbort();" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIPortalApplication.label.Abort")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> - </div> - - </div> - </div> - </div> + <div class="LoadingContainer"> + <div class="LoadingText"><%=_ctx.appRes("UIPortalApplication.label.Loading")%></div> + <span class="LoadingProgressBar"></span> + + <div class="UIAction"> + <a href="javascript:ajaxAbort();" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIPortalApplication.label.Abort")%></a> + </div> + + </div> + </div> + Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -62,17 +62,7 @@ { for(act in actions) { - println "<td>"; - println " <div onclick="+uicomponent.event("Click", act.getEventId())+" class=\"ActionButton LightBlueStyle\">"; - println " <div class=\"ButtonLeft\">"; - println " <div class=\"ButtonRight\">"; - println " <div class=\"ButtonMiddle\">"; - println " <a href=\"javascript:void(0);\"> ${act.getActionKey()} </a>"; - println " </div>"; - println " </div>"; - println " </div>"; - println " </div>"; - println "</td>"; + println " <a href=\"javascript:void(0);\" onclick="+uicomponent.event("Click", act.getEventId())+" class=\"ActionButton LightBlueStyle\"> ${act.getActionKey()} </a>"; } } %> @@ -110,14 +100,10 @@ %> </div> <div class="MessageActionBar"> - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <% - printAction(actions); - %> - </tr> - </table> + <div class="UIAction"> + <% + printAction(actions); + %> </div> </div> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -128,22 +128,8 @@ </div> <div class="MessageActionBar"> - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("Close")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIPopupMessages.button.ok")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <div class="UIAction"> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Close")%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIPopupMessages.button.ok")%></a> </div> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -61,62 +61,28 @@ <div class="ActionBar"> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <% if (uicomponent.isShowActions()) { %> - <div onclick="<%=uicomponent.event("Abort", "");%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".label.abort")%></a> - </div> - </div> - </div> - </div> - <% - String action = "next"; - if(step == children.size()){ - action = "done"; - actionLink = uicomponent.event("ViewStep" + String.valueOf(step+1), ""); - } else { - actionLink = uicomponent.url("ViewStep" + String.valueOf(step+1)); - } - %> - - <div onclick="$actionLink" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <%=_ctx.appRes(uicomponent.getId() + ".label."+action)%> - </div> - </div> - </div> - </div> - - <% - int showBack = step; - if (uicomponent.getClass().getName().contains("Edit")) showBack++; - if(showBack > 2) { - actionLink = uicomponent.url("ViewStep" + String.valueOf(step-1)); - String display = "LightBlueStyle"; - %> - <div onclick="$actionLink" class="ActionButton $display"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <%=_ctx.appRes(uicomponent.getId() + ".label.back")%> - </div> - </div> - </div> - </div> - <% } %> - - - <%} // End if (step != 3)%> - </td> - </tr> - </table> + <% if (uicomponent.isShowActions()) { %> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Abort", "");%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".label.abort")%></a> + <% + String action = "next"; + if(step == children.size()){ + action = "done"; + actionLink = uicomponent.event("ViewStep" + String.valueOf(step+1), ""); + } else { + actionLink = uicomponent.url("ViewStep" + String.valueOf(step+1)); + } + %> + <a href="javascript:void(0);" onclick="$actionLink" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".label."+action)%></a> + <% + int showBack = step; + if (uicomponent.getClass().getName().contains("Edit")) showBack++; + if(showBack > 2) { + actionLink = uicomponent.url("ViewStep" + String.valueOf(step-1)); + String display = "LightBlueStyle"; + %> + <a onclick="$actionLink" class="ActionButton $display"><%=_ctx.appRes(uicomponent.getId() + ".label.back")%></a> + <% } %> + <%} // End if (step != 3)%> </div> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -27,26 +27,12 @@ %> </table> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <% for(action in uicomponent.getActions()) { - String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action); - String link = uicomponent.event(action); - %> - <div onclick="$link" class="ActionButton LightBlueStyle" onmouseover="this.style.color = '#058ee6'" onmouseout="this.style.color='black'"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);">$actionLabel</a> - </div> - </div> - </div> - </div> - <%}%> - </td> - </tr> - </table> + <% for(action in uicomponent.getActions()) { + String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action); + String link = uicomponent.event(action); + %> + <a href="javascript:void(0);" onclick="$link" class="ActionButton LightBlueStyle">$actionLabel</a> + <%}%> </div> </div> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormTabPane.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormTabPane.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormTabPane.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -55,26 +55,12 @@ <%}%> </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <%for(action in uicomponent.getActions()) { - String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action); - String link = uicomponent.event(action); - %> - <div onclick="$link" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);">$actionLabel</a> - </div> - </div> - </div> - </div> - <%}%> - </td> - </tr> - </table> + <%for(action in uicomponent.getActions()) { + String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action); + String link = uicomponent.event(action); + %> + <a href="javascript:void(0);" onclick="$link" class="ActionButton LightBlueStyle">$actionLabel</a> + <%}%> </div> </div> <%uiform.end()%> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -37,26 +37,12 @@ <%//Rerender this component with the new structure%> <%// start render action%> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <% for(action in uicomponent.getActions()) { - String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action) - String link = uicomponent.event(action); - %> - <div onclick="$link" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:window.scroll(0,0);">$actionLabel</a> - </div> - </div> - </div> - </div> - <%}%> - </td> - </tr> - </table> + <% for(action in uicomponent.getActions()) { + String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action) + String link = uicomponent.event(action); + %> + <a href="javascript:window.scroll(0,0);" onclick="$link" class="ActionButton LightBlueStyle">$actionLabel</a> + <%}%> </div> <%// end render action%> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -142,33 +142,19 @@ %> <%if(actions != null && actions.length > 0) { %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <%for(i in 0..actions.length -1) { - if(actionValues != null && actionValues.length > 0) { - if(actionValues[i] != null) { %> - <div class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitEvent('<%=formName%>','<%=actions[i]%>','&objectId=<%=actionValues[i]%>');"> - <%} else { %> - <div class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitForm('<%=formName%>','<%=actions[i]%>', true);"> - <% - } - } else { - %> - <div class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitForm('<%=formName%>','<%=actions[i]%>', true);"> - <%}%> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(formName + ".action." + actions[i])%></a> - </div> - </div> - </div> - </div> - <%} %> - </td> - </tr> - </table> + <%for(i in 0..actions.length -1) { + if(actionValues != null && actionValues.length > 0) { + if(actionValues[i] != null) { %> + <a href="javascript:void(0);" class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitEvent('<%=formName%>','<%=actions[i]%>','&objectId=<%=actionValues[i]%>');"><%=_ctx.appRes(formName + ".action." + actions[i])%></a> + <%} else { %> + <a href="javascript:void(0);" class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitForm('<%=formName%>','<%=actions[i]%>', true);"><%=_ctx.appRes(formName + ".action." + actions[i])%></a> + <% + } + } else { + %> + <a href="javascript:void(0);" class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitForm('<%=formName%>','<%=actions[i]%>', true);"><%=_ctx.appRes(formName + ".action." + actions[i])%></a> + <%}%> + <%} %> </div> <%} %> </div> Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl 2011-09-01 11:55:13 UTC (rev 7272) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl 2011-09-01 12:42:22 UTC (rev 7273) @@ -134,23 +134,9 @@ </div> <% if(isMulti) { %> <div class="UIAction"> - <table class="ActionContainer" align="center"> - <tr> - <td align="center"> - <%for(String action : uicomponent.getActions()){%> - <a href="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <%=uiform.getLabel(action)%> - </div> - </div> - </div> - </a> - <%}%> - </td> - </tr> - </table> + <%for(String action : uicomponent.getActions()){%> + <a href="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle"><%=uiform.getLabel(action)%></a> + <%}%> </div> <% } %> <%uicomponent.renderChild(UIPopupWindow.class);%>