Merge branch 'V5' into V6

Author: sanluan

publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/tools/CmsFileUtils.java

@@ -471,12 +471,17 @@ public static boolean moveFile(String filepath, String backupFilePath) {
         if (CommonUtils.notEmpty(file)) {
             File backupFile = new File(backupFilePath);
             try {
-                if (backupFile.exists()) {
-                    FileUtils.deleteQuietly(backupFile);
-                }
                 if (file.isDirectory()) {
-                    FileUtils.moveDirectory(file, backupFile);
+                    if (backupFile.exists()) {
+                        FileUtils.copyDirectory(file, backupFile);
+                        FileUtils.deleteQuietly(file);
+                    } else {
+                        FileUtils.moveDirectory(file, backupFile);
+                    }
                 } else {
+                    if (backupFile.exists()) {
+                        FileUtils.deleteQuietly(backupFile);
+                    }
                     FileUtils.moveFile(file, backupFile);
                 }
                 return true;

publiccms-parent/publiccms/src/main/resources/templates/admin/cmsFileBackup/list.html

@@ -64,9 +64,7 @@
                 <td>${a.creationTime?datetime}</td>
                 <td><@t.fileSize a.size/></td>
                 <td class="wrap">
-                    <#if !a.directory>
-                        <a href="cmsFileBackup/recycle?type=${type!}&paths=${filePath?url}&_csrf=<@tools.csrfToken admin=true/>" class="btnText green" title="<@t.page 'confirm.recycle'/>" target="ajaxTodo"><i class="icon-reply icon-large"></i><@t.page 'button.recycle'/></a>
-                    </#if>
+                    <a href="cmsFileBackup/recycle?type=${type!}&paths=${filePath?url}&_csrf=<@tools.csrfToken admin=true/>" class="btnText green" title="<@t.page 'confirm.recycle'/>" target="ajaxTodo"><i class="icon-reply icon-large"></i><@t.page 'button.recycle'/></a>
                     <#if editableSubfix?seq_contains(a.fileName?keep_after_last('.')?lower_case)>
                       <a href="cmsFileBackup/content?type=${type!}&path=${filePath?url}" class="edit btnText blue" target="navTab" rel="cmsWebBackup/content:${filePath}" title="${a.fileName}"><i class="icon-eye-open"></i><@t.page 'button.view'/></a>
                     </#if>

publiccms-parent/publiccms/src/main/resources/templates/admin/cmsPage/list.html

@@ -1,7 +1,7 @@
 <#macro pageList filepath=''>
     <@tools.fileList path=filepath>
         <#list list as a>
-            <@t.merge 'pages' filepath+'/'+a.fileName/>
+            <@t.merge 'pages' '/'+filepath?has_content?then(filepath+'/','')+a.fileName/>
             <#if !a.directory><@t.merge 'paths' filepath+'/'+a.fileName/></#if>
         </#list>
         <@sys.lock userId=admin.id itemType='page' itemIds=t.paths><#assign lockMap=map!/></@sys.lock>
@@ -14,17 +14,17 @@
         <@sys.user ids=t.userIds!><#assign userMap=map!/></@sys.user>
         <#list list as a>
             <#local currentPath=filepath?has_content?then(filepath+'/','')+a.fileName>
-            <#if (deptPageMap[filepath+'/'+a.fileName])?has_content&&deptPageMap[filepath+'/'+a.fileName]>
+            <#if (deptPageMap['/'+currentPath])?has_content&&deptPageMap['/'+currentPath]>
                 <li<#if a.directory><#if (path?has_content && path?starts_with(currentPath+'/'))> class="expand"<#else> _src="cmsPage/list.html?parent=${currentPath?url}"</#if><#elseif path?has_content && path=currentPath> class="selected"</#if>>
                     <#if a.directory>
                         <a href="javascript:;" onclick="return false;">${a.fileName}</a>
                         <#if path?has_content && path?starts_with(currentPath+'/')>
                             <ul>
                                  <@pageList currentPath/>
-                            </ul> 
+                            </ul>
                         </#if>
                     <#else>
-                        <a href="cmsPage/metadata.html?path=${(currentPath?url)!}" target="ajax" rel="pageBox">
+                        <a href="cmsPage/metadata.html?path=${(currentPath?url)!}"<#if (object.extendList)?has_content> class="red" title="<@t.page "metadata"/>"</#if> target="ajax" rel="pageBox">
                             <@tools.metadata path=currentPath>
                                <#if lockMap?has_content && lockMap[currentPath]?has_content>
                                   <#assign lockUser=(userMap[lockMap[currentPath].userId?string].nickname)!''/>

publiccms-parent/publiccms/src/main/resources/templates/admin/cmsPlace/list.html

@@ -14,12 +14,12 @@
                         <#if path?has_content && path?starts_with(currentPath+'/')>
                             <ul>
                                  <@placeList currentPath/>
-                            </ul> 
+                            </ul>
                         </#if>
                     <#elseif (object.size)?has_content && 0 lt object.size && (!(object.metadataExtendList)?has_content)>
-                        <a href="cmsPlace/dataList.html?path=${currentPath?url}" target="navTab" rel="cmsPlace/dataList" title="<@t.page 'place_data'/>:${(object.alias)!}">${(object.alias)!a.fileName}<#if 0 lt ((object.size)!0)> <@t.page 'place_data'/>(${object.size})</#if></a>
+                        <a href="cmsPlace/dataList.html?path=${currentPath?url}" target="navTab" rel="cmsPlace/dataList" title="<@t.page 'place_data'/>:${(object.alias)!}">${(object.alias)!a.fileName} <@t.page 'place_data'/>(${object.size})</a>
                     <#else>
-                        <a href="cmsPlace/metadata.html?path=${currentPath?url}" target="ajax" rel="placeBox">${(object.alias)!a.fileName}<#if 0 lt ((object.size)!0)> (${object.size})</#if></a>
+                        <a href="cmsPlace/metadata.html?path=${currentPath?url}"<#if (object.metadataExtendList)?has_content> class="red" title="<@t.page "metadata"/>"</#if> target="ajax" rel="placeBox">${(object.alias)!a.fileName}</a><#if 0 lt ((object.size)!0)> <a href="cmsPlace/dataList.html?path=${currentPath?url}" target="navTab" rel="cmsPlace/dataList" title="<@t.page 'place_data'/>:${(object.alias)!}"><@t.page 'place_data'/> (${object.size})</a></#if>
                     </#if>
                 </@tools.placeMetadata>
                 </li>

publiccms-parent/publiccms/src/main/webapp/resource/css/core.css

@@ -165,9 +165,10 @@ header .navbar-toggler.side-right{background-image:url(../images/side-right.png)
 .leftPageContent .tree li:not(:has(ul)){min-width:auto;float:none;clear:both;}
 .tree ul:after{display:block;content:".";height:0;clear:both;visibility:hidden;}
 .tree li a.disabled{color:#aaa;}
-.tree a{height:auto;line-height:26px;font-size:13px;}
+.tree a{height:auto;line-height:26px;font-size:13px;margin-right:5px;}
 .tree a>i{margin-right:5px;}
 .tree a, .tree a:hover{text-decoration:none;}
+.tree a.red{color:red;}
 .tree .collapsable,.tree .end_collapsable,.tree .end_expandable,.tree .expandable,.tree .file,.tree .folder_collapsable,.tree .folder_expandable,.tree .last_collapsable,.tree .last_expandable, .tree .first_collapsable, .tree .first_expandable,.tree .ckbox{font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display: inline-block;line-height:26px;text-align:center;width:18px;}
 .tree .collapsable,.tree .end_collapsable,.tree .end_expandable,.tree .expandable,.tree .file,.tree .folder_collapsable,.tree .folder_expandable,.tree .last_collapsable,.tree .last_expandable, .tree .first_collapsable, .tree .first_expandable{font-family:iconfont;}
 .tree .folder_collapsable:before{content:"\e668";}

publiccms-parent/publiccms/src/main/webapp/resource/js/jui.min.js

@@ -165,7 +165,7 @@
                         tree.subTree(op);
                     }
                 } else {
-                    node.children().wrap("<div></div>");
+                    node.children().wrapAll("<div></div>");
                     var $box=$(">div", node).prepend(( op.ckbox ? "<span class=\"ckbox " + checked + "\"></span>": "" )
                             + ( op.icon ? "<span class=\""+op.options.file+"\"></span>": "" ));
                     if(node.hasClass(op.options.selected) ){