Changelog et xhtml

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-754

diff --git a/ChangeLog b/ChangeLog
index b74cfa7..c0e7b1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ New :
 
 Bug/Wish :
 
+       * Admin :
+               - #323: admin link in fiche opens out of the popup.                                     -Car
+
        * Profile :
                - User can delete his own melix.                                                                        -Car
 

diff --git a/templates/include/emploi.tpl b/templates/include/emploi.tpl
index 630caf1..9f7b197 100644 (file)
--- a/templates/include/emploi.tpl
+++ b/templates/include/emploi.tpl
@@ -19,7 +19,8 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-
+{if $address.entreprise || $address.secteur || $address.fonction ||
+  $address.poste || $address.fonction}
       <div class="adresse">
        <table>
         {if $address.entreprise}
@@ -55,5 +56,6 @@
         {/if}
         </table>
       </div>
+{/if}
 
 {* vim:set et sws=2 sts=2 sw=2: *}