Author: tan_pham_dinh Date: 2010-01-30 04:30:40 -0500 (Sat, 30 Jan 2010) New Revision: 1473 Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.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_it.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.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/WEB-INF/classes/locale/portal/webui_zh.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPage.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortal.gtmpl Log: GTNPORTAL-561: Remove useless code in HTML Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-01-30 09:30:40 UTC (rev 1473) @@ -18,33 +18,29 @@ */ function UIComponent(node) { + if(!node) return null; this.node = node ; - if(node) this.type = node.className ; - componentBlock = eXo.core.DOMUtil.findFirstDescendantByClass(node, "div", "UIComponentBlock"); - var children = eXo.core.DOMUtil.getChildrenByTagName(componentBlock, "div") ; + this.type = node.className ; + var DOMUtil = eXo.core.DOMUtil; + componentBlock = DOMUtil.findFirstDescendantByClass(node, "div", "UIComponentBlock"); + var children = DOMUtil.getChildrenByTagName(componentBlock, "div") ; for(var i=0; i<children.length; i++) { - if(eXo.core.DOMUtil.hasClass(children[i], "META-DATA-BLOCK")) this.metaData = children[i]; - else if(eXo.core.DOMUtil.hasClass(children[i], "LAYOUT-BLOCK")) this.layout = children[i]; - else if(eXo.core.DOMUtil.hasClass(children[i], "VIEW-BLOCK")) this.view = children[i]; - else if(eXo.core.DOMUtil.hasClass(children[i], "EDITION-BLOCK")) this.control = children[i]; + if(DOMUtil.hasClass(children[i], "LAYOUT-BLOCK")) this.layout = children[i]; + else if(DOMUtil.hasClass(children[i], "VIEW-BLOCK")) this.view = children[i]; + else if(DOMUtil.hasClass(children[i], "EDITION-BLOCK")) this.control = children[i]; } this.component = ""; - var div = eXo.core.DOMUtil.getChildrenByTagName(this.metaData, "div"); - if(div.length > 0) { - this.id = div[0].firstChild.nodeValue ; - this.title = div[1].firstChild.nodeValue ; - } - //minh.js.exo - //bug PORTAL-1161. - //this.description = div[2].firstChild.nodeValue ; + if(DOMUtil.hasClass(node, "UIPortal")) this.id = node.id.replace("UIPortal-", ""); + else if(DOMUtil.hasClass(node, "UIPortlet")) this.id = node.id.replace("UIPortlet-", ""); + else if(DOMUtil.hasClass(node, "UIContainer")) this.id = node.id.replace("UIContainer-", ""); + else this.id = node.id; + }; -//UIComponent.prototype.getDescription = function() { return this.description ; }; UIComponent.prototype.getId = function() { return this.id ; }; -UIComponent.prototype.getTitle = function() { return this.title ; }; UIComponent.prototype.getElement = function() { return this.node ; }; UIComponent.prototype.getUIComponentType = function() { return this.type ; }; 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 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2010-01-30 09:30:40 UTC (rev 1473) @@ -1332,9 +1332,6 @@ --> <UIPortlet> <label> - <portlet>مدخل</portlet> - <title>مدخل</title> - <description>مدخل إكزو</description> <portletContent>وصف المدخل</portletContent> <View>عرض</View> </label> @@ -1671,9 +1668,6 @@ <Container>الحاويات</Container> <DragControlArea>هذا المجال لجر هذه الحاوية</DragControlArea> </title> - <label> - <Thecontainer>الحاوية</Thecontainer> - </label> <deleteContainer>هل أنت متأكد من حذف هذه الحاوية؟</deleteContainer> <tooltip> <closeContainer>إغلاق الحاوية</closeContainer> @@ -1688,8 +1682,6 @@ --> <UIPage> <label> - <title>صفحة البوابة</title> - <description>صفحة البوابة</description> <pageContent>وصف الصفحة</pageContent> </label> <msg> @@ -1754,10 +1746,6 @@ ############################################################################ --> <UIPageBody> - <label> - <title>صفحة البوابة</title> - <description>صفحة البوابة</description> - </label> <msg> <pageNotFoundLine1>!لم يتم العثور على الصفحة</pageNotFoundLine1> <pageNotFoundLine2>ليس لديك الحق في مشاهدة هذه الصفحة</pageNotFoundLine2> @@ -1766,29 +1754,6 @@ </msg> </UIPageBody> <!-- - ############################################################################ - # org.exoplatform.portal.component.view.UIPortal # - ############################################################################ - --> - <UIPortal> - <label> - <title>حاوية واجهة مستخدم البوابة</title> - <description>حاوية واجهة مستخدم البوابة</description> - </label> - </UIPortal> - <!-- - ############################################################################ - # org.exoplatform.portal.component.view.UITableColumnContainer# - ############################################################################ - --> - <UITableColumnContainer> - <label> - <title>حاوية التصفح</title> - <description>حاوية التصفح</description> - </label> - </UITableColumnContainer> - - <!-- ############################################################################### # org.exoplatform.portal.webui.component.UISearchForm # ############################################################################### 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 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-01-30 09:30:40 UTC (rev 1473) @@ -771,9 +771,6 @@ ############################################################################# ############################################################################# -UIPortlet.label.portlet=Portlet -UIPortlet.label.title=Portlet -UIPortlet.label.description=GateIn portlet UIPortlet.label.portletContent=Portlet Description UIPortlet.label.View=View UIPortlet.lable.information=Done @@ -978,7 +975,6 @@ UIContainer.title.Container=Container UIContainer.title.DragControlArea=Hold this area to drag this container -UIContainer.label.Thecontainer=The container UIContainer.deleteContainer=Are you sure you want to delete this Container? UIContainer.tooltip.closeContainer=Delete Container UIContainer.tooltip.editContainer=Edit Container @@ -988,8 +984,6 @@ # org.exoplatform.portal.component.view.UIPage # ############################################################################ -UIPage.label.title=Portal Page -UIPage.label.description=The page body of the portal UIPage.label.pageContent=Page Description UIPage.msg.EditPermission.null=You do not have the rights to edit this page. @@ -1024,27 +1018,12 @@ # org.exoplatform.portal.component.view.UIPageBody # ############################################################################ -UIPageBody.label.title=Portal Page Body UIPageBody.label.description=The page body of the portal UIPageBody.msg.pageNotFoundLine1=Page not found. UIPageBody.msg.pageNotFoundLine2=You do not have permission to view this page. UIPageBody.msg.pageNotFoundLine3=Page can be deleted. UIPageBody.msg.pageNotFoundLine4=This node does not have any pages. - ############################################################################ - # org.exoplatform.portal.component.view.UIPortal # - ############################################################################ - -UIPortal.label.title=UIPortal Container -UIPortal.label.description=The UIPortal Container - - ############################################################################ - # org.exoplatform.portal.component.view.UITableColumnContainer# - ############################################################################ - -UITableColumnContainer.label.title=Navigation Container -UITableColumnContainer.label.description=The navigation container - ############################################################################### # org.exoplatform.portal.webui.component.UISearchForm # ############################################################################### 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 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-01-30 09:30:40 UTC (rev 1473) @@ -768,9 +768,6 @@ ############################################################################# ############################################################################# -UIPortlet.label.portlet=Portlet -UIPortlet.label.title=Portlet -UIPortlet.label.description=Portlet eXo Platform UIPortlet.label.portletContent=Descripci\u00f3n del Portlet UIPortlet.label.View=Ver UIPortlet.lable.information=Hecho @@ -974,7 +971,6 @@ UIContainer.title.Container=Contenedor UIContainer.title.DragControlArea=Manten este \u00e1rea para arrastrar este contenedor -UIContainer.label.Thecontainer=El contenedor UIContainer.deleteContainer=\u00bfEst\u00e1s seguro de que deseas borrar este Contenedor? UIContainer.tooltip.closeContainer=Borrar Contenedor UIContainer.tooltip.editContainer=Editar Contenedor @@ -984,8 +980,6 @@ # org.exoplatform.portal.component.view.UIPage # ############################################################################ -UIPage.label.title=P\u00e1gina del Portal -UIPage.label.description=El cuerpo de la p\u00e1gina del portal UIPage.label.pageContent=Descripci\u00f3n de la P\u00e1gina UIPage.msg.EditPermission.null=No tienes permisos para editar esta p\u00e1gina. @@ -1020,27 +1014,11 @@ # org.exoplatform.portal.component.view.UIPageBody # ############################################################################ -UIPageBody.label.title=Cuerpo de la P\u00e1gina del Portal -UIPageBody.label.description=El Cuerpo de la P\u00e1gina del Portal UIPageBody.msg.pageNotFoundLine1=P\u00e1gina no encontrada. UIPageBody.msg.pageNotFoundLine2=No tienes permisos para ver esta P\u00e1gina. UIPageBody.msg.pageNotFoundLine3=La P\u00e1gina no puede ser borrada. UIPageBody.msg.pageNotFoundLine4=Este nodo no tiene ninguna P\u00e1gina. - ############################################################################ - # org.exoplatform.portal.component.view.UIPortal # - ############################################################################ - -UIPortal.label.title=Contenedor UIPortal -UIPortal.label.description=El Contenedor UIPortal - - ############################################################################ - # org.exoplatform.portal.component.view.UITableColumnContainer# - ############################################################################ - -UITableColumnContainer.label.title=Contenedor de Navegaci\u00f3n -UITableColumnContainer.label.description=El Contenedor de Navegaci\u00f3n - ############################################################################### # org.exoplatform.portal.webui.component.UISearchForm # ############################################################################### 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 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-01-30 09:30:40 UTC (rev 1473) @@ -753,9 +753,6 @@ ############################################################################# ############################################################################# -UIPortlet.label.portlet=Portlet -UIPortlet.label.title=Portlet -UIPortlet.label.description=Portlets eXo Platform UIPortlet.label.portletContent=Description de portlet UIPortlet.label.View=Visualiser UIPortlet.lable.information=Terminé @@ -959,7 +956,6 @@ UIContainer.title.Container=Conteneur UIContainer.title.DragControlArea=Cliquer sur cette partie sans relâcher le bouton pour faire glisser ce conteneur -UIContainer.label.Thecontainer=Le conteneur UIContainer.deleteContainer=Confirmez-vous la suppression de ce conteneur? UIContainer.tooltip.closeContainer=Fermer le conteneur UIContainer.tooltip.editContainer=Editer le conteneur @@ -969,8 +965,6 @@ # org.exoplatform.portal.component.view.UIPage # ############################################################################ -UIPage.label.title=Page du portail -UIPage.label.description=La page du portail UIPage.label.pageContent=Description de la page UIPage.msg.EditPermission.null=Vous n'avez pas le droit d'éditer cette page ! @@ -1005,27 +999,11 @@ # org.exoplatform.portal.component.view.UIPageBody # ############################################################################ -UIPageBody.label.title=Page principale du portail -UIPageBody.label.description=La page principale du portail UIPageBody.msg.pageNotFoundLine1=Page non trouvée! UIPageBody.msg.pageNotFoundLine2=Vous n'avez pas les droits suffisants pour voir cette page. UIPageBody.msg.pageNotFoundLine3=Page supprimée! UIPageBody.msg.pageNotFoundLine4=This node does not have any pages. - ############################################################################ - # org.exoplatform.portal.component.view.UIPortal # - ############################################################################ - -UIPortal.label.title=Conteneur UIPortal -UIPortal.label.description=Le conteneur UIPortal - - ############################################################################ - # org.exoplatform.portal.component.view.UITableColumnContainer# - ############################################################################ - -UITableColumnContainer.label.title=Conteneur de navigation -UITableColumnContainer.label.description=Conteneur de navigation - ############################################################################### # org.exoplatform.portal.webui.component.UISearchForm # ############################################################################### Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-01-30 09:30:40 UTC (rev 1473) @@ -769,9 +769,6 @@ ############################################################################# ############################################################################# -UIPortlet.label.portlet=Portlet -UIPortlet.label.title=Portlet -UIPortlet.label.description=Portlet di GateIn UIPortlet.label.portletContent=Descrizione della Portlet UIPortlet.label.View=Visualizza UIPortlet.lable.information=Fatto @@ -975,7 +972,6 @@ UIContainer.title.Container=Contenitore UIContainer.title.DragControlArea=Mantieni quest'area per copiare il Contenitore -UIContainer.label.Thecontainer=Il contenitore UIContainer.deleteContainer=Sicuro di voler eliminare questo contenitore? UIContainer.tooltip.closeContainer=Elimina il Contenitore UIContainer.tooltip.editContainer=Modifica il Contenitore @@ -985,8 +981,6 @@ # org.exoplatform.portal.component.view.UIPage # ############################################################################ -UIPage.label.title=Pagina del Portale -UIPage.label.description=Il corpo della pagina del portale UIPage.label.pageContent=Descrizione della Pagina UIPage.msg.EditPermission.null=Non hai i permessi per modificare la pagina. @@ -1021,27 +1015,11 @@ # org.exoplatform.portal.component.view.UIPageBody # ############################################################################ -UIPageBody.label.title=Corpo della Pagina del Portale -UIPageBody.label.description=Il corpo della pagina del portale UIPageBody.msg.pageNotFoundLine1=Pagina non trovata. UIPageBody.msg.pageNotFoundLine2=Non hai i permessi per visualizzare la pagina. UIPageBody.msg.pageNotFoundLine3=La pagina pu\u00F2 essere eliminata. UIPageBody.msg.pageNotFoundLine4=Questo nodo non ha pagine. - ############################################################################ - # org.exoplatform.portal.component.view.UIPortal # - ############################################################################ - -UIPortal.label.title=Contenitore UIPortal -UIPortal.label.description=Il Contenitore UIPortal - - ############################################################################ - # org.exoplatform.portal.component.view.UITableColumnContainer# - ############################################################################ - -UITableColumnContainer.label.title=Contenitore della Navigazione -UITableColumnContainer.label.description=Il Contenitore della Navigazione - ############################################################################### # org.exoplatform.portal.webui.component.UISearchForm # ############################################################################### Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2010-01-30 09:30:40 UTC (rev 1473) @@ -1186,9 +1186,6 @@ </UIDecoratorConfigOptions> <UIPortlet> <label> - <portlet>포틀릿</portlet> - <title>포틀릿</title> - <description>GateIn 포틀릿</description> <portletContent>포틀릿 설명</portletContent> <View>보기</View> </label> @@ -1460,9 +1457,6 @@ <Container>컨테이너</Container> <DragControlArea>컨테이너에 드래그하는 영역 유지</DragControlArea> </title> - <label> - <Thecontainer>컨테이너</Thecontainer> - </label> <deleteContainer>이 컨테이너를 삭제하시겠습니까?</deleteContainer> <tooltip> <closeContainer>컨테이너 삭제</closeContainer> @@ -1472,8 +1466,6 @@ </UIContainer> <UIPage> <label> - <title>포탈 페이지</title> - <description>포탈 페이지 설명</description> <pageContent>페이지 설명</pageContent> </label> <msg> @@ -1532,10 +1524,6 @@ <!-- # org.exoplatform.portal.component.view.UIPageBody #--> <!-- ############################################################################--> <UIPageBody> - <label> - <title>포탈 페이지 몸체</title> - <description>포탈의 페이지 몸체</description> - </label> <msg> <pageNotFoundLine1>페이지를 찾을 수 없습니다.</pageNotFoundLine1> <pageNotFoundLine2>이 페이지를 볼 수 있는 권한이 없습니다.</pageNotFoundLine2> @@ -1543,24 +1531,6 @@ <pageNotFoundLine4>이 노드에 페이지가 존재하지 않습니다.</pageNotFoundLine4> </msg> </UIPageBody> -<!-- ############################################################################--> -<!-- # org.exoplatform.portal.component.view.UIPortal #--> -<!-- ############################################################################--> - <UIPortal> - <label> - <title>UIPortal 컨테이너</title> - <description>UIPortal 컨테이너</description> - </label> - </UIPortal> - <UITableColumnContainer> - <label> - <title>내비게이션 컨테이너</title> - <description>내비게이션 컨테이너</description> - </label> - </UITableColumnContainer> -<!-- ############################################################################--> -<!-- # org.exoplatform.portal.component.view.UITableColumnContainer#--> -<!-- ############################################################################--> <UISearch> <label> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-01-30 09:30:40 UTC (rev 1473) @@ -1,4 +1,4 @@ -# + # # Copyright (C) 2010 eXo Platform SAS. # # This is free software; you can redistribute it and/or modify it @@ -770,9 +770,6 @@ ############################################################################# ############################################################################# -UIPortlet.label.portlet=Portlet -UIPortlet.label.title=Portlet -UIPortlet.label.description=GateIn portlet UIPortlet.label.portletContent=Portlet omschrijving UIPortlet.label.View=Tonen UIPortlet.lable.information=#{word.done} @@ -976,7 +973,6 @@ UIContainer.title.Container=Container UIContainer.title.DragControlArea=Blijf over dit gebied om de container te verslepen -UIContainer.label.Thecontainer=De container UIContainer.deleteContainer=Weet U zeker dat U deze container wilt verwijderen? UIContainer.tooltip.closeContainer=Verwijder container UIContainer.tooltip.editContainer=Wijzig container @@ -986,8 +982,6 @@ # org.exoplatform.portal.component.view.UIPage # ############################################################################ -UIPage.label.title=Portaal pagina -UIPage.label.description=De pagina inhoud van de portaal UIPage.label.pageContent=Pagina omschrijving UIPage.msg.EditPermission.null=U heeft geen voldoende rechten om deze pagina te wijzigen. @@ -1019,27 +1013,11 @@ # org.exoplatform.portal.component.view.UIPageBody # ############################################################################ -UIPageBody.label.title=Portaal pagina inhoud -UIPageBody.label.description=De pagina inhoud van de portaal UIPageBody.msg.pageNotFoundLine1=Pagina niet gevonden. UIPageBody.msg.pageNotFoundLine2=U heeft geen rechten om deze pagina te bekijken. UIPageBody.msg.pageNotFoundLine3=Pagina kan niet verwijderd worden. UIPageBody.msg.pageNotFoundLine4=Deze node heeft geen pagina's. -############################################################################ -# org.exoplatform.portal.component.view.UIPortal # -############################################################################ - -UIPortal.label.title=UIPortal Container -UIPortal.label.description=The UIPortal Container - -############################################################################ -# org.exoplatform.portal.component.view.UITableColumnContainer# -############################################################################ - -UITableColumnContainer.label.title=Navigatie container -UITableColumnContainer.label.description=De navigatie container - ############################################################################### # org.exoplatform.portal.webui.component.UISearchForm # ############################################################################### 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 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2010-01-30 09:30:40 UTC (rev 1473) @@ -758,9 +758,6 @@ ############################################################################# ############################################################################# -UIPortlet.label.portlet=Портлет -UIPortlet.label.title=Портлет -UIPortlet.label.description=eXo Platform портлет UIPortlet.label.portletContent=Описание портлета UIPortlet.label.View=Показать UIPortlet.lable.information=Готово @@ -964,7 +961,6 @@ UIContainer.title.Container=Контейнер UIContainer.title.DragControlArea=Зажмите здесь для перетаскивания контейнера -UIContainer.label.Thecontainer=Контейнер UIContainer.deleteContainer=Вы действительно хотите удалить контейнер? UIContainer.tooltip.closeContainer=Удалить контейнер UIContainer.tooltip.editContainer=Изменить контейнер @@ -974,8 +970,6 @@ # org.exoplatform.portal.component.view.UIPage # ############################################################################ -UIPage.label.title=Страница портала -UIPage.label.description=Описание странице UIPage.label.pageContent=Содержимое страницы UIPage.msg.EditPermission.null=У Вас нету прав для редактирования страницы. @@ -1010,27 +1004,11 @@ # org.exoplatform.portal.component.view.UIPageBody # ############################################################################ -UIPageBody.label.title=Тело страницы портала -UIPageBody.label.description=Тело страницы портала UIPageBody.msg.pageNotFoundLine1=Страница не найдена. UIPageBody.msg.pageNotFoundLine2=У Вас нету прав для просмотра страницы. UIPageBody.msg.pageNotFoundLine3=Страница может быть удалена. UIPageBody.msg.pageNotFoundLine4=Узел не содержит страниц. - ############################################################################ - # org.exoplatform.portal.component.view.UIPortal # - ############################################################################ - -UIPortal.label.title=Контейнер интерфейса портала -UIPortal.label.description=Контейнер интерфейса портала - - ############################################################################ - # org.exoplatform.portal.component.view.UITableColumnContainer# - ############################################################################ - -UITableColumnContainer.label.title=Контейнер навигации -UITableColumnContainer.label.description=Контейнер навигации - ############################################################################### # org.exoplatform.portal.webui.component.UISearchForm # ############################################################################### 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 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2010-01-30 09:30:40 UTC (rev 1473) @@ -749,9 +749,6 @@ ############################################################################# ############################################################################# -UIPortlet.label.portlet=Портлет -UIPortlet.label.title=Портлет -UIPortlet.label.description=eXo Platform портлет UIPortlet.label.portletContent=Опис портлету UIPortlet.label.View=Перегляд UIPortlet.lable.information=Виконано @@ -955,7 +952,6 @@ UIContainer.title.Container=Контейнер UIContainer.title.DragControlArea=Перетягніть в цю область контейнер -UIContainer.label.Thecontainer=Контейнер UIContainer.deleteContainer=Ви впевнені, що бажаєте видалити цей контейнер? UIContainer.tooltip.closeContainer=Видалити контейнер UIContainer.tooltip.editContainer=Редагувати контейнер @@ -965,8 +961,6 @@ # org.exoplatform.portal.component.view.UIPage # ############################################################################ -UIPage.label.title=Сторінка порталу -UIPage.label.description=Тіло сторінки порталу UIPage.label.pageContent=Опис сторінки UIPage.msg.EditPermission.null=У Вас немає прав, щоб редагувати цю сторінку. @@ -1001,27 +995,11 @@ # org.exoplatform.portal.component.view.UIPageBody # ############################################################################ -UIPageBody.label.title=Тіло сторінки порталу -UIPageBody.label.description=Тіло сторінки порталу UIPageBody.msg.pageNotFoundLine1=Сторінка не знайдена. UIPageBody.msg.pageNotFoundLine2=У Вас немає прав для перегляду цієї сторінки. UIPageBody.msg.pageNotFoundLine3=Сторінка може бути видалена. UIPageBody.msg.pageNotFoundLine4=Цей вузол немає сторінок. - ############################################################################ - # org.exoplatform.portal.component.view.UIPortal # - ############################################################################ - -UIPortal.label.title=UIПортал Контейнер -UIPortal.label.description=UIПортал Контейнер - - ############################################################################ - # org.exoplatform.portal.component.view.UITableColumnContainer# - ############################################################################ - -UITableColumnContainer.label.title=Навігаційний контейнер -UITableColumnContainer.label.description=Навігаційний контейнер - ############################################################################### # org.exoplatform.portal.webui.component.UISearchForm # ############################################################################### 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 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-01-30 09:30:40 UTC (rev 1473) @@ -749,9 +749,6 @@ ############################################################################# ############################################################################# -UIPortlet.label.portlet=Portlet -UIPortlet.label.title=Portlet -UIPortlet.label.description=eXo Platform Portlet UIPortlet.label.portletContent=Mô tả Portlet UIPortlet.label.View=Xem UIPortlet.lable.information=Thực hiện @@ -953,7 +950,6 @@ UIContainer.title.Container=Container UIContainer.title.DragControlArea=Giữ vùng này để kéo Container. -UIContainer.label.Thecontainer=Container UIContainer.deleteContainer=Bạn có chắc chắn muốn xóa Container này không? UIContainer.tooltip.closeContainer=Đóng Container UIContainer.tooltip.editContainer=Sửa Container @@ -963,8 +959,6 @@ # org.exoplatform.portal.component.view.UIPage # ############################################################################ -UIPage.label.title=Portal Page -UIPage.label.description=Phần thân của trang Portal. UIPage.label.pageContent=Vùng chứa nội dung của trang. UIPage.msg.EditPermission.null=Bạn không được quyền chỉnh sửa trang này! @@ -999,27 +993,11 @@ # org.exoplatform.portal.component.view.UIPageBody # ############################################################################ -UIPageBody.label.title=Phần thân của trang Portal -UIPageBody.label.description=Phần thân của trang Portal UIPageBody.msg.pageNotFoundLine1=Không tìm thấy trang nào! UIPageBody.msg.pageNotFoundLine2=Bạn không được quyền được xem trang này! UIPageBody.msg.pageNotFoundLine3=Trang này có thể được xóa! UIPageBody.msg.pageNotFoundLine4=Node này không có bất kỳ trang web nào. - ############################################################################ - # org.exoplatform.portal.component.view.UIPortal # - ############################################################################ - -UIPortal.label.title=UIPortal Container -UIPortal.label.description=UIPortal Container - - ############################################################################ - # org.exoplatform.portal.component.view.UITableColumnContainer# - ############################################################################ - -UITableColumnContainer.label.title=Navigation Container -UITableColumnContainer.label.description=Navigation Container - ############################################################################### # org.exoplatform.portal.webui.component.UISearchForm # ############################################################################### Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2010-01-30 09:30:40 UTC (rev 1473) @@ -1135,9 +1135,6 @@ </UIDecoratorConfigOptions> <UIPortlet> <label> - <portlet>Portlet</portlet> - <title>Portlet</title> - <description>GateIn portlet</description> <portletContent>Portlet描述</portletContent> <View>查看</View> </label> @@ -1395,9 +1392,6 @@ <Container>容器</Container> <DragControlArea>保持这个区域，拖动容器。</DragControlArea> </title> - <label> - <Thecontainer>容器</Thecontainer> - </label> <deleteContainer>您确定要删除此容器？</deleteContainer> <tooltip> <closeContainer>删除容器</closeContainer> @@ -1407,8 +1401,6 @@ </UIContainer> <UIPage> <label> - <title>门户页面</title> - <description>门户页面正文</description> <pageContent>页面描述</pageContent> </label> <msg> @@ -1465,10 +1457,6 @@ </UIPageDesktop> <UIPageBody> - <label> - <title>门户页面正文</title> - <description>门户页面正文</description> - </label> <msg> <pageNotFoundLine1>未找到页面</pageNotFoundLine1> <pageNotFoundLine2>您无权查看这个网页。</pageNotFoundLine2> @@ -1477,19 +1465,6 @@ </msg> </UIPageBody> - <UIPortal> - <label> - <title>UIPortal 容器</title> - <description>UIPortal 容器</description> - </label> - </UIPortal> - <UITableColumnContainer> - <label> - <title>导航容器</title> - <description>导航容器</description> - </label> - </UITableColumnContainer> - <UISearch> <label> <AdvancedSearch>高级搜索</AdvancedSearch> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2010-01-30 09:30:40 UTC (rev 1473) @@ -1286,9 +1286,6 @@ </UIDecoratorConfigOptions> <UIPortlet> <label> - <portlet>Portlet</portlet> - <title>Portlet</title> - <description>GateIn portlet</description> <portletContent>Portlet描述</portletContent> <View>查看</View> </label> @@ -1564,9 +1561,6 @@ <Container>容器</Container> <DragControlArea>保持這個區域，拖動容器。</DragControlArea> </title> - <label> - <Thecontainer>容器</Thecontainer> - </label> <deleteContainer>您確定要刪除此容器？</deleteContainer> <tooltip> <closeContainer>刪除容器</closeContainer> @@ -1576,8 +1570,6 @@ </UIContainer> <UIPage> <label> - <title>Portal頁面</title> - <description>Portal頁面正文</description> <pageContent>頁面描述</pageContent> </label> <msg> @@ -1637,10 +1629,6 @@ </UIPageDesktop> <UIPageBody> - <label> - <title>Portal頁面正文</title> - <description>Portal頁面正文</description> - </label> <msg> <pageNotFoundLine1>未找到頁面</pageNotFoundLine1> <pageNotFoundLine2>您無權查看這個網頁。</pageNotFoundLine2> @@ -1649,19 +1637,6 @@ </msg> </UIPageBody> - <UIPortal> - <label> - <title>UIPortal容器</title> - <description>UIPortal容器</description> - </label> - </UIPortal> - <UITableColumnContainer> - <label> - <title>導覽器容器</title> - <description>導覽器容器</description> - </label> - </UITableColumnContainer> - <UISearch> <label> <AdvancedSearch>高級搜索</AdvancedSearch> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-01-30 09:30:40 UTC (rev 1473) @@ -26,18 +26,6 @@ style="top: 0px; left:0px;"> <div class="UIComponentBlock"> - <div class="META-DATA-BLOCK" style="display: none"> - <div class="id"><%=uicomponent.getId();%></div> - <div class="title"><%=_ctx.appRes("UIPortlet.label.title");%></div> - <div class="description"> - <%if(uicomponent.getDescription() != null) {%> - <%=uicomponent.getDescription();%> - <%} else {%> - <%=_ctx.appRes("UIPortlet.label.description");%> - <%}%> - </div> - </div> - <%if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == uiPortalApp.APP_BLOCK_EDIT_MODE) { %> <div class="LAYOUT-BLOCK LAYOUT-PORTLET"> <div class="PortletLayoutDecorator"> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2010-01-30 09:30:40 UTC (rev 1473) @@ -29,12 +29,6 @@ <div class="LeftContainerBlock"> <div class="RightContainerBlock UIComponentBlock"> - <div class="META-DATA-BLOCK" style="display: none"> - <div class="id">$uicomponent.id</div> - <div class="title"><%=_ctx.appRes("UIContainer.title.Container")%></div> - <div class="description"><%=_ctx.appRes("UIContainer.label.Thecontainer")%></div> - </div> - <% int portalMode = uiPortalApp.getModeState(); if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == uiPortalApp.APP_BLOCK_EDIT_MODE){ @@ -48,9 +42,11 @@ </div> </div> + <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> <div style="position: relative;"> <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> <%/*Begin InfoBar*/%> @@ -85,6 +81,7 @@ </div> </div> </div> + <%} %> </div> </div> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2010-01-30 09:30:40 UTC (rev 1473) @@ -20,14 +20,6 @@ <div class="LeftContainerBlock"> <div class="RightContainerBlock UIComponentBlock"> - <div class="META-DATA-BLOCK" style="display: none"> - <div class="id">$uicomponent.id</div> - <div class="title"><%=_ctx.appRes("UITableColumnContainer.label.title")%></div> - <div class="description"><%=_ctx.appRes("UITableColumnContainer.label.description")%></div> - </div> - - - <% int portalMode = uiPortalApp.getModeState(); String style = ""; @@ -53,9 +45,11 @@ </div> <%/*Debug On IE -----For DND */%> + <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> <div style="position: relative;"> <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> <%/*Begin InfoBar*/%> @@ -91,6 +85,7 @@ </div> </div> </div> + <%} %> </div> </div> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2010-01-30 09:30:40 UTC (rev 1473) @@ -16,13 +16,6 @@ <div class="LeftContainerBlock"> <div class="RightContainerBlock UIComponentBlock"> - <div class="META-DATA-BLOCK" style="display: none"> - <div class="id">$uicomponent.id</div> - <div class="title"><%=_ctx.appRes("UITableColumnContainer.label.title")%></div> - <div class="description"><%=_ctx.appRes("UITableColumnContainer.label.description")%></div> - </div> - - <% int portalMode = uiPortalApp.getModeState(); String style = ""; @@ -49,9 +42,11 @@ </div> <%/*Debug On IE -----For DND */%> + <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> <div style="position: relative;"> <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> <%/*Begin InfoBar*/%> @@ -87,6 +82,7 @@ </div> </div> </div> + <%} %> </div> </div> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPage.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPage.gtmpl 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPage.gtmpl 2010-01-30 09:30:40 UTC (rev 1473) @@ -5,11 +5,6 @@ <div class="UIPage" id="UIPage-${uicomponent.id}"> <div class="UIComponentBlock"> - <div class="META-DATA-BLOCK" style="display: none"> - <div class="id">$uicomponent.id</div> - <div class="title"><%=_ctx.appRes("UIPage.label.title")%></div> - <div class="description"><%=_ctx.appRes("UIPage.label.description")%></div> - </div> <div class="VIEW-PAGE"> <div id="UIPage"> <div class="UIRowContainer"> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl 2010-01-30 09:30:40 UTC (rev 1473) @@ -5,11 +5,6 @@ %> <div class="UIPageBody" id="${uicomponent.id}"> <div class="UIComponent UIComponentBlock"> - <div class="META-DATA-BLOCK" style="display: none"> - <div class="id">$uicomponent.id</div> - <div class="title"><%=_ctx.appRes("UIPage.label.title")%></div> - <div class="description"><%=_ctx.appRes("UIPage.label.description")%></div> - </div> <%if(portalMode == UIPortalApplication.APP_BLOCK_EDIT_MODE || portalMode == UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE) {%> <div class="LAYOUT-BLOCK LAYOUT-PAGEBODY DragControlArea" onmousedown="eXo.portal.PortalDragDrop.init.call(this, event);"> @@ -79,9 +74,11 @@ </div> </div> <%}%> + <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> <div class="EDITION-BLOCK EDITION-PAGEBODY" style="position:relative"> <div class="UIPageBodyMask" style="position:absolute; display:none;" onmousedown="eXo.portal.PortalDragDrop.init.call(this, event);"><span></span></div> <div class="CONTROL-PAGEBODY CONTROL-BLOCK" style="display: none"><span></span></div> </div> + <%} %> </div> </div> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl 2010-01-30 09:30:40 UTC (rev 1473) @@ -5,11 +5,6 @@ %> <div class="UISiteBody" id="${uicomponent.id}"> <div class="UIComponent UIComponentBlock"> - <div class="META-DATA-BLOCK" style="display: none"> - <div class="id">$uicomponent.id</div> - <div class="title"><%=_ctx.appRes("UIPage.label.title")%></div> - <div class="description"><%=_ctx.appRes("UIPage.label.description")%></div> - </div> <%if(portalMode == UIPortalApplication.APP_BLOCK_EDIT_MODE || portalMode == UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE) {%> <div class="LAYOUT-BLOCK LAYOUT-SITEBODY DragControlArea"> @@ -74,9 +69,11 @@ <% } else { uicomponent.renderChildren(); } %> </div> <%}%> + <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> <div class="EDITION-BLOCK EDITION-SITEBODY"> <div class="CONTROL-SITEBODY CONTROL-BLOCK" style="display: none"><span></span></div> </div> <div class="UISiteBodyMask" style="position:absolute; display:none;"><span></span></div> + <%} %> </div> </div> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortal.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortal.gtmpl 2010-01-30 06:38:18 UTC (rev 1472) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortal.gtmpl 2010-01-30 09:30:40 UTC (rev 1473) @@ -1,25 +1,30 @@ <% + import org.exoplatform.portal.webui.workspace.UIPortalApplication; def rcontext = _ctx.getRequestContext(); rcontext.getJavascriptManager().importJavascript('eXo.portal.PortalDragDrop'); + int portalMode = _ctx.getRequestContext().getUIApplication().getModeState(); %> <div class="UIPortal" id="UIPortal-$uicomponent.id"> <div class="UIComponentBlock"> - <div class="META-DATA-BLOCK" style="display: none"> - <div class="id">$uicomponent.id</div> - <div class="title"><%=_ctx.appRes("UIPortal.label.title")%></div> - <div class="description"><%=_ctx.appRes("UIPortal.label.description")%></div> - </div> - <div class="LAYOUT-PORTAL LAYOUT-BLOCK" style="display: none;"></div> + + <%if(portalMode == UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE || portalMode == UIPortalApplication.APP_BLOCK_EDIT_MODE) { %> + <div class="LAYOUT-PORTAL LAYOUT-BLOCK"> + <%} else {%> <div class="VIEW-PORTAL VIEW-BLOCK"> + <%} %> <div id="$uicomponent.id"> <div class="UIRowContainer"> <%uicomponent.renderChildren();%> </div> </div> </div> + + <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> <div class="EDITION-BLOCK EDITION-PORTAL" style="display: none;"> <div class="CONTROL-PORTAL CONTROL-BLOCK"><span></span></div> </div> + <%} %> + </div> </div> \ No newline at end of file