portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r921837 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: resources/org/apache/jetspeed/portlets/spaces/resources/ resources/org/apache/jetspeed/portlets/toolbox/resources/ webapp/WEB-INF/view/spaces/
Date Thu, 11 Mar 2010 13:22:02 GMT
Author: woonsan
Date: Thu Mar 11 13:22:02 2010
New Revision: 921837

URL: http://svn.apache.org/viewvc?rev=921837&view=rev
Log:
JS2-1057: Fixing copying and moving in page navigator

Added:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_en.properties
  (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_ko.properties
  (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_en.properties
  (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_ko.properties
  (with props)
Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources.properties?rev=921837&r1=921836&r2=921837&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources.properties
Thu Mar 11 13:22:02 2010
@@ -13,13 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# $Id: CacheMonitorResources.properties 773302 2009-05-10 03:34:06Z taylor $
+# $Id$
 #
 
-# DO NOT TRANSLATE & DO NOT INCLUDE IN L10N PROPERTIES FILE
-
-spaces.label.name = Name 
-spaces.label.title = Title 
+spaces.label.name = Name
+spaces.label.title = Title
 spaces.label.description = Description
 spaces.label.owner = Owner
 spaces.label.security = Security
@@ -43,6 +41,7 @@ spaces.pages.label.close = Close
 spaces.pages.label.ok = OK
 spaces.pages.label.cancel = Cancel
 spaces.pages.message.confirm.delete = Are you sure to delete this item?
-spaces.pages.message.confirm.choosefolder = Choose the target folder.
+spaces.pages.message.confirm.choosefolder = Choose a target folder.
 spaces.pages.message.confirm.move = Are you sure to move this item?
 spaces.pages.message.confirm.copy = Are you sure to copy this item?
+spaces.pages.message.choose.different.target = Please choose a different target folder from
the current folder.

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_en.properties?rev=921837&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_en.properties
(added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_en.properties
Thu Mar 11 13:22:02 2010
@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Id$
+#
+
+spaces.label.name = Name
+spaces.label.title = Title
+spaces.label.description = Description
+spaces.label.owner = Owner
+spaces.label.security = Security
+spaces.label.theme = Theme
+spaces.table.title = Spaces
+spaces.label.edit = Edit
+spaces.label.delete = Delete
+spaces.label.add = Add Space
+spaces.label.edit.current = Edit Current Space
+spaces.label.save = Save
+spaces.label.cancel = Cancel
+
+spaces.pages.label.add = Add Page
+spaces.pages.label.rename = Rename
+spaces.pages.label.delete = Delete
+spaces.pages.label.move = Move
+spaces.pages.label.copy = Copy
+spaces.pages.label.space.title = {0}
+spaces.pages.label.template = Template
+spaces.pages.label.close = Close
+spaces.pages.label.ok = OK
+spaces.pages.label.cancel = Cancel
+spaces.pages.message.confirm.delete = Are you sure to delete this item?
+spaces.pages.message.confirm.choosefolder = Choose a target folder.
+spaces.pages.message.confirm.move = Are you sure to move this item?
+spaces.pages.message.confirm.copy = Are you sure to copy this item?
+spaces.pages.message.choose.different.target = Please choose a different target folder from
the current folder.

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_en.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_ko.properties?rev=921837&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_ko.properties
(added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_ko.properties
Thu Mar 11 13:22:02 2010
@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Id$
+#
+
+spaces.label.name = \uc774\ub984
+spaces.label.title = \ud0c0\uc774\ud2c0
+spaces.label.description = \uc124\uba85
+spaces.label.owner = \uc18c\uc720\uc790
+spaces.label.security = \ubcf4\uc548
+spaces.label.theme = \ud14c\ub9c8
+spaces.table.title = \uc2a4\ud398\uc774\uc2a4
+spaces.label.edit = \ud3b8\uc9d1
+spaces.label.delete = \uc0ad\uc81c
+spaces.label.add = \ucd94\uac00
+spaces.label.edit.current = \uc2a4\ud398\uc774\uc2a4 \ud3b8\uc9d1
+spaces.label.save = \uc800\uc7a5
+spaces.label.cancel = \ucde8\uc18c
+
+spaces.pages.label.add = \ud398\uc774\uc9c0 \ucd94\uac00
+spaces.pages.label.rename = \uc774\ub984\ubc14\uafb8\uae30
+spaces.pages.label.delete = \uc0ad\uc81c
+spaces.pages.label.move = \uc774\ub3d9
+spaces.pages.label.copy = \ubcf5\uc0ac
+spaces.pages.label.space.title = {0}
+spaces.pages.label.template = \ud15c\ud50c\ub9bf
+spaces.pages.label.close = \ub2eb\uae30
+spaces.pages.label.ok = \ud655\uc778
+spaces.pages.label.cancel = \ucde8\uc18c
+spaces.pages.message.confirm.delete = \uc774 \ud56d\ubaa9\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
+spaces.pages.message.confirm.choosefolder = \ub300\uc0c1 \ud3f4\ub354\ub97c \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.
+spaces.pages.message.confirm.move = \uc774 \ud56d\ubaa9\uc744 \uc774\ub3d9\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
+spaces.pages.message.confirm.copy = \uc774 \ud56d\ubaa9\uc744 \ubcf5\uc0ac\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
+spaces.pages.message.choose.different.target = \ud604\uc7ac\uc758 \ud3f4\ub354\uc640 \ub2e4\ub978
\ub300\uc0c1 \ud3f4\ub354\ub97c \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_ko.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_ko.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/spaces/resources/SpacesResources_ko.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties?rev=921837&r1=921836&r2=921837&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources.properties
Thu Mar 11 13:22:02 2010
@@ -16,7 +16,6 @@
 # $Id$
 #
 
-# DO NOT TRANSLATE & DO NOT INCLUDE IN L10N PROPERTIES FILE
 toolbox.label.portlets = Portlets
 toolbox.label.layout = Layout
 toolbox.label.theme = Theme

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_en.properties?rev=921837&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_en.properties
(added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_en.properties
Thu Mar 11 13:22:02 2010
@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Id$
+#
+
+toolbox.label.portlets = Portlets
+toolbox.label.layout = Layout
+toolbox.label.theme = Theme
+toolbox.label.widget = Widgets
+toolbox.label.search = Search
+toolbox.label.page = Page
+toolbox.label.moveFirst = <<
+toolbox.label.movePrev = <
+toolbox.label.moveNext = >
+toolbox.label.moveLast = >>
+toolbox.label.preview = Preview
+toolbox.label.add = Add
+toolbox.label.close = Close
+
+toolbox.message.chooseOne = Choose one
+toolbox.message.search = Search portlets

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_en.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_ko.properties?rev=921837&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_ko.properties
(added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_ko.properties
Thu Mar 11 13:22:02 2010
@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Id$
+#
+
+toolbox.label.portlets = \ud3ec\ud2c0\ub9bf
+toolbox.label.layout = \ub808\uc774\uc544\uc6c3
+toolbox.label.theme = \ud14c\ub9c8
+toolbox.label.widget = \uc704\uc9d3
+toolbox.label.search = \uac80\uc0c9
+toolbox.label.page = \ud398\uc774\uc9c0
+toolbox.label.moveFirst = <<
+toolbox.label.movePrev = <
+toolbox.label.moveNext = >
+toolbox.label.moveLast = >>
+toolbox.label.preview = \ubbf8\ub9ac\ubcf4\uae30
+toolbox.label.add = \ucd94\uac00
+toolbox.label.close = \ub2eb\uae30
+
+toolbox.message.chooseOne = \uc120\ud0dd
+toolbox.message.search = \ud3ec\ud2c0\ub9bf \uac80\uc0c9

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_ko.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_ko.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/toolbox/resources/JetspeedToolboxResources_ko.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp?rev=921837&r1=921836&r2=921837&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
Thu Mar 11 13:22:02 2010
@@ -56,9 +56,8 @@ private void printMenuItem(MenuElement e
     
     if (MenuElement.MENU_ELEMENT_TYPE.equals(type))
     { 
-        out.write("<li type='" + type + "' nodeType='" + nodeType + "' editable='" + editable
+ "' path='" + path + "' class='closed'>");
-        out.write("<a href='#'>" + title + "</a>");
-        out.write("\n");
+        out.write("<li type='" + type + "' nodeType='" + nodeType + "' editable='" + editable
+ "' path='" + path + "' class='closed'>\n");
+        out.write("<a href='#'>" + title + "</a>\n");
         
         if (depth < maxDepth)
         {
@@ -66,16 +65,14 @@ private void printMenuItem(MenuElement e
 	        
 	        if (childElements != null && !childElements.isEmpty())
 	        {
-	            out.write("<ul style='display: none'>");
-	            out.write("\n");
+	            out.write("<ul style='display: none'>\n");
 	            
 	            for (MenuElement child : childElements)
 	            {
 	                printMenuItem(child, depth + 1, maxDepth, out, renderRequest, renderResponse,
rc, pageNavigator);
 	            }
 	            
-	            out.write("</ul>");
-	            out.write("\n");
+	            out.write("</ul>\n");
 	        }
         }
         
@@ -88,8 +85,7 @@ private void printMenuItem(MenuElement e
         out.write("<div>");
         out.write("<a href='" + pageNavigator.getAbsoluteUrl(url, renderResponse, rc)
+ "'>" + title + "</a>");
         out.write("</div>");
-        out.write("</li>");
-        out.write("\n");
+        out.write("</li>\n");
     }
 }
 
@@ -106,9 +102,9 @@ private void printFolderMenuItem(MenuEle
     String title = element.getTitle(renderRequest.getLocale());
     if (MenuElement.MENU_ELEMENT_TYPE.equals(type))
     { 
-        out.write("<li path='" + path + "' class='closed'>");
-        out.write("<input type='radio' name='targetFolder' value='" + path + "' /><a
href='#'>" + title + "</a>");
-        out.write("\n");
+        out.write("<li path='" + path + "' class='closed'>\n");
+        out.write("<input type='radio' name='targetFolder' value='" + path + "' />\n");
+        out.write("<a href='#'>" + title + "</a>\n");
         
         if (depth < maxDepth)
         {
@@ -116,21 +112,18 @@ private void printFolderMenuItem(MenuEle
             
             if (childElements != null && !childElements.isEmpty())
             {
-                out.write("<ul style='display: none'>");
-                out.write("\n");
+                out.write("<ul style='display: none'>\n");
                 
                 for (MenuElement child : childElements)
                 {
                     printFolderMenuItem(child, depth + 1, maxDepth, out, renderRequest);
                 }
                 
-                out.write("</ul>");
-                out.write("\n");
+                out.write("</ul>\n");
             }
         }
         
-        out.write("</li>");
-        out.write("\n");
+        out.write("</li>\n");
     }
 }
 %>
@@ -247,15 +240,21 @@ for (MenuElement element : linkElements)
     <h2 id="<portlet:namespace/>modalHeader"><fmt:message key='spaces.pages.message.confirm.choosefolder'/></h2>
   </div>
   <div id="<portlet:namespace/>modalBody">
-    <div style="WIDTH: 100%; HEIGHT: 400px; OVERFLOW: auto">
+    <div style="WIDTH: 100%; HEIGHT: 200px; OVERFLOW: auto">
       <form id="<portlet:namespace/>targetFolderForm">
         <ul class="navmenu">
+          <li path='<%=space.getPath()%>' class='expanded'>
+            <input type='radio' name='targetFolder' value='<%=space.getPath()%>'/>
+            <a href='#'><%=space.getTitle()%></a>
+            <ul class="navmenu">
 <%
 for (MenuElement element : menuElements)
 {
     printFolderMenuItem(element, 0, 6, out, renderRequest);
 }
 %>
+            </ul>
+          </li>
         </ul>
       </form>
     </div>
@@ -387,16 +386,29 @@ YUI().use('jetui-portal', 'io', 'json', 
         }
         e.halt();
     };
-
+    
     var onMoveComplete = function(id, o, args) {
         var listItem = args.complete[0];
         if (listItem) {
+            onCopyComplete(id, o, args);
             listItem.remove();
         }
     };
     
     var onCopyComplete = function(id, o, args) {
         var listItem = args.complete[0];
+        var target = args.complete[1];
+        var targetPath = args.complete[2];
+        if (listItem && target && targetPath) {
+            var pageNavMenu = Y.Node.one("#<portlet:namespace/>pageNavMenu");
+            pageNavMenu.all("LI").each(function(v, k) {
+                if (target == v.getAttribute("path")) {
+                    var clonedListItem = listItem.cloneNode(true);
+                    clonedListItem.setAttribute("path", targetPath);
+                    v.one("UL").append(clonedListItem);
+                }
+            });
+        }
     };
     
     var currentFolderChoosingMode = "move";
@@ -411,31 +423,35 @@ YUI().use('jetui-portal', 'io', 'json', 
         });
         
         if (target) {
+            var nodeType = curNodeListItem.getAttribute("nodeType");
+            var sourcePath = curNodeListItem.getAttribute("path");
+            var targetPath = target + sourcePath.substring(sourcePath.lastIndexOf('/'));
+            if (sourcePath == targetPath) {
+                alert("<fmt:message key='spaces.pages.message.choose.different.target'/>");
+                e.halt();
+                return;
+            }
             if (currentFolderChoosingMode == "move") {
                 var cf = confirm("<fmt:message key='spaces.pages.message.confirm.move'/>");
                 if (cf) {
-                    var path = curNodeListItem.getAttribute("path");
-                    var nodeType = curNodeListItem.getAttribute("nodeType");
-                    var uri = "<%=contextPath%>/services/pagemanagement/move/" + nodeType
+ path + "?_type=json";
+                    var uri = "<%=contextPath%>/services/pagemanagement/move/" + nodeType
+ sourcePath + "?_type=json";
                     var config = {
                             on: { complete: onMoveComplete },
                             method: "POST",
-                            data: "deep=true&merge=true&target=" + target,
-                            arguments: { complete: [ curNodeListItem ] }
+                            data: "deep=true&merge=true&target=" + targetPath,
+                            arguments: { complete: [ curNodeListItem, target, targetPath
] }
                         };
                     var request = Y.io(uri, config);
                 }
             } else if (currentFolderChoosingMode == "copy") {
                 var cf = confirm("<fmt:message key='spaces.pages.message.confirm.copy'/>");
                 if (cf) {
-                    var path = curNodeListItem.getAttribute("path");
-                    var nodeType = curNodeListItem.getAttribute("nodeType");
-                    var uri = "<%=contextPath%>/services/pagemanagement/copy/" + nodeType
+ path + "?_type=json";
+                    var uri = "<%=contextPath%>/services/pagemanagement/copy/" + nodeType
+ sourcePath + "?_type=json";
                     var config = {
                             on: { complete: onCopyComplete },
                             method: "POST",
-                            data: "deep=true&merge=true&target=" + target,
-                            arguments: { complete: [ curNodeListItem ] }
+                            data: "deep=true&merge=true&target=" + targetPath,
+                            arguments: { complete: [ curNodeListItem, target, targetPath
] }
                         };
                     var request = Y.io(uri, config);
                 }
@@ -455,7 +471,7 @@ YUI().use('jetui-portal', 'io', 'json', 
         }
         var modalFeatures = {
             "width": 400,
-            "height": 500,
+            "height": 300,
             "addClasses": ["layout-<%=theme.getPageLayoutDecoration().getName()%>"]
         };
         var portal = (JETUI_YUI ? JETUI_YUI.getPortalInstance() : null);
@@ -472,7 +488,7 @@ YUI().use('jetui-portal', 'io', 'json', 
         }
         var modalFeatures = {
             "width": 400,
-            "height": 500,
+            "height": 300,
             "addClasses": ["layout-<%=theme.getPageLayoutDecoration().getName()%>"]
         };
         var portal = (JETUI_YUI ? JETUI_YUI.getPortalInstance() : null);



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message