projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renames user_id to uid accordingly to our naming convention.
[platal.git]
/
templates
/
xnetgrp
/
form.announce.tpl
diff --git
a/templates/xnetgrp/form.announce.tpl
b/templates/xnetgrp/form.announce.tpl
index
03d612c
..
1a5eccc
100644
(file)
--- a/
templates/xnetgrp/form.announce.tpl
+++ b/
templates/xnetgrp/form.announce.tpl
@@
-1,6
+1,6
@@
{**************************************************************************}
{* *}
{**************************************************************************}
{* *}
-{* Copyright (C) 2003-20
07
Polytechnique.org *}
+{* Copyright (C) 2003-20
10
Polytechnique.org *}
{* http://opensource.polytechnique.org/ *}
{* *}
{* This program is free software; you can redistribute it and/or modify *}
{* http://opensource.polytechnique.org/ *}
{* *}
{* This program is free software; you can redistribute it and/or modify *}
@@
-22,7
+22,7
@@
<table class="tinybicol" id="art{$art.id}">
<tr>
<table class="tinybicol" id="art{$art.id}">
<tr>
- <th>
+ <th
{if $art.photo}colspan="2"{/if}
>
{if $is_logged && !$admin}
<div style="float: right">
{if $is_admin}
{if $is_logged && !$admin}
<div style="float: right">
{if $is_admin}
@@
-32,40
+32,47
@@
</div>
{/if}
{tidy}
</div>
{/if}
{tidy}
- {if $admin}Aperçu de
: {/if}{$art.titre}
+ {if $admin}Aperçu de
: {/if}{$art.titre}
{/tidy}
</th>
</tr>
<tr>
{/tidy}
</th>
</tr>
<tr>
+ {if $art.photo}
+ <td rowspan="{if ($is_logged || $admin) && $art.contacts}3{else}2{/if}" style="width: 100px">
+ <img src="{$platal->ns}announce/photo/{$art.id}" alt="{$art.titre}" style="width: 100px" />
+ </td>
+ {/if}
<td style="padding-bottom: 1em">
<td style="padding-bottom: 1em">
- {tidy}
- {$art.texte|wiki_to_html|smarty:nodefaults}
- {/tidy}
+ {$art.texte|miniwiki|smarty:nodefaults}
</td>
</tr>
{if ($is_logged || $admin) && $art.contacts}
<tr class="pair">
</td>
</tr>
{if ($is_logged || $admin) && $art.contacts}
<tr class="pair">
- <td class="titre">Contacts
:</td>
+ <td class="titre">Contacts
:</td>
</tr>
<tr class="pair">
<td style="padding-left: 20px">
</tr>
<tr class="pair">
<td style="padding-left: 20px">
- {tidy}
{if $art.contact_html}
{if $art.contact_html}
+ {tidy}
{$art.contact_html|nl2br|smarty:nodefaults}
{$art.contact_html|nl2br|smarty:nodefaults}
+ {/tidy}
{else}
{else}
- {$art.contacts|
wiki_to_html|nl2br
|smarty:nodefaults}
+ {$art.contacts|
miniwiki
|smarty:nodefaults}
{/if}
{/if}
- {/tidy}
</td>
</tr>
{/if}
</td>
</tr>
{/if}
- <tr class="pair right">
- <td>
+ <tr class="pair">
+ <td {if $art.photo}colspan="2"{/if}>
+ <div style="float: right">
+ <small>
+ Annonce proposée par {profile user=$art.uid sex=false promo=true groupperms=false}
+ </small>
+ </div>
<small>
<small>
- Annonce proposée par
- <a class="popup2" href="https://www.polytechnique.org/profile/{$art.forlife}">
- {$art.prenom} {$art.nom} (X{$art.promo})
- </a>
+ {if $art.post_id}
+ <a href="{$platal->ns}forum/read/{$art.post_id}">{icon name=comments title="Discussions"}Discuter</a>
+ {/if}
</small>
</td>
</tr>
</small>
</td>
</tr>