diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/category-page.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/category-page.html.ftl index 28ce09c3f..ed48a0a58 100644 --- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/category-page.html.ftl +++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/category-page.html.ftl @@ -1,5 +1,4 @@ <#import "./main.html.ftl" as main> -<#-- <#import "./contentitems/${CmsPagesContentItemTypeModel.itemClass}.html.ftl" as contentitem> --> <@main.librecms>
@@ -13,151 +12,7 @@ <#import "./contentitems/default.html.ftl" as contentitem> <@contentitem.details /> - - <#--

Index Item Title ${CmsPagesCategorizedItemModel.title}

-
-CmsPagesContentItemTypeModel.displayName = ${CmsPagesContentItemTypeModel.displayName}
-CmsPagesContentItemTypeModel.itemClass = ${CmsPagesContentItemTypeModel.itemClass}
-
-
-

- Enim pariatur esse nisi commodo cupidatat dolor reprehenderit commodo. Nulla mollit officia dolore ipsum elit irure excepteur ex excepteur est non aliqua. Tempor est amet id occaecat deserunt ea adipisicing laborum tempor exercitation dolor ex quis laboris. Nulla quis sit exercitation ex sunt ipsum adipisicing consequat mollit sunt. Ea fugiat commodo ullamco reprehenderit non. Ea laborum aute non ex Lorem sint anim. In sunt sit laboris amet ipsum tempor officia incididunt eu nostrud voluptate labore veniam. -

-
- -
Associated images (using media list images)
-
- - -
-

- Et ut ea adipisicing irure mollit excepteur proident labore velit sint ex ipsum irure duis. Do irure do irure officia consectetur est. Nulla proident sit cillum veniam excepteur sint est culpa quis voluptate nostrud nulla. Minim incididunt dolor quis ullamco eu pariatur sunt deserunt aliquip elit cupidatat minim. Ipsum sunt dolore non anim minim et amet est aute. -

-

- Ex reprehenderit tempor quis velit incididunt minim ex consectetur nisi dolore incididunt. Culpa ullamco enim veniam do nulla esse pariatur. Aliqua irure laborum ut reprehenderit eiusmod sunt enim ipsum commodo non. Et cupidatat sint officia mollit do Lorem eu sunt. Sint voluptate ea id consectetur elit cupidatat excepteur. Cupidatat aliquip amet enim nisi incididunt laborum nostrud pariatur eiusmod. Do ullamco tempor ex mollit cillum dolor sint voluptate. -

-

- Ut ut excepteur enim exercitation mollit cillum id sit magna. Ullamco ullamco do reprehenderit nisi consequat. Id dolore eu laborum ex ipsum fugiat veniam id incididunt aliquip proident nulla commodo. Officia deserunt consequat in id ex sit. Lorem nostrud officia culpa enim labore id sit. -

--> +
@@ -195,7 +50,7 @@ CmsPagesContentItemTypeModel.itemClass = ${CmsPagesContentItemTypeModel.itemClas <#items as item>

  • - ${item.title} + ${item.title}

    ${item.description}

    • diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl index bfa8e780a..f30dbcd68 100644 --- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl +++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl @@ -70,7 +70,7 @@

  • - ${news.title} + ${news.title}
    <#--
    ${news.getReleaseDate('yyyy-MM-dd')}
    -->
    ${news.getReleaseDate('dd. MMM yyyy')}
    @@ -88,7 +88,9 @@ <#items as event>

  • -
    ${event.title}
    +
    ${event.getStartDate('dd. MMM yyyy HH:mm')}

    ${event.description}

    diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl index 3bad7aaa2..78f5c7251 100644 --- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl +++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl @@ -31,7 +31,7 @@
  • + href="/pages${category.categoryPath}/index.${negotiatedLocale}.html${CmsPagesPageUrlModel.queryString}"> ${category.title}
    • diff --git a/ccm-core/src/main/java/org/libreccm/theming/mvc/ThemesMvc.java b/ccm-core/src/main/java/org/libreccm/theming/mvc/ThemesMvc.java index ae25a34f2..fd306727f 100644 --- a/ccm-core/src/main/java/org/libreccm/theming/mvc/ThemesMvc.java +++ b/ccm-core/src/main/java/org/libreccm/theming/mvc/ThemesMvc.java @@ -33,6 +33,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.libreccm.core.CoreConstants; +import org.libreccm.l10n.GlobalizationHelper; import org.libreccm.sites.Site; import org.libreccm.sites.SiteRepository; import org.libreccm.theming.ThemeInfo; @@ -50,6 +51,9 @@ import org.libreccm.theming.manifest.ThemeTemplate; public class ThemesMvc { public static final String DEFAULT_THEME_PARAM = "--DEFAULT--"; + + @Inject + private GlobalizationHelper globalizationHelper; @Inject private Models models; @@ -146,6 +150,10 @@ public class ThemesMvc { models.put("application", application); models.put("contextPath", servletContext.getContextPath()); + models.put( + "negotiatedLocale", + globalizationHelper.getNegotiatedLocale().toString() + ); models.put("themeName", themeInfo.getName()); models.put("themeVersion", themeInfo.getVersion()); models.put(