LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Fixed several typos

pull/10/head
Jens Pelzetter 2021-04-06 20:58:35 +02:00
parent 073d37a3de
commit fe0bfd2d31
11 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationStep.java
View File

@ -42,7 +42,6 @@ import java.util.stream.Collectors;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.mvc.Controller;
import javax.mvc.Models; import javax.mvc.Models;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import javax.ws.rs.FormParam; import javax.ws.rs.FormParam;
@ -57,7 +56,6 @@ import javax.ws.rs.PathParam;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RequestScoped @RequestScoped
@Controller
@Path("/") @Path("/")
@AuthoringStepPathFragment(CategorizationStep.PATH_FRAGMENT) @AuthoringStepPathFragment(CategorizationStep.PATH_FRAGMENT)
@Named("CmsCategorizationStep") @Named("CmsCategorizationStep")

2
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DefaultAuthoringStepConstants.java
View File

@ -34,6 +34,6 @@ public final class DefaultAuthoringStepConstants {
* other localized resource of the default authoring steps. * other localized resource of the default authoring steps.
*/ */
public static final String BUNDLE public static final String BUNDLE
= "org.libreccms.ui.DefaultAuthoringStepsBundle"; = "org.librecms.ui.DefaultAuthoringStepsBundle";
} }

20
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentController.java
View File

@ -168,7 +168,7 @@ public class DocumentController {
@AuthorizationRequired @AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String redirectToDocumentFolders( public String redirectToDocumentFolders(
@PathParam("sectionIdentifider") final String sectionIdentifier @PathParam("sectionIdentifier") final String sectionIdentifier
) { ) {
return String.format( return String.format(
"redirect:/%s/documentfolders/", "redirect:/%s/documentfolders/",
@ -190,7 +190,7 @@ public class DocumentController {
@AuthorizationRequired @AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public MvcDocumentCreateStep<? extends ContentItem> createDocument( public MvcDocumentCreateStep<? extends ContentItem> createDocument(
@PathParam("sectionIdentifider") final String sectionIdentifier, @PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("documentType") final String documentType @PathParam("documentType") final String documentType
) { ) {
return createDocument(sectionIdentifier, "", documentType); return createDocument(sectionIdentifier, "", documentType);
@ -212,7 +212,7 @@ public class DocumentController {
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public MvcDocumentCreateStep<? extends ContentItem> createDocument( public MvcDocumentCreateStep<? extends ContentItem> createDocument(
@PathParam("sectionIdentifider") final String sectionIdentifier, @PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("folderPath") final String folderPath, @PathParam("folderPath") final String folderPath,
@PathParam("documentType") final String documentType @PathParam("documentType") final String documentType
) { ) {
@ -302,7 +302,7 @@ public class DocumentController {
@AuthorizationRequired @AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String editDocument( public String editDocument(
@PathParam("sectionIdentifider") final String sectionIdentifier, @PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("documentPath") final String documentPath @PathParam("documentPath") final String documentPath
) { ) {
final Optional<ContentSection> sectionResult = sectionsUi final Optional<ContentSection> sectionResult = sectionsUi
@ -352,7 +352,7 @@ public class DocumentController {
@AuthorizationRequired @AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public MvcAuthoringStep editDocument( public MvcAuthoringStep editDocument(
@PathParam("sectionIdentifider") final String sectionIdentifier, @PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("documentPath") final String documentPath, @PathParam("documentPath") final String documentPath,
@PathParam("authoringStep") final String authoringStepIdentifier @PathParam("authoringStep") final String authoringStepIdentifier
) { ) {
@ -427,7 +427,7 @@ public class DocumentController {
@AuthorizationRequired @AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String showHistory( public String showHistory(
@PathParam("sectionIdentifider") final String sectionIdentifier, @PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("documentPath") final String documentPath @PathParam("documentPath") final String documentPath
) { ) {
final Optional<ContentSection> sectionResult = sectionsUi final Optional<ContentSection> sectionResult = sectionsUi
@ -485,7 +485,7 @@ public class DocumentController {
@AuthorizationRequired @AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String showPublishStep( public String showPublishStep(
@PathParam("sectionIdentifider") final String sectionIdentifier, @PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("documentPath") final String documentPath @PathParam("documentPath") final String documentPath
) { ) {
final Optional<ContentSection> sectionResult = sectionsUi final Optional<ContentSection> sectionResult = sectionsUi
@ -546,7 +546,7 @@ public class DocumentController {
@AuthorizationRequired @AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String publish( public String publish(
@PathParam("sectionIdentifider") final String sectionIdentifier, @PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("documentPath") final String documentPath, @PathParam("documentPath") final String documentPath,
@FormParam("selectedLifecycleUuid") @DefaultValue("") @FormParam("selectedLifecycleUuid") @DefaultValue("")
final String selectedLifecycleUuid final String selectedLifecycleUuid
@ -609,7 +609,7 @@ public class DocumentController {
@AuthorizationRequired @AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String republish( public String republish(
@PathParam("sectionIdentifider") final String sectionIdentifier, @PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("documentPath") final String documentPath @PathParam("documentPath") final String documentPath
) { ) {
final Optional<ContentSection> sectionResult = sectionsUi final Optional<ContentSection> sectionResult = sectionsUi
@ -654,7 +654,7 @@ public class DocumentController {
@AuthorizationRequired @AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String unpublish( public String unpublish(
@PathParam("sectionIdentifider") final String sectionIdentifier, @PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("documentPath") final String documentPath @PathParam("documentPath") final String documentPath
) { ) {
final Optional<ContentSection> sectionResult = sectionsUi final Optional<ContentSection> sectionResult = sectionsUi

2
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/PublishStep.java
View File

@ -40,7 +40,6 @@ import java.util.Optional;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.mvc.Controller;
import javax.mvc.Models; import javax.mvc.Models;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import javax.ws.rs.FormParam; import javax.ws.rs.FormParam;
@ -55,7 +54,6 @@ import javax.ws.rs.Path;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RequestScoped @RequestScoped
@Controller
@Path("/") @Path("/")
@AuthoringStepPathFragment(PublishStep.PATH_FRAGMENT) @AuthoringStepPathFragment(PublishStep.PATH_FRAGMENT)
@Named("CmsPublishStep") @Named("CmsPublishStep")

3
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/RelatedInfoStep.java
View File

@ -18,7 +18,6 @@
*/ */
package org.librecms.ui.contentsections.documents; package org.librecms.ui.contentsections.documents;
import com.arsdigita.kernel.KernelConfig;
import org.libreccm.api.Identifier; import org.libreccm.api.Identifier;
import org.libreccm.api.IdentifierParser; import org.libreccm.api.IdentifierParser;
@ -72,7 +71,6 @@ import java.util.stream.Collectors;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.mvc.Controller;
import javax.mvc.Models; import javax.mvc.Models;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import javax.ws.rs.DefaultValue; import javax.ws.rs.DefaultValue;
@ -97,7 +95,6 @@ import javax.ws.rs.core.MediaType;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RequestScoped @RequestScoped
@Controller
@Path("/") @Path("/")
@AuthoringStepPathFragment(RelatedInfoStep.PATH_FRAGMENT) @AuthoringStepPathFragment(RelatedInfoStep.PATH_FRAGMENT)
@Named("CmsRelatedInfoStep") @Named("CmsRelatedInfoStep")

2
ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleStepsConstants.java
View File

@ -30,6 +30,6 @@ public final class ArticleStepsConstants {
} }
public static final String BUNDLE public static final String BUNDLE
= "org.libreccms.ui.contenttypes.ArticleBundle"; = "org.librecms.ui.contenttypes.ArticleBundle";
} }

2
ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java
View File

@ -33,7 +33,6 @@ import org.librecms.ui.contentsections.documents.DocumentUi;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
import javax.mvc.Controller;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import org.librecms.ui.contentsections.documents.MvcAuthoringStep; import org.librecms.ui.contentsections.documents.MvcAuthoringStep;
@ -56,7 +55,6 @@ import javax.ws.rs.PathParam;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RequestScoped @RequestScoped
@Controller
@Path("/") @Path("/")
@AuthoringStepPathFragment(MvcArticlePropertiesStep.PATH_FRAGMENT) @AuthoringStepPathFragment(MvcArticlePropertiesStep.PATH_FRAGMENT)
@Named("CmsArticlePropertiesStep") @Named("CmsArticlePropertiesStep")

3
ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStep.java
View File

@ -30,7 +30,6 @@ import org.librecms.ui.contentsections.ItemPermissionChecker;
import org.librecms.ui.contentsections.documents.AuthoringStepPathFragment; import org.librecms.ui.contentsections.documents.AuthoringStepPathFragment;
import org.librecms.ui.contentsections.documents.DocumentUi; import org.librecms.ui.contentsections.documents.DocumentUi;
import javax.enterprise.context.RequestScoped;
import javax.mvc.Controller; import javax.mvc.Controller;
import javax.ws.rs.Path; import javax.ws.rs.Path;
@ -42,6 +41,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.ws.rs.FormParam; import javax.ws.rs.FormParam;
@ -54,7 +54,6 @@ import javax.ws.rs.PathParam;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RequestScoped @RequestScoped
@Controller
@Path("/") @Path("/")
@AuthoringStepPathFragment(MvcArticleTextBodyStep.PATH_FRAGMENT) @AuthoringStepPathFragment(MvcArticleTextBodyStep.PATH_FRAGMENT)
@Named("CmsArticleTextBodyStep") @Named("CmsArticleTextBodyStep")

2
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml
View File

@ -63,7 +63,7 @@
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
<a href="/@cms/contentsections"> <a href="/@cms">
#{CmsAdminMessages['contentsections.list.label']} #{CmsAdminMessages['contentsections.list.label']}
</a> </a>
</li> </li>

2
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml
View File

@ -297,7 +297,7 @@
id="rename-folder-#{row.name}-dialog-title"> id="rename-folder-#{row.name}-dialog-title">
#{CmsAdminMessages.getMessage('contentsection.documentfolder.rename_folder_dialog.title', [row.folderPath])} #{CmsAdminMessages.getMessage('contentsection.documentfolder.rename_folder_dialog.title', [row.folderPath])}
</h2> </h2>
<button aria-label="#{CmsMessages['contentsection.documentfolder.rename_folder_dialog.close']}" <button aria-label="#{CmsAdminMessages['contentsection.documentfolder.rename_folder_dialog.close']}"
class="close" class="close"
data-dismiss="modal" data-dismiss="modal"
type="button" > type="button" >

2
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/categorization.xhtml
View File

@ -35,7 +35,7 @@
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-title" <h3 class="modal-title"
id="edit-categorization-#{tree.domainKey}-title"> id="edit-categorization-#{tree.domainKey}-title">
#{CmsDefaultStepsMessageBundle.getMessage('categorization.edit.title', tree.domainKey, CmsCategorizationStep.contentItemTitle)} #{CmsDefaultStepsMessageBundle.getMessage('categorization.edit.title', tree.domainKey, CmsSelectedDocumentModel.itemTitle)}
<button aria-label="#{CmsDefaultStepsMessageBundle['categorization.edit.cancel']}" <button aria-label="#{CmsDefaultStepsMessageBundle['categorization.edit.cancel']}"
class="close" class="close"
data-dismiss="modal" data-dismiss="modal"