Author: dpillot
Date: Thu Jun 14 17:03:39 2007
New Revision: 708
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D708&repname=
=3Dcorporate_portal_templates_v2
Log:
TEMPLATES-279 241
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties
branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_pop.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/mysettings.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2.properties&re=
v=3D708&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties Thu Jun 14 17:03:39 2007
@@ -212,7 +212,11 @@
mySettingsBackToPage =3D Back to page
mySettingsSuccess =3D Settings updated
mySettingsSuccessIntro =3D Your user settings have been updated successful=
ly.
-
+mySettingsPersonalProperties =3D User personal properties
+mySettingsaddPersonalProperties =3D To add a personal property
+mySettingsremoveProperty =3D To remove this personal property
+mySettingsnewpropvalue =3D initial value =
+mySettingsnewproplabel =3D label of this new property
=
ContentContainerListOperations =3D List operations
ContentContainerOperations =3D Container operations
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_en.properties=
&rev=3D708&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties Thu Jun 14 17:03:39 2007
@@ -713,4 +713,9 @@
ldap.group.sitelocalisation=3DGroup Localisation
homepage=3DHomepage
ldap.searchall=3Dsearch all
-davbox.mountpoint=3DMount point
\ No newline at end of file
+davbox.mountpoint=3DMount point
+mySettingsPersonalProperties=3DUser personal properties
+mySettingsaddPersonalProperties=3DTo add a personal property
+mySettingsremoveProperty=3DTo remove this personal property
+mySettingsnewproplabel=3Dlabel of this new property
+mySettingsnewpropvalue=3Dinitial value
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_fr.properties=
&rev=3D708&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties Thu Jun 14 17:03:39 2007
@@ -624,4 +624,9 @@
ldap.group.sitelocalisation=3DGroupe localisation
homepage=3DPage d'accueuil
ldap.searchall=3Dtout rechercher
-davbox.mountpoint=3DPoint de montage
\ No newline at end of file
+davbox.mountpoint=3DPoint de montage
+mySettingsPersonalProperties=3DPropri=C3=A9t=C3=A9s personelles
+mySettingsaddPersonalProperties=3DAjouter une propri=C3=A9t=C3=A9 personne=
lle
+mySettingsremoveProperty=3DEffacer cette propri=C3=A9t=C3=A9 sp=C3=A9cifiq=
ue
+mySettingsnewproplabel=3Dnom de la nouvelle propri=C3=A9t=C3=A9
+mySettingsnewpropvalue=3Dvaleur initiale
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_pop.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/ldap_pop.jsp&rev=3D708&repname=3Dcorporate_portal_templates=
_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_pop.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_pop.jsp Thu Jun 14 17:03:39 2=
007
@@ -15,20 +15,24 @@
See the License for the specific language governing permissions and
limitations under the License.
--%><%@ page import=3D"org.jahia.bin.Jahia" %>
-<%@ page import=3D"org.jahia.params.ParamBean" %>
+<%@ page import=3D"org.jahia.params.*" %>
<%@ page import=3D"org.jahia.registries.ServicesRegistry" %>
<%@ page import=3D"org.apache.log4j.Logger" %>
<%@ page import=3D"org.jahia.services.usermanager.*" %>
<%@ page import=3D"org.jahia.services.sites.*" %>
+<%@ page import=3D"org.jahia.services.pages.*" %>
<%@ page import=3D"java.util.*" %>
=
+<%@ page import=3D"org.jahia.engines.mysettings.MySettingsEngine" %>
+
<%@ page contentType=3D"text/html;charset=3DUTF-8" language=3D"java" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%!
private static JahiaUserManagerService service =3D ServicesRegistry.ge=
tInstance().getJahiaUserManagerService();
private static final JahiaGroupManagerService GroupService =3D ServicesReg=
istry.getInstance().getJahiaGroupManagerService();
private static final JahiaSitesService SitesService =3D ServicesRegistry.g=
etInstance().getJahiaSitesService();
-org.apache.log4j.Logger logger =3D org.apache.log4j.Logger.getLogger(getCl=
ass());
+
+private Logger logger =3D org.apache.log4j.Logger.getLogger(getClass());
=
/**
* internal method to render bundle resources
@@ -53,10 +57,58 @@
return "";
}
}
+
+ private TreeSet getSortedMemberShip(JahiaUser user,Logger logger){
+
+ Vector groups=3DGroupService.getUserMembership(user);
+ logger.debug(groups);
+ final TreeSet sortedResources =3D new TreeSet(new Comparator() {
+ public int compare(Object o1, Object o2) {
+ String g1 =3D (String)o1;
+ String g2 =3D (String)o2;
+ return g1.compareToIgnoreCase(g2);
+
+ }});
+ sortedResources.addAll(groups);
+
+ return sortedResources;
+ }
+
+ private TreeSet getMembers(JahiaGroup group,Logger logger){
+ Enumeration memberlist=3Dgroup.members();
+ Vector members=3Dnew Vector();
+ while(memberlist.hasMoreElements()){
+ Object memberobject=3Dmemberlist.nextElement();
+ members.addElement(memberobject);
+ }
+ final TreeSet sortedResources =3D new TreeSet(new Comparator() {
+ public int compare(Object o1, Object o2) {
+ String g1=3D"";
+ String g2=3D"";
+ if(o1 instanceof JahiaUser){
+ g1=3D((JahiaUser)o1).getUsername();
+ } else if(o1 instanceof JahiaGroup){
+ g1=3D((JahiaGroup)o1).getGroupname();
+ }
+ if(o2 instanceof JahiaUser){
+ g2=3D((JahiaUser)o2).getUsername();
+ } else if(o2 instanceof JahiaGroup){
+ g2=3D((JahiaGroup)o2).getGroupname();
+ }
+
+
+
+ return g1.compareToIgnoreCase(g2);
+
+ }});
+ sortedResources.addAll(members);
+ return sortedResources;
+ }
%>
<%
=
Locale locale =3D (Locale) session.getAttribute(ParamBean.SESSION_LOCA=
LE);
+ JahiaSite thesite=3D(JahiaSite) session.getAttribute(ParamBean.SESSION=
_SITE);
if (locale =3D=3D null) locale =3D request.getLocale();//fail-over loc=
ale
String path =3D request.getContextPath();//jahia path
String userkey =3D request.getParameter("u");
@@ -64,15 +116,16 @@
JahiaUser userdetail=3Dnull;
JahiaGroup groupdetail=3Dnull;
if(userkey!=3Dnull){
- userdetail =3D service.lookupUser(userkey);
+ userdetail =3D service.lookupUser(userkey);
} else {
- groupdetail=3DGroupService.lookupGroup(gname);
+ groupdetail=3DGroupService.lookupGroup(gname);
}
String targetname =3D "";
if (userdetail !=3D null) targetname =3D userdetail.getUsername();
if (groupdetail !=3D null) targetname =3D groupdetail.getGroupname();
JahiaUser currentuser =3D (JahiaUser) session.getAttribute(ParamBean.S=
ESSION_USER);
=
+
%>
<html>
<head><title><%=3Dtargetname%></title>
@@ -128,20 +181,36 @@
=
</style>
<script type=3D"text/javascript">
+var parentwin=3Dwindow.opener;
+var initialpage=3D""+parentwin.location;
+var isDisplayed=3Dfalse;
+
=
function openWindowDetail(id,type){
window.location.href=3D"?"+type+"=3D"+id;
}
+function showHome(url){
+if(isDisplayed){
+parentwin.location=3Dinitialpage;
+isDisplayed=3Dfalse;
+document.getElementById('homepagebutton').innerHTML=3D"voir la page"
+} else {
+parentwin.location=3Durl;
+isDisplayed=3Dtrue;
+document.getElementById('homepagebutton').innerHTML=3D"retour"
+
+}
+}
</script>
</head>
<body>
<center>
<div id=3D"wrapper">
-<table cellpadding=3D"5" cellspacing=3D"5" width=3D"400" border=3D"0" bgco=
lor=3D"#FFFFFF">
-<tr><td><%if(userdetail!=3Dnull){%><img src=3D"img/ldap/perso.gif" width=
=3D"53" height=3D"53" border=3D"0"><%} else {%><img src=3D"img/ldap/mygroup=
.gif" width=3D"106" height=3D"53" border=3D"0"><%}%></td>
+<table cellpadding=3D"5" cellspacing=3D"5" width=3D"450" border=3D"0" bgco=
lor=3D"#FFFFFF">
+<tr><td width=3D"54"><%if(userdetail!=3Dnull){%><img src=3D"img/ldap/perso=
.gif" width=3D"53" height=3D"53" border=3D"0"><%} else {%><img src=3D"img/l=
dap/mygroup.gif" width=3D"106" height=3D"53" border=3D"0"><%}%></td>
<td align=3D"left"><br>
=
- <h3>Detail <%=3Dtargetname%></h3></td>
+ <h3><%=3Dtargetname%></h3></td>
<td align=3D"right">
<div id=3D"buttons">
<div class=3D"button">
@@ -160,45 +229,67 @@
<%
int homepid=3Duserdetail.getHomepageID();
if(homepid>-1){
+ String hometitle=3D"voir la homepage";
+ String urlhome=3D Jahia.getContextPath() + Jahia.getServletPath() +"/p=
id/"+homepid;
+
%>
- <tr><td></td><td colspan=3D"2">homepid:<%=3Dhomepid%></td><td></td></t=
r>
+
+ <tr><td></td><td colspan=3D"2" align=3D"center"><a href=3D"javascript:=
showHome('<%=3Durlhome%>')"><span id=3D"homepagebutton"><%=3Dhometitle%></s=
pan></a></td><td></td></tr>
<%
} else {
%>
- <tr><td></td><td colspan=3D"2"><%=3DgetRessource("ldap.user.nohomepage=
",locale)%><br/><br/></td><td></td></tr>
+ <tr><td></td><td colspan=3D"2" align=3D"center"><%=3DgetRessource("lda=
p.user.nohomepage",locale)%><br/><br/></td><td></td></tr>
<%
}
- String[] labels=3D{"username","firtsname","lastname","email"};
- String[] rkeys=3D{"name","firtsname","lastname","email"};
- // we try to get username, last, first, email
+ String username=3Duserdetail.getUsername();
+ String[] labels=3D{"firstname","lastname","email","organization"};
+ String[] rkeys=3D{"firstname","lastname","email","organization"};
+ // we try to get last, first, email
Properties properties=3Duserdetail.getProperties();
- //out.println(properties);
+ if(logger.isDebugEnabled()){
+ out.println("DEBUG ENABLED:<br/>"+properties);
+ }
+ %>
+ <tr><td align=3D"right"><img src=3D"img/ldap/fiche_left.gif" width=3D"13"=
height=3D"25" border=3D"0"></td><td bgcolor=3D"#eeeeee"><%=3DgetRessource(=
"ldap.user.name",locale)%></td><td><div id=3D"data"><%=3Dusername%></div><t=
d><img src=3D"img/ldap/fiche_rigth.gif" width=3D"13" height=3D"25" border=
=3D"0"></td></tr>
+<tr><td colspan=3D"4"> </td></tr>
+ <%
for(int i=3D0;i<labels.length;i++){
String label=3DgetRessource("ldap.user."+rkeys[i],locale);
String val=3Dproperties.getProperty(labels[i]);
- logger.debug("label:"+label+" val:"+val);
+ logger.debug("label:"+label+"("+labels[i]+") val:"+val);
=
- if(val=3D=3Dnull || val.equals("")) continue;
+ if(val=3D=3Dnull) continue;
=
%>
<tr><td align=3D"right"><img src=3D"img/ldap/fiche_left.gif"
width=3D"13"=
height=3D"25" border=3D"0"></td><td bgcolor=3D"#eeeeee"><%=3Dlabel%></td><=
td><div id=3D"data"><%=3Dval%></div><td><img src=3D"img/ldap/fiche_rigth.gi=
f" width=3D"13" height=3D"25" border=3D"0"></td></tr>
<tr><td colspan=3D"4"> </td></tr>
<%
- }
- Iterator it=3Duserdetail.getUserProperties().propertyNameIterator();
- while(it.hasNext()){
- String key=3D(String) it.next();
- String value=3Duserdetail.getUserProperties().getProperty(key);
- if(!key.equals("firstname") && !key.equals("lastname") && !key.equals(=
"organization") && !key.equals("email") && !value.equals("")){
-%>
+ }
+
+ Iterator it =3D userdetail.getUserProperties().propertyNameIterato=
r();
+ while (it.hasNext()) {
+ String key =3D (String) it.next();
+ String value =3D"";
+ boolean toDisplay=3Dfalse;
+ value =3D userdetail.getUserProperties().getProperty(key);
+ if (key.startsWith(MySettingsEngine.USER_PROPERTY_PREFIX)) {
+ int index =3D key.indexOf (MySettingsEngine.SEPARATOR);
+ key =3D key.substring (index + 1);
+ toDisplay=3Dtrue;
+ }
+
+ if (toDisplay && !key.equals("firstname") && !key.equals("=
lastname") && !key.equals("organization") && !key.equals("email") && !key.e=
quals("username") && !value.equals("")) {
+ %>
<tr><td align=3D"right"><img src=3D"img/ldap/fiche_left.gif" width=3D"13" =
height=3D"25" border=3D"0"></td><td bgcolor=3D"#eeeeee"><%=3Dkey%></td><td>=
<div id=3D"data"><%=3Dvalue%></div><td><img src=3D"img/ldap/fiche_rigth.gif=
" width=3D"13" height=3D"25" border=3D"0"></td></tr>
<tr><td colspan=3D"4"> </td></tr>
<%
-}
+ }
=
}
//membership
- Vector v =3D GroupService.getUserMembership(userdetail);
+ //Vector v =3D GroupService.getUserMembership(userdetail);
+ TreeSet v =3DgetSortedMemberShip(userdetail,logger);
+ //out.println(v.size());
if(v.size()>0){
%>
<tr><td></td><td colspan=3D"2"><%=3DgetRessource("ldap.user.membership=
",locale)%>:<br/></td><td></td></tr>
@@ -206,10 +297,12 @@
for(Iterator i=3Dv.iterator();i.hasNext();){
String gn=3D(String) i.next();
JahiaGroup g=3DGroupService.lookupGroup(gn);
- if(gn!=3Dnull && g!=3Dnull && g.getSiteID ()>0 ){
- //out.println(g.getGroupKey ()+" "+g.getSiteID ());
+ boolean isLdap=3Dfalse;
+ if(gn!=3Dnull && g!=3Dnull){
+ isLdap=3Dg.getProviderName().indexOf("ldap")!=3D-1;
+ if(!isLdap && g.getSiteID()=3D=3D0) continue;
%>
- <tr><td></td><td><a href=3D"javascript:openWindowDetail('<%=3Dg.getGro=
upKey()%>','g')"><%=3Dg.getGroupname()%></a></td><td>[<%=3DSitesService.get=
Site(g.getSiteID()).getTitle ()%>]</td><td></td></tr>
+ <tr><td></td><td><a href=3D"javascript:openWindowDetail('<%=3Dg.getGro=
upKey()%>','g')"><%=3Dg.getGroupname()%></a></td><td><%if(!isLdap && g.getS=
iteID()!=3D0)out.print("["+SitesService.getSite(g.getSiteID()).getTitle ()+=
"]");%></td><td></td></tr>
<%
}
}//end loop
@@ -224,36 +317,39 @@
<%
} else {
=
+%>
+
+<%
// group display
int homepid=3Dgroupdetail.getHomepageID();
int c=3D0;
if(homepid>-1){
%>
- homepid:<%=3Dhomepid%> <br/>
+ <tr><td></td><td colspan=3D"2">homepid:<%=3Dhomepid%></td></tr>
<%
} else {
%>
- <%=3DgetRessource("ldap.group.nohomepage",locale)%><br/><br/>
-
-
+ <tr><td></td><td colspan=3D"2"><%=3DgetRessource("ldap.group.nohomepag=
e",locale)%><br/><br/></td></tr>
=
- <%=3DgetRessource("ldap.group.membership",locale)%>:<br/>
-
- <%
=
=
=
=
+ <%
+ }
+ StringBuffer bf=3Dnew StringBuffer();
+TreeSet members=3DgetMembers(groupdetail,logger);
+Iterator membersit=3Dmembers.iterator();
+ if(members.size()>0){
+ %>
+ <tr><td></td><td colspan=3D"2"><%=3DgetRessource("ldap.group.membershi=
p",locale)%>:<br/></td></tr>
=
- }
+ <%
=
=
- StringBuffer bf=3Dnew StringBuffer();
- Enumeration memberlist=3Dgroupdetail.members();
=
- if(memberlist!=3Dnull){
- while(memberlist.hasMoreElements()) {
- Object memberobject=3Dmemberlist.nextElement();
+ while(membersit.hasNext()) {
+ Object memberobject=3Dmembersit.next();
if(memberobject instanceof JahiaUser){
JahiaUser theuser=3D(JahiaUser) memberobject;
bf.append("<a href=3D\"javascript:openWindowDetail('").append(theuser.=
getUserKey()).append("','u')\">").append(theuser.getUsername()).append("</a=
><br/> ");
@@ -265,16 +361,14 @@
=
=
%>
- <%=3Dbf.toString()%><br/>
+ <tr><td></td><td colspan=3D"2"><%=3Dbf.toString()%><br/></td></tr>
<%
=
=
}
}
%>
-<%
=
-%>
</td></tr>
<tr><td colspan=3D"4">
<table border=3D"0" width=3D"100%">
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/mysettings.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/mysettings.jsp&rev=3D708&repname=3Dcorporate_portal_templat=
es_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/mysettings.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/mysettings.jsp Thu Jun 14 17:03:39=
2007
@@ -1,18 +1,20 @@
+<%@ page import=3D"org.jahia.engines.mysettings.MySettingsEngine" %>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
<%--
Copyright 2002-2006 Jahia Ltd
=
-Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L), =
-Version 1.0 (the "License"), or (at your option) any later version; you ma=
y =
-not use this file except in compliance with the License. You should have =
-received a copy of the License along with this program; if not, you may ob=
tain =
-a copy of the License at =
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
=
http://www.jahia.org/license/
=
-Unless required by applicable law or agreed to in writing, software =
-distributed under the License is distributed on an "AS IS" BASIS, =
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
-See the License for the specific language governing permissions and =
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
limitations under the License.
--%><%@ include file=3D"common/top_declarations.inc"%>
<jesi:template>
@@ -44,8 +46,128 @@
return propValue.isReadOnly();
}
}
+
+/**
+ * internal method to render engine bundle resources
+ * @return a string empty if resource is non existent
+ */
+ private String getEngineRessource(String label, Locale l) {
+ try {
+ return ResourceBundle.getBundle("JahiaEnginesResources", l).ge=
tString(label);
+ } catch (Exception e) {
+ return "";
+ }
+ }
+
+ /**
+ * internal method to render bundle resources
+ * @return a string empty if resource is non existent
+ */
+ private String getRessource(String label, Locale l) {
+ try {
+ return ResourceBundle.getBundle("jahiatemplates.Corporate_port=
al_templates_v2", l).getString(label);
+ } catch (Exception e) {
+ return "";
+ }
+ }
+%>
+<%
+Locale locale =3D (Locale) session.getAttribute(ParamBean.SESSION_LOCALE);
+String [] defaultkeys=3D{"firstname","lastname","organization","email"};
+String [] defaultRkeys=3D{"mySettingsFirstName","mySettingsLastName","mySe=
ttingsOrganization","mySettingsEmail"};
%>
+<style type=3D"text/css">
+/* ------------------------------------------------ */
+/* BUTTON STRUCT */
+/* ------------------------------------------------ */
+#wrapper .button {
+ display: inline;
+}
+
+#wrapper .button a:link,
+#wrapper .button a:visited,
+#wrapper .button div.clicked,
+#wrapper .button div.disabledButton {
+ text-decoration: none;
+ border: 1px solid;
+ font-size: 11px;
+ cursor: default;
+ font-style: normal;
+ padding: 5px 5px 5px 5px;
+ margin-left: 6px;
+ font-weight: bold;
+ height: 24px;
+ display: inline;
+}
+
+#wrapper .button a:link,
+#wrapper .button a:visited,
+#wrapper .button div.clicked {
+ color: black;
+ border-color: #D0D0D0 #555555 #555555 #D0D0D0;
+ background-image: url( <%=3Drequest.getContextPath()%>/jsp/jahia/css/b=
g_button_up.gif );
+}
+
+#wrapper .button div.disabledButton {
+ color: #a1a192;
+ background-color: #f5f4ea;
+ border-color: #a1a192 #a1a192 #a1a192 #a1a192;
+}
+
+#wrapper .button a:focus,
+#wrapper .button a:hover {
+ border-top: 1px solid;
+ border-right: 2px solid;
+ border-left: 1px solid;
+ border-bottom: 2px solid;
+ border-color: #D0D0D0 #555555 #555555 #D0D0D0;
+ cursor: default;
+ margin-left: 5px;
+ height: 24px;
+}
+
+#wrapper .button a:active {
+ background-image: url( <%=3Drequest.getContextPath()%>/jsp/jahia/css/b=
g_button_down.gif );
+ border: 1px solid;
+ border-color: #555555 #D0D0D0 #D0D0D0 #555555;
+ cursor: default;
+ margin-left: 6px;
+}
+
+
+</style>
+<script type=3D"text/javascript" language=3D"javascript">
+<!--
+var addprop=3Dfalse;
+
+//preloading icons
+adding =3D new Image();
+adding.src =3D "<%=3Drequest.getContextPath()%>/jsp/jahia/engines/images/a=
dding.png";
+deleting =3D new Image();
+deleting.src =3D "<%=3Drequest.getContextPath()%>/jsp/jahia/engines/images=
/deleting.png";
+
+//functions
+function keytoRemove(id){
+document.mainForm.keytoremove.value=3Did;
+document.mainForm.submit();
+}
+function showAdd(){
+var elm=3Ddocument.getElementById('personal');
+var elmvis=3Delm.style.visibility;
+var icon =3D document.getElementById('addingicon');
+if(elmvis=3D=3D"hidden") {
+elm.style.visibility=3D'visible';
+icon.src=3Ddeleting.src;
+} else {
+elm.style.visibility=3D'hidden';
+icon.src=3Dadding.src;
+document.getElementById("pkey").value=3D'';
+document.getElementById("pval").value=3D'';
+}
=
+}
+//-->
+</script>
<div class=3D"full2">
<h1><content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate=
_portal_templates_v2"
resourceName=3D"mySettings"/></h1>
@@ -89,41 +211,94 @@
<% } %>
=
<h2><content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo=
rate_portal_templates_v2"
- resourceName=3D"mySettingsProperties"/></h2>
+ resourceName=3D"mySettingsProperties"/>(default)</h2><br/>
<table>
+ <%
+ for(int i=3D0;i<defaultkeys.length;i++){
+ %>
<tr>
<td><content:resourceBundle resourceBundle=3D"jahiatemplates.Cor=
porate_portal_templates_v2"
- resourceName=3D"mySettingsFirstName"/> :</td>
- <td><input type=3D"text" <% if (isPropReadOnly(engineMap, "first=
name")) {
- %>disabled=3D"true"<%}%> name=3D'<%=3DMySettingsEngine.USER_PR=
OPERTY_PREFIX+"firstname"%>'
- value=3D'<%=3DgetUserProp(engineMap, "firstname")%>' /></td>
+ resourceName=3D"<%=3DdefaultRkeys[i]%>"/> :</td>
+ <td><input type=3D"text" <% if (isPropReadOnly(engineMap,default=
keys[i] )) {
+ %>disabled=3D"true"<%}%> name=3D'<%=3DMySettingsEngine.USER_PR=
OPERTY_PREFIX+defaultkeys[i]%>'
+ value=3D'<%=3DgetUserProp(engineMap, defaultkeys[i])%>' /></td>
</tr>
+ <%
+ }
+ %>
+
+ </table>
+
+
+ <%
+ JahiaUser u=3DjData.params().getUser();
+ StringBuffer sb=3Dnew StringBuffer();
+ int cp=3D0;
+ Iterator propit=3Du.getUserProperties().propertyNameIterat=
or();
+ logger.debug(u.getUserProperties());
+ while(propit.hasNext()){
+ String n=3D(String) propit.next();
+ //logger.debug("key=3D"+n+" "+u.getUserProperty(n).get=
Value());
+ if(n.startsWith(MySettingsEngine.USER_PROPERTY_PREFIX)=
){
+ sb.append("<tr><td>");
+ sb.append(n.substring(n.indexOf(MySettingsEngine.S=
EPARATOR)+1));
+ sb.append(" :</td><td><input type=3D\"text\"");
+ if (isPropReadOnly(engineMap,n )) {
+ sb.append(" disabled=3D\"true\"");
+ }
+ sb.append(" name=3D\"").append(n).append("\" value=
=3D\"").append(getUserProp(engineMap, n)).append("\"/> ");
+ sb.append("<a href=3D\"javascript:keytoRemove('").=
append(n).append("')\"><img src=3D\"").append(request.getContextPath());
+ sb.append("/jsp/jahia/engines/images/deleting.png\=
" width=3D\"16\" height=3D\"16\" border=3D\"0\" alt=3D\"");
+ sb.append(getRessource("mySettingsremoveProperty",=
locale));
+ sb.append("\"/></a></td></tr>");
+
+ cp++;
+ }
+ }
+ if(cp>0){
+ %>
+ <h2><content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo=
rate_portal_templates_v2"
+ resourceName=3D"mySettingsPersonalProperties"/></h2><br/>
+ <table>
+ <%=3Dsb.toString()%>
+ </table>
+ <%
+ }
+ %>
+
+ <h2><content:resourceBundle resourceBundle=3D"jahiatemplates.C=
orporate_portal_templates_v2"
+ resourceName=3D"mySettingsaddPersonalProperties"/></h2>
+ <br/><table><tr valign=3D"middle"><td><a href=3D"javascript:showAd=
d();"><img id=3D"addingicon" src=3D"<%=3Drequest.getContextPath()%>/jsp/jah=
ia/engines/images/adding.png" width=3D"16" height=3D"16" border=3D"0"/></a>=
</td><td>
+ <table id=3D"personal" style=3D"visibility:hidden;">
<tr>
<td><content:resourceBundle resourceBundle=3D"jahiatemplates.Cor=
porate_portal_templates_v2"
- resourceName=3D"mySettingsLastName"/> :</td>
- <td><input type=3D"text" <% if (isPropReadOnly(engineMap, "lastn=
ame")) {
- %>disabled=3D"true"<%}%> name=3D'<%=3DMySettingsEngine.USER_PR=
OPERTY_PREFIX+"lastname"%>'
- value=3D'<%=3DgetUserProp(engineMap, "lastname")%>' /></td>
- </tr>
- <tr>
+ resourceName=3D"mySettingsnewproplabel"/> :<input type=3D"text=
" id=3D"pkey" name=3D'<%=3DMySettingsEngine.USER_NEWPROPERTY_PREFIX%>'
+ value=3D'' /></td>
<td><content:resourceBundle resourceBundle=3D"jahiatemplates.Cor=
porate_portal_templates_v2"
- resourceName=3D"mySettingsOrganization"/> :</td>
- <td><input type=3D"text" <% if (isPropReadOnly(engineMap, "organ=
ization")) {
- %>disabled=3D"true"<%}%> name=3D'<%=3DMySettingsEngine.USER_PR=
OPERTY_PREFIX+"organization"%>'
- value=3D'<%=3DgetUserProp(engineMap, "organization")%>' /></td>
+ resourceName=3D"mySettingsnewpropvalue"/>:<input type=3D"text"=
id=3D"pval" name=3D'<%=3DMySettingsEngine.USER_NEWPROPERTYVALUE_PREFIX%>'
+ value=3D'' /></td>
</tr>
- <tr>
- <td><content:resourceBundle resourceBundle=3D"jahiatemplates.Cor=
porate_portal_templates_v2"
- resourceName=3D"mySettingsEmail"/> :</td>
- <td><input type=3D"text" <% if (isPropReadOnly(engineMap, "email=
")) {
- %>disabled=3D"true"<%}%> name=3D'<%=3DMySettingsEngine.USER_PR=
OPERTY_PREFIX+"email"%>'
- value=3D'<%=3DgetUserProp(engineMap, "email")%>' /></td>
- </tr>
- </table>
+
+<input type=3D"hidden" id=3D"keytoremove" name=3D"keytoremove" value=3D""/>
+
+
+
+
+
+
+
+ </table></td></tr></table>
=
<br>
- <input type=3D"submit" name=3D"submit" value=3D'<content:resourceB=
undle
- resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2=
" resourceName=3D"mySettingsSubmit"/>'/>
+ <div id=3D"buttons"><div class=3D"button">
+ <a href=3D"javascript:document.mainForm.submit();"
+ title=3D"<content:resourceBundle
+ resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2=
" resourceName=3D"mySettingsSubmit"/>"><content:resourceBundle
+ resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2=
" resourceName=3D"mySettingsSubmit"/></a>
+ </div>
+ </div>
+ <!--input type=3D"submit" name=3D"submit" value=3D'<content:resour=
ceBundle
+ resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2=
" resourceName=3D"mySettingsSubmit"/>'/-->
</form>
</div>
</jesi:fragment>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
