Some minor fixes for links
parent
3425657121
commit
2e4bbc2611
|
|
@ -1,5 +1,4 @@
|
||||||
<#import "./main.html.ftl" as main>
|
<#import "./main.html.ftl" as main>
|
||||||
<#-- <#import "./contentitems/${CmsPagesContentItemTypeModel.itemClass}.html.ftl" as contentitem> -->
|
|
||||||
|
|
||||||
<@main.librecms>
|
<@main.librecms>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
@ -13,151 +12,7 @@
|
||||||
<#import "./contentitems/default.html.ftl" as contentitem>
|
<#import "./contentitems/default.html.ftl" as contentitem>
|
||||||
</#if>
|
</#if>
|
||||||
<@contentitem.details />
|
<@contentitem.details />
|
||||||
</#if>
|
</#if>
|
||||||
<#-- <h1>Index Item Title ${CmsPagesCategorizedItemModel.title}</h1>
|
|
||||||
<pre>
|
|
||||||
CmsPagesContentItemTypeModel.displayName = ${CmsPagesContentItemTypeModel.displayName}
|
|
||||||
CmsPagesContentItemTypeModel.itemClass = ${CmsPagesContentItemTypeModel.itemClass}
|
|
||||||
</pre>
|
|
||||||
<div class="row">
|
|
||||||
<p class="col-8">
|
|
||||||
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.
|
|
||||||
</p>
|
|
||||||
<figure class="col-4">
|
|
||||||
<button class="imgbox-button"
|
|
||||||
data-bs-target="#imggallery"
|
|
||||||
data-bs-toggle="modal"
|
|
||||||
type="button">
|
|
||||||
<img class="img-thumbnail"
|
|
||||||
src="${themeUrl}/images/placeholder.png" />
|
|
||||||
</button>
|
|
||||||
<figcaption>Associated images (using media list images)</figcaption>
|
|
||||||
</figure>
|
|
||||||
<div aria-hidden="true"
|
|
||||||
aria-labelledby="imgbox-title"
|
|
||||||
class="modal modal-xl fade"
|
|
||||||
id="imgbox"
|
|
||||||
tabindex="-1">
|
|
||||||
<div class="modal-dialog">
|
|
||||||
<div class="modal-content">
|
|
||||||
<div class="modal-header">
|
|
||||||
<h2 class="modal-title"
|
|
||||||
id="imgbox-title">
|
|
||||||
Images
|
|
||||||
</h2>
|
|
||||||
<button aria-label="Close"
|
|
||||||
class="btn-close"
|
|
||||||
data-bs-dismiss="modal"
|
|
||||||
type="button">
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<figure class="modal-body">
|
|
||||||
<img class="img-fluid"
|
|
||||||
src="${themeUrl}/images/placeholder.png" />
|
|
||||||
<figcaption>
|
|
||||||
Associated image
|
|
||||||
</figcaption>
|
|
||||||
</figure>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div aria-hidden="true"
|
|
||||||
aria-labelledby="imggallery-title"
|
|
||||||
class="modal modal-xl fade"
|
|
||||||
id="imggallery"
|
|
||||||
tabindex="-1">
|
|
||||||
<div class="modal-dialog">
|
|
||||||
<div class="modal-content">
|
|
||||||
<div class="modal-header">
|
|
||||||
<h2 class="modal-title"
|
|
||||||
id="imggallery-title">
|
|
||||||
Images
|
|
||||||
</h2>
|
|
||||||
<button aria-label="Close"
|
|
||||||
class="btn-close"
|
|
||||||
data-bs-dismiss="modal"
|
|
||||||
type="button">
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="modal-body">
|
|
||||||
<div class="carousel slide"
|
|
||||||
data-bs-interval="false"
|
|
||||||
data-bs-ride="carousel"
|
|
||||||
id="imggallery-carousel">
|
|
||||||
<div class="carousel-indicators">
|
|
||||||
<button aria-current="true"
|
|
||||||
aria-label="First image"
|
|
||||||
class="active"
|
|
||||||
data-bs-slide-to="0"
|
|
||||||
data-bs-target="#imggallery-carousel"
|
|
||||||
type="button"></button>
|
|
||||||
<button aria-label="Second image"
|
|
||||||
data-bs-slide-to="1"
|
|
||||||
data-bs-target="#imggallery-carousel"
|
|
||||||
type="button"></button>
|
|
||||||
<button aria-label="Slide 3"
|
|
||||||
data-bs-slide-to="2"
|
|
||||||
data-bs-target="#imggallery-carousel"
|
|
||||||
type="button"></button>
|
|
||||||
</div>
|
|
||||||
<div class="carousel-inner">
|
|
||||||
<div class="carousel-item active">
|
|
||||||
<figure class="d-block w-100">
|
|
||||||
<img class="img-fluid"
|
|
||||||
src="${themeUrl}/images/placeholder.png" />
|
|
||||||
<figcaption class="carousel-caption d-none d-md-block">
|
|
||||||
First image
|
|
||||||
</figcaption>
|
|
||||||
</figure>
|
|
||||||
</div>
|
|
||||||
<div class="carousel-item">
|
|
||||||
<figure class="d-block w-100">
|
|
||||||
<img class="img-fluid"
|
|
||||||
src="${themeUrl}/images/placeholder_2.png" />
|
|
||||||
<figcaption class="carousel-caption d-none d-md-block">
|
|
||||||
2nd image
|
|
||||||
</figcaption>
|
|
||||||
</figure>
|
|
||||||
</div>
|
|
||||||
<div class="carousel-item">
|
|
||||||
<figure class="d-block w-100">
|
|
||||||
<img class="img-fluid"
|
|
||||||
src="${themeUrl}/images/placeholder_3.png" />
|
|
||||||
<figcaption class="carousel-caption d-none d-md-block">
|
|
||||||
Image 3
|
|
||||||
</figcaption>
|
|
||||||
</figure>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<button class="carousel-control-prev"
|
|
||||||
data-bs-slide="prev"
|
|
||||||
data-bs-target="#imggallery-carousel"
|
|
||||||
type="button">
|
|
||||||
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
|
|
||||||
<span class="visually-hidden">Previous</span>
|
|
||||||
</button>
|
|
||||||
<button class="carousel-control-next"
|
|
||||||
data-bs-slide="next"
|
|
||||||
data-bs-target="#imggallery-carousel"
|
|
||||||
type="button">
|
|
||||||
<span class="carousel-control-next-icon" aria-hidden="true"></span>
|
|
||||||
<span class="visually-hidden">Next</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<p>
|
|
||||||
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.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
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.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
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.
|
|
||||||
</p> -->
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-4">
|
<div class="col-lg-4">
|
||||||
<!-- Attachments -->
|
<!-- Attachments -->
|
||||||
|
|
@ -195,7 +50,7 @@ CmsPagesContentItemTypeModel.itemClass = ${CmsPagesContentItemTypeModel.itemClas
|
||||||
<#items as item>
|
<#items as item>
|
||||||
<li class="list-group-item">
|
<li class="list-group-item">
|
||||||
<h2>
|
<h2>
|
||||||
<a href="/pages/${CmsPagesCategoryModel.category.path}${item.name}.${item.lang}.html${CmsPagesPageUrlModel.queryString}">${item.title}</a>
|
<a href="/pages/${CmsPagesCategoryModel.category.path}${item.name}.${negotiatedLocale}.html${CmsPagesPageUrlModel.queryString}">${item.title}</a>
|
||||||
</h2>
|
</h2>
|
||||||
<p class="item-description">${item.description}</p>
|
<p class="item-description">${item.description}</p>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@
|
||||||
<li class="list-group-item">
|
<li class="list-group-item">
|
||||||
<h3 class="d-flex w-100 justify-content-between">
|
<h3 class="d-flex w-100 justify-content-between">
|
||||||
<div>
|
<div>
|
||||||
<a href="/pages${CmsPagesCategoryModel.category.path}${news.name}.${news.lang}.html${CmsPagesPageUrlModel.queryString}">${news.title}</a>
|
<a href="/pages${CmsPagesCategoryModel.category.path}${news.name}.${negotiatedLocale}.html${CmsPagesPageUrlModel.queryString}">${news.title}</a>
|
||||||
</div>
|
</div>
|
||||||
<#-- <div>${news.getReleaseDate('yyyy-MM-dd')}</div> -->
|
<#-- <div>${news.getReleaseDate('yyyy-MM-dd')}</div> -->
|
||||||
<div>${news.getReleaseDate('dd. MMM yyyy')}</div>
|
<div>${news.getReleaseDate('dd. MMM yyyy')}</div>
|
||||||
|
|
@ -88,7 +88,9 @@
|
||||||
<#items as event>
|
<#items as event>
|
||||||
<li class="list-group-item">
|
<li class="list-group-item">
|
||||||
<h3 class="d-flex w-100 justify-content-between">
|
<h3 class="d-flex w-100 justify-content-between">
|
||||||
<div>${event.title}</div>
|
<div>
|
||||||
|
<a href="/pages${CmsPagesCategoryModel.category.path}${event.name}.${negotiatedLocale}.html${CmsPagesPageUrlModel.queryString}">${event.title}</a>
|
||||||
|
</div>
|
||||||
<div>${event.getStartDate('dd. MMM yyyy HH:mm')}</div>
|
<div>${event.getStartDate('dd. MMM yyyy HH:mm')}</div>
|
||||||
</h3>
|
</h3>
|
||||||
<p class="item-description">${event.description}</p>
|
<p class="item-description">${event.description}</p>
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
<li ${category.selected?then("aria-selected=\"page\"","")}
|
<li ${category.selected?then("aria-selected=\"page\"","")}
|
||||||
class="nav-item ${category.selected?then( "active","")}">
|
class="nav-item ${category.selected?then( "active","")}">
|
||||||
<a class="nav-link"
|
<a class="nav-link"
|
||||||
href="/pages${category.categoryPath}">
|
href="/pages${category.categoryPath}/index.${negotiatedLocale}.html${CmsPagesPageUrlModel.queryString}">
|
||||||
${category.title}
|
${category.title}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
|
||||||
import javax.ws.rs.core.UriInfo;
|
import javax.ws.rs.core.UriInfo;
|
||||||
|
|
||||||
import org.libreccm.core.CoreConstants;
|
import org.libreccm.core.CoreConstants;
|
||||||
|
import org.libreccm.l10n.GlobalizationHelper;
|
||||||
import org.libreccm.sites.Site;
|
import org.libreccm.sites.Site;
|
||||||
import org.libreccm.sites.SiteRepository;
|
import org.libreccm.sites.SiteRepository;
|
||||||
import org.libreccm.theming.ThemeInfo;
|
import org.libreccm.theming.ThemeInfo;
|
||||||
|
|
@ -50,6 +51,9 @@ import org.libreccm.theming.manifest.ThemeTemplate;
|
||||||
public class ThemesMvc {
|
public class ThemesMvc {
|
||||||
|
|
||||||
public static final String DEFAULT_THEME_PARAM = "--DEFAULT--";
|
public static final String DEFAULT_THEME_PARAM = "--DEFAULT--";
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private GlobalizationHelper globalizationHelper;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private Models models;
|
private Models models;
|
||||||
|
|
@ -146,6 +150,10 @@ public class ThemesMvc {
|
||||||
|
|
||||||
models.put("application", application);
|
models.put("application", application);
|
||||||
models.put("contextPath", servletContext.getContextPath());
|
models.put("contextPath", servletContext.getContextPath());
|
||||||
|
models.put(
|
||||||
|
"negotiatedLocale",
|
||||||
|
globalizationHelper.getNegotiatedLocale().toString()
|
||||||
|
);
|
||||||
models.put("themeName", themeInfo.getName());
|
models.put("themeName", themeInfo.getName());
|
||||||
models.put("themeVersion", themeInfo.getVersion());
|
models.put("themeVersion", themeInfo.getVersion());
|
||||||
models.put(
|
models.put(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue