Author: tan_pham_dinh Date: 2009-11-16 03:38:47 -0500 (Mon, 16 Nov 2009) New Revision: 605 Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl Log: GTNPORTAL-93: Add tootltip to control buttons of UIGadget and localize them Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js 2009-11-16 07:40:13 UTC (rev 604) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js 2009-11-16 08:38:47 UTC (rev 605) @@ -197,10 +197,12 @@ minimized = true; gadgetApp.style.display = "none"; DOMUtil.replaceClass(selectedElement, "MinimizeGadget", "RestoreGadget"); + selectedElement.title = selectedElement.getAttribute("unminiTitle"); } else { minimized = false; gadgetApp.style.display = "block"; DOMUtil.replaceClass(selectedElement, "RestoreGadget", "MinimizeGadget"); + selectedElement.title = selectedElement.getAttribute("miniTitle"); } var compId = portletFrag.parentNode.id; Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2009-11-16 07:40:13 UTC (rev 604) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2009-11-16 08:38:47 UTC (rev 605) @@ -2279,5 +2279,19 @@ <Group>Group</Group> </header> </UIAddGroupNavigation> -</bundle> - + <!-- + ############################################################################ + # org.exoplatform.portal.webui.application.UIGadget # + ############################################################################ + --> + <UIGadget> + <tooltip> + <Minimize>تصغير</Minimize> + <Unminimize>استعادة</Unminimize> + <Maximize>تكبير</Maximize> + <Unmaximize>استعادة بانخفاض</Unmaximize> + <editGadget>Edit Gadget</editGadget> + <deleteGadget>Delete this gadget</deleteGadget> + </tooltip> + </UIGadget> +</bundle> \ No newline at end of file Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-16 07:40:13 UTC (rev 604) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-16 08:38:47 UTC (rev 605) @@ -1363,3 +1363,14 @@ UIAddGroupNavigation.Action.Add=Add Navigation UIAddGroupNavigation.Label.NoPermission=This user doesn't have permisson to add navigation UIAddGroupNavigation.header.Group=Group + + ############################################################################ + # org.exoplatform.portal.webui.application.UIGadget # + ############################################################################ + +UIGadget.tooltip.Minimize=Minimize +UIGadget.tooltip.Unminimize=Restore +UIGadget.tooltip.Maximize=Maximize +UIGadget.tooltip.Unmaximize=Restore Down +UIGadget.tooltip.editGadget=Edit Gadget +UIGadget.tooltip.deleteGadget=Delete Gadget \ No newline at end of file Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2009-11-16 07:40:13 UTC (rev 604) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2009-11-16 08:38:47 UTC (rev 605) @@ -1363,3 +1363,14 @@ UIAddGroupNavigation.Action.Add=A\u00f1adir Navegaci\u00f3n UIAddGroupNavigation.Label.NoPermission=Este usuario no tiene permisos para a\u00f1adir una Navegaci\u00f3n UIAddGroupNavigation.header.Group=Grupo + + ############################################################################ + # org.exoplatform.portal.webui.application.UIGadget # + ############################################################################ + +UIGadget.tooltip.Minimize=Minimizar +UIGadget.tooltip.Unminimize=Restaurar +UIGadget.tooltip.Maximize=Maximizar +UIGadget.tooltip.Unmaximize=Restaurar +UIGadget.tooltip.editGadget=Editar Gadget +UIGadget.tooltip.deleteGadget=Borrar Gadget Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-16 07:40:13 UTC (rev 604) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-16 08:38:47 UTC (rev 605) @@ -1331,3 +1331,14 @@ UIAddGroupNavigation.Action.Add=Add Navigation UIAddGroupNavigation.Label.NoPermission=This user doesn't have permisson to add navigation UIAddGroupNavigation.header.Group=Group + + ############################################################################ + # org.exoplatform.portal.webui.application.UIGadget # + ############################################################################ + +UIGadget.tooltip.Minimize=Réduire +UIGadget.tooltip.Unminimize=Restaurer +UIGadget.tooltip.Maximize=Agrandir +UIGadget.tooltip.Unmaximize=Restaurer Again +UIGadget.tooltip.editGadget=Editer la Gadget +UIGadget.tooltip.deleteGadget=Supprimer la Gadget Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-16 07:40:13 UTC (rev 604) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-16 08:38:47 UTC (rev 605) @@ -1354,3 +1354,14 @@ UIAddGroupNavigation.Action.Add=Добавить навигацию UIAddGroupNavigation.Label.NoPermission=This user doesn't have permisson to add navigation UIAddGroupNavigation.header.Group=Группа + + ############################################################################ + # org.exoplatform.portal.webui.application.UIGadget # + ############################################################################ + +UIGadget.tooltip.Minimize=Свернуть +UIGadget.tooltip.Unminimize=Восстановить +UIGadget.tooltip.Maximize=Развернуть +UIGadget.tooltip.Unmaximize=Восстановить +UIGadget.tooltip.editGadget=Изменить гаджеты +UIGadget.tooltip.deleteGadget=Удалить гаджеты Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-16 07:40:13 UTC (rev 604) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-16 08:38:47 UTC (rev 605) @@ -1344,3 +1344,14 @@ UIAddGroupNavigation.Action.Add=Додати навігацію UIAddGroupNavigation.Label.NoPermission=This user doesn't have permisson to add navigation + + ############################################################################ + # org.exoplatform.portal.webui.application.UIGadget # + ############################################################################ + +UIGadget.tooltip.Minimize=Мінімізувати +UIGadget.tooltip.Unminimize=Відновити +UIGadget.tooltip.Maximize=Максимізувати +UIGadget.tooltip.Unmaximize=Відновити +UIGadget.tooltip.editGadget=Редагувати Ґаджети +UIGadget.tooltip.deleteGadget=Видалити Ґаджети Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-16 07:40:13 UTC (rev 604) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-16 08:38:47 UTC (rev 605) @@ -1330,3 +1330,14 @@ UIAddGroupNavigation.Action.Add=Add Navigation UIAddGroupNavigation.header.Group=Group UIAddGroupNavigation.Label.NoPermission=This user doesn't have permisson to add navigation + + ############################################################################ + # org.exoplatform.portal.webui.application.UIGadget # + ############################################################################ + +UIGadget.tooltip.Minimize=Thu nhỏ cửa sổ +UIGadget.tooltip.Unminimize=Khôi phục +UIGadget.tooltip.Maximize=Phóng lớn cửa sổ +UIGadget.tooltip.Unmaximize=Thu nhỏ cửa sổ +UIGadget.tooltip.editGadget=Sửa Gadget +UIGadget.tooltip.deleteGadget=Xóa Gadget Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl 2009-11-16 07:40:13 UTC (rev 604) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl 2009-11-16 08:38:47 UTC (rev 605) @@ -19,7 +19,13 @@ jsmanager.importJavascript("eXo.gadget.UIGadget"); rcontext.getJavascriptManager().addCustomizedOnLoadScript("eXo.gadget.UIGadget.confirmDeleteGadget = '" + _ctx.appRes("UIGadgetContainerManagement.confirm.DeleteGadget") + "';"); jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.createGadget('$url','content-$id', $metadata, $userPref, '$view', '$hostName', " + (isDev ? 1 : 0) - + ", " + (isDebug ? 1 : 0) + ", " + (noCache ? 1 : 0) + ");") + + ", " + (isDebug ? 1 : 0) + ", " + (noCache ? 1 : 0) + ");"); + + boolean isMini = Boolean.parseBoolean(uicomponent.getProperties().get("minimized")); + String miniTitle = _ctx.appRes("UIGadget.tooltip.Minimize"); + String unminiTitle = _ctx.appRes("UIGadget.tooltip.Unminimize"); + String maxiTitle = _ctx.appRes("UIGadget.tooltip.Maximize"); + String unmaxiTitle = _ctx.appRes("UIGadget.tooltip.Unmaximize"); %> <div class="UIGadget" id="$id" style="left: $posX; top: $posY; z-Index: $zIndex; width: 100%" > <div class="GadgetControl" style="visibility: visible;"> @@ -27,11 +33,13 @@ <div class="RightControlBar"> <div class="CenterControlBar"> <div class="GadgetTitle" style="display: none"><%= uicomponent.getApplicationName() %></div> - <div class="CloseGadget IconControl" onclick="eXo.gadget.UIGadget.deleteGadget(this)" onmousedown="event.cancelBubble=true;"><span></span></div> - <div class="<%=Boolean.parseBoolean(uicomponent.getProperties().get("minimized")) ? "RestoreGadget": "MinimizeGadget";%> MinimizeAction IconControl" - onclick="eXo.gadget.UIGadget.minimizeGadget(this)" onmousedown="event.cancelBubble=true;" style="display:none;"><span></span></div> - <div class="EditGadget IconControl" onclick="eXo.gadget.UIGadget.editGadget('$id')" onmousedown="event.cancelBubble=true;"><span></span></div> - <div class="MaximizeGadget IconControl" onclick="eXo.gadget.UIGadget.maximizeGadget(this)" onmousedown="event.cancelBubble=true;" title="Maximize"><span></span></div> + <div class="CloseGadget IconControl" onclick="eXo.gadget.UIGadget.deleteGadget(this)" onmousedown="event.cancelBubble=true;" title="<%=_ctx.appRes("UIGadget.tooltip.deleteGadget")%>"><span></span></div> + <div class="<%=isMini ? "RestoreGadget": "MinimizeGadget";%> MinimizeAction IconControl" + onclick="eXo.gadget.UIGadget.minimizeGadget(this)" onmousedown="event.cancelBubble=true;" style="display:none;" + title="<%=isMini ? unminiTitle : miniTitle%>" miniTitle="$miniTitle" unminiTitle="$unminiTitle"><span></span></div> + <div class="EditGadget IconControl" onclick="eXo.gadget.UIGadget.editGadget('$id')" onmousedown="event.cancelBubble=true;" title="<%=_ctx.appRes("UIGadget.tooltip.editGadget")%>"><span></span></div> + <div class="MaximizeGadget IconControl" onclick="eXo.gadget.UIGadget.maximizeGadget(this)" onmousedown="event.cancelBubble=true;" + title="<%=view.equals(uicomponent.HOME_VIEW) ? maxiTitle : unmaxiTitle%>"><span></span></div> <div class="GadgetDragHandleArea"><span></span></div> <div style="clear: both;"><span></span></div> </div>