Index: workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/AbstractDocumentWorkflowPlugin.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/AbstractDocumentWorkflowPlugin.properties (date 1556288290000) +++ workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/AbstractDocumentWorkflowPlugin.properties (date 1562769437000) @@ -3,8 +3,9 @@ publish-label=Publish locked-message=Document is currently being edited by someone else depublish-label=Take offline... -depublish-title=Take document '{0}' offline +depublish-title=Take offline depublish-message=Are you sure you want to take document '{0}' offline? +publish-message=Are you sure you want to publish document '{0}'? delete-label=Delete... delete-title=Delete '{0}' delete-message=Are you sure you want to delete the document '{0}'? Index: workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/PublicationWorkflowPlugin.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/PublicationWorkflowPlugin.java (date 1556288290000) +++ workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/PublicationWorkflowPlugin.java (date 1562769358000) @@ -204,8 +204,10 @@ unpublished, jcrSession); if (!referencesToUnpublishedDocuments.isEmpty()) { + final IModel publishNotification = new StringResourceModel("publish-message", PublicationWorkflowPlugin.this) + .setParameters(getDocumentName()); return new UnpublishedReferencesDialog(publishAction, - new UnpublishedReferenceNodeProvider(referencesToUnpublishedDocuments), + new UnpublishedReferenceNodeProvider(referencesToUnpublishedDocuments), publishNotification, getEditorManager()); } } catch (final RepositoryException e) { @@ -234,8 +236,10 @@ unpublished, jcrSession); if (!referencesToUnpublishedDocuments.isEmpty()) { + final IModel publishNotification = new StringResourceModel("publish-message", PublicationWorkflowPlugin.this) + .setParameters(getDocumentName()); final UnpublishedReferenceNodeProvider provider = new UnpublishedReferenceNodeProvider(referencesToUnpublishedDocuments); - return new UnpublishedReferencesDialog(this, provider, getEditorManager()); + return new UnpublishedReferencesDialog(this, provider, publishNotification, getEditorManager()); } } catch (final RepositoryException e) { log.error(e.getMessage()); Index: workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/DepublishDialog.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/DepublishDialog.properties (date 1562767715000) +++ workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/DepublishDialog.properties (date 1562767715000) @@ -0,0 +1,1 @@ +depublish=Take offline Index: workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/UnpublishedReferencesDialog.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/UnpublishedReferencesDialog.java (date 1556288290000) +++ workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/UnpublishedReferencesDialog.java (date 1562769409000) @@ -18,22 +18,25 @@ import javax.jcr.Node; import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; -import org.hippoecm.addon.workflow.WorkflowDialog; +import org.apache.wicket.model.IModel; import org.hippoecm.addon.workflow.IWorkflowInvoker; +import org.hippoecm.addon.workflow.WorkflowDialog; import org.hippoecm.frontend.service.IEditorManager; import org.hippoecm.repository.api.WorkflowDescriptor; public class UnpublishedReferencesDialog extends WorkflowDialog { public UnpublishedReferencesDialog(final IWorkflowInvoker invoker, final ISortableDataProvider provider, - final IEditorManager mgr) { + final IModel notification, final IEditorManager mgr) { super(invoker); setOutputMarkupId(true); + setNotification(notification); setTitleKey("title"); setCssClass("hippo-workflow-dialog"); setOkLabel(getString("publish")); + setFocusOnOk(); add(new UnpublishedReferencesView("docsview", provider, mgr)); } Index: workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/UnpublishedReferencesDialog.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/UnpublishedReferencesDialog.properties (date 1556288290000) +++ workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/UnpublishedReferencesDialog.properties (date 1562769409000) @@ -1,2 +1,2 @@ publish=Publish -title=Unpublished references +title=Publish Index: workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/DepublishDialog.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/DepublishDialog.java (date 1556288290000) +++ workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/dialogs/DepublishDialog.java (date 1562769358000) @@ -39,6 +39,7 @@ setNotification(notification); setCssClass("hippo-workflow-dialog"); setFocusOnOk(); + setOkLabel(getString("depublish")); try { ReferringDocumentsProvider provider = new ReferringDocumentsProvider(new JcrNodeModel(workflowModel.getNode()));