From 05cb05c0bceb85d3f5d6c078403e73e8c9995325 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Sat, 21 Apr 2007 10:20:18 +0000 Subject: [PATCH] Use the same promo selector for Events, NL and Xnet htdocs/css/xnet.css | 5 +++ modules/profile.php | 4 +- modules/search.php | 2 - templates/axletter/edit.tpl | 17 +--------- templates/events/form.tpl | 56 ------------------------------------ templates/xnetgrp/announce-edit.tpl | 33 +++++++-------------- 6 files changed, 22 insertions(+), 95 deletions(-) git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1722 839d8a87-29fc-0310-9880-83ba4fa771e5 --- htdocs/css/xnet.css | 5 ++ modules/profile.php | 4 +- modules/search.php | 2 +- templates/axletter/edit.tpl | 17 +---- templates/events/form.tpl | 56 +------------- templates/include/field.promo.tpl | 88 ++++++++++++++++++++++ .../include/{select.field.tpl => field.select.tpl} | 2 + templates/xnetgrp/announce-edit.tpl | 33 +++----- 8 files changed, 112 insertions(+), 95 deletions(-) create mode 100644 templates/include/field.promo.tpl rename templates/include/{select.field.tpl => field.select.tpl} (97%) diff --git a/htdocs/css/xnet.css b/htdocs/css/xnet.css index a070124..2513ab9 100644 --- a/htdocs/css/xnet.css +++ b/htdocs/css/xnet.css @@ -63,6 +63,11 @@ td { vertical-align: top; } h1 { font-size: 130%; } h2 { font-size: 115%; } +.smaller { + font-size: smaller; + font-style: italic; +} + /*************************************************************************** * DEBUG ***************************************************************************/ diff --git a/modules/profile.php b/modules/profile.php index 0967afa..f2dcaba 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -549,7 +549,7 @@ class ProfileModule extends PLModule function handler_ref_sect(&$page, $sect) { header('Content-Type: text/html; charset=utf-8'); - $page->changeTpl('include/select.field.tpl', NO_SKIN); + $page->changeTpl('include/field.select.tpl', NO_SKIN); $page->assign('onchange', 'setSSecteurs()'); $page->assign('id', 'ssect_field'); $page->assign('name', 'ss_secteur'); @@ -562,7 +562,7 @@ class ProfileModule extends PLModule function handler_ref_country(&$page, $sect, $ssect = '') { header('Content-Type: text/html; charset=utf-8'); - $page->changeTpl('include/select.field.tpl', NO_SKIN); + $page->changeTpl('include/field.select.tpl', NO_SKIN); $page->assign('name', 'pays_sel'); $where = ($ssect ? ' AND ms.ss_secteur = {?}' : ''); $it = XDB::iterator("SELECT a2 AS id, pays AS field diff --git a/modules/search.php b/modules/search.php index 9845509..09f2e63 100644 --- a/modules/search.php +++ b/modules/search.php @@ -397,7 +397,7 @@ class SearchModule extends PLModule exit(); } header('Content-Type: text/xml; charset="UTF-8"'); - $page->changeTpl('include/select.field.tpl', NO_SKIN); + $page->changeTpl('include/field.select.tpl', NO_SKIN); $page->assign('name', $type); $page->assign('list', XDB::iterator('SELECT '.$field.' AS field, '.$id.' AS id diff --git a/templates/axletter/edit.tpl b/templates/axletter/edit.tpl index e61a09f..cbffd84 100644 --- a/templates/axletter/edit.tpl +++ b/templates/axletter/edit.tpl @@ -51,7 +51,7 @@

- +
@@ -62,20 +62,7 @@ (uniquement lettres, chiffres ou -) - - - - - - - - + {include file="include/field.promo.tpl" prefix=""} {if !$saved} diff --git a/templates/events/form.tpl b/templates/events/form.tpl index 9d7485d..8411cfc 100644 --- a/templates/events/form.tpl +++ b/templates/events/form.tpl @@ -129,40 +129,6 @@ N'oublie pas de remplir les informations suivantes :

- -
Options du message
Promo min - - (0 pour pas de minimum... ex: 1947) -
Promo max - - (0 pour pas de maximum... ex: 2001) -
Echéance d'envoi
@@ -172,27 +138,7 @@ Tu peux limiter la visibilité de ton annonce aux camarades de certaines promotions : - - - - - - - - - - - + {include file="include/field.promo.tpl"} - - - - - - - - - - - + {include file="include/field.promo.tpl" promo_min=$art.promo_min promo_max=$art.promo_max} + {if $art.public} + + {/if} {if $new} -- 2.1.4
Informations complémentaires
Promotion la plus ancienne - incluse -  (ex : 1980, 0 signifie pas de minimum) -
Promotion la plus jeune - incluse -  (ex : 2000, 0 signifie pas de maximum) -
- -
Choisis la date d'expiration de ton annonce : diff --git a/templates/include/field.promo.tpl b/templates/include/field.promo.tpl new file mode 100644 index 0000000..0f9e4d0 --- /dev/null +++ b/templates/include/field.promo.tpl @@ -0,0 +1,88 @@ +{**************************************************************************} +{* *} +{* Copyright (C) 2003-2007 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 $full} + +{/if} + + + + + + + + + + + +{if $full} +
Promotion la plus ancienne + incluse +  (ex : 1980) +
Promotion la plus jeune + incluse +  (ex : 2000) +
+ +
+{/if} + +{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *} diff --git a/templates/include/select.field.tpl b/templates/include/field.select.tpl similarity index 97% rename from templates/include/select.field.tpl rename to templates/include/field.select.tpl index 51a99be..d7cc678 100644 --- a/templates/include/select.field.tpl +++ b/templates/include/field.select.tpl @@ -26,3 +26,5 @@ {/iterate} + +{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *} diff --git a/templates/xnetgrp/announce-edit.tpl b/templates/xnetgrp/announce-edit.tpl index e0546fc..7af72fe 100644 --- a/templates/xnetgrp/announce-edit.tpl +++ b/templates/xnetgrp/announce-edit.tpl @@ -26,9 +26,9 @@ function visibilityChange(box) { var state = (box.checked ? 'none' : ''); document.getElementById('promo_titre').style.display = state; - document.getElementById('promo_min').style.display = state; - document.getElementById('promo_max').style.display = state; - document.getElementById('promo_desc').style.display = state; + document.getElementById('promo_min_tr').style.display = state; + document.getElementById('promo_max_tr').style.display = state; + document.getElementById('promo_range_tr').style.display = state; } {/literal} @@ -140,25 +140,14 @@ function visibilityChange(box)
Promotions cibles
Promotion minimale : - - incluse* (ex : 1980) -
Promotion maximale : - - incluse* (ex : 2000) -
- * 0 signifie qu'il n'y a pas de limite -
Demandes de publication