diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/AbstractPublicationPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/AbstractPublicationPropertiesStep.java index 42fc8bb..f0cbbd9 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/AbstractPublicationPropertiesStep.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/AbstractPublicationPropertiesStep.java @@ -4,6 +4,7 @@ import org.libreccm.api.Identifier; import org.libreccm.api.IdentifierParser; import org.libreccm.l10n.GlobalizationHelper; import org.libreccm.security.AuthorizationRequired; +import org.libreccm.ui.BaseUrl; import org.librecms.assets.Person; import org.librecms.assets.PersonRepository; import org.librecms.contentsection.AssetRepository; @@ -31,6 +32,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; import javax.mvc.Models; +import javax.servlet.http.HttpServletRequest; import javax.transaction.Transactional; import javax.ws.rs.DefaultValue; import javax.ws.rs.FormParam; @@ -51,6 +53,9 @@ public abstract class AbstractPublicationPropertiesStep getStepClass() { return MonographPropertiesStep.class; } + + @Override + protected String getEditStepUrlFragment() { + return "monograph-basicproperties"; + } @Override @Transactional(Transactional.TxType.REQUIRED) diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationPropertiesStepModel.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationPropertiesStepModel.java index bc0d43b..bc00411 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationPropertiesStepModel.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationPropertiesStepModel.java @@ -19,6 +19,8 @@ import javax.inject.Named; @Named("SciCmsPublicationPropertiesStepModel") public class PublicationPropertiesStepModel { + private String baseUrl; + private String name; private Map titleValues; @@ -26,12 +28,22 @@ public class PublicationPropertiesStepModel { private List unusedTitleLocales; private int yearOfPublication; - + private Map shortDecriptionValues; private List unusedShortDescriptionLocales; private List authors; + + private String editStepUrlFragment; + + public String getBaseUrl() { + return baseUrl; + } + + protected void setBaseUrl(final String baseUrl) { + this.baseUrl = baseUrl; + } public String getName() { return name; @@ -56,11 +68,11 @@ public class PublicationPropertiesStepModel { public void setUnusedTitleLocales(final List unusedTitleLocales) { this.unusedTitleLocales = new ArrayList<>(unusedTitleLocales); } - + public int getYearOfPublication() { return yearOfPublication; } - + public void setYearOfPublication(final int yearOfPublication) { this.yearOfPublication = yearOfPublication; } @@ -95,4 +107,12 @@ public class PublicationPropertiesStepModel { this.authors = new ArrayList<>(authors); } + public String getEditStepUrlFragment() { + return editStepUrlFragment; + } + + public void setEditStepUrlFragment(final String editStepUrlFragment) { + this.editStepUrlFragment = editStepUrlFragment; + } + } diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication-with-publisher.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication-with-publisher.xhtml index 1f1821a..0c35fb3 100644 --- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication-with-publisher.xhtml +++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication-with-publisher.xhtml @@ -3,12 +3,54 @@ xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm" + xmlns:librecms="http://xmlns.jcp.org/jsf/composite/components/librecms" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +

#{SciPublicationsUiMessageBundle['publicationwithpublisher.publisher']}

+ +
+
+ +
+
+ + +

+ + + #{SciCmsPublicationWithPublisherPropertiesStepModel.publisherName}, #{SciCmsPublicationWithPublisherPropertiesStepModel.publisherPlace} + + + #{SciCmsPublicationWithPublisherPropertiesStepModel.publisherName} + + + + + +

diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication.xhtml index a9c230b..07a0a6c 100644 --- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication.xhtml +++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication.xhtml @@ -3,6 +3,7 @@ xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm" + xmlns:librecms="http://xmlns.jcp.org/jsf/composite/components/librecms" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> @@ -10,6 +11,35 @@

#{authoringStepTitle}

+ + + + + + + + + + + + + + +

#{SciPublicationsUiMessageBundle['basicproperties.name.header']}

#{SciCmsPublicationPropertiesStepModel.name}
@@ -33,7 +63,7 @@ id="name-edit-dialog" tabindex="-1">