diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/event/MvcEventInfoStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/event/MvcEventInfoStep.java index c49c4a178..a3e7d069e 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/event/MvcEventInfoStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/event/MvcEventInfoStep.java @@ -48,7 +48,7 @@ import javax.ws.rs.PathParam; * @author Jens Pelzetter */ @RequestScoped -@Path(MvcAuthoringSteps.PATH_PREFIX + "event-info") +@Path(MvcAuthoringSteps.PATH_PREFIX + "@event-info") @Controller @MvcAuthoringStepDef( bundle = EventStepsConstants.BUNDLE, @@ -111,7 +111,7 @@ public class MvcEventInfoStep extends AbstractMvcAuthoringStep { } if (itemPermissionChecker.canEditItem(getEvent())) { - return "org/librecms/ui/contenttypes/event/event-info/overview.xhtml"; + return "org/librecms/ui/contenttypes/event/event-info.xhtml"; } else { return documentUi.showAccessDenied( getContentSection(), diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/event/MvcEventInfoStepEventTypeModel.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/event/MvcEventInfoStepEventTypeModel.java index 7e1ad195c..bd245f87c 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/event/MvcEventInfoStepEventTypeModel.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/event/MvcEventInfoStepEventTypeModel.java @@ -34,7 +34,7 @@ import javax.inject.Named; * @author Jens Pelzetter */ @RequestScoped -@Named("CmsEventInfoSstepEventType") +@Named("CmsEventInfoStepEventType") public class MvcEventInfoStepEventTypeModel { private boolean canEdit; diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-text/available-languages.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-text/available-languages.xhtml index 2b861b6c1..8e1c0b720 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-text/available-languages.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-text/available-languages.xhtml @@ -8,7 +8,7 @@ + value="/libreccm/@contentsections/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@article-text" />

#{CmsArticleMessageBundle['textstep.header']}

diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/create-event.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/create-event.xhtml new file mode 100644 index 000000000..fbd2c9d50 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/create-event.xhtml @@ -0,0 +1,82 @@ +]> + + + + +
+

${CmsEventMessageBundle["createform.title"]}

+ + + + + +
+ + + + + + + + + + + #{CmsEventMessageBundle['createform.cancel']} + + + + +
+ + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/event-basic-properties.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/event-basic-properties.xhtml new file mode 100644 index 000000000..ab114e305 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/event-basic-properties.xhtml @@ -0,0 +1,152 @@ +]> + + + + + + +

#{CmsEventMessageBundle.getMessage('basicproperties.header', [CmsEventPropertiesStep.name])}

+ +

#{CmsEventPropertiesStep.getMessage('basicproperties.name.header')}

+
+ 
#{CmsEventPropertiesStep.name}
+ + + +
+ + + + + + + + + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/event-info.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/event-info.xhtml new file mode 100644 index 000000000..570b85f84 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/event-info.xhtml @@ -0,0 +1,85 @@ +]> + + + + + + +

#{CmsEventMessageBundle['eventinfo_step.header']}

+ + + + + + + + + + + + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventdate/edit.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventdate/edit.xhtml new file mode 100644 index 000000000..733d0ca9d --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventdate/edit.xhtml @@ -0,0 +1,44 @@ +]> + + + + +
+ + + #{CmsEventMessageBundle['eventinfo_step.back']} + + +

#{CmsEventMessageBundle.getMessage('eventinfo_step.eventdate.header.edit',[CmsSelectedDocumentModel.itemName, CmsEventInfoStepEventDate.selectedLocale])}

+
+ + + + + + + + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventdate/view.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventdate/view.xhtml new file mode 100644 index 000000000..ddb0356eb --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventdate/view.xhtml @@ -0,0 +1,39 @@ +]> + + + + +
+ + + #{CmsEventMessageBundle['eventinfo_step.back']} + + +

#{CmsEventMessageBundle.getMessage('eventinfo_step.eventdate.header.view',[CmsSelectedDocumentModel.itemName, CmsEventInfoStepEventDate.selectedLocale])}

+
+ + +
+ + + #{CmsEventMessageBundle['eventinfo_step.edit']} + +
+ +
+ +
+ + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventtype/edit.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventtype/edit.xhtml new file mode 100644 index 000000000..38b266043 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventtype/edit.xhtml @@ -0,0 +1,45 @@ +]> + + + + +
+ + + #{CmsEventMessageBundle['eventinfo_step.back']} + + +

#{CmsEventMessageBundle.getMessage('eventinfo_step.eventtype.header.edit',[CmsSelectedDocumentModel.itemName, CmsEventInfoStepEventType.selectedLocale])}

+
+ + + + + + + + + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventtype/view.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventtype/view.xhtml new file mode 100644 index 000000000..93e1e6d24 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/eventtype/view.xhtml @@ -0,0 +1,40 @@ +]> + + + + +
+ + + #{CmsEventMessageBundle['eventinfo_step.back']} + + +

#{CmsEventMessageBundle.getMessage('eventinfo_step.eventtype.header.view',[CmsSelectedDocumentModel.itemName, CmsEventInfoStepEventType.selectedLocale])}

+
+ + +
+ + + #{CmsEventMessageBundle['eventinfo_step.edit']} + +
+ +
+ +
+ + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/location/edit.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/location/edit.xhtml new file mode 100644 index 000000000..36ef8b2a2 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/location/edit.xhtml @@ -0,0 +1,45 @@ +]> + + + + +
+ + + #{CmsEventMessageBundle['eventinfo_step.back']} + + +

#{CmsEventMessageBundle.getMessage('eventinfo_step.location.header.edit',[CmsSelectedDocumentModel.itemName, CmsEventInfoStepLocation.selectedLocale])}

+
+ + + + + + + + + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/location/view.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/location/view.xhtml new file mode 100644 index 000000000..fe832f60b --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/location/view.xhtml @@ -0,0 +1,41 @@ +]> + + + + +
+ + + #{CmsEventMessageBundle['eventinfo_step.back']} + + +

#{CmsEventMessageBundle.getMessage('eventinfo_step.location.header.view',[CmsSelectedDocumentModel.itemName, CmsEventInfoStepLocation.selectedLocale])}

+
+ + +
+ + + #{CmsEventMessageBundle['eventinfo_step.edit']} + +
+ +
+ +
+ + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/main-contributor/edit.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/main-contributor/edit.xhtml new file mode 100644 index 000000000..6387b8079 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/main-contributor/edit.xhtml @@ -0,0 +1,45 @@ +]> + + + + +
+ + + #{CmsEventMessageBundle['eventinfo_step.back']} + + +

#{CmsEventMessageBundle.getMessage('eventinfo_step.main_contributor.header.edit',[CmsSelectedDocumentModel.itemName, CmsEventInfoStepMainContributor.selectedLocale])}

+
+ + + + + + + + + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/main-contributor/view.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/main-contributor/view.xhtml new file mode 100644 index 000000000..d07e9e009 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/main-contributor/view.xhtml @@ -0,0 +1,42 @@ +]> + + + + +
+ + + #{CmsEventMessageBundle['eventinfo_step.back']} + + +

#{CmsEventMessageBundle.getMessage('eventinfo_step.main_contributor.header.view',[CmsSelectedDocumentModel.itemName, CmsEventInfoStepMainContributor.selectedLocale])}

+
+ + +
+ + + #{CmsEventMessageBundle['eventinfo_step.edit']} + +
+ +
+ +
+ + + + + + + + + diff --git a/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/EventBundle.properties b/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/EventBundle.properties index 55793bb94..c78a0d443 100644 --- a/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/EventBundle.properties +++ b/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/EventBundle.properties @@ -11,3 +11,36 @@ createstep.summary.error.missing=The summary of the event is missing. createstep.initial_locale.error.missing=The initial locale of the event is missing. createstep.workflow.none_selected=No workflow was selected. createstep.workflow.error.not_available=The selected workflow is not available. +createform.title=Create a new event +createform.name.help=The name of the new event. Can only contain the letters a to z and A to Z, numbers, the underscore ("_") and the dash ("-"). +createform.name.label=Name +createform.initial_locale.help=The initial locale of the new event. All localizable provided using this form is created for the selected language. +createform.title.help=The title of the new event. +createform.title.label=Title +createform.summary.help=A short summary of the new event. +createform.workflow.label=Summary +createform.cancel=Cancel +createform.submit=Create new event +eventinfo_step.header=Event Information +eventdate.editor.header=Additonal information about the date of the event +eventdate.editor.add_variant=Add language +location.editor.add_variant=Add language +location.editor.header=Information about the location of the event +main_contributor.editor.add_variant=Add language +main_contributor.editor.header=Information about the organizer of the event +eventtype.editor.add_variant=Add language +eventtype.editor.header=Information about the type of the event +eventinfo_step.back=Back +eventinfo_step.eventdate.header.view=Viewing information about event date of event {0} for language {1} +eventinfo_step.edit=Edit +eventinfo_step.eventtype.header.view=Showing information about event type of event {0} for language {1} +eventinfo_step.location.header.view=Showing information about location of event {0} for language {1} +eventinfo_step.main_contributor.header.view=Showing information about organizer of event {0} for language {1} +eventinfo_step.eventdate.header.edit=Edit information about event date of event {0} for language {1} +eventinfo_step.eventdate.editor.header=Information about the date of the event +eventinfo_step.eventtype.header.edit=Edit information about the type of event {0} for language {1} +eventinfo_step.eventtype.editor.header=Information about the type of event +eventinfo_step.main_contributor.header.edit=Edit information about the organizer of event {0} for language {1} +eventinfo_step.location.editor.header=Informatio about the location of the event +eventinfo_step.location.header.edit=Edit information about the location of event {0} for language {1} +eventinfo_step.main_contributor.editor.header=Information about the organizier of the event diff --git a/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/EventBundle_de.properties b/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/EventBundle_de.properties index e402052d7..657713b94 100644 --- a/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/EventBundle_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/EventBundle_de.properties @@ -11,3 +11,36 @@ createstep.summary.error.missing=Es wurde keine Zusammenfassung der Veranstaltun createstep.initial_locale.error.missing=Die initale Sprache f\u00fcr die Veranstaltung wurde nicht angegeben. createstep.workflow.none_selected=Es wurde kein Arbeitsablauf ausgew\u00e4hlt. createstep.workflow.error.not_available=Der ausgew\u00e4hlte Arbeitsablauf ist nicht verf\u00fcgbar. +createform.title=Eine neue Veranstaltung anlegen +createform.name.help=Der Name der neuen Veranstaltung. Darf nur die Buchstaben a bis z, A bis Z, Ziffern, den Bindestrich ("-") und den Unterstrich ("_") enthalten. +createform.name.label=Name +createform.initial_locale.help=Die initiale Sprache der neuen Veranstaltung. Alle lokalisierbaren Angaben in diesem Formular werden f\u00fcr diese Sprache angelegt. +createform.title.help=Der Titel der neuen Veranstaltung. +createform.title.label=Titel +createform.summary.help=Eine kurze Zusammenfassung der neuen Veranstaltung. +createform.workflow.label=Zusammenfassung +createform.cancel=Abbrechen +createform.submit=Neue Veranstaltung anlegen +eventinfo_step.header=Informationen \u00fcber die Veranstaltung +eventdate.editor.header=Zus\u00e4tzliche Informationen \u00fcber den Zeitpunkt der Veranstaltung +eventdate.editor.add_variant=Sprache hinzuf\u00fcgen +location.editor.add_variant=Sprache hinzuf\u00fcgen +location.editor.header=Informationen \u00fcber den Veranstaltungsort +main_contributor.editor.add_variant=Sprache hinzuf\u00fcgen +main_contributor.editor.header=Informationen \u00fcber den Veranstalter +eventtype.editor.add_variant=Sprache hinzuf\u00fcgen +eventtype.editor.header=Informationen \u00fcber die Art der Veranstaltung +eventinfo_step.back=Zur\u00fcck +eventinfo_step.eventdate.header.view=Zeige Informationen \u00fcber Veranstaltungsdatum in Sprache {1} f\u00fcr Veranstaltung {0} +eventinfo_step.edit=Bearbeiten +eventinfo_step.eventtype.header.view=Zeige Informationen \u00fcber den Typ der Veranstaltung {0} in Sprache {1} +eventinfo_step.location.header.view=Zeige Informationen \u00fcber Veranstaltungsort f\u00fcr Veranstaltung {0} in Sprache {1} +eventinfo_step.main_contributor.header.view=Zeige Informationen \u00fcber Veranstalter der Veranstaltung {0} f\u00fcr Sprache {1} +eventinfo_step.eventdate.header.edit=Informationen \u00fcber den Zeitpunkt der Veranstaltung {0} f\u00fcr Sprache {1} bearbeiten +eventinfo_step.eventdate.editor.header=Informationen \u00fcber den Zeitpunkt der Veranstaltung +eventinfo_step.eventtype.header.edit=Informationen \u00fcber die Art der Veranstaltung {0} f\u00fcr Sprache {1} bearbeiten +eventinfo_step.eventtype.editor.header=Informationen \u00fcber die Art der Veranstaltung +eventinfo_step.main_contributor.header.edit=Informationen \u00fcber den Veranstalter der Veranstaltung {0} f\u00fcr Sprache {1} bearbeiten +eventinfo_step.location.editor.header=Informationen \u00fcber den Ort der Veranstaltung +eventinfo_step.location.header.edit=Informationen \u00fcber den Ort der Veranstaltung {0} f\u00fcr Sprache {1} bearbeiten +eventinfo_step.main_contributor.editor.header=Informationen \u00fcber den Veranstalter