diff --git a/ccm-sci-publications-researchreport/application.xml b/ccm-sci-publications-researchreport/application.xml new file mode 100644 index 000000000..853be1069 --- /dev/null +++ b/ccm-sci-publications-researchreport/application.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + Additional content type Research Report for the ccm-sci-publications module. + + \ No newline at end of file diff --git a/ccm-sci-publications-researchreport/oracle-se-create.sql b/ccm-sci-publications-researchreport/oracle-se-create.sql new file mode 100644 index 000000000..b0de6e153 --- /dev/null +++ b/ccm-sci-publications-researchreport/oracle-se-create.sql @@ -0,0 +1,3 @@ +@ ddl/oracle-se/create.sql + +@ ddl/oracle-se/deferred.sql diff --git a/ccm-sci-publications-researchreport/pdl/com/arsdigita/content-types/ResearchReport.pdl b/ccm-sci-publications-researchreport/pdl/com/arsdigita/content-types/ResearchReport.pdl new file mode 100644 index 000000000..925dc105f --- /dev/null +++ b/ccm-sci-publications-researchreport/pdl/com/arsdigita/content-types/ResearchReport.pdl @@ -0,0 +1,29 @@ +// +// Copyright (C) 2012 Jens Pelzetter +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; either version 2.1 of +// the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// + +model com.arsdigita.cms.contenttypes; + +import com.arsdigita.cms.ContentPage; + +// PDL definition for a working paper +object type ResearchReport extends UnPublished { + + reference key (ct_researchreport.researchreport_id); + +} \ No newline at end of file diff --git a/ccm-sci-publications-researchreport/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ResearchReport.xml b/ccm-sci-publications-researchreport/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ResearchReport.xml new file mode 100644 index 000000000..c287fceda --- /dev/null +++ b/ccm-sci-publications-researchreport/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ResearchReport.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-sci-publications-researchreport/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ResearchReport.xml b/ccm-sci-publications-researchreport/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ResearchReport.xml new file mode 100644 index 000000000..3c5283c85 --- /dev/null +++ b/ccm-sci-publications-researchreport/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ResearchReport.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-sci-publications-researchreport/src/ccm-sci-publications-researchreport.config b/ccm-sci-publications-researchreport/src/ccm-sci-publications-researchreport.config new file mode 100644 index 000000000..f86433ce8 --- /dev/null +++ b/ccm-sci-publications-researchreport/src/ccm-sci-publications-researchreport.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/ccm-sci-publications-researchreport/src/ccm-sci-publications-researchreport.load b/ccm-sci-publications-researchreport/src/ccm-sci-publications-researchreport.load new file mode 100644 index 000000000..135e16b75 --- /dev/null +++ b/ccm-sci-publications-researchreport/src/ccm-sci-publications-researchreport.load @@ -0,0 +1,18 @@ + + + +
+
+
+ + + + +
+ + + + + + + \ No newline at end of file diff --git a/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ResearchReport.java b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ResearchReport.java new file mode 100644 index 000000000..2dacc50f3 --- /dev/null +++ b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ResearchReport.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2012 Jens Pelzetter, + * ScientificCMS Team, http://www.scientificcms.org + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.cms.contenttypes; + +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import java.math.BigDecimal; + +/** + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class ResearchReport extends UnPublished { + + public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.ResearchReport"; + + public ResearchReport() { + this(BASE_DATA_OBJECT_TYPE); + } + + public ResearchReport(final BigDecimal id) { + this(new OID(BASE_DATA_OBJECT_TYPE, id)); + } + + public ResearchReport(final OID oid) { + super(oid); + } + + public ResearchReport(final DataObject dataObject) { + super(dataObject); + } + + public ResearchReport(final String type) { + super(type); + } +} diff --git a/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ResearchReportInitializer.java b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ResearchReportInitializer.java new file mode 100644 index 000000000..cce22a8ee --- /dev/null +++ b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ResearchReportInitializer.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2012 Jens Pelzetter, + * ScientificCMS Team, http://www.scientificcms.org + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.cms.contenttypes; + +/** + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class ResearchReportInitializer extends ContentTypeInitializer { + + public ResearchReportInitializer() { + super("ccm-sci-publications-researchreport.pdl.mf", ResearchReport.BASE_DATA_OBJECT_TYPE); + } + + @Override + public String[] getStylesheets() { + return new String[]{INTERNAL_THEME_TYPES_DIR + "sci/ResearchReport.xsl"}; + } + + @Override + public String getTraversalXML() { + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ResearchReport.xml"; + } +} diff --git a/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ResearchReportLoader.java b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ResearchReportLoader.java new file mode 100644 index 000000000..9d8ce0eed --- /dev/null +++ b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ResearchReportLoader.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2012 Jens Pelzetter, + * ScientificCMS Team, http://www.scientificcms.org + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.cms.contenttypes; + +/** + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class ResearchReportLoader extends AbstractContentTypeLoader { + + private static final String[] TYPES = {"/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ResearchReport.xml"}; + + public ResearchReportLoader() { + super(); + } + + public String[] getTypes() { + return TYPES; + } + +} diff --git a/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportPropertiesStep.java b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportPropertiesStep.java new file mode 100644 index 000000000..b21b36925 --- /dev/null +++ b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportPropertiesStep.java @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2012 Jens Pelzetter, + * ScientificCMS Team, http://www.scientificcms.org + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.cms.contenttypes.ui; + +import com.arsdigita.bebop.Component; +import com.arsdigita.bebop.Label; +import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; +import com.arsdigita.cms.ui.authoring.BasicPageForm; +import com.arsdigita.cms.ui.authoring.SimpleEditStep; +import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; +import com.arsdigita.toolbox.ui.DomainObjectPropertySheet; + +/** + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class ResearchReportPropertiesStep extends UnPublishedPropertiesStep { + + public ResearchReportPropertiesStep(final ItemSelectionModel itemModel, final AuthoringKitWizard parent) { + super(itemModel, parent); + } + + public static Component getResearchReportPropertiesSheet(final ItemSelectionModel itemModel) { + final DomainObjectPropertySheet sheet = (DomainObjectPropertySheet) getUnPublishedPropertySheet(itemModel); + + return sheet; + } + + @Override + protected void addBasicProperties(final ItemSelectionModel itemModel, final AuthoringKitWizard parent) { + final SimpleEditStep basicProperties = new SimpleEditStep(itemModel, parent, EDIT_SHEET_NAME); + + final BasicPageForm editBasicSheet = new ResearchReportPropertyForm(itemModel, this); + + basicProperties.add( + EDIT_SHEET_NAME, + (String) PublicationGlobalizationUtil.globalize("publications.ui.publication.edit_basic_sheet"). + localize(), + new WorkflowLockedComponentAccess(editBasicSheet, itemModel), + editBasicSheet.getSaveCancelSection().getCancelButton()); + + basicProperties.setDisplayComponent(getResearchReportPropertiesSheet(itemModel)); + + getSegmentedPanel().addSegment( + new Label((String) PublicationGlobalizationUtil. + globalize("publications.ui.publication.basic_properties").localize()), + basicProperties); + } + +} diff --git a/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportPropertyForm.java b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportPropertyForm.java new file mode 100644 index 000000000..0d0a44f65 --- /dev/null +++ b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportPropertyForm.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2012 Jens Pelzetter, + * ScientificCMS Team, http://www.scientificcms.org + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.cms.contenttypes.ui; + +import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.event.FormSubmissionListener; +import com.arsdigita.cms.ItemSelectionModel; + +/** + * + * @author Jens Pelzetter + */ +public class ResearchReportPropertyForm extends UnPublishedPropertyForm implements FormInitListener, + FormProcessListener, + FormSubmissionListener{ + + public static final String ID = "ResearchReportEdit"; + + public ResearchReportPropertyForm(final ItemSelectionModel itemModel) { + this(itemModel, null); + } + + public ResearchReportPropertyForm(final ItemSelectionModel itemModel, ResearchReportPropertiesStep step) { + super(itemModel, step); + addSubmissionListener(this); + } + +// @Override +// protected void addWidgets() { +// super.addWidgets(); +// } + +// @Override +// public void init(final FormSectionEvent fse) throws FormProcessException { +// super.init(fse); +// } + +// @Override +// public void process(final FormSectionEvent fse) throws FormProcessException { +// super.process(fse); +// } +} diff --git a/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportResources.properties b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportResources.properties new file mode 100644 index 000000000..b8c5114a2 --- /dev/null +++ b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportResources.properties @@ -0,0 +1,5 @@ +# To change this template, choose Tools | Templates +# and open the template in the editor. + +publications.ui.workingPaper_properties.title=Basic properties +publications.ui.researchreport.basic_properties.description=Basic properties diff --git a/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportResources_de.properties b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportResources_de.properties new file mode 100644 index 000000000..8e1283617 --- /dev/null +++ b/ccm-sci-publications-researchreport/src/com/arsdigita/cms/contenttypes/ui/ResearchReportResources_de.properties @@ -0,0 +1,5 @@ +# To change this template, choose Tools | Templates +# and open the template in the editor. + +publications.ui.workingPaper_properties.title=Basiseigenschaften +publications.ui.researchreport.basic_properties.description=Basiseigenschaften diff --git a/ccm-sci-publications-researchreport/web/heirloom/contenttypes/sci/ResearchReport.xsl b/ccm-sci-publications-researchreport/web/heirloom/contenttypes/sci/ResearchReport.xsl new file mode 100644 index 000000000..e1694c9ee --- /dev/null +++ b/ccm-sci-publications-researchreport/web/heirloom/contenttypes/sci/ResearchReport.xsl @@ -0,0 +1,19 @@ + +]> + + + + +

+ + + +

+ + + \ No newline at end of file diff --git a/ccm-sci-publications/application.xml b/ccm-sci-publications/application.xml index f13453263..d055118f5 100644 --- a/ccm-sci-publications/application.xml +++ b/ccm-sci-publications/application.xml @@ -6,8 +6,8 @@ release="1" webapp="ROOT"> - - + + diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaper.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaper.java index 7def6c707..9fbdd03dd 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaper.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaper.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2010 Jens Pelzetter, - * for the Center of Social Politics of the University of Bremen + * ScientificCMS Team, http://www.scientificcms.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -26,6 +26,7 @@ import java.math.BigDecimal; /** * * @author Jens Pelzetter + * @version $Id$ */ public class WorkingPaper extends UnPublished { diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperInitializer.java index 4e1696085..5af85184b 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperInitializer.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2010 Jens Pelzetter, - * for the Center of Social Politics of the University of Bremen + * ScientificCMS Team, http://www.scientificcms.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperLoader.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperLoader.java index 581ea23fc..b54e4c5d2 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperLoader.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperLoader.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2010 Jens Pelzetter, - * for the Center of Social Politics of the University of Bremen + * ScientificCMS Team, http://www.scientificcms.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -22,6 +22,7 @@ package com.arsdigita.cms.contenttypes; /** * * @author Jens Pelzetter + * @version $Id$ */ public class WorkingPaperLoader extends AbstractContentTypeLoader { diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertiesStep.java index 00757f9d3..448a40660 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertiesStep.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2010 Jens Pelzetter, - * for the Center of Social Politics of the University of Bremen + * ScientificCMS Team, http://www.scientificcms.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -35,6 +35,7 @@ import com.arsdigita.toolbox.ui.DomainObjectPropertySheet; /** * * @author Jens Pelzetter + * @version $Id$ */ public class WorkingPaperPropertiesStep extends UnPublishedPropertiesStep { diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertyForm.java index d5272768e..0c6231feb 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertyForm.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2010 Jens Pelzetter, - * for the Center of Social Politics of the University of Bremen + * ScientificCMS Team, http://www.scientificcms.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -33,6 +33,7 @@ import com.arsdigita.cms.contenttypes.WorkingPaper; /** * * @author Jens Pelzetter + * @version $Id$ */ public class WorkingPaperPropertyForm extends UnPublishedPropertyForm diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/ArticleInCollectedVolume.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/ArticleInCollectedVolume.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/ArticleInCollectedVolume.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/ArticleInCollectedVolume.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/ArticleInJournal.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/ArticleInJournal.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/ArticleInJournal.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/ArticleInJournal.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/CollectedVolume.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/CollectedVolume.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/CollectedVolume.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/CollectedVolume.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Expertise.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/Expertise.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Expertise.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/Expertise.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/GreyLiterature.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/GreyLiterature.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/GreyLiterature.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/GreyLiterature.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/InProceedings.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/InProceedings.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/InProceedings.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/InProceedings.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/InternetArticle.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/InternetArticle.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/InternetArticle.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/InternetArticle.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Journal.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/Journal.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Journal.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/Journal.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Monograph.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/Monograph.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Monograph.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/Monograph.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Proceedings.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/Proceedings.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Proceedings.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/Proceedings.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Publication.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/Publication.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Publication.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/Publication.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/PublicationWithPublisher.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/PublicationWithPublisher.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/PublicationWithPublisher.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/PublicationWithPublisher.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Publisher.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/Publisher.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Publisher.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/Publisher.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Review.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/Review.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Review.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/Review.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/SciAuthor.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/SciAuthor.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/SciAuthor.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/SciAuthor.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Series.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/Series.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/Series.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/Series.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/UnPublished.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/UnPublished.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/UnPublished.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/UnPublished.xsl diff --git a/ccm-sci-publications/web/themes/heirloom/contenttypes/sci/WorkingPaper.xsl b/ccm-sci-publications/web/themes/heirloom/content-types/sci/WorkingPaper.xsl similarity index 100% rename from ccm-sci-publications/web/themes/heirloom/contenttypes/sci/WorkingPaper.xsl rename to ccm-sci-publications/web/themes/heirloom/content-types/sci/WorkingPaper.xsl