Skip to content

Commit 64aa708

Browse files
SilverYoChammoqui
SilverYoCha
authored and
mmoqui
committed
Feature #13197: implementing new community component.
Modifying main.jsp to take into account new Silverpeas's TAGs designed to write a JSP. Modifying component descriptor. Fixing pom.xml problem.
1 parent 1cf5db5 commit 64aa708

File tree

5 files changed

+89
-62
lines changed

5 files changed

+89
-62
lines changed

‎community/community-configuration/src/main/config/xmlcomponents/community.xml

Lines changed: 64 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,62 +24,90 @@
2424
along with this program. If not, see <http://www.gnu.org/licenses/>.
2525
2626
-->
27-
<WAComponent xmlns="http://silverpeas.org/xml/ns/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
28-
xsi:schemaLocation="http://silverpeas.org/xml/ns/component https://www.silverpeas.org/xsd/component.xsd">
27+
<WAComponent xmlns="http://silverpeas.org/xml/ns/component"
28+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
29+
xsi:schemaLocation="http://silverpeas.org/xml/ns/component https://www.silverpeas.org/xsd/component.xsd">
2930
<name>community</name>
3031
<label>
31-
<message lang="fr">community</message>
32-
<message lang="en">community</message>
33-
<message lang="de">community</message>
32+
<message lang="fr">Community</message>
33+
<message lang="en">Community</message>
34+
<message lang="de">Community</message>
3435
</label>
35-
<description>
36+
<description>
3637
<message lang="fr">community</message>
3738
<message lang="en">community</message>
3839
<message lang="de">community</message>
3940
</description>
40-
<suite>
41-
<message lang="fr">80 Nouveaux Composants</message>
42-
<message lang="en">80 New Components </message>
43-
<message lang="de">80 Neue Komponenten</message>
41+
<suite>
42+
<message lang="fr">02 Gestion Collaborative</message>
43+
<message lang="en">02 Collaborative Management</message>
44+
<message lang="de">02 kollaborative Verwaltung</message>
4445
</suite>
46+
<inheritSpaceRightsByDefault>false</inheritSpaceRightsByDefault>
47+
<publicByDefault>true</publicByDefault>
4548
<visible>true</visible>
4649
<portlet>false</portlet>
4750
<profiles>
48-
<profile name="admin">
49-
<label>
50-
<message lang="fr">Gestionnaires</message>
51-
<message lang="en">Administrators</message>
52-
<message lang="de">Administrator</message>
53-
</label>
54-
<help>
55-
<message lang="fr">Gestionnaires.</message>
56-
<message lang="en">Administrators.</message>
57-
<message lang="de">Administrator</message>
58-
</help>
59-
</profile>
60-
<profile name="publisher">
61-
<label>
62-
<message lang="fr">Publieurs</message>
63-
<message lang="en">Publishers</message>
64-
<message lang="de">Herausgeber</message>
65-
</label>
66-
<help>
67-
<message lang="fr">Publieurs.</message>
68-
<message lang="en">Publishers.</message>
69-
<message lang="de">Herausgeber</message>
70-
</help>
71-
</profile>
7251
<profile name="user">
73-
<label>
52+
<label>
7453
<message lang="fr">Lecteurs</message>
7554
<message lang="en">Readers</message>
7655
<message lang="de">Leser</message>
7756
</label>
78-
<help>
57+
<help>
7958
<message lang="fr">Lecteurs.</message>
8059
<message lang="en">Readers.</message>
8160
<message lang="de">Leser.</message>
8261
</help>
8362
</profile>
8463
</profiles>
64+
<parameters>
65+
<parameter>
66+
<name>defaultMemberRole</name>
67+
<label>
68+
<message lang="fr">Rôle par défaut attribué à un nouveau membre</message>
69+
<message lang="en">Default role assigned to a new member</message>
70+
<message lang="de">Standardrolle, die einem neuen Mitglied zugewiesen wird</message>
71+
</label>
72+
<order>1</order>
73+
<mandatory>true</mandatory>
74+
<value>no</value>
75+
<updatable>always</updatable>
76+
<type>select</type>
77+
<options>
78+
<option>
79+
<name>
80+
<message lang="fr">Lecteur</message>
81+
<message lang="en">Readers</message>
82+
<message lang="de">Leser</message>
83+
</name>
84+
<value>reader</value>
85+
</option>
86+
<option>
87+
<name>
88+
<message lang="fr">Rédacteur</message>
89+
<message lang="en">Writer</message>
90+
<message lang="en">Redaktor</message>
91+
</name>
92+
<value>writer</value>
93+
</option>
94+
<option>
95+
<name>
96+
<message lang="fr">Publieur</message>
97+
<message lang="en">Publisher</message>
98+
<message lang="en">Herausgeber</message>
99+
</name>
100+
<value>publisher</value>
101+
</option>
102+
<option>
103+
<name>
104+
<message lang="fr">Gestionnaire</message>
105+
<message lang="en">Manager</message>
106+
<message lang="en">Verwalter</message>
107+
</name>
108+
<value>admin</value>
109+
</option>
110+
</options>
111+
</parameter>
112+
</parameters>
85113
</WAComponent>

‎community/community-library/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<groupId>org.silverpeas.components.community</groupId>
3636
<artifactId>silverpeas-community</artifactId>
3737
<packaging>jar</packaging>
38-
<name>community Business Library</name>
38+
<name>Community Business Library</name>
3939

4040
<dependencies>
4141
<dependency>

‎community/community-war/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<groupId>${project.groupId}</groupId>
5353
<artifactId>silverpeas-community</artifactId>
5454
<version>${project.version}</version>
55-
<scope>provided</scope>
55+
<scope>compile</scope>
5656
</dependency>
5757
<dependency>
5858
<groupId>org.silverpeas.core</groupId>

‎community/community-war/src/main/webapp/community/jsp/main.jsp

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,55 +23,54 @@
2323
along with this program. If not, see <http://www.gnu.org/licenses/>.
2424
2525
--%>
26-
<%@ include file="check.jsp"%>
26+
<%@ include file="check.jsp" %>
2727
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
28-
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
29-
<%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view"%>
28+
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
29+
<%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view" %>
3030

31-
<c:set var="componentId" value="${requestScope.browseContext[3]}"/>
31+
<c:set var="componentId" value="${requestScope.browseContext[3]}"/>
3232
<c:set var="currentUserLanguage" value="${requestScope.resources.language}"/>
3333
<fmt:setLocale value="${currentUserLanguage}"/>
3434
<view:setBundle bundle="${requestScope.resources.multilangBundle}"/>
3535
<view:setBundle bundle="${requestScope.resources.iconsBundle}" var="icons"/>
3636

37-
<fmt:message key="community.menu.item.subscribe" var="subscribeLabel"/>
37+
<fmt:message key="community.menu.item.subscribe" var="subscribeLabel"/>
3838
<fmt:message key="community.menu.item.unsubscribe" var="unsubscribeLabel"/>
3939

4040
<c:set var="isUserSubscribed" value="${requestScope.isUserSubscribed}"/>
4141

42-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
43-
<html>
44-
<head>
45-
<view:looknfeel />
42+
<view:sp-page>
43+
<view:sp-head-part>
4644
<script type="application/javascript">
4745
SUBSCRIPTION_PROMISE.then(function() {
4846
window.spSubManager = new SilverpeasSubscriptionManager({
49-
componentInstanceId : '${componentId}',
50-
labels : {
47+
componentInstanceId : '${componentId}', labels : {
5148
subscribe : '${silfn:escapeJs(subscribeToSuggestionBoxLabel)}',
5249
unsubscribe : '${silfn:escapeJs(unsubscribeFromSuggestionBoxLabel)}'
5350
}
5451
});
5552
});
5653
</script>
57-
</head>
58-
<body>
59-
<view:operationPane>
60-
<c:if test="${isUserSubscribed != null}">
61-
<view:operationSeparator/>
62-
<view:operation altText="<span id='subscriptionMenuLabel'></span>" icon="" action="javascript:spSubManager.switchUserSubscription()"/>
63-
</c:if>
64-
</view:operationPane>
54+
</view:sp-head-part>
55+
<view:sp-body-part>
56+
<view:operationPane>
57+
<c:if test="${isUserSubscribed != null}">
58+
<view:operationSeparator/>
59+
<view:operation altText="<span id='subscriptionMenuLabel'></span>" icon="" action="javascript:spSubManager.switchUserSubscription()"/>
60+
</c:if>
61+
</view:operationPane>
6562
<view:window>
6663
<view:frame>
6764
Bienvenue sur l'application community.
6865
</view:frame>
6966
<view:frame>
7067
<view:board>
71-
Cette instance s'appelle <span class="communityName"><c:out value="${requestScope.browseContext[1]}" /></span>.<br/>
72-
Elle se situe dans l'espace <span class="communityName"><c:out value="${requestScope.browseContext[0]}" /></span>.
68+
Cette instance s'appelle
69+
<span class="communityName"><c:out value="${requestScope.browseContext[1]}"/></span>.<br/>
70+
Elle se situe dans l'espace
71+
<span class="communityName"><c:out value="${requestScope.browseContext[0]}"/></span>.
7372
</view:board>
7473
</view:frame>
7574
</view:window>
76-
</body>
77-
</html>
75+
</view:sp-body-part>
76+
</view:sp-page>

‎community/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
</description>
5050

5151
<modules>
52+
<module>community-configuration</module>
5253
<module>community-library</module>
5354
<module>community-war</module>
54-
<module>community-configuration</module>
5555
</modules>
5656

5757
</project>

0 commit comments

Comments
 (0)