From ee37a5fd9993cf6cf86bda07d8ac5e854e244553 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 16 Jul 2021 10:18:27 +0200 Subject: [PATCH] Improve links. --- .../src/org/argeo/suite/ui/SuiteApp.java | 3 +- .../src/org/argeo/suite/ui/SuiteUiUtils.java | 122 +++++++++++------- .../org/argeo/docbook/ui/DbkImageManager.java | 2 +- .../argeo/docbook/ui/DbkTextInterpreter.java | 4 +- .../argeo/publishing/servlet/DbkServlet.java | 1 + 5 files changed, 84 insertions(+), 48 deletions(-) diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java index dabd8af..0343f71 100644 --- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java +++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java @@ -365,7 +365,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { } } - private String nodeToState(Node node) { + // TODO move it to an internal package? + static String nodeToState(Node node) { return '/' + Jcr.getWorkspaceName(node) + Jcr.getPath(node); } diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java index 0cfee18..8849810 100644 --- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java +++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java @@ -16,11 +16,14 @@ import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.dialogs.LightweightDialog; import org.argeo.cms.ui.util.CmsEvent; import org.argeo.cms.ui.util.CmsIcon; +import org.argeo.cms.ui.util.CmsLink; +import org.argeo.cms.ui.util.CmsStyle; import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.entity.EntityNames; import org.argeo.entity.EntityType; import org.argeo.jcr.Jcr; +import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; import org.argeo.suite.SuiteRole; import org.eclipse.swt.SWT; @@ -222,6 +225,11 @@ public class SuiteUiUtils { } public static Label addPicture(Composite parent, Node fileNode, Integer maxWidth) throws RepositoryException { + return addPicture(parent, fileNode, maxWidth, null); + } + + public static Label addPicture(Composite parent, Node fileNode, Integer maxWidth, Node link) + throws RepositoryException { Node content = fileNode.getNode(Node.JCR_CONTENT); // TODO move it deeper in the middleware. if (!content.isNodeType(EntityType.box.get())) { @@ -261,63 +269,87 @@ public class SuiteUiUtils { } Label img = new Label(parent, SWT.NONE); CmsUiUtils.markup(img); - img.setText(CmsUiUtils.img(fileNode, width.toString(), height.toString())); + StringBuffer txt = new StringBuffer(); + String target = toLink(link); + if (target != null) + txt.append(""); + txt.append(CmsUiUtils.img(fileNode, width.toString(), height.toString())); + if (target != null) + txt.append(""); + img.setText(txt.toString()); if (parent.getLayout() instanceof GridLayout) { GridData gd = new GridData(SWT.CENTER, SWT.CENTER, false, false); gd.widthHint = width.intValue(); gd.heightHint = height.intValue(); img.setLayoutData(gd); } - img.addMouseListener(new MouseListener() { - private static final long serialVersionUID = -1362242049325206168L; - @Override - public void mouseUp(MouseEvent e) { - } + if (target == null) + img.addMouseListener(new MouseListener() { + private static final long serialVersionUID = -1362242049325206168L; - @Override - public void mouseDown(MouseEvent e) { - } + @Override + public void mouseUp(MouseEvent e) { + } - @Override - public void mouseDoubleClick(MouseEvent e) { - LightweightDialog dialog = new LightweightDialog(img.getShell()) { - - @Override - protected Control createDialogArea(Composite parent) { - parent.setLayout(new GridLayout()); - ScrolledComposite scroll = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL); - scroll.setLayoutData(CmsUiUtils.fillAll()); - scroll.setLayout(CmsUiUtils.noSpaceGridLayout()); - scroll.setExpandHorizontal(true); - scroll.setExpandVertical(true); - // scroll.setAlwaysShowScrollBars(true); - - Composite c = new Composite(scroll, SWT.NONE); - scroll.setContent(c); - c.setLayout(new GridLayout()); - c.setLayoutData(CmsUiUtils.fillAll()); - Label bigImg = new Label(c, SWT.NONE); - CmsUiUtils.markup(bigImg); - bigImg.setText(CmsUiUtils.img(fileNode, Jcr.get(content, EntityNames.SVG_WIDTH), - Jcr.get(content, EntityNames.SVG_HEIGHT))); - bigImg.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true)); - return bigImg; - } - - @Override - protected Point getInitialSize() { - Point shellSize = img.getShell().getSize(); - return new Point(shellSize.x - 100, shellSize.y - 100); - } - - }; - dialog.open(); - } - }); + @Override + public void mouseDown(MouseEvent e) { + } + + @Override + public void mouseDoubleClick(MouseEvent e) { + LightweightDialog dialog = new LightweightDialog(img.getShell()) { + + @Override + protected Control createDialogArea(Composite parent) { + parent.setLayout(new GridLayout()); + ScrolledComposite scroll = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL); + scroll.setLayoutData(CmsUiUtils.fillAll()); + scroll.setLayout(CmsUiUtils.noSpaceGridLayout()); + scroll.setExpandHorizontal(true); + scroll.setExpandVertical(true); + // scroll.setAlwaysShowScrollBars(true); + + Composite c = new Composite(scroll, SWT.NONE); + scroll.setContent(c); + c.setLayout(new GridLayout()); + c.setLayoutData(CmsUiUtils.fillAll()); + Label bigImg = new Label(c, SWT.NONE); + CmsUiUtils.markup(bigImg); + bigImg.setText(CmsUiUtils.img(fileNode, Jcr.get(content, EntityNames.SVG_WIDTH), + Jcr.get(content, EntityNames.SVG_HEIGHT))); + bigImg.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true)); + return bigImg; + } + + @Override + protected Point getInitialSize() { + Point shellSize = img.getShell().getSize(); + return new Point(shellSize.x - 100, shellSize.y - 100); + } + + }; + dialog.open(); + } + }); return img; } + public static String toLink(Node node) { + try { + return node != null ? "#" + CmsUiUtils.cleanPathForUrl(SuiteApp.nodeToState(node)) : null; + } catch (RepositoryException e) { + throw new JcrException("Cannot get link from " + node, e); + } + } + + public static Control addLink(Composite parent, String label, Node node, CmsStyle style) + throws RepositoryException { + String target = toLink(node); + CmsLink link = new CmsLink(label, target, style); + return link.createUi(parent, node); + } + public static boolean isCoworker(CmsView cmsView) { boolean coworker = cmsView.doAs(() -> CurrentUser.isInRole(SuiteRole.coworker.dn())); return coworker; diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImageManager.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImageManager.java index 08b3db7..25a466a 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImageManager.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImageManager.java @@ -123,7 +123,7 @@ public class DbkImageManager extends DefaultImageManager { return fileUri.toString(); // local Node fileNode = getFileNode(imageDataNode); - String url = getCleanDataPath(fileNode); + String url = CmsUiUtils.getDataPathForUrl(fileNode); return url; } diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java index c6fe0d6..b195692 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java @@ -30,6 +30,8 @@ import org.argeo.jcr.JcrException; public class DbkTextInterpreter implements TextInterpreter { private DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); + private String linkCssClass = DbkType.link.name(); + @Override public void write(Item item, String content) { try { @@ -199,7 +201,7 @@ public class DbkTextInterpreter implements TextInterpreter { String href = child.getProperty(DbkAttr.XLINK_HREF).getString(); // TODO deal with other forbidden XML characters? href = href.replace("&", "&"); - sb.append(""); + sb.append(""); readAsSimpleHtml(child, sb); sb.append(""); } diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java b/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java index cb3dffa..ca94c22 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java @@ -133,6 +133,7 @@ public class DbkServlet extends HttpServlet { sb.append(req.getContextPath()).append(req.getServletPath()).append('/'); sb.append(themeId).append('/').append(cssPath).append(' '); } + // FIXME make it more generic sb.append("https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap") .append(' '); sb.append( -- 2.30.2