From a9cd2babbdceaeb57e9de04ce0e7113a14926ec1 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 17 Aug 2008 21:43:56 +0200 Subject: [PATCH] Update to last core: * remove templates moved to the core. * remove useless templates and fix broken references. Signed-off-by: Florent Bruneau --- classes/xorg.php | 40 ++++++ core | 2 +- htdocs/xorg.php | 10 +- templates/admin/promo.tpl | 2 +- templates/axletter/admin.tpl | 2 +- templates/carnet/mescontacts.tpl | 2 +- templates/core/403.tpl | 25 ---- templates/core/404.tpl | 30 ---- templates/core/bug.tpl | 86 ------------ templates/core/plset.tpl | 53 ------- templates/core/table-editor.tpl | 160 ---------------------- templates/core/wiki.help.tpl | 35 ----- templates/core/wiki.tpl | 64 --------- templates/events/admin_tips.tpl | 2 +- templates/forums/admin.tpl | 2 +- templates/include/csv-importer.tpl | 243 --------------------------------- templates/include/plview.multipage.tpl | 84 ------------ templates/lists/annu.tpl | 2 +- templates/profile/admin_decos.tpl | 2 +- templates/profile/referent.tpl | 2 +- templates/search/index.tpl | 4 +- templates/skin/common.backtrace.tpl | 80 ----------- templates/xnetgrp/annuaire.tpl | 2 +- 23 files changed, 57 insertions(+), 877 deletions(-) create mode 100644 classes/xorg.php delete mode 100644 templates/core/403.tpl delete mode 100644 templates/core/404.tpl delete mode 100644 templates/core/bug.tpl delete mode 100644 templates/core/plset.tpl delete mode 100644 templates/core/table-editor.tpl delete mode 100644 templates/core/wiki.help.tpl delete mode 100644 templates/core/wiki.tpl delete mode 100644 templates/include/csv-importer.tpl delete mode 100644 templates/include/plview.multipage.tpl delete mode 100644 templates/skin/common.backtrace.tpl diff --git a/classes/xorg.php b/classes/xorg.php new file mode 100644 index 0000000..1049ca6 --- /dev/null +++ b/classes/xorg.php @@ -0,0 +1,40 @@ +changeTpl('core/password_prompt_logged.tpl'); + $page->addJsLink('do_challenge_response_logged.js'); + } else { + $page->changeTpl('core/password_prompt.tpl'); + $page->addJsLink('do_challenge_response.js'); + } + $page->assign_by_ref('platal', $this); + $page->run(); + } +} + +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +?> diff --git a/core b/core index 8cd8f58..7cb40d8 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8cd8f58b0e58ee8ebc2ebf1bb79f2e20eb05808d +Subproject commit 7cb40d85a05eb9d16218b9504ee484741e2e92e3 diff --git a/htdocs/xorg.php b/htdocs/xorg.php index 1fbce45..e43ef73 100644 --- a/htdocs/xorg.php +++ b/htdocs/xorg.php @@ -21,11 +21,11 @@ require_once dirname(__FILE__).'/../include/xorg.inc.php'; -$platal = new Platal('auth', 'carnet', 'email', 'events', 'forums', - 'geoloc', 'lists', 'marketing', 'payment', 'platal', - 'profile', 'register', 'search', 'stats', 'admin', - 'newsletter', 'axletter', 'bandeau', 'survey', - 'gadgets', 'googleapps'); +$platal = new Xorg('auth', 'carnet', 'email', 'events', 'forums', + 'geoloc', 'lists', 'marketing', 'payment', 'platal', + 'profile', 'register', 'search', 'stats', 'admin', + 'newsletter', 'axletter', 'bandeau', 'survey', + 'gadgets', 'googleapps'); if (!($path = Env::v('n')) || ($path{0} < 'A' || $path{0} > 'Z')) { $platal->run(); diff --git a/templates/admin/promo.tpl b/templates/admin/promo.tpl index d92c1c5..3a53289 100644 --- a/templates/admin/promo.tpl +++ b/templates/admin/promo.tpl @@ -36,7 +36,7 @@ {if $promo} -{include file="include/csv-importer.tpl"} +{include core=csv-importer.tpl} {/if} {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/axletter/admin.tpl b/templates/axletter/admin.tpl index a4ab3e3..f4c3bac 100644 --- a/templates/axletter/admin.tpl +++ b/templates/axletter/admin.tpl @@ -46,6 +46,6 @@

Ajout d'utilisateurs

-{include file="include/csv-importer.tpl"} +{include core=csv-importer.tpl} {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/carnet/mescontacts.tpl b/templates/carnet/mescontacts.tpl index 06d7647..2ae0319 100644 --- a/templates/carnet/mescontacts.tpl +++ b/templates/carnet/mescontacts.tpl @@ -90,7 +90,7 @@ Rechercher dans tes contacts :

-{include file="core/plset.tpl"} +{include core=plset.tpl} {/if} diff --git a/templates/core/403.tpl b/templates/core/403.tpl deleted file mode 100644 index aeea268..0000000 --- a/templates/core/403.tpl +++ /dev/null @@ -1,25 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 Polytechnique.org *} -{* http://opensource.polytechnique.org/ *} -{* *} -{* This program is free software; you can redistribute it and/or modify *} -{* it under the terms of the GNU General Public License as published by *} -{* the Free Software Foundation; either version 2 of the License, or *} -{* (at your option) any later version. *} -{* *} -{* This program is distributed in the hope that it will be useful, *} -{* but WITHOUT ANY WARRANTY; without even the implied warranty of *} -{* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *} -{* GNU General Public License for more details. *} -{* *} -{* You should have received a copy of the GNU General Public License *} -{* along with this program; if not, write to the Free Software *} -{* Foundation, Inc., *} -{* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *} -{* *} -{**************************************************************************} - -

Tu n'as pas les permissions nécessaires pour accéder à cette page.

- -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/core/404.tpl b/templates/core/404.tpl deleted file mode 100644 index a606b54..0000000 --- a/templates/core/404.tpl +++ /dev/null @@ -1,30 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 Polytechnique.org *} -{* http://opensource.polytechnique.org/ *} -{* *} -{* This program is free software; you can redistribute it and/or modify *} -{* it under the terms of the GNU General Public License as published by *} -{* the Free Software Foundation; either version 2 of the License, or *} -{* (at your option) any later version. *} -{* *} -{* This program is distributed in the hope that it will be useful, *} -{* but WITHOUT ANY WARRANTY; without even the implied warranty of *} -{* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *} -{* GNU General Public License for more details. *} -{* *} -{* You should have received a copy of the GNU General Public License *} -{* along with this program; if not, write to the Free Software *} -{* Foundation, Inc., *} -{* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *} -{* *} -{**************************************************************************} - -

Cette page n'existe pas !!!

- -{if $near} -

L'adresse suivante semble correspondre à ta demande :
-{icon name="lightbulb" title="Cherchais-tu ?"} {$globals->baseurl}/{$near} -

-{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/core/bug.tpl b/templates/core/bug.tpl deleted file mode 100644 index 4b3d80a..0000000 --- a/templates/core/bug.tpl +++ /dev/null @@ -1,86 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 Polytechnique.org *} -{* http://opensource.polytechnique.org/ *} -{* *} -{* This program is free software; you can redistribute it and/or modify *} -{* it under the terms of the GNU General Public License as published by *} -{* the Free Software Foundation; either version 2 of the License, or *} -{* (at your option) any later version. *} -{* *} -{* This program is distributed in the hope that it will be useful, *} -{* but WITHOUT ANY WARRANTY; without even the implied warranty of *} -{* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *} -{* GNU General Public License for more details. *} -{* *} -{* You should have received a copy of the GNU General Public License *} -{* along with this program; if not, write to the Free Software *} -{* Foundation, Inc., *} -{* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *} -{* *} -{**************************************************************************} - - - -
-{if $bug_sent} -

- Ton message a bien été envoyé au support de Polytechnique.org, tu devrais en - recevoir une copie d'ici quelques minutes. Nous allons le traiter et y répondre - dans les plus brefs délais. -

- -
-{else} -
- {xsrf_token_field} -

Signaler un bug ou demander une amélioration

-
- -   Sujet : - - -
- - -
-
-
- -
-{/if} - -{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *} diff --git a/templates/core/plset.tpl b/templates/core/plset.tpl deleted file mode 100644 index a0e4de1..0000000 --- a/templates/core/plset.tpl +++ /dev/null @@ -1,53 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 Polytechnique.org *} -{* http://opensource.polytechnique.org/ *} -{* *} -{* This program is free software; you can redistribute it and/or modify *} -{* it under the terms of the GNU General Public License as published by *} -{* the Free Software Foundation; either version 2 of the License, or *} -{* (at your option) any later version. *} -{* *} -{* This program is distributed in the hope that it will be useful, *} -{* but WITHOUT ANY WARRANTY; without even the implied warranty of *} -{* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *} -{* GNU General Public License for more details. *} -{* *} -{* You should have received a copy of the GNU General Public License *} -{* along with this program; if not, write to the Free Software *} -{* Foundation, Inc., *} -{* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *} -{* *} -{**************************************************************************} - -
-

- {$plset_mods[$plset_mod]} - {if $plset_mods|@count > 1}[ - {assign var=has_prev value=false} - {foreach from=$plset_mods key=mod item=desc name=mods} - {if $mod neq $plset_mod} - {if $has_prev}| {/if} - {$desc} - {assign var=has_prev value=true} - {/if} - {/foreach} - ] - {/if} -

-

- {if !$plset_count} - Aucune entrée - {elseif $plset_count eq 1} - 1 entrée - {else} - {$plset_count} entrées - {/if} -

-
- -
-{include file=$plset_content} -
- -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/core/table-editor.tpl b/templates/core/table-editor.tpl deleted file mode 100644 index df3b459..0000000 --- a/templates/core/table-editor.tpl +++ /dev/null @@ -1,160 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 Polytechnique.org *} -{* http://opensource.polytechnique.org/ *} -{* *} -{* This program is free software; you can redistribute it and/or modify *} -{* it under the terms of the GNU General Public License as published by *} -{* the Free Software Foundation; either version 2 of the License, or *} -{* (at your option) any later version. *} -{* *} -{* This program is distributed in the hope that it will be useful, *} -{* but WITHOUT ANY WARRANTY; without even the implied warranty of *} -{* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *} -{* GNU General Public License for more details. *} -{* *} -{* You should have received a copy of the GNU General Public License *} -{* along with this program; if not, write to the Free Software *} -{* Foundation, Inc., *} -{* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *} -{* *} -{**************************************************************************} - - -

{$title}

- -{if $list} - - - - {foreach from=$t->vars item=myval key=myvar}{if $myval.display} - - {/if}{/foreach} - {if !$hideactions} - - {/if} - -{if !$readonly} - - - - -{/if} -{iterate from=$list item=myrow} - -{foreach from=$t->vars item=myval}{if $myval.display} - -{/if}{/foreach} - {if !$hideactions} - - {/if} - -{/iterate} -
{$myval.desc}{if $t->sortfield eq $myvar}{if $t->sortdesc}{icon name="bullet_arrow_down"}{else}{icon name="bullet_arrow_up"}{/if}{/if}action
- - Nouvelles entrées : Manuellement • Depuis un CSV - - - {icon name=add title='nouvelle entrée'} -
- {assign var="myfield" value=$myval.Field} - {if $myfield eq $t->idfield} - {assign var="idval" value=$myrow.$myfield} - {/if} - {if $myval.Type eq 'timestamp'} - {$myrow.$myfield|date_format:"%x %X"} - {elseif $myval.Type eq 'checkbox'} - - {elseif $myval.Type eq 'ip_address'} - {$myrow.$myfield|uint_to_ip} - {else} - {$myrow.$myfield} - {/if} - - {if !$readonly} - {icon name=page_edit title='éditer'} - {icon name=delete title='supprimer'} - {/if} -
- -{if ($p_prev > -1) || ($p_next > -1)} -

-{if $p_prev > -1}{$msg_previous_page} {/if} -{if $p_next > -1}{$msg_next_page}{/if} -

-{/if} - -{elseif $massadd} -{include file="include/csv-importer.tpl"} - -

-back -

- -{else} - -
- {xsrf_token_field} - - - - - {foreach from=$t->vars item=myval}{assign var="myfield" value=$myval.Field}{if ($myfield neq $t->idfield) or ($t->idfield_editable)} - - - - - {/if}{/foreach} -
- {if $id} - modification de l'entrée - {else} - nouvelle entrée - {/if} -
- {$myval.desc} - - {if $myval.Type eq 'set'} - - {elseif $myval.Type eq 'enum'} - - {elseif ($myval.Type eq 'textarea') or ($myval.Type eq 'varchar200')} - - {elseif ($myval.Type eq 'checkbox')} - - {else} - - {if $myval.Type eq 'timestamp'}jj/mm/aaaa hh:mm:ss{/if} - {if $myval.Type eq 'date'}jj/mm/aaaa{/if} - {if $myval.Type eq 'time'}hh:mm:ss{/if} - {/if} -
- -

- -

- -
- -

-back -

- -{/if} - - -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/core/wiki.help.tpl b/templates/core/wiki.help.tpl deleted file mode 100644 index 216c6d9..0000000 --- a/templates/core/wiki.help.tpl +++ /dev/null @@ -1,35 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 Polytechnique.org *} -{* http://opensource.polytechnique.org/ *} -{* *} -{* This program is free software; you can redistribute it and/or modify *} -{* it under the terms of the GNU General Public License as published by *} -{* the Free Software Foundation; either version 2 of the License, or *} -{* (at your option) any later version. *} -{* *} -{* This program is distributed in the hope that it will be useful, *} -{* but WITHOUT ANY WARRANTY; without even the implied warranty of *} -{* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *} -{* GNU General Public License for more details. *} -{* *} -{* You should have received a copy of the GNU General Public License *} -{* along with this program; if not, write to the Free Software *} -{* Foundation, Inc., *} -{* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *} -{* *} -{**************************************************************************} - -

Syntaxe wiki

- - - - {foreach from=$wiki_help key=syntax item=html} - - - - - {/foreach} -
SyntaxeApparence
{$syntax|nl2br}{$html|smarty:nodefaults}
- -{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *} diff --git a/templates/core/wiki.tpl b/templates/core/wiki.tpl deleted file mode 100644 index 8a76fa3..0000000 --- a/templates/core/wiki.tpl +++ /dev/null @@ -1,64 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 Polytechnique.org *} -{* http://opensource.polytechnique.org/ *} -{* *} -{* This program is free software; you can redistribute it and/or modify *} -{* it under the terms of the GNU General Public License as published by *} -{* the Free Software Foundation; either version 2 of the License, or *} -{* (at your option) any later version. *} -{* *} -{* This program is distributed in the hope that it will be useful, *} -{* but WITHOUT ANY WARRANTY; without even the implied warranty of *} -{* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *} -{* GNU General Public License for more details. *} -{* *} -{* You should have received a copy of the GNU General Public License *} -{* along with this program; if not, write to the Free Software *} -{* Foundation, Inc., *} -{* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *} -{* *} -{**************************************************************************} - -{if $canedit || $has_perms} - - - - {if $canedit} - - {/if} - {if $has_perms} - - - - - - - - {/if} - -
- Voir la page - - Éditer la page - - Historique - - Upload -
- - - - <-- Droits associés
-{/if} - -{if $text} -{$pmwiki|smarty:nodefaults} -{else} -{include file=$pmwiki_cache} -{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/events/admin_tips.tpl b/templates/events/admin_tips.tpl index feb1e81..ff9f08a 100644 --- a/templates/events/admin_tips.tpl +++ b/templates/events/admin_tips.tpl @@ -22,6 +22,6 @@

Aperçu de l'astuce

{include file="include/tips.tpl" full=true tips=$entry nochange=true} -{include file="core/table-editor.tpl"} +{include core=table-editor.tpl} {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/forums/admin.tpl b/templates/forums/admin.tpl index f58fdf2..a8edfa8 100644 --- a/templates/forums/admin.tpl +++ b/templates/forums/admin.tpl @@ -38,7 +38,7 @@ Dans les masques le * remplace n'importe quel texte et le -{include file="core/table-editor.tpl"} +{include core=table-editor.tpl} {literal} -
- {xsrf_token_field} -
- Import d'un CSV : - {if $csv_page eq 'source'} - Choisir la source - {else} - Choisir la source - {/if} - » - {if $csv_page eq 'values'} - Définir les valeurs - {elseif $smarty.session.csv} - Définir les valeurs - {else} - Définir les valeurs - {/if} - » - {if $csv_page eq 'valid'} - Vérifier et valider - {elseif $csv_action} - Vérifier et valider - {else} - Vérifier et valider - {/if} -
- {if $csv_page eq 'source'} -
-
- Entrez les données sous la forme suivante (avec - - comme séparateur) :
- 
TITRE1{$smarty.session.csv_separator|default:";"}TITRE2{$smarty.session.csv_separator|default:";"}...
-val1_1{$smarty.session.csv_separator|default:";"}val1_2{$smarty.session.csv_separator|default:";"}...
-val2_1{$smarty.session.csv_separator|default:";"}val2_2{$smarty.session.csv_separator|default:";"}...
-val3_1{$smarty.session.csv_separator|default:";"}val3_2{$smarty.session.csv_separator|default:";"}...
-
- {elseif $csv_page eq 'values'} -
- Action à effectuer si l'entrée existe : - -
- - - - - {if $smarty.session.csv_action eq 'update'} - - {/if} - - {foreach from=$csv_fields item=f} - - - - - {if $smarty.session.csv_action eq 'update'} - - {/if} - - {/foreach} -
ChampValeurMàJ
{$csv_field_desc[$f]|default:$f} - - - - - - - Si - - - - - -
Alors -
Sinon - - 		- -
- {elseif $csv_page eq 'valid'} - {if !$csv_done} - - - {foreach from=$csv_fields item=f} - - {/foreach} - - {foreach from=$csv_preview item=assoc} - - {foreach from=$csv_fields item=f} - - {/foreach} - - {/foreach} -
{$csv_field_desc[$f]|default:$f}
{$assoc[$f]}
- {else} - Les données ont été ajoutées. - {/if} - {/if} - - {if !$csv_done} -
- - - {if $csv_page eq 'source'} - - {elseif $csv_page eq 'values'} - - {elseif $csv_page eq 'valid'} - - {/if} -
- {/if} -
- -{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *} diff --git a/templates/include/plview.multipage.tpl b/templates/include/plview.multipage.tpl deleted file mode 100644 index edd3313..0000000 --- a/templates/include/plview.multipage.tpl +++ /dev/null @@ -1,84 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 Polytechnique.org *} -{* http://opensource.polytechnique.org/ *} -{* *} -{* This program is free software; you can redistribute it and/or modify *} -{* it under the terms of the GNU General Public License as published by *} -{* the Free Software Foundation; either version 2 of the License, or *} -{* (at your option) any later version. *} -{* *} -{* This program is distributed in the hope that it will be useful, *} -{* but WITHOUT ANY WARRANTY; without even the implied warranty of *} -{* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *} -{* GNU General Public License for more details. *} -{* *} -{* You should have received a copy of the GNU General Public License *} -{* along with this program; if not, write to the Free Software *} -{* Foundation, Inc., *} -{* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *} -{* *} -{**************************************************************************} - -{capture name=pages} -{if $plview->pages > 1} - {if $show_bounds}
[{$first} - {$last}] 
{/if} -
- {if $plview->page neq 1} - {icon name=resultset_first title="Première page"}{* - *}{icon name=resultset_previous title="Page précédente"} - {else} - {icon name=null title=""}{icon name=null title=""} - {/if} - {section name=page loop=$plview->pages+1 start=1} - {if $smarty.section.page.index eq $plview->page} - {$plview->page} - {else} - {$smarty.section.page.index} - {/if} - {/section} - {if $plview->page neq $plview->pages} - {icon name=resultset_next title="Page suivante"}{* - *}{icon name=resultset_last title="Dernière page"} - {else} - {icon name=null title=""}{icon name=null title=""} - {/if} -
-{/if} -{/capture} - -{capture name=order} -{if $plset_count > 1} -
- Trier par : - {foreach from=$orders key=name item=sort} - [ - {if $name eq $order} - tri ascendant - {$sort.desc} - {elseif $order eq "-$name"} - tri ascendant - {$sort.desc} - {else} - {$sort.desc} - {/if} - ]  - {/foreach} -
-{/if} -{/capture} - - -{$smarty.capture.order|smarty:nodefaults} - -{$smarty.capture.pages|smarty:nodefaults} - -
- {include file=$plview->templateName()} -
- -{$smarty.capture.pages|smarty:nodefaults}
- -{$smarty.capture.order|smarty:nodefaults} - -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/lists/annu.tpl b/templates/lists/annu.tpl index 1390e1f..b5e214f 100644 --- a/templates/lists/annu.tpl +++ b/templates/lists/annu.tpl @@ -66,7 +66,7 @@ -{include file="core/plset.tpl"} +{include core=plset.tpl}

modérateurs de la liste diff --git a/templates/profile/admin_decos.tpl b/templates/profile/admin_decos.tpl index fe8e526..a8e0f9e 100644 --- a/templates/profile/admin_decos.tpl +++ b/templates/profile/admin_decos.tpl @@ -20,7 +20,7 @@ {* *} {**************************************************************************} -{include file="core/table-editor.tpl"} +{include core=table-editor.tpl}

Administration Polytechnique.org

diff --git a/templates/profile/referent.tpl b/templates/profile/referent.tpl index 3e3feea..0be0c9b 100644 --- a/templates/profile/referent.tpl +++ b/templates/profile/referent.tpl @@ -22,7 +22,7 @@ {if $plset_count} -{include file="core/plset.tpl"} +{include core=plset.tpl} {else} {include wiki=Docs.Emploi} {/if} diff --git a/templates/search/index.tpl b/templates/search/index.tpl index 99471bd..5058d57 100644 --- a/templates/search/index.tpl +++ b/templates/search/index.tpl @@ -29,8 +29,8 @@ {include file=search/adv.links.tpl do_title=1 with_soundex=$with_soundex} {/if} {/if} - - {include file='core/plset.tpl'} + + {include core=plset.tpl} {if $search_pages_nb > 1}

diff --git a/templates/skin/common.backtrace.tpl b/templates/skin/common.backtrace.tpl deleted file mode 100644 index 7df0dee..0000000 --- a/templates/skin/common.backtrace.tpl +++ /dev/null @@ -1,80 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 Polytechnique.org *} -{* http://opensource.polytechnique.org/ *} -{* *} -{* This program is free software; you can redistribute it and/or modify *} -{* it under the terms of the GNU General Public License as published by *} -{* the Free Software Foundation; either version 2 of the License, or *} -{* (at your option) any later version. *} -{* *} -{* This program is distributed in the hope that it will be useful, *} -{* but WITHOUT ANY WARRANTY; without even the implied warranty of *} -{* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *} -{* GNU General Public License for more details. *} -{* *} -{* You should have received a copy of the GNU General Public License *} -{* along with this program; if not, write to the Free Software *} -{* Foundation, Inc., *} -{* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *} -{* *} -{**************************************************************************} - -{foreach from=$backtraces key=bt_name item=trace} -

-

- {if $trace->error}{/if} - Exécution de {$bt_name} : {$trace->traces|@count} actions en {$trace->totaltime|string_format:"%.3f"}s (hover-me pour la trace) - {if $trace->error}{/if} -

-
-{foreach item=query from=$trace->traces} -{if $query.data} -{assign var=cols value=$query.data[0]|@count} -{else} -{assign var=cols value=1} -{/if} - - - - - {if $query.error} - - - - {else} - - - - {/if} -{if $query.data} - - {foreach key=key item=item from=$query.data[0]} - - {/foreach} - - {foreach item=data_row from=$query.data} - - {foreach item=item from=$data_row} - - {/foreach} - - {/foreach} -{/if} -
- ACTION: - 
{$query.action}
-
-
- ERROR:
- {$query.error|nl2br} -
- INFO:
- {$query.rows} ligne{if $query.rows > 1}s{/if} en {$query.exectime|string_format:"%.3f"}s -
{$key}
{$item}
-{/foreach} -
-
-{/foreach} - -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/xnetgrp/annuaire.tpl b/templates/xnetgrp/annuaire.tpl index 02b1d5b..6fd19d6 100644 --- a/templates/xnetgrp/annuaire.tpl +++ b/templates/xnetgrp/annuaire.tpl @@ -57,7 +57,7 @@ Le groupe {$asso.nom} compte {$nb_tot} membres : {if $plset_base} -{include file="core/plset.tpl"} +{include core=plset.tpl} {else}

-- 2.1.4