Skip to content

Commit 6af887e

Browse files
NicolasEYSSERICNicolasEYSSERIC
committed
Merge pull request #22 from auroreallibe/9920d51e6f97aa115aa89462c1dc8aad3f21cf0b
Fixing bug #1942
2 parents 8cfe104 + 9920d51 commit 6af887e

File tree

3 files changed

+76
-41
lines changed

3 files changed

+76
-41
lines changed

‎whitepages/whitepages-war/src/main/webapp/whitePages/jsp/consultCard.jsp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,10 @@
104104
<view:setBundle basename="com.stratelia.webactiv.multilang.generalMultilang" var="GML" />
105105
<c:set var="browseContext" value="${requestScope.browseContext}" />
106106

107-
<HTML>
108-
<HEAD>
109-
<TITLE><%=resource.getString("GML.popupTitle")%></TITLE>
107+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
108+
<html xmlns="http://www.w3.org/1999/xhtml">
109+
<head>
110+
<title><%=resource.getString("GML.popupTitle")%></title>
110111
<%
111112
out.println(gef.getLookStyleSheet());
112113
%>
@@ -218,8 +219,8 @@ function openSPWindow(fonction,windowName){
218219
219220
});
220221
</script>
221-
</HEAD>
222-
<BODY id="whitePagesSheet">
222+
</head>
223+
<body id="whitePagesSheet">
223224
<%
224225
out.println(window.printBefore());
225226
out.println(frame.printBefore());
@@ -394,7 +395,7 @@ if (userFull != null) {
394395
</div>
395396

396397
<div class="divSee" id="sheetExpert">
397-
<form name="myForm" method="POST" action="<%=routerUrl%>effectiveCreate">
398+
<form name="myForm" method="post" action="<%=routerUrl%>effectiveCreate">
398399
<%
399400
viewForm.display(out, context, data);
400401
%>
@@ -412,9 +413,9 @@ out.println(frame.printAfter());
412413
out.println(window.printAfter());
413414
%>
414415

415-
<FORM NAME="choixFiche" METHOD="POST">
416-
<input type="hidden" name="userCardId">
417-
</FORM>
416+
<form name="choixFiche" method="post">
417+
<input type="hidden" name="userCardId" />
418+
</form>
418419
<!-- Dialog to notify a user -->
419420
<div id="directoryDialog">
420421
<view:board>
@@ -455,5 +456,5 @@ out.println(window.printAfter());
455456
</div>
456457
</div>
457458
<view:progressMessage/>
458-
</BODY>
459-
</HTML>
459+
</body>
460+
</html>

‎whitepages/whitepages-war/src/main/webapp/whitePages/jsp/dynamicSearch.jsp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@
4747
<view:setBundle basename="com.stratelia.webactiv.multilang.generalMultilang" var="GML" />
4848
<c:set var="browseContext" value="${requestScope.browseContext}" />
4949

50-
<HTML>
51-
<HEAD>
52-
<TITLE><%=resource.getString("GML.popupTitle")%></TITLE>
50+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
51+
<html xmlns="http://www.w3.org/1999/xhtml">
52+
<head>
53+
<title><%=resource.getString("GML.popupTitle")%></title>
5354
<%
5455
out.println(gef.getLookStyleSheet());
5556
%>
@@ -203,8 +204,8 @@ $(document).ready(function(){
203204
204205
});
205206
</script>
206-
</HEAD>
207-
<BODY id="whitePages">
207+
</head>
208+
<body id="whitePages">
208209
<%
209210
List cards = (List)request.getAttribute("cards");
210211
@@ -243,13 +244,13 @@ String queryValue = request.getAttribute("query") != null ? (String)request.get
243244
if(!main){
244245
// no form search in Main
245246
%>
246-
<br><fmt:message key="whitePages.op.searchCard" bundle="${LML}"/><br>
247+
<br/><fmt:message key="whitePages.op.searchCard" bundle="${LML}"/><br/>
247248
<div class="zoneNavAndSearch">
248249
<div id="search">
249-
<FORM id="searchform" name="searchform" method="POST" action="<%=routerUrl + "getSearchResult"%>" >
250+
<form id="searchform" name="searchform" method="post" action="<%=routerUrl + "getSearchResult"%>" >
250251
<div>
251252
<label class="txtlibform" for="query"><fmt:message key="whitePages.keywords" bundle="${LML}"/></label>
252-
<input type="text" id="query" value="<%=queryValue%>" size="60" name="query" class="ac_input champTexte">
253+
<input type="text" id="query" value="<%=queryValue%>" size="60" name="query" class="ac_input champTexte"/>
253254
<p class="txtexform"><fmt:message key="whitePages.keywordssample" bundle="${LML}"/></p>
254255
</div>
255256
<%
@@ -319,7 +320,7 @@ if (searchFields != null && !searchFields.isEmpty()) {
319320
</tr></tbody>
320321
</table>
321322
</div>
322-
</FORM>
323+
</form>
323324
</div>
324325
</div>
325326
<%
@@ -440,5 +441,5 @@ if(cards != null && cards.size() > 0){
440441
</div>
441442
</div>
442443
<view:progressMessage/>
443-
</BODY>
444-
</HTML>
444+
</body>
445+
</html>

‎whitepages/whitepages-war/src/main/webapp/whitePages/jsp/styleSheets/whitePages.css

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -169,18 +169,15 @@
169169
}
170170

171171
.listinUsers .link {
172-
color:#333366;
173-
border-bottom:1px solid #9E9ECF;
174-
display:block;
175-
padding:5px 0 3px 0;
176-
font-size:11px;
172+
border-bottom: 1px solid #9E9ECF;
173+
color: #333366;
174+
display: block;
175+
font-size: 11px;
176+
padding: 0 0 3px;
177177
}
178178
.listinUsers .link:hover, #directory .link:focus {
179179
color:#000;
180-
border-bottom:1px solid #000;
181-
display:block;
182-
padding:5px 0 3px 0;
183-
font-size:11px;
180+
border-color:1px solid #000;
184181
}
185182

186183
.listinUsers .action .invitation {
@@ -212,8 +209,13 @@
212209
right:10px;
213210
}
214211

212+
.userProfil .statut img {
213+
position: absolute;
214+
right: 33px;
215+
top: 12px;
216+
}
217+
215218
.userProfil .statut {
216-
background:transparent url(images_annuaire/sep-2-tiraits.gif) 50% top no-repeat;
217219
color:#333333; font-size:10px;
218220
padding:10px 0 0;
219221
margin:0;
@@ -224,12 +226,19 @@
224226
}
225227

226228
.userProfil {
227-
float: left;
229+
float: left;
230+
padding: 8px;
228231
position: relative;
229-
width: 20%;
232+
width: 180px;
230233
}
231234

232-
235+
.userProfil .userName {
236+
color: #000000;
237+
font-size: 14px;
238+
font-weight: bold;
239+
margin: 0;
240+
padding: 0;
241+
}
233242
.userProfil address { font-style:normal;}
234243

235244
.userProfil .action {
@@ -252,13 +261,17 @@
252261
}
253262

254263
.sheet {
255-
width:78%;
256-
margin-left:15px;
257-
float:left;
264+
margin-left: 210px;
258265
}
266+
.sheet .divSee {
267+
float:left;
268+
width:100%;
269+
margin-bottom: 10px;}
270+
259271
.sheet address { font-style:normal;}
260272

261273

274+
262275
/*- [ whitePages BEGIN ] --------------------------- */
263276

264277
/*- Zone de recherche --------- */
@@ -407,11 +420,31 @@
407420
width:62px;
408421
}
409422

410-
.profilPhoto img{
411-
height:80px;
412-
width:62px;
423+
.profilPhoto {
424+
border: 1px solid #CCCCCC;
425+
overflow: hidden;
413426
}
414427

428+
#whitePagesSheet .profilPhoto {
429+
height: auto;
430+
margin: 7px 6px;
431+
width: 108px;
432+
}
433+
434+
#whitePagesSheet .profilPhoto img{
435+
width:108px;
436+
}
437+
438+
439+
html > body #whitePagesSheet .profilPhoto img{
440+
max-height: 140px;
441+
max-width:108px;
442+
height:auto;
443+
width:auto;
444+
}
445+
446+
447+
415448
#whitePages .listinUsers .profilPhoto img {
416449
height:80px;
417450
}

0 commit comments

Comments
 (0)