From lkaufmann@users.forge.codelutin.com Fri May 16 15:31:05 2014
From: lkaufmann@users.forge.codelutin.com
To: wao-commits@list.forge.codelutin.com
Subject:
 [Wao-commits] r1950 -	trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
Date: Fri, 16 May 2014 15:31:04 +0200
Message-ID: <20140516133104.F40D9181DA8@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5778791226768778366=="

--===============5778791226768778366==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: lkaufmann
Date: 2014-05-16 15:31:04 +0200 (Fri, 16 May 2014)
New Revision: 1950

Url: http://forge.codelutin.com/projects/wao/repository/revisions/1950

Log:
Refs #4997 Contact edit screen layout update & add sticky button to contacts =
screen

Modified:
   trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp
   trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp

Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp	2014-05=
-16 13:29:12 UTC (rev 1949)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp	2014-05=
-16 13:31:04 UTC (rev 1950)
@@ -303,18 +303,21 @@
=20
 <s:set var=3D"fullView" value=3D"%{fullView}"/>
=20
-<button type=3D"button" id=3D"switch-compact-full-view" class=3D"btn <s:if t=
est=3D"fullView">full-view</s:if><s:else>compact-view</s:else>">
-    <span class=3D"only-in-compact-view">
-        <i class=3D"icon-resize-full"></i> <s:text name=3D"wao.ui.action.swi=
tchToFullView"/>
-    </span>
-    <span class=3D"only-in-full-view">
-        <i class=3D"icon-resize-small"></i> <s:text name=3D"wao.ui.action.sw=
itchToCompactView"/>
-    </span>
-</button>
+<div class=3D"sticky-buttons">
+    <button type=3D"button" id=3D"switch-compact-full-view" class=3D"btn <s:=
if test=3D"fullView">full-view</s:if><s:else>compact-view</s:else>">
+        <span class=3D"only-in-compact-view">
+            <i class=3D"fa fa-expand"></i><span class=3D"only-on-hover"> <s:=
text name=3D"wao.ui.action.switchToFullView" /></span>
+        </span>
+        <span class=3D"only-in-full-view">
+            <i class=3D"fa fa-compress"></i><span class=3D"only-on-hover"> <=
s:text name=3D"wao.ui.action.switchToCompactView" /></span>
+        </span>
+    </button>
+</div>
=20
+
 <s:property value=3D"#pagination" escapeHtml=3D"false"/>
=20
-<table id=3D"contacts-list" class=3D"contacts-list large-table <s:if test=3D=
"fullView">full-view</s:if><s:else>compact-view</s:else>">
+<table id=3D"contacts-list" class=3D"contacts-list large-table table-striped=
 <s:if test=3D"fullView">full-view</s:if><s:else>compact-view</s:else>">
     <thead>
         <tr>
             <th><s:text name=3D"wao.ui.field.Contact.creationDate"/></th>

Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-i=
nput.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.j=
sp	2014-05-16 13:29:12 UTC (rev 1949)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.j=
sp	2014-05-16 13:31:04 UTC (rev 1950)
@@ -67,263 +67,265 @@
         });
=20
     </script>
+    <content tag=3D"mainClass">form</content>
 </head>
=20
-<h1>
-    <s:if test=3D"updateContactCommand.creation">
-        <s:text name=3D"wao.ui.contact.creation"/>
-    </s:if>
-    <s:else>
-        <s:text name=3D"wao.ui.contact.edition"/>
-    </s:else>
-</h1>
+    <div class=3D"form-wrapper">
+        <h1>
+            <s:if test=3D"updateContactCommand.creation">
+                <s:text name=3D"wao.ui.contact.creation"/>
+            </s:if>
+            <s:else>
+                <s:text name=3D"wao.ui.contact.edition"/>
+            </s:else>
+        </h1>
=20
-<aside class=3D"well">
+        <aside class=3D"well">
=20
-    <h2><s:text name=3D"wao.ui.misc.information"/></h2>
+            <h2><s:text name=3D"wao.ui.misc.information"/></h2>
=20
-    <s:text name=3D"wao.ui.form.Contact.contactCreatedOn">
-        <s:param value=3D"%{formatDate(updateContactCommand.contact.creation=
Date)}"/>
-    </s:text>
+            <s:text name=3D"wao.ui.form.Contact.contactCreatedOn">
+                <s:param value=3D"%{formatDate(updateContactCommand.contact.=
creationDate)}"/>
+            </s:text>
=20
-    <h3><s:text name=3D"wao.ui.field.Contact.boat"/></h3>
+            <h3><s:text name=3D"wao.ui.field.Contact.boat"/></h3>
=20
-    <table class=3D"table">
-        <tbody>
-            <tr>
-                <th>
-                    <s:text name=3D"wao.ui.field.Boat.name"/>
-                </th>
-                <td>
-                    <s:property value=3D"updateContactCommand.contact.boat.n=
ame"/>
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    <s:text name=3D"wao.ui.field.Boat.immatriculation"/>
-                </th>
-                <td>
-                    <s:property value=3D"updateContactCommand.contact.boat.i=
mmatriculation"/>
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    <s:text name=3D"wao.ui.field.Boat.districtCode"/>
-                </th>
-                <td>
-                    <s:property value=3D"updateContactCommand.contact.boat.d=
istrictCode"/>
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    <s:text name=3D"wao.ui.field.Boat.boatLength"/>
-                </th>
-                <td>
-                    <s:property value=3D"%{'' + updateContactCommand.contact=
.boat.boatLength}"/>
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    <s:text name=3D"wao.ui.field.Boat.buildYear"/>
-                </th>
-                <td>
-                    <s:property value=3D"%{'' + updateContactCommand.contact=
.boat.buildYear}"/>
-                </td>
-            </tr>
-        </tbody>
-    </table>
+            <table class=3D"table">
+                <tbody>
+                    <tr>
+                        <th>
+                            <s:text name=3D"wao.ui.field.Boat.name"/>
+                        </th>
+                        <td>
+                            <s:property value=3D"updateContactCommand.contac=
t.boat.name"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>
+                            <s:text name=3D"wao.ui.field.Boat.immatriculatio=
n"/>
+                        </th>
+                        <td>
+                            <s:property value=3D"updateContactCommand.contac=
t.boat.immatriculation"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>
+                            <s:text name=3D"wao.ui.field.Boat.districtCode"/>
+                        </th>
+                        <td>
+                            <s:property value=3D"updateContactCommand.contac=
t.boat.districtCode"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>
+                            <s:text name=3D"wao.ui.field.Boat.boatLength"/>
+                        </th>
+                        <td>
+                            <s:property value=3D"%{'' + updateContactCommand=
.contact.boat.boatLength}"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>
+                            <s:text name=3D"wao.ui.field.Boat.buildYear"/>
+                        </th>
+                        <td>
+                            <s:property value=3D"%{'' + updateContactCommand=
.contact.boat.buildYear}"/>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
=20
-    <h3><s:text name=3D"wao.ui.field.Contact.sampleRow"/></h3>
+            <h3><s:text name=3D"wao.ui.field.Contact.sampleRow"/></h3>
=20
-    <table class=3D"table">
-        <tbody>
-            <tr>
-                <th>
-                    <s:text name=3D"wao.ui.field.SampleRow.profession"/>
-                </th>
-                <td>
-                    <s:property value=3D"updateContactCommand.contact.sample=
Row.professionDescription"/>
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    <s:text name=3D"wao.ui.field.SampleRow.programName"/>
-                </th>
-                <td>
-                    <s:property value=3D"updateContactCommand.contact.sample=
Row.programName"/>
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    <s:text name=3D"wao.ui.field.SampleRow.periodBegin"/>
-                </th>
-                <td>
-                    <s:property value=3D"%{formatMonth(updateContactCommand.=
contact.sampleRow.periodBegin)}"/>
-                </td>
-            </tr>
-            <tr>
-                <th>
-                    <s:text name=3D"wao.ui.field.SampleRow.periodEnd"/>
-                </th>
-                <td>
-                    <s:property value=3D"%{formatMonth(updateContactCommand.=
contact.sampleRow.periodEnd)}"/>
-                </td>
-            </tr>
-        </tbody>
-    </table>
+            <table class=3D"table">
+                <tbody>
+                    <tr>
+                        <th>
+                            <s:text name=3D"wao.ui.field.SampleRow.professio=
n"/>
+                        </th>
+                        <td>
+                            <s:property value=3D"updateContactCommand.contac=
t.sampleRow.professionDescription"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>
+                            <s:text name=3D"wao.ui.field.SampleRow.programNa=
me"/>
+                        </th>
+                        <td>
+                            <s:property value=3D"updateContactCommand.contac=
t.sampleRow.programName"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>
+                            <s:text name=3D"wao.ui.field.SampleRow.periodBeg=
in"/>
+                        </th>
+                        <td>
+                            <s:property value=3D"%{formatMonth(updateContact=
Command.contact.sampleRow.periodBegin)}"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>
+                            <s:text name=3D"wao.ui.field.SampleRow.periodEnd=
"/>
+                        </th>
+                        <td>
+                            <s:property value=3D"%{formatMonth(updateContact=
Command.contact.sampleRow.periodEnd)}"/>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
=20
-</aside>
+        </aside>
=20
-<s:form>
+        <s:form>
=20
-    <s:hidden name=3D"contactId" value=3D"%{contactId}"/>
+            <s:hidden name=3D"contactId" value=3D"%{contactId}"/>
=20
-    <fieldset>
-        <legend><s:text name=3D"wao.ui.misc.observers"/></legend>
+            <fieldset>
+                <legend><s:text name=3D"wao.ui.misc.observers"/></legend>
=20
-        <s:set name=3D"editObservers"
-               value=3D"%{authenticatedWaoUser.isAuthorizedToEditContactObse=
rvers(updateContactCommand.contact)}"/>
+                <s:set name=3D"editObservers"
+                       value=3D"%{authenticatedWaoUser.isAuthorizedToEditCon=
tactObservers(updateContactCommand.contact)}"/>
=20
-        <s:select name=3D"updateContactCommand.contact.mainObserver.topiaId"
-                  label=3D"%{getText('wao.ui.field.Contact.mainObserver')}"
-                  list=3D"observers"
-                  emptyOption=3D"true"
-                  disabled=3D"%{!#editObservers}"
-                  cssClass=3D"select2 input-large"
-                  />
+                <s:select name=3D"updateContactCommand.contact.mainObserver.=
topiaId"
+                          label=3D"%{getText('wao.ui.field.Contact.mainObser=
ver')}"
+                          list=3D"observers"
+                          emptyOption=3D"true"
+                          disabled=3D"%{!#editObservers}"
+                          cssClass=3D"select2 input-large"
+                          />
=20
-        <s:if test=3D"authenticatedWaoUser.isAuthorizedToDisplayContactSecon=
daryObservers(updateContactCommand.contact)">
-            <s:select name=3D"updateContactCommand.contact.secondaryObserver=
s"
-                      value=3D"%{updateContactCommand.contact.secondaryObser=
versTopiaIds}"
-                      label=3D"%{getText('wao.ui.field.Contact.secondaryObse=
rvers')}"
-                      list=3D"observers"
-                      multiple=3D"true"
-                      disabled=3D"%{!#editObservers}"
-                      cssClass=3D"select2 input-xlarge"
-                      />
-        </s:if>
+                <s:if test=3D"authenticatedWaoUser.isAuthorizedToDisplayCont=
actSecondaryObservers(updateContactCommand.contact)">
+                    <s:select name=3D"updateContactCommand.contact.secondary=
Observers"
+                              value=3D"%{updateContactCommand.contact.second=
aryObserversTopiaIds}"
+                              label=3D"%{getText('wao.ui.field.Contact.secon=
daryObservers')}"
+                              list=3D"observers"
+                              multiple=3D"true"
+                              disabled=3D"%{!#editObservers}"
+                              cssClass=3D"select2 input-xlarge"
+                              />
+                </s:if>
=20
-    </fieldset>
+            </fieldset>
=20
-    <%--Do not remove the id (use by contacts page)--%>
-    <fieldset id=3D"coordinatorOrObserverFocus">
-        <legend><s:text name=3D"wao.ui.misc.observationReport"/></legend>
+            <%--Do not remove the id (use by contacts page)--%>
+            <fieldset id=3D"coordinatorOrObserverFocus">
+                <legend><s:text name=3D"wao.ui.misc.observationReport"/></le=
gend>
=20
-        <s:set name=3D"editObservationReport"
-               value=3D"%{authenticatedWaoUser.isAuthorizedToEditObservation=
Report(updateContactCommand.contact)}"/>
+                <s:set name=3D"editObservationReport"
+                       value=3D"%{authenticatedWaoUser.isAuthorizedToEditObs=
ervationReport(updateContactCommand.contact)}"/>
=20
-        <s:textfield name=3D"updateContactCommand.contact.observationBeginDa=
te"
-                     label=3D"%{getText('wao.ui.field.Contact.beginDate')}"
-                     placeholder=3D"%{getDateTimePlaceholder()}"
-                     disabled=3D"%{!#editObservationReport}"/>
+                <s:textfield name=3D"updateContactCommand.contact.observatio=
nBeginDate"
+                             label=3D"%{getText('wao.ui.field.Contact.beginD=
ate')}"
+                             placeholder=3D"%{getDateTimePlaceholder()}"
+                             disabled=3D"%{!#editObservationReport}"/>
=20
-        <s:textfield name=3D"updateContactCommand.contact.observationEndDate"
-                     label=3D"%{getText('wao.ui.field.Contact.endDate')}"
-                     placeholder=3D"%{getDateTimePlaceholder()}"
-                     disabled=3D"%{!#editObservationReport}"/>
+                <s:textfield name=3D"updateContactCommand.contact.observatio=
nEndDate"
+                             label=3D"%{getText('wao.ui.field.Contact.endDat=
e')}"
+                             placeholder=3D"%{getDateTimePlaceholder()}"
+                             disabled=3D"%{!#editObservationReport}"/>
=20
-        <s:select name=3D"updateContactCommand.contact.contactState"
-                  label=3D"%{getText('wao.ui.field.Contact.contactState')}"
-                  requiredLabel=3D"true"
-                  list=3D"contactStates"
-                  disabled=3D"%{!#editObservationReport}"/>
+                <s:select name=3D"updateContactCommand.contact.contactState"
+                          label=3D"%{getText('wao.ui.field.Contact.contactSt=
ate')}"
+                          requiredLabel=3D"true"
+                          list=3D"contactStates"
+                          disabled=3D"%{!#editObservationReport}"/>
=20
-        <div id=3D"contactStateMotif">
-            <s:select name=3D"updateContactCommand.contact.contactStateMotif"
-                      value=3D"%{updateContactCommand.contact.contactState.t=
opiaId}"
-                      label=3D"%{getText('wao.ui.field.Contact.contactStateM=
otif')}"
-                      list=3D"contactStateMotives"
-                      emptyOption=3D"true"
-                      disabled=3D"%{!#editObservationReport}"/>
-        </div>
+                <div id=3D"contactStateMotif">
+                    <s:select name=3D"updateContactCommand.contact.contactSt=
ateMotif"
+                              value=3D"%{updateContactCommand.contact.contac=
tState.topiaId}"
+                              label=3D"%{getText('wao.ui.field.Contact.conta=
ctStateMotif')}"
+                              list=3D"contactStateMotives"
+                              emptyOption=3D"true"
+                              disabled=3D"%{!#editObservationReport}"/>
+                </div>
=20
-        <s:checkbox name=3D"updateContactCommand.contact.mammalsObservation"
-                    label=3D"%{getText('wao.ui.field.Contact.mammalsObservat=
ion')}"
-                    disabled=3D"%{!#editObservationReport}"/>
+                <s:checkbox name=3D"updateContactCommand.contact.mammalsObse=
rvation"
+                            label=3D"%{getText('wao.ui.field.Contact.mammals=
Observation')}"
+                            disabled=3D"%{!#editObservationReport}"/>
=20
-        <s:checkbox name=3D"updateContactCommand.contact.mammalsCapture"
-                    id=3D"mammalsCaptureCheckbox"
-                    label=3D"%{getText('wao.ui.field.Contact.mammalsCapture'=
)}"
-                    disabled=3D"%{!#editObservationReport}"/>
+                <s:checkbox name=3D"updateContactCommand.contact.mammalsCapt=
ure"
+                            id=3D"mammalsCaptureCheckbox"
+                            label=3D"%{getText('wao.ui.field.Contact.mammals=
Capture')}"
+                            disabled=3D"%{!#editObservationReport}"/>
=20
-        <div id=3D"mammalsInfo">
-            <s:textarea name=3D"updateContactCommand.contact.mammalsInfo"
-                        label=3D"%{getText('wao.ui.field.Contact.mammalsInfo=
')}"
-                        disabled=3D"%{!#editObservationReport}"/>
-            <div class=3D"alert">
-                <s:text name=3D"wao.ui.page.ContactForm.mammalsInfo.disclaim=
er"/>
-            </div>
-        </div>
+                <div id=3D"mammalsInfo">
+                    <s:textarea name=3D"updateContactCommand.contact.mammals=
Info"
+                                label=3D"%{getText('wao.ui.field.Contact.mam=
malsInfo')}"
+                                disabled=3D"%{!#editObservationReport}"/>
+                    <div class=3D"alert">
+                        <s:text name=3D"wao.ui.page.ContactForm.mammalsInfo.=
disclaimer"/>
+                    </div>
+                </div>
=20
-        <s:textfield name=3D"updateContactCommand.contact.dataInputDate"
-                     label=3D"%{getText('wao.ui.field.Contact.dataInputDate'=
)}"
-                     placeholder=3D"%{getDatePlaceholder()}"
-                     disabled=3D"%{!#editObservationReport}"/>
+                <s:textfield name=3D"updateContactCommand.contact.dataInputD=
ate"
+                             label=3D"%{getText('wao.ui.field.Contact.dataIn=
putDate')}"
+                             placeholder=3D"%{getDatePlaceholder()}"
+                             disabled=3D"%{!#editObservationReport}"/>
=20
-        <s:select name=3D"updateContactCommand.contact.observedDataControl"
-                  label=3D"%{getText('wao.ui.field.Contact.observedDataContr=
ol')}"
-                  list=3D"observedDataControls"
-                  emptyOption=3D"true"
-                  disabled=3D"%{!#editObservationReport || !authenticatedWao=
User.coordinator}"/>
+                <s:select name=3D"updateContactCommand.contact.observedDataC=
ontrol"
+                          label=3D"%{getText('wao.ui.field.Contact.observedD=
ataControl')}"
+                          list=3D"observedDataControls"
+                          emptyOption=3D"true"
+                          disabled=3D"%{!#editObservationReport || !authenti=
catedWaoUser.coordinator}"/>
=20
-        <s:textfield name=3D"updateContactCommand.contact.restitution"
-                     label=3D"%{getText('wao.ui.field.Contact.restitution')}"
-                     placeholder=3D"%{getDatePlaceholder()}"
-                     disabled=3D"%{!#editObservationReport}"/>
+                <s:textfield name=3D"updateContactCommand.contact.restitutio=
n"
+                             label=3D"%{getText('wao.ui.field.Contact.restit=
ution')}"
+                             placeholder=3D"%{getDatePlaceholder()}"
+                             disabled=3D"%{!#editObservationReport}"/>
=20
-        <s:textarea name=3D"updateContactCommand.contact.comment"
-                    label=3D"%{getText('wao.ui.field.Contact.comment')}"
-                    placeholder=3D"%{getText('wao.ui.misc.noComment')}"
-                    disabled=3D"%{!#editObservationReport || !authenticatedW=
aoUser.coordinatorOrObserver}"/>
+                <s:textarea name=3D"updateContactCommand.contact.comment"
+                            label=3D"%{getText('wao.ui.field.Contact.comment=
')}"
+                            placeholder=3D"%{getText('wao.ui.misc.noComment'=
)}"
+                            disabled=3D"%{!#editObservationReport || !authen=
ticatedWaoUser.coordinatorOrObserver}"/>
=20
-        <s:textarea name=3D"updateContactCommand.contact.commentCoordinator"
-                    label=3D"%{getText('wao.ui.field.Contact.commentCoordina=
tor')}"
-                    placeholder=3D"%{getText('wao.ui.misc.noComment')}"
-                    disabled=3D"%{!#editObservationReport || !authenticatedW=
aoUser.coordinator}"/>
+                <s:textarea name=3D"updateContactCommand.contact.commentCoor=
dinator"
+                            label=3D"%{getText('wao.ui.field.Contact.comment=
Coordinator')}"
+                            placeholder=3D"%{getText('wao.ui.misc.noComment'=
)}"
+                            disabled=3D"%{!#editObservationReport || !authen=
ticatedWaoUser.coordinator}"/>
=20
-    </fieldset>
+            </fieldset>
=20
-    <%--Do not remove the id (use by contacts page)--%>
-    <fieldset id=3D"adminFocus">
-        <legend><s:text name=3D"wao.ui.form.programEvaluation"/></legend>
+            <%--Do not remove the id (use by contacts page)--%>
+            <fieldset id=3D"adminFocus">
+                <legend><s:text name=3D"wao.ui.form.programEvaluation"/></le=
gend>
=20
-        <s:if test=3D"authenticatedWaoUser.authorizedToDisplayContactDataRel=
iability">
-            <s:select name=3D"updateContactCommand.contact.dataReliability"
-                      label=3D"%{getText('wao.ui.field.Contact.dataReliabili=
ty')}"
-                      list=3D"dataReliabilities"
-                      emptyOption=3D"true"
-                      disabled=3D"%{!authenticatedWaoUser.isAuthorizedToEdit=
ContactDataReliability(updateContactCommand.contact)}"/>
-        </s:if>
+                <s:if test=3D"authenticatedWaoUser.authorizedToDisplayContac=
tDataReliability">
+                    <s:select name=3D"updateContactCommand.contact.dataRelia=
bility"
+                              label=3D"%{getText('wao.ui.field.Contact.dataR=
eliability')}"
+                              list=3D"dataReliabilities"
+                              emptyOption=3D"true"
+                              disabled=3D"%{!authenticatedWaoUser.isAuthoriz=
edToEditContactDataReliability(updateContactCommand.contact)}"/>
+                </s:if>
=20
-        <s:textarea name=3D"updateContactCommand.contact.commentAdmin"
-                    label=3D"%{getText('wao.ui.field.Contact.commentAdmin')}"
-                    placeholder=3D"%{getText('wao.ui.misc.noComment')}"
-                    disabled=3D"%{!authenticatedWaoUser.admin}"/>
-    </fieldset>
+                <s:textarea name=3D"updateContactCommand.contact.commentAdmi=
n"
+                            label=3D"%{getText('wao.ui.field.Contact.comment=
Admin')}"
+                            placeholder=3D"%{getText('wao.ui.misc.noComment'=
)}"
+                            disabled=3D"%{!authenticatedWaoUser.admin}"/>
+            </fieldset>
=20
-    <div class=3D"form-actions">
-        <s:url action=3D"contacts" id=3D"contactsUrl"/>
-        <s:a href=3D"%{contactsUrl}" cssClass=3D"btn">
-            <i class=3D"icon-chevron-left"></i> <s:text name=3D"wao.ui.actio=
n.cancel"/>
-        </s:a>
-        <s:if test=3D"authenticatedWaoUser.isAuthorizedToEditContact(updateC=
ontactCommand.contact)">
-            <s:submit type=3D"button" cssClass=3D"btn">
-                <i class=3D"icon-hdd"></i> <s:text name=3D"wao.ui.action.sav=
e"/>
-            </s:submit>
-        </s:if>
+            <div class=3D"form-actions">
+                <s:url action=3D"contacts" id=3D"contactsUrl"/>
+                <s:a href=3D"%{contactsUrl}" cssClass=3D"btn">
+                    <i class=3D"icon-chevron-left"></i> <s:text name=3D"wao.=
ui.action.cancel"/>
+                </s:a>
+                <s:if test=3D"authenticatedWaoUser.isAuthorizedToEditContact=
(updateContactCommand.contact)">
+                    <s:submit type=3D"button" cssClass=3D"btn">
+                        <i class=3D"icon-hdd"></i> <s:text name=3D"wao.ui.ac=
tion.save"/>
+                    </s:submit>
+                </s:if>
=20
-        <s:if
-            test=3D" ! updateContactCommand.creation && authenticatedWaoUser=
.isAuthorizedToDeleteContact(updateContactCommand.contact)">
-            <s:url action=3D"delete-contact" id=3D"deleteContactUrl">
-                <s:param name=3D"contactId" value=3D"contactId"/>
-            </s:url>
-            <s:a href=3D"%{deleteContactUrl}" cssClass=3D"btn pull-right">
-                <i class=3D"icon-trash"></i> <s:text name=3D"wao.ui.action.d=
eleteContact"/>
-            </s:a>
-        </s:if>
+                <s:if
+                    test=3D" ! updateContactCommand.creation && authenticate=
dWaoUser.isAuthorizedToDeleteContact(updateContactCommand.contact)">
+                    <s:url action=3D"delete-contact" id=3D"deleteContactUrl">
+                        <s:param name=3D"contactId" value=3D"contactId"/>
+                    </s:url>
+                    <s:a href=3D"%{deleteContactUrl}" cssClass=3D"btn pull-r=
ight">
+                        <i class=3D"icon-trash"></i> <s:text name=3D"wao.ui.=
action.deleteContact"/>
+                    </s:a>
+                </s:if>
+            </div>
+
+        </s:form>
     </div>
-
-</s:form>
-
 </html>
=20


--===============5778791226768778366==--