From: Florent Bruneau Date: Mon, 3 Sep 2007 20:42:02 +0000 (+0200) Subject: Upgdate the profile to use the new medal image handler X-Git-Tag: xorg/0.9.15~174^2~11 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=5e70bf2485c8de6717182a83dcbdca51237ba322;p=platal.git Upgdate the profile to use the new medal image handler Signed-off-by: Florent Bruneau --- diff --git a/htdocs/javascript/ajax.js b/htdocs/javascript/ajax.js index a839afc..2d67102 100644 --- a/htdocs/javascript/ajax.js +++ b/htdocs/javascript/ajax.js @@ -103,7 +103,7 @@ function _showTempMessage(id, state, back) var obj = document.getElementById(id); if (currentTempMessage != state) { return; - } + } setOpacity(obj, back * 4); if (back > 0) { setTimeout("_showTempMessage('" + id + "', " + currentTempMessage + "," + (back-1) + ")", 125); diff --git a/include/user.func.inc.php b/include/user.func.inc.php index b515c0c..aca62cd 100644 --- a/include/user.func.inc.php +++ b/include/user.func.inc.php @@ -477,7 +477,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private') $user['applis_join'] = join(', ', $user['applis_fmt']); if (has_user_right($user['medals_pub'], $view)) { - $res = XDB::iterator("SELECT m.id, m.text AS medal, m.type, m.img, s.gid, g.text AS grade + $res = XDB::iterator("SELECT m.id, m.text AS medal, m.type, s.gid, g.text AS grade FROM profile_medals_sub AS s INNER JOIN profile_medals AS m ON ( s.mid = m.id ) LEFT JOIN profile_medals_grades AS g ON ( s.mid = g.mid AND s.gid = g.gid ) diff --git a/templates/profile/emploi.tpl b/templates/profile/emploi.tpl index bad6bca..2826683 100644 --- a/templates/profile/emploi.tpl +++ b/templates/profile/emploi.tpl @@ -24,210 +24,170 @@ {section name=adresses_pro loop=2} {assign var='i' value=$smarty.section.adresses_pro.index} -
- - - - - - {include file=include/flags.radio.tpl name="pubpro[$i]" val=$pubpro.$i} - - - - - - - - - - - - - - - - - - - - - {include file=include/flags.radio.tpl name="adr_pubpro[$i]" val=$adr_pubpro.$i} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {include file=include/flags.radio.tpl name="tel_pubpro[$i]" val=$tel_pubpro.$i} - - - - - - - - - - - - - {include file=include/flags.radio.tpl name="email_pubpro[$i]" val=$email_pubpro.$i} - - - - - - - - -
- Informations professionnelles - Entreprise n°{$i+1} -
- Entreprise ou organisme - - -
- Secteur d'activité - - -
- Sous-Secteur d'activité - - -
- Poste occupé - - -
- Fonction occupée - - -
- Adresse professionnelle - - -
-   - - -
-   - - -
- Code postal
- 		- -
- Ville
- 		- -
- Pays - - -
- Région ou département
- (selon pays) - 		- -
- Téléphone professionnel - - -   -
- Fax - - -
- Mobile - - -
- E-mail - - -
- Page web - - -
-
+ + + + + {include file=include/flags.radio.tpl name="pubpro[$i]" val=$pubpro.$i} + + + + + + + + + + + + + + + + + + + + + {include file=include/flags.radio.tpl name="adr_pubpro[$i]" val=$adr_pubpro.$i} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {include file=include/flags.radio.tpl name="tel_pubpro[$i]" val=$tel_pubpro.$i} + + + + + + + + + + + + + {include file=include/flags.radio.tpl name="email_pubpro[$i]" val=$email_pubpro.$i} + + + + + + + + +
+ Informations professionnelles - Entreprise n°{$i+1} +
Entreprise ou organisme + +
Secteur d'activité + +
Sous-Secteur d'activité + +
Poste occupé + +
Fonction occupée + +
Adresse professionnelle + +
  + +
  + +
Code postal + +
Ville + +
Pays + +
+ Région ou département
+ (selon pays) + 		+ +
Téléphone professionnel + +   +
Fax + +
Mobile + +
E-mail + +
Page web + +
{/section} -
- - - - - - - - - - - -
- Informations professionnelles - CV -
- - - - - -
- - - privé -
-
- Curriculum vitae
- Le CV n'est jamais public.
- Comment remplir mon CV ?
- {icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki - 		- {javascript name=ajax} - -
- -
-
+ + + + + + + + + + + +
+ Informations professionnelles - CV +
+ + + + + +
+ + + privé +
+
+ Curriculum vitae
+ Le CV n'est jamais public.
+ Comment remplir mon CV ?
+ {icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki + 		+ +
+ +
{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl index 42841aa..fd45b22 100644 --- a/templates/profile/general.tpl +++ b/templates/profile/general.tpl @@ -347,7 +347,6 @@ Commentaire ? ICQ ? etc... - {javascript name=ajax}
diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl index c2aa469..5af2146 100644 --- a/templates/profile/profile.tpl +++ b/templates/profile/profile.tpl @@ -167,7 +167,7 @@ function chgMainWinLoc(strPage)

Distinctions :

{foreach from=$x.medals item=m}
- {$m.medal} + {$m.medal}
{$m.medal}
{$m.grade}