Author: phuong_vu Date: 2011-03-07 22:20:22 -0500 (Mon, 07 Mar 2011) New Revision: 5972 Modified: portal/branches/branch-GTNPORTAL-1822/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties Log: GTNPORTAL-1234 Save nodeName instead of resourceBundle key for Default tab dashboard Modified: portal/branches/branch-GTNPORTAL-1822/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1822/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-03-08 03:20:22 UTC (rev 5972) @@ -30,7 +30,11 @@ <div class="TabsContainer ClearFix"> <% for(int i = 0;i < tabNbs;i++){ node = nodes.get(i); - String tabLabel = node.getResolvedLabel(); + def tabLabel = node.getLabel(); + if ("Tab_Default".equals(node.getName())) + { + tabLabel = _ctx.appRes("UIUserToolBarDashboard.page." + node.getLabel()); + } String param = "" + i; if(node.getUri().equals(selectedNode.getUri())){ %> @@ -40,7 +44,7 @@ <div class="RightTab"> <div class="MiddleTab"> <% - String ondblclick = "eXo.webui.UITabbedDashboard.showEditLabelInput(this," + i + ",\"" + node.getResolvedLabel() + "\")"; + String ondblclick = "eXo.webui.UITabbedDashboard.showEditLabelInput(this," + i + ",\"" + tabLabel + "\")"; %> <span ondblclick='$ondblclick'>$tabLabel</span> <a href="<%= uicomponent.url("DeleteTab",param); %>"> Modified: portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java =================================================================== --- portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-03-08 03:20:22 UTC (rev 5972) @@ -130,7 +130,7 @@ PageNode pageNode = new PageNode(); pageNode.setName(_nodeName); - pageNode.setLabel("UIUserToolBarDashboard.page.ClickAndType"); + pageNode.setLabel(_nodeName); pageNode.setUri(_nodeName); pageNode.setPageReference(page.getPageId()); Modified: portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-03-08 03:20:22 UTC (rev 5972) @@ -52,15 +52,16 @@ String href = Util.getPortalRequestContext().getPortalURI() + node.getUri(); String icon = node.getIcon(); if(icon == null) icon = "DefaultPageIcon"; - if (uicomponent.DEFAULT_TAB_NAME.equals(node.getName())) + def resolvedLabel = node.getLabel(); + if ("Tab_Default".equals(node.getName())) { - node.setResolvedLabel(_ctx.appRes(node.getLabel())); + resolvedLabel = _ctx.appRes("UIUserToolBarDashboard.page." + node.getLabel()); } - boolean toolong = (node.resolvedLabel.length() > 60); - String label = ( toolong ? node.resolvedLabel.substring(0, 57) + "..." : node.resolvedLabel); + boolean toolong = (resolvedLabel.length() > 60); + String label = ( toolong ? resolvedLabel.substring(0, 57) + "..." : resolvedLabel); String title = ""; - if(toolong) title = "title='$node.resolvedLabel'"; + if(toolong) title = "title='$resolvedLabel'"; else title = ""; print """ <div class="MenuItem $tabStyleNavigation"> Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-03-08 03:20:22 UTC (rev 5972) @@ -1418,7 +1418,7 @@ UIListPermissionSelectorPopup.title.ListPermissionSelector=Select Permission -UIUserToolBarDashboard.page.ClickAndType=Click & Type Page Name +UIUserToolBarDashboard.page.Tab_Default=Click & Type Page Name ####################################################################### # org.exoplatform.webui.core.UIConfirmation # Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-03-08 03:20:22 UTC (rev 5972) @@ -1309,7 +1309,7 @@ UIGadget.tooltip.editGadget=Editer la Gadget UIGadget.tooltip.deleteGadget=Supprimer la Gadget -UIUserToolBarDashboard.page.ClickAndType=Cliquez pour renommer +UIUserToolBarDashboard.page.Tab_Default=Cliquez pour renommer Locale.zh_CN=Chinois simplifié Locale.zh_TW=Chinois traditionnel Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-03-08 03:20:22 UTC (rev 5972) @@ -1410,7 +1410,7 @@ UIListPermissionSelectorPopup.title.ListPermissionSelector=Seleziona il Permesso -UIUserToolBarDashboard.page.ClickAndType=Clicca e inserisci il nome della pagina +UIUserToolBarDashboard.page.Tab_Default=Clicca e inserisci il nome della pagina ####################################################################### # org.exoplatform.webui.core.UIConfirmation # Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-03-08 03:20:22 UTC (rev 5972) @@ -1352,4 +1352,4 @@ UIGadget.message.isLossData=Gadget này có thể đã bị xóa khỏi cơ sở dữ liệu hoặc việc đọc gadget từ cơ sở dữ liệu xảy ra lỗi UIListPermissionSelectorPopup.title.ListPermissionSelector=Lựa chọn quyền -UIUserToolBarDashboard.page.ClickAndType=Nhấp chuột và điền tên trang +UIUserToolBarDashboard.page.Tab_Default=Nhấp chuột và điền tên trang