Feature #10542

Add support of the feature in Kmelia with non-treeview
tree-structured documentation.

Ensure the feature works also for Toolbox.

Author: mmoqui

kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle.properties

@@ -245,8 +245,8 @@ ContainsTooLargeText=ne doit pas exc\u00e9der
 PubGererChemins=Emplacements
 DateDesc=Dates de modification d\u00e9croissantes
 Model=Contenu
-PublicationAddToTopic3=existe d\u00e9j\u00e0 dans le dossier courant \!
-PublicationAddToTopic2=a \u00e9t\u00e9 ajout\u00e9 au dossier courant \!
+PublicationAddToTopic3=existe d\u00e9j\u00e0 dans le dossier courant !
+PublicationAddToTopic2=a \u00e9t\u00e9 ajout\u00e9 au dossier courant !
 PublicationAddToTopic1=La publication
 ConfirmDeletePath=Etes-vous s\u00fbr de vouloir supprimer l'emplacement ?
 Home=Accueil
@@ -262,7 +262,7 @@ Error=erreur
 TopicPath=Emplacement
 Page=Page
 PubDeclass=Publication d\u00e9class\u00e9e
-kmelia.CopyPublicationLink=Pour copier le lien vers cette publication \: Clique droit puis 'Copier le raccourci'
+kmelia.CopyPublicationLink=Pour copier le lien vers cette publication : Clique droit puis 'Copier le raccourci'
 PubDeMemeSujet=M\u00eame sujet
 kmelia.LastModification=Derni\u00e8re modification
 kmelia.FolderAddLink=Cr\u00e9er un dossier li\u00e9 \u00e0 un r\u00e9pertoire r\u00e9seau
@@ -460,3 +460,4 @@ kmelia.publications.batch.update.fail = {0} publications n'ont pas pu \u00eatre
 kmelia.publications.batch.update = Vous \u00eates sur le point de modifier le contenu de <b>{0} publications</b>... Seuls les champs renseign\u00e9s seront appliqu\u00e9s \u00e0 ces publications.
 kmelia.ExportPDFApplication=Fusionner tous les PDF de l'application
 kmelia.sort.manual.reset.confirm=Etes-vous s\u00fbr(e) de vouloir supprimer d\u00e9finitivement l'ordre manuel et revenir \u00e0 l'ordre par d\u00e9faut ?
+kmelia.folder.trash.confirm=<p>Etes-vous s\u00fbr de vouloir placer le dossier dans la corbeille ?</p><p>(Tous droits sp\u00e9cifiques du dossier seront retir\u00e9s.)</p> 

kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_de.properties

@@ -512,3 +512,4 @@ kmelia.publications.batch.update = Sie sind dabei, den Inhalt von <b> {0} Publik
 kmelia.ExportPDFApplication=Merge all PDF of the application
 kmelia.LocalPathMandatory=Ein lokaler Standort ist ein Muss!
 kmelia.sort.manual.reset.confirm=Sind Sie sicher, dass Sie das manuelle Ranking dauerhaft entfernen und zum Standardranking zur\u00fcckkehren m\u00f6chten?
+kmelia.folder.trash.confirm=<p>Do you really want to put the folder in the trash?</p><p>(All the specific rights of the folder will be removed.)</p>

kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_en.properties

@@ -512,3 +512,4 @@ kmelia.RightsSpecificDisable=Click here to unset specific access rights...
 ConfirmDeleteCoordinate=Are you sure to delete the classification
 kmelia.FolderAddLink=Create a topic linked to a network folder
 kmelia.sort.manual.reset.confirm=Are you sure to permanently remove the manual ordering and revert to the default ordering?
+kmelia.folder.trash.confirm=<p>M\u00f6chten Sie den Ordner wirklich in den Papierkorb legen?</p><p>(Dabei werden s\u00e4mtliche spezifischen Rechte des Ordners entfernt.)</p>

kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_fr.properties

@@ -460,3 +460,4 @@ kmelia.publications.batch.update.none=Aucune publication n'a \u00e9t\u00e9 modif
 kmelia.publications.batch.update.success = {0} publications modifi\u00e9es avec succ\u00e8s
 kmelia.publications.batch.update.fail = {0} publications n'ont pas pu \u00eatre modifi\u00e9es
 kmelia.publications.batch.update = Vous \u00eates sur le point de modifier le contenu de <b>{0} publications</b>... Seuls les champs renseign\u00e9s seront appliqu\u00e9s \u00e0 ces publications.
+kmelia.folder.trash.confirm=<p>Etes-vous s\u00fbr de vouloir placer le dossier dans la corbeille ?</p><p>(Tous droits sp\u00e9cifiques du dossier seront retir\u00e9s.)</p>

kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/JSONServlet.java

@@ -92,27 +92,27 @@ private String getOperations(String id, KmeliaSessionController kmeliaSC) {
       } else {
         // getting profile
         String profile = kmeliaSC.getUserTopicProfile(id);
+        NodeDetail folder = kmeliaSC.getNodeHeader(id);
 
         // getting operations of topic according to profile and current
         boolean isAdmin = SilverpeasRole.ADMIN.isInRole(profile);
         boolean isPublisher = SilverpeasRole.PUBLISHER.isInRole(profile);
         boolean isWriter = SilverpeasRole.WRITER.isInRole(profile);
         boolean isUser = SilverpeasRole.USER.isInRole(profile);
         boolean isRoot = NodePK.ROOT_NODE_ID.equals(id);
-        boolean isBasket = NodePK.BIN_NODE_ID.equals(id);
+        boolean isInBasket = folder.getFullPath().contains("/" + NodePK.BIN_NODE_ID + "/");
         Role role = new Role().setAdmin(isAdmin).setPublisher(isPublisher).setWriter(isWriter)
             .setUser(isUser);
 
-        if (isBasket) {
-          addBasketOperations(operations, role);
+        if (isInBasket) {
+          addBasketOperations(operations, role, folder);
         } else if (StringUtil.isDefined(profile)) {
-          NodeDetail node = kmeliaSC.getNodeHeader(id);
           UserDetail user = kmeliaSC.getUserDetail();
           // general operations
-          addGeneralOperations(kmeliaSC, operations, role, profile, isRoot, node);
+          addGeneralOperations(kmeliaSC, operations, role, profile, isRoot, folder);
 
           // topic operations
-          addTopicOperations(kmeliaSC, operations, role, isRoot, node, user);
+          addTopicOperations(kmeliaSC, operations, role, isRoot, folder, user);
 
           // publication operations
           addPublicationOperations(kmeliaSC, operations, role, isRoot, user);
@@ -216,13 +216,20 @@ private void addGeneralOperations(final KmeliaSessionController kmeliaSC,
     operations.put("responsibles", !user.isAnonymous());
   }
 
-  private void addBasketOperations(final JSONCodec.JSONObject operations, final Role role) {
+  private void addBasketOperations(final JSONCodec.JSONObject operations, final Role role,
+      NodeDetail node) {
     boolean binOperationsAllowed = role.isAdmin() || role.isPublisher() || role.isWriter();
+    boolean isAdmin = role.isAdmin();
     operations.put("emptyTrash", binOperationsAllowed);
     operations.put(OP_EXPORT_PUBLICATIONS, binOperationsAllowed);
     operations.put("copyPublications", binOperationsAllowed);
     operations.put("cutPublications", binOperationsAllowed);
     operations.put(OP_DELETE_PUBLICATIONS, binOperationsAllowed);
+    if (!node.isBin()) {
+      operations.put("deleteTopic", isAdmin);
+      operations.put("copyTopic", isAdmin);
+      operations.put("cutTopic", isAdmin);
+    }
   }
 
   private static class Role {

kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/KmeliaRequestRouter.java

@@ -234,6 +234,8 @@ public String getDestination(String function, KmeliaSessionController kmelia,
         destination = rootDestination + "basket.jsp";
       } else if (function.equals("ViewPublicationsToValidate")) {
         destination = rootDestination + "publicationsToValidate.jsp";
+      } else if (function.equals("ViewPublicationsNonVisibles")) {
+        destination = rootDestination + "publicationsNonVisibles.jsp";
       } else if ("GoBackToResults".equals(function)) {
         SearchContext searchContext = kmelia.getSearchContext();
         request.setAttribute("SearchContext", searchContext);

kmelia/kmelia-war/src/main/webapp/kmelia/jsp/basket.jsp

@@ -24,15 +24,21 @@
 
 --%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view"%>
 
 <%@ include file="checkKmelia.jsp" %>
-<%
-String translation = (String) request.getAttribute("Language");
-%>
+
+<fmt:setLocale value="${sessionScope[sessionController].language}" />
+<view:setBundle bundle="${requestScope.resources.multilangBundle}" />
+<fmt:message var="emptyBasket" key="EmptyBasket"/>
+<fmt:message var="basketLabel" key="kmelia.basket"/>
+<c:set var="translation" value="${requestScope.Language}"/>
+<c:set var="componentId" value="${request.browseContext[3]}"/>
 
 <!DOCTYPE>
-<html lang="<%= translation %>">
+<html lang="${translation}">
 <head>
 	<title></title>
 <view:looknfeel/>
@@ -84,33 +90,30 @@ $(document).ready(function() {
 <body id="kmelia" onUnload="closeWindows()" class="yui-skin-sam">
 <div id="<%=componentId %>">
 <%
-        Window window = gef.getWindow();
-        BrowseBar browseBar = window.getBrowseBar();
-        browseBar.setI18N("GoToCurrentTopic", translation);
-        browseBar.setExtraInformation(resources.getString("kmelia.basket"));
+	Window window = gef.getWindow();
+	BrowseBar browseBar = window.getBrowseBar();
+	browseBar.setI18N("GoToCurrentTopic", (String) request.getAttribute("Language"));
+	browseBar.setExtraInformation(resources.getString("kmelia.basket"));
 
-        //Display operations
-        OperationPane operationPane = window.getOperationPane();
-        operationPane.addOperation("useless", resources.getString("EmptyBasket"), "javascript:onClick=emptyTrash()");
-
-    //Instanciation du cadre avec le view generator
-	Frame frame = gef.getFrame();
+	//Display operations
+	OperationPane operationPane = window.getOperationPane();
+	operationPane.addOperation("useless", resources.getString("EmptyBasket"), "javascript:onClick=emptyTrash()");
 
     out.println(window.printBefore());
-    out.println(frame.printBefore());
 %>
-
+	<view:frame>
 		<div id="pubList">
-		<%
-			 Board board = gef.getBoard();
-			 out.println("<br/>");
-			 out.println(board.printBefore());
-			 out.println("<br/><center>"+resources.getString("kmelia.inProgressPublications")+"<br/><br/><img src=\""+resources.getIcon("kmelia.progress")+"\"/></center><br/>");
-			 out.println(board.printAfter());
-		 %>
+			<br/>
+			<view:board>
+				<div class="center"><fmt:message key="kmelia.inProgressPublications"/></div>
+				<br/><br/>
+				<img alt=progression" src="${requestScope.resources.getIcon('kmelia.progress')}"/>
+			</view:board>
+			<br/>
 		</div>
+
+	</view:frame>
 	<%
-		out.println(frame.printAfter());
 		out.println(window.printAfter());
 	%>
 

kmelia/kmelia-war/src/main/webapp/kmelia/jsp/javaScript/navigation.js

@@ -27,6 +27,17 @@ let importFileWindow = window;
 let importFilesWindow = window;
 let exportComponentWindow = window;
 
+const nodePath = [];
+
+function __addNodeParent(nodeId) {
+  nodePath.push(nodeId);
+}
+
+function isParentNode(parentId, nodeId) {
+  const idx = nodePath.indexOf(parentId);
+  return idx > -1 && nodePath.indexOf(nodeId) > idx;
+}
+
 function addFavorite(name, description, url)
 {
   postNewLink(name, url, description);
@@ -197,6 +208,7 @@ function displayPath(id) {
     $(data).each(function(i, topic) {
       if (topic.id !== '0') {
         addBreadCrumbElement("javascript:topicGoTo(" + topic.id + ")", topic.text);
+        __addNodeParent(topic.id);
       }
     });
   });
@@ -708,7 +720,10 @@ function writeInConsole(text) {
 }
 
 function deleteFolder(nodeId, nodeLabel) {
-  const label = getString('ConfirmDeleteTopic') + " '" + nodeLabel + "' ?";
+  const isInBin = _isInBin(nodeId);
+  const deletionLabel = getString('ConfirmDeleteTopic') + " '" + nodeLabel + "' ?";
+  const removalLabel = getString('kmelia.folder.trash.confirm');
+  const label = isInBin ? deletionLabel : removalLabel;
   jQuery.popup.confirm(label, function() {
     const componentId = getComponentId();
     const url = getWebContext() + '/KmeliaAJAXServlet';
@@ -717,7 +732,7 @@ function deleteFolder(nodeId, nodeLabel) {
       if (data !== null && data.length > 0 && !isNaN(data)) {
         // fires event
         try {
-          nodeDeleted(nodeId);
+          nodeDeleted(nodeId, isInBin);
         } catch (e) {
           writeInConsole(e);
         }
@@ -895,7 +910,7 @@ function emptyTrash() {
     function(data) {
       spProgressMessage.hide();
       if (data === "ok") {
-        displayTopicContent("1");
+        displayTopicContent(binNodeId);
       } else {
         notyError(data);
       }
@@ -905,7 +920,7 @@ function emptyTrash() {
 }
 
 function checkDnD(id, operations) {
-  if (operations.addPubli == true) {
+  if (operations.addPubli) {
     activateDragAndDrop();
   } else {
     muteDragAndDrop();