From 5e8c1c02c8eb8ed62e5a14b0efc41bef1e5ba771 Mon Sep 17 00:00:00 2001
From: haint <haithanh0809@gmail.com>
Date: Wed, 16 Oct 2013 13:44:42 +0700
Subject: [PATCH] EXOGTN-1590: [Edit-Inplace] Implement deleting window

---
 .../gatein/portal/web/templates/zone_1_column.gtmpl  |  4 +++-
 .../portal/web/templates/zone_1_row_2_columns.gtmpl  | 12 +++++++++---
 .../portal/web/templates/zone_2_columns_1_row.gtmpl  | 12 +++++++++---
 .../portal/web/templates/zone_2_columns_70_30.gtmpl  |  8 ++++++--
 .../gatein/portal/web/templates/zone_3_columns.gtmpl | 12 +++++++++---
 .../portal/web/assets/javascripts/layout-view.js     | 10 +++++++++-
 6 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_column.gtmpl b/portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_column.gtmpl
index 3ca55c7be..448526724 100644
--- a/portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_column.gtmpl
+++ b/portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_column.gtmpl
@@ -2,7 +2,9 @@
   <div id="1" class="span12 sortable <%=l1==null || l1.isEmpty() ? 'emptyContainer' : '' %>" >
     <% l1.each { name, fragment -> %>
     <div id="${name}" class="portlet">
-        <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+        <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+            <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+        </h3>
         <div>${fragment.content}</div>
     </div>
     <% } %>
diff --git a/portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_row_2_columns.gtmpl b/portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_row_2_columns.gtmpl
index f5f21398d..b57680bcc 100644
--- a/portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_row_2_columns.gtmpl
+++ b/portal/web/src/main/java/org/gatein/portal/web/templates/zone_1_row_2_columns.gtmpl
@@ -2,7 +2,9 @@
     <div id="3" class="span12 sortable <%=l3==null || l3.isEmpty() ? 'emptyContainer' : '' %>">
         <% l3.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
       <% } %>
@@ -12,7 +14,9 @@
     <div id="1" class="span6 sortable <%=l1==null || l1.isEmpty() ? 'emptyContainer' : '' %>">
         <% l1.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
       <% } %>
@@ -20,7 +24,9 @@
     <div id="2" class="span6 sortable <%=l2==null || l2.isEmpty() ? 'emptyContainer' : '' %>">
         <% l2.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-         <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+         <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
         <% } %>
diff --git a/portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_1_row.gtmpl b/portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_1_row.gtmpl
index 81d8c587d..fb9e3c001 100644
--- a/portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_1_row.gtmpl
+++ b/portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_1_row.gtmpl
@@ -2,7 +2,9 @@
     <div id="1" class="span6 sortable <%=l1==null || l1.isEmpty() ? 'emptyContainer' : '' %>">
         <% l1.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
       <% } %>
@@ -10,7 +12,9 @@
     <div id="2" class="span6 sortable <%=l2==null || l2.isEmpty() ? 'emptyContainer' : '' %>">
         <% l2.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-         <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+         <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
         <% } %>
@@ -20,7 +24,9 @@
     <div id="3" class="span12 sortable <%=l3==null || l3.isEmpty() ? 'emptyContainer' : '' %>">
         <% l3.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
       <% } %>
diff --git a/portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_70_30.gtmpl b/portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_70_30.gtmpl
index 7ff67da52..1892c7f7b 100644
--- a/portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_70_30.gtmpl
+++ b/portal/web/src/main/java/org/gatein/portal/web/templates/zone_2_columns_70_30.gtmpl
@@ -2,7 +2,9 @@
     <div id="1" class="span3 sortable <%=l1==null || l1.isEmpty() ? 'emptyContainer' : '' %>">
         <% l1.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
       <% } %>
@@ -10,7 +12,9 @@
     <div id="2" class="span9 sortable <%=l2==null || l2.isEmpty() ? 'emptyContainer' : '' %>">
         <% l2.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-         <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+         <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
         <% } %>
diff --git a/portal/web/src/main/java/org/gatein/portal/web/templates/zone_3_columns.gtmpl b/portal/web/src/main/java/org/gatein/portal/web/templates/zone_3_columns.gtmpl
index 7b034ac1b..7b4cbb6e8 100644
--- a/portal/web/src/main/java/org/gatein/portal/web/templates/zone_3_columns.gtmpl
+++ b/portal/web/src/main/java/org/gatein/portal/web/templates/zone_3_columns.gtmpl
@@ -2,7 +2,9 @@
     <div id="1" class="span4 sortable <%=l1==null || l1.isEmpty() ? 'emptyContainer' : '' %>">
         <% l1.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+          <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
       <% } %>
@@ -10,7 +12,9 @@
     <div id="2" class="span4 sortable <%=l2==null || l2.isEmpty() ? 'emptyContainer' : '' %>">
         <% l2.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-         <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+         <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
         <% } %>
@@ -18,7 +22,9 @@
     <div id="3" class="span4 sortable <%=l3==null || l3.isEmpty() ? 'emptyContainer' : '' %>">
         <% l3.each { name, fragment -> %>
         <div id="${name}" class="portlet">
-         <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}</h3>
+         <h3 style="${cursor}" title="${tooltip}">${icon} ${fragment.title}
+          <% if (editing) { %><button class="close" type="button">x</button> <% } %>
+          </h3>
           <div>${fragment.content}</div>
         </div>
         <% } %>
diff --git a/portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js b/portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js
index 506dc423b..76dc41ab8 100644
--- a/portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js
+++ b/portal/web/src/main/resources/org/gatein/portal/web/assets/javascripts/layout-view.js
@@ -3,7 +3,8 @@
 		el : '.editing',
 		
 		events : {
-			"click a.switch" : "switchLayout"
+			"click a.switch" : "switchLayout",
+			"click button.close" : "deleteApp"
 		},
 
         initialize : function() {
@@ -66,6 +67,13 @@
         	}
         },
         
+        deleteApp : function(e) {
+        	var appId = $(e.target).closest('div.portlet').attr('id');
+        	var containerId = $(e.target).closest('div.sortable').attr('id')
+        	var container = this.model.getDescendant(containerId);
+        	container.removeChild(appId);
+        },
+        
         switchLayout : function(e) {
         	var anchor = e.target;
         	var href = $(anchor).attr('href');