Skip to content

Commit

Permalink
BACKLOG-22478: remove dependency to default module jnt:listSites to b…
Browse files Browse the repository at this point in the history
…e able to move it to legacy (#46)
  • Loading branch information
jkevan committed Apr 2, 2024
1 parent 4f0e08f commit d7514b7
Show file tree
Hide file tree
Showing 10 changed files with 128 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/import/repository.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
export="true"
j:view="bootstrapSites.settingsBootstrap3GoogleMaterialStyle"
jcr:mixinTypes="jmix:renderable"
jcr:primaryType="jnt:listSites"
jcr:primaryType="jnt:listProjects"
live="true"
preview="true"/>
</pagecontent>
Expand Down
17 changes: 17 additions & 0 deletions src/main/resources/META-INF/definitions.cnd
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,20 @@
[jnt:userContentRetrieval] > jnt:contentRetrieval, jmix:userProfileComponents, jmix:bindedComponent, jmix:studioOnly

[jnt:myFilesDashboard] > jnt:content, jmix:siteComponent, mix:title, jmix:studioOnly

[jnt:listProjects] > jnt:content, mix:title, jmix:siteComponent, jmix:list, jmix:studioOnly
- edit (boolean)
- contribute (boolean)
- preview (boolean)
- live (boolean)
- administrationlink (boolean)
- editproperties (boolean)
- details (boolean)
- detailsLabel (string) internationalized nofulltext
- detailsTemplate (string)
- export (boolean)
- delete (boolean)
- typeOfContent (string, choicelist[resourceBundle]) = 'website' indexed=no < 'website', 'contents', 'files'
- numberOfSitesPerPage (long) hidden
- numberMaxOfSitesDisplayed (long)
- templatesSets (weakreference, choicelist[nodes='/modules;jnt:virtualsite']) multiple
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<%@ page contentType="text/html; UTF-8" %>
<%@ taglib prefix="template" uri="http://www.jahia.org/tags/templateLib" %>
<%@ taglib prefix="jcr" uri="http://www.jahia.org/tags/jcr" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="functions" uri="http://www.jahia.org/tags/functions" %>
<%@ taglib prefix="query" uri="http://www.jahia.org/tags/queryLib" %>
<%@ taglib prefix="ui" uri="http://www.jahia.org/tags/uiComponentsLib" %>
<%--@elvariable id="currentNode" type="org.jahia.services.content.JCRNodeWrapper"--%>
<%--@elvariable id="out" type="java.io.PrintWriter"--%>
<%--@elvariable id="script" type="org.jahia.services.render.scripting.Script"--%>
<%--@elvariable id="scriptInfo" type="java.lang.String"--%>
<%--@elvariable id="workspace" type="java.lang.String"--%>
<%--@elvariable id="renderContext" type="org.jahia.services.render.RenderContext"--%>
<%--@elvariable id="currentResource" type="org.jahia.services.render.Resource"--%>
<%--@elvariable id="url" type="org.jahia.services.render.URLGenerator"--%>


<c:if test="${empty currentNode.properties['typeOfContent'] or currentNode.properties['typeOfContent'].string eq 'website'}">
<c:set var="query" value="select * from [jnt:virtualsite] as site where ischildnode(site,'/sites') and localname(site) <> 'systemsite'" />
</c:if>
<c:if test="${not empty currentNode.properties['typeOfContent'] and currentNode.properties['typeOfContent'].string ne 'website'}">
<c:set var="query" value="select * from [jnt:virtualsite] as site where ischildnode(site,'/sites')" />
</c:if>
<jcr:nodeProperty node="${currentNode}" name="templatesSets" var="templatesSets"/>
<c:forEach items="${templatesSets}" var="templatesSet" varStatus="status">
<c:choose>
<c:when test="${status.first}">
<c:set var="query" value="${query} and (site.[j:templatesSet] = '${templatesSet.node.name}'" />
</c:when>
<c:otherwise>
<c:set var="query" value="${query} or site.[j:templatesSet] = '${templatesSet.node.name}'" />
</c:otherwise>
</c:choose>
<c:if test="${status.last}">
<c:set var="query" value="${query})" />
</c:if>
</c:forEach>
<c:set var="query" value="${query} order by site.[jcr:created] desc" />

<query:definition var="result" statement="${query}"
limit="${currentNode.properties['numberMaxOfSitesDisplayed'].string}"/>
<c:set target="${moduleMap}" property="listQuery" value="${result}"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cache.dependsOnVisibilityOf=/sites/[^/]*
20 changes: 20 additions & 0 deletions src/main/resources/resources/userDashboard.properties
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,23 @@ myPages.link=Page
jnt_editUserDetails.j_altNumber=Other phone number
jnt_user.j_facebookID=URL to your Facebook page
jnt_user.j_linkedinID=URL to your LinkedIn page
jnt_listProjects=List of all sites
jnt_listProjects.administrationlink=Link to administration
jnt_listProjects.contribute=Display link to the contribute mode
jnt_listProjects.delete=Delete site link
jnt_listProjects.details=Display details link
jnt_listProjects.detailsLabel=Details link label
jnt_listProjects.detailsTemplate=Details link template
jnt_listProjects.displayAsTable=Display as a table
jnt_listProjects.edit=Display link to the edit mode
jnt_listProjects.editproperties=Edit site properties
jnt_listProjects.export=Export link
jnt_listProjects.live=Display link to the live mode
jnt_listProjects.numberMaxOfSitesDisplayed=Max number of sites returned
jnt_listProjects.numberOfSitesPerPage=Fill the max number of sites per page
jnt_listProjects.preview=Display link to the preview mode
jnt_listProjects.type=select if the link is in contribute or edit mode
jnt_listProjects.typeOfContent=Select a type of content
jnt_listProjects.typeOfContent.contents=Contents
jnt_listProjects.typeOfContent.files=Files
jnt_listProjects.typeOfContent.website=Web Site
5 changes: 5 additions & 0 deletions src/main/resources/resources/userDashboard_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,8 @@ jnt_user.j_facebookID=Link zu Ihrer Facebook-Seite
jnt_user.j_linkedinID=Link auf Ihre LinkedIn-Seite
mySettings.myFiles.label=Meine Dateien
mySettings.mySettings.label=Mein Profil
jnt_listProjects=Liste aller Sites
jnt_listProjects.contribute=Link zum Beitragen-Modus anzeigen
jnt_listProjects.live=Link zum Live-Modus anzeigen
jnt_listProjects.numberMaxOfSitesDisplayed=Maximalle anzahl der Sites
jnt_listProjects.preview=Link zum Vorschau-Modus anzeigen
20 changes: 20 additions & 0 deletions src/main/resources/resources/userDashboard_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,23 @@ jnt_user.j_facebookID=URL to your Facebook page
jnt_user.j_linkedinID=URL to your LinkedIn page
mySettings.myFiles.label=My Files
mySettings.mySettings.label=My Profile
jnt_listProjects=List of all sites
jnt_listProjects.administrationlink=Link to administration
jnt_listProjects.contribute=Display link to the contribute mode
jnt_listProjects.delete=Delete site link
jnt_listProjects.details=Display details link
jnt_listProjects.detailsLabel=Details link label
jnt_listProjects.detailsTemplate=Details link template
jnt_listProjects.displayAsTable=Display as a table
jnt_listProjects.edit=Display link to the edit mode
jnt_listProjects.editproperties=Edit site properties
jnt_listProjects.export=Export link
jnt_listProjects.live=Display link to the live mode
jnt_listProjects.numberMaxOfSitesDisplayed=Max number of sites returned
jnt_listProjects.numberOfSitesPerPage=Fill the max number of sites per page
jnt_listProjects.preview=Display link to the preview mode
jnt_listProjects.type=select if the link is in contribute or edit mode
jnt_listProjects.typeOfContent=Select a type of content
jnt_listProjects.typeOfContent.contents=Contents
jnt_listProjects.typeOfContent.files=Files
jnt_listProjects.typeOfContent.website=Web Site
20 changes: 20 additions & 0 deletions src/main/resources/resources/userDashboard_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,23 @@ jnt_user.j_linkedinID=Lien vers votre page LinkedIn
jnt_user.jahia.ui.theme=Thème Jahia
mySettings.myFiles.label=Mes fichiers
mySettings.mySettings.label=Mon Profil
jnt_listProjects=Liste des sites
jnt_listProjects.administrationlink=Lien vers l'Administration
jnt_listProjects.contribute=Afficher le lien vers le Mode Contribution
jnt_listProjects.delete=Lien vers la suppression de site
jnt_listProjects.details=Afficher le lien vers les détails
jnt_listProjects.detailsLabel=Libellé du lien vers les détails
jnt_listProjects.detailsTemplate=Template du lien vers les détails
jnt_listProjects.displayAsTable=Présenter sous forme de tableau
jnt_listProjects.edit=Afficher le lien vers le Mode Edition
jnt_listProjects.editproperties=Editer les propriétés du site
jnt_listProjects.export=Permettre d'exporter le site
jnt_listProjects.live=Afficher le lien vers le mode en ligne
jnt_listProjects.numberMaxOfSitesDisplayed=Nombre maximum de sites renvoyés
jnt_listProjects.numberOfSitesPerPage=Entrez le nombre maximum de sites par page
jnt_listProjects.preview=Afficher le lien vers le mode aperçu
jnt_listProjects.type=le lien est-il affiché en Mode Contribution ou en Mode Edition
jnt_listProjects.typeOfContent=Sélectionnez un type de contenu
jnt_listProjects.typeOfContent.contents=Contenus
jnt_listProjects.typeOfContent.files=Fichiers
jnt_listProjects.typeOfContent.website=Site web

0 comments on commit d7514b7

Please sign in to comment.