Fix some bugs and layout issues on the new profile edition form

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index d4ece44..6e6ba22 100644 (file)
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -86,6 +86,18 @@ p {
     background: inherit;
 }
 
+input.error, textarea.error {
+    background-color: #faa;
+}
+
+input.valid, textarea.valid {
+    background-color: #afa;
+}
+
+input.warning, textarea.warning {
+    background-color: #fda;
+}
+
 h1 {
     color: #555555;
     background: url('../images/skins/default_titre.gif');

diff --git a/htdocs/css/openweb.css b/htdocs/css/openweb.css
index 6ae26a9..a1a39e8 100644 (file)
--- a/htdocs/css/openweb.css
+++ b/htdocs/css/openweb.css
@@ -89,6 +89,18 @@ p {
     background: inherit;
 }
 
+input.error, textarea.error {
+    background-color: #faa;
+}
+
+input.valid, textarea.valid {
+    background-color: #afa;
+}
+
+input.warning, textarea.warning {
+    background-color: #fda;
+}
+
 h1 {
     color: #369;
     font-size: 140%;

diff --git a/templates/profile/base.tpl b/templates/profile/base.tpl
index addb55b..3f57433 100644 (file)
--- a/templates/profile/base.tpl
+++ b/templates/profile/base.tpl
@@ -23,18 +23,20 @@
 <form action="{$wiz_baseurl}/{$lookup[$current]}" method="post" id="prof_annu">
   <div>
     {icon name=information title="Voir ma fiche"} Tu peux consulter ta fiche telle que la
-    voient <a class="popup2" href="profile/{$smarty.session.forlife}">les X</a>,
+    voient <a class="popup2" href="profile/{$smarty.session.forlife}?view=public">n'importe quel internaute</a>,
     <a class="popup2" href="profile/{$smarty.session.forlife}?view=ax">l'AX</a> ou
-    <a class="popup2" href="profile/{$smarty.session.forlife}?view=public">n'importe quel internaute</a>.
+    <a class="popup2" href="profile/{$smarty.session.forlife}">les X</a>.
     {include file="include/flags.radio.tpl" notable=true disabled=true name="profile_ex_pub"}
   </div>
   <div style="margin-top: 1em">
     {include file=$profile_page}
   </div>
-  <div style="clear: both" class="center">
+  <div style="clear: both; margin-top: 1em" class="center">
     <input type="hidden" name="valid_page" value="{$current}" />
     <input type="submit" name="current_page" value="Valider les modifications" />
+    {if $current neq count($lookup)-1}
     <input type="submit" name="next_page" value="Valider et passer à la page suivante" />
+    {/if}
   </div>
 </form>
 

diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index 6c304d2..df5fd30 100644 (file)
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -22,8 +22,7 @@
 
 
 {include file="profile/applis.js.tpl"}
-<div class="blocunite_tab">
-  <table class="bicol" cellspacing="0" cellpadding="0" 
+  <table class="bicol" style="margin-bottom: 1em"
     summary="Profil : Informations générales">
     <tr>
       <th colspan="2">
@@ -121,7 +120,7 @@
         <span class="titre">Post-application</span>
       </td>
       <td class="dcold">
-        <select name="appli2[id]" onchange="fillType(this.form['appli[type]'], this.selectedIndex-1);">   
+        <select name="appli2[id]" onchange="fillType(this.form['appli2[type]'], this.selectedIndex-1);">
           {applis_options selected=$appli2.id}
         </select>
         <br />
@@ -137,11 +136,9 @@
       </td>
     </tr>
   </table>
-</div>
 
 {if !$no_private_key}
-<div class="blocunite">
-  <table class="bicol" cellspacing="0" cellpadding="0" 
+  <table class="bicol"  style="margin-bottom: 1em"
     summary="Profil : Informations générales">
     <tr>
       <th>
@@ -176,11 +173,9 @@
       </td>
     </tr>
   </table>
-</div>
 {/if}
 
-<div class="blocunite">
-  <table class="bicol" cellspacing="0" cellpadding="0"
+  <table class="bicol"  style="margin-bottom: 1em"
     summary="Profil: Trombinoscope">
     <tr>
       <th colspan="3">
@@ -228,9 +223,7 @@
       </td>
     </tr>
   </table>
-</div>
-<div class="blocunite">
-  <table class="bicol" cellspacing="0" cellpadding="0"
+  <table class="bicol" style="margin-bottom: 1em"
     summary="Profil: Divers">
     <tr>
       <th colspan="2">
@@ -364,6 +357,5 @@
       </td>
     </tr>
   </table>
-</div>
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}