[gatein-commits] gatein SVN: r1506 - in portal/branches/3.0.0-Beta05-CP/web: portal/src/main/webapp/WEB-INF/classes/locale/portal and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Feb 3 02:20:10 EST 2010 

Author: trong.tran
Date: 2010-02-03 02:20:09 -0500 (Wed, 03 Feb 2010)
New Revision: 1506

Modified:
   portal/branches/3.0.0-Beta05-CP/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UIPage.gtmpl
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl
   portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortal.gtmpl
Log:
GTNPORTAL-561: Remove useless code in HTML

Modified: portal/branches/3.0.0-Beta05-CP/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties	2010-02-03 07:20:09 UTC (rev 1506)
@@ -770,9 +770,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
@@ -976,7 +973,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
@@ -986,8 +982,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.
 
@@ -1022,27 +1016,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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UIPage.gtmpl
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UIPage.gtmpl	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UIPage.gtmpl	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortal.gtmpl
===================================================================
--- portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortal.gtmpl	2010-02-03 06:59:13 UTC (rev 1505)
+++ portal/branches/3.0.0-Beta05-CP/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortal.gtmpl	2010-02-03 07:20:09 UTC (rev 1506)
@@ -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

More information about the gatein-commits mailing list