From 9d8034e0102194a9d5c472bff5af4acb4a533dd3 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Mon, 12 Mar 2018 11:43:11 +0100 Subject: [PATCH] clickable labels --- .../async/DocumentUpdatedAsyncListener.java | 1 - .../async/FileDeletedAsyncListener.java | 7 ++-- .../async/RouteStepValidateAsyncListener.java | 2 +- .../com/sismics/util/HtmlToPlainText.java | 40 +------------------ .../app/docs/controller/document/Document.js | 1 + .../src/partial/docs/document.view.html | 2 +- 6 files changed, 7 insertions(+), 46 deletions(-) diff --git a/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentUpdatedAsyncListener.java b/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentUpdatedAsyncListener.java index 2d208970..a3cdfcf5 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentUpdatedAsyncListener.java +++ b/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentUpdatedAsyncListener.java @@ -27,7 +27,6 @@ public class DocumentUpdatedAsyncListener { * Document updated. * * @param event Document updated event - * @throws Exception */ @Subscribe public void on(final DocumentUpdatedAsyncEvent event) { diff --git a/docs-core/src/main/java/com/sismics/docs/core/listener/async/FileDeletedAsyncListener.java b/docs-core/src/main/java/com/sismics/docs/core/listener/async/FileDeletedAsyncListener.java index 43b027b7..c32be428 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/listener/async/FileDeletedAsyncListener.java +++ b/docs-core/src/main/java/com/sismics/docs/core/listener/async/FileDeletedAsyncListener.java @@ -1,13 +1,12 @@ package com.sismics.docs.core.listener.async; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.eventbus.Subscribe; import com.sismics.docs.core.dao.lucene.LuceneDao; import com.sismics.docs.core.event.FileDeletedAsyncEvent; import com.sismics.docs.core.model.jpa.File; import com.sismics.docs.core.util.FileUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Listener on file deleted. @@ -24,7 +23,7 @@ public class FileDeletedAsyncListener { * File deleted. * * @param fileDeletedAsyncEvent File deleted event - * @throws Exception + * @throws Exception e */ @Subscribe public void on(final FileDeletedAsyncEvent fileDeletedAsyncEvent) throws Exception { diff --git a/docs-core/src/main/java/com/sismics/docs/core/listener/async/RouteStepValidateAsyncListener.java b/docs-core/src/main/java/com/sismics/docs/core/listener/async/RouteStepValidateAsyncListener.java index cbe55acd..ce8b729b 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/listener/async/RouteStepValidateAsyncListener.java +++ b/docs-core/src/main/java/com/sismics/docs/core/listener/async/RouteStepValidateAsyncListener.java @@ -39,7 +39,7 @@ public class RouteStepValidateAsyncListener { public void run() { final UserDto user = routeStepValidateEvent.getUser(); - // Send the password recovery email + // Send route step validated email Map paramRootMap = new HashMap<>(); paramRootMap.put("user_name", user.getUsername()); paramRootMap.put("document_id", routeStepValidateEvent.getDocument().getId()); diff --git a/docs-core/src/main/java/com/sismics/util/HtmlToPlainText.java b/docs-core/src/main/java/com/sismics/util/HtmlToPlainText.java index 62fcd212..39bce3b5 100644 --- a/docs-core/src/main/java/com/sismics/util/HtmlToPlainText.java +++ b/docs-core/src/main/java/com/sismics/util/HtmlToPlainText.java @@ -1,58 +1,20 @@ package com.sismics.util; -import org.jsoup.Jsoup; import org.jsoup.helper.StringUtil; -import org.jsoup.helper.Validate; -import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.nodes.Node; import org.jsoup.nodes.TextNode; -import org.jsoup.select.Elements; import org.jsoup.select.NodeTraversor; import org.jsoup.select.NodeVisitor; -import java.io.IOException; - /** * HTML to plain-text. This example program demonstrates the use of jsoup to convert HTML input to lightly-formatted * plain-text. That is divergent from the general goal of jsoup's .text() methods, which is to get clean data from a * scrape. - *

- * Note that this is a fairly simplistic formatter -- for real world use you'll want to embrace and extend. - *

- *

- * To invoke from the command line, assuming you've downloaded the jsoup jar to your current directory:

- *

java -cp jsoup.jar org.jsoup.examples.HtmlToPlainText url [selector]

- * where url is the URL to fetch, and selector is an optional CSS selector. - * + * * @author Jonathan Hedley, jonathan@hedley.net */ public class HtmlToPlainText { - private static final String userAgent = "Mozilla/5.0 (jsoup)"; - private static final int timeout = 5 * 1000; - - public static void main(String... args) throws IOException { - Validate.isTrue(args.length == 1 || args.length == 2, "usage: java -cp jsoup.jar org.jsoup.examples.HtmlToPlainText url [selector]"); - final String url = args[0]; - final String selector = args.length == 2 ? args[1] : null; - - // fetch the specified URL and parse to a HTML DOM - Document doc = Jsoup.connect(url).userAgent(userAgent).timeout(timeout).get(); - - HtmlToPlainText formatter = new HtmlToPlainText(); - - if (selector != null) { - Elements elements = doc.select(selector); // get each element that matches the CSS selector - for (Element element : elements) { - String plainText = formatter.getPlainText(element); // format that element to plain text - System.out.println(plainText); - } - } else { // format the whole doc - String plainText = formatter.getPlainText(doc); - System.out.println(plainText); - } - } - /** * Format an Element to plain-text * @param element the root element to format diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/Document.js b/docs-web/src/main/webapp/src/app/docs/controller/document/Document.js index ba70097f..c81fb75e 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/Document.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/Document.js @@ -13,6 +13,7 @@ angular.module('docs').controller('Document', function ($scope, $rootScope, $tim $scope.currentPage = 1; $scope.limit = _.isUndefined(localStorage.documentsPageSize) ? '10' : localStorage.documentsPageSize; $scope.search = $state.params.search ? $state.params.search : ''; + $scope.setSearch = function (search) { $scope.search = search }; $scope.searchOpened = false; $scope.searchDropdownAnchor = angular.element(document.querySelector('.search-dropdown-anchor')); $scope.paginationShown = true; diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.html b/docs-web/src/main/webapp/src/partial/docs/document.view.html index b309daf5..9a27b326 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.view.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.view.html @@ -63,7 +63,7 @@