Author: dpillot
Date: Tue Aug 28 14:56:20 2007
New Revision: 771
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D771&repname=
=3Dcorporate_portal_templates_v2
Log:
TEMPLATES-269,TEMPLATES-268
cosmetics, text, typo
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_de.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_es.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_it.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_pt.properties
branches/JAHIA-5-0-SP-BRANCH/src/jsp/css/ldap.css
branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_search.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=3D771&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 Tue Aug 28 14:56:20 2007
@@ -356,7 +356,7 @@
ldap.group.origin=3Dfrom
ldap.grouplist =3D Group List
ldap.userlist =3D User List
-ldap.bygroups=3DBy groups
+ldap.bygroups=3Dby groups
ldap.input.index=3DIndex
ldap.input.query=3DEnter your query
ldap.input.searchindex=3DTo search by alphabetic index
@@ -368,7 +368,7 @@
ldap.results.title =3D Results List
ldap.results.next =3D Next Results
ldap.results.previous =3D Previous Results
-ldap.byusers =3D By users
+ldap.byusers =3D by users
ldap.user.name =3D User name
ldap.user.firstname =3D User firstname
ldap.user.organization =3D Organization
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_de.properties=
&rev=3D771&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_de.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_de.properties Tue Aug 28 14:56:20 2007
@@ -334,7 +334,7 @@
ldap.group.origin=3Dvon
ldap.grouplist =3D Gruppenliste
ldap.userlist =3D Benutzerliste
-ldap.bygroups=3DDurch Gruppen
+ldap.bygroups=3Ddurch Gruppen
ldap.input.index=3DIndex
ldap.input.query=3DGeben Sie Ihre Anfrage ein
ldap.input.searchindex=3DDen alphabetischen Index durchsuchen
@@ -346,7 +346,7 @@
ldap.results.title =3D Ergebnisliste
ldap.results.next =3D N=C3=A4chste Ergebnisse
ldap.results.previous =3D Vorausgehende Ergebnisse
-ldap.byusers =3D Durch Benutzer
+ldap.byusers =3D durch Benutzer
ldap.user.name =3D Benutzername
ldap.user.firstname =3D Vorname
ldap.user.organization =3D Organisation
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=3D771&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 Tue Aug 28 14:56:20 2007
@@ -344,7 +344,7 @@
ldap.group.origin=3Dfrom
ldap.grouplist=3DGroup List
ldap.userlist=3DUser List
-ldap.bygroups=3DBy groups
+ldap.bygroups=3Dby groups
ldap.input.index=3DIndex
ldap.input.query=3DEnter your query
ldap.input.searchindex=3DTo search by alphabetic index
@@ -356,7 +356,7 @@
ldap.results.title =3D Results List
ldap.results.next=3DNext Results
ldap.results.previous=3DPrevious Results
-ldap.byusers =3D By users
+ldap.byusers =3D by users
ldap.user.name=3DUser name
ldap.user.firstname =3D User firstname
ldap.user.organization=3DOrganization
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_es.properties=
&rev=3D771&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_es.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_es.properties Tue Aug 28 14:56:20 2007
@@ -334,7 +334,7 @@
ldap.group.origin=3Dde
ldap.grouplist =3D Lista de grupos
ldap.userlist =3D Lista de usuarios
-ldap.bygroups=3DPor grupos
+ldap.bygroups=3Dpor grupos
ldap.input.index=3D=C3=8Dndice
ldap.input.query=3DEscriba su consulta
ldap.input.searchindex=3DBuscar por =C3=ADndice alfab=C3=A9tico
@@ -346,7 +346,7 @@
ldap.results.title =3D Lista de resultados
ldap.results.next =3D Resultados siguientes
ldap.results.previous =3D Resultados anteriores
-ldap.byusers =3D Por usuarios
+ldap.byusers =3D por usuarios
ldap.user.name =3D Nombre de usuario
ldap.user.firstname =3D Nombre del usuario
ldap.user.organization =3D Organizaci=C3=B3n
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=3D771&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 Tue Aug 28 14:56:20 2007
@@ -237,8 +237,8 @@
layout2 =3D Boite color=C3=A9e
layout3 =3D Boite pleine
ldap.allfound=3D{0} {2} trouv=C3=A9s
-ldap.bygroups=3DPar groupe
-ldap.byusers =3D Par utilisateur
+ldap.bygroups=3Dpar groupe
+ldap.byusers =3D par utilisateur
ldap.criteria.hide=3DPour masquer les crit=C3=A8res avanc=C3=A9s
ldap.criteria.show=3Dpour afficher les crit=C3=A8res avanc=C3=A9s
ldap.gosearch=3DRechercher
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_it.properties=
&rev=3D771&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_it.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_it.properties Tue Aug 28 14:56:20 2007
@@ -334,7 +334,7 @@
ldap.group.origin=3Dda
ldap.grouplist =3D Elenco gruppi
ldap.userlist =3D Elenco utenti
-ldap.bygroups=3DPer gruppi
+ldap.bygroups=3Dper gruppi
ldap.input.index=3DIndice
ldap.input.query=3DImmettere la query
ldap.input.searchindex=3DPer cercare in ordine alfabetico
@@ -346,7 +346,7 @@
ldap.results.title =3D Elenco dei risultati
ldap.results.next =3D Risultati successivi
ldap.results.previous =3D Risultati precedenti
-ldap.byusers =3D Da parte degli utenti
+ldap.byusers =3D da parte degli utenti
ldap.user.name =3D Nome utente
ldap.user.firstname =3D Nome utente
ldap.user.organization =3D Organizzazione
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_pt.properties=
&rev=3D771&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_pt.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_pt.properties Tue Aug 28 14:56:20 2007
@@ -334,7 +334,7 @@
ldap.group.origin=3Dde
ldap.grouplist =3D Lista de grupos
ldap.userlist =3D Lista de usu=C3=A1rios
-ldap.bygroups=3DPor grupos
+ldap.bygroups=3Dpor grupos
ldap.input.index=3D=C3=8Dndice
ldap.input.query=3DInsira sua consulta
ldap.input.searchindex=3DPara pesquisar por =C3=ADndice alfab=C3=A9tico
@@ -346,7 +346,7 @@
ldap.results.title =3D Lista de Resultados
ldap.results.next =3D Pr=C3=B3ximos Resultados
ldap.results.previous =3D Resultados Anteriores
-ldap.byusers =3D Por usu=C3=A1rios
+ldap.byusers =3D por usu=C3=A1rios
ldap.user.name =3D Nome do usu=C3=A1rio
ldap.user.firstname =3D Nome do usu=C3=A1rio
ldap.user.organization =3D Organiza=C3=A7=C3=A3o
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/css/ldap.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/css/ldap.css&rev=3D771&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/css/ldap.css (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/css/ldap.css Tue Aug 28 14:56:20 2=
007
@@ -12,23 +12,23 @@
}
=
.switchcontent1 {
-
- margin: 3px;
+ /*border:2px solid red;*/
+ /*margin: 3px;*/
width: 100%;
- height: 90px;
+ height: 120px;
font-size: 12px;
font-family: Arial, sans-serif;
text-align: center;
margin-bottom: 4px;
- padding: 2px 2px;
+ /*padding: 2px 2px;*/
=
}
=
.floatleft1 {
float: left;
- width: 98px !important;
-
- height: 100px;
+ width: 120px !important;
+ padding:4px;
+ height: 120px;
text-align: center;
background-color: #eee;
border: 1px solid #CCC;
@@ -36,9 +36,9 @@
=
.floatleft2 {
float: left;
- width: 370px !important;
-
- height: 100px;
+ width: 340px !important;
+ padding:4px;
+ height: 120px;
text-align: center;
background-color: #eee;
border: 1px solid #CCC;
@@ -46,9 +46,9 @@
=
.floatleft3 {
float: left;
- width: 200px !important;
-
- height: 100px;
+ width: 210px !important;
+ padding:4px;
+ height: 120px;
text-align: center;
background-color: #eee;
border: 1px solid #CCC;
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_search.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/ldap_search.jsp&rev=3D771&repname=3Dcorporate_portal_templa=
tes_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_search.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_search.jsp Tue Aug 28 14:56:2=
0 2007
@@ -276,14 +276,14 @@
=
StringBuffer sb =3D new StringBuffer();
if (select.equalsIgnoreCase("u")) {
- sb.append("<br/>").append(getRessource("ldap.gosearch", loc)).appe=
nd(" ").append(getRessource("ldap.byusers", loc));
+ sb.append("<br/><a href=3D\"javascript:switchUser();\">").append(g=
etRessource("ldap.gosearch", loc)).append(" ").append(getRessource("ldap.by=
groups", loc)).append("</a>");
sb.append("<br/><img id=3D\"ugview\" src=3D\"").append(contextURL);
sb.append("/img/ldap/users0.gif\" width=3D\"48\" height=3D\"24\" a=
lign=3D\"middle\" onMouseOver=3D\"this.src =3D '");
sb.append(contextURL).append("/img/ldap/users1.gif'\" onMouseOut=
=3D\"this.src=3D'").append(contextURL).append("/img/ldap/users0.gif'\" onCl=
ick=3D\"switchGroup();\" alt=3D\"").append(getRessource("ldap.gosearch", lo=
c)).append(" ").append(getRessource("ldap.groups", loc)).append("\" title=
=3D\"").append(getRessource("ldap.gosearch", loc)).append(" ").append(getRe=
ssource("ldap.groups", loc)).append("\"><br>");
=
=
} else {
- sb.append("<br/>").append(getRessource("ldap.gosearch", loc)).appe=
nd(" ").append(getRessource("ldap.bygroups", loc));
+ sb.append("<br/><a href=3D\"javascript:switchUser();\">").append(g=
etRessource("ldap.gosearch", loc)).append(" ").append(getRessource("ldap.by=
users", loc)).append("</a>");
sb.append("<br><img id=3D\"ugview\" src=3D\"").append(contextURL);
sb.append("/img/ldap/groups0.gif\" width=3D\"48\" height=3D\"24\" =
align=3D\"middle\" onMouseOver=3D\"this.src =3D '");
sb.append(contextURL).append("/img/ldap/groups1.gif'\" onMouseOut=
=3D\"this.src=3D'").append(contextURL).append("/img/ldap/groups0.gif'\" onC=
lick=3D\"switchUser();\" alt=3D\"").append(getRessource("ldap.gosearch", lo=
c)).append(" ").append(getRessource("ldap.users", loc)).append("\" title=3D=
\"").append(getRessource("ldap.gosearch", loc)).append(" ").append(getResso=
urce("ldap.users", loc)).append("\"><br>");
@@ -594,7 +594,7 @@
=
</div>
=
- <div class=3D"floatleft3">
+ <div class=3D"floatleft3"><br/>
<%=3Ddropdown%>
=
</div>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
