From: Pierre Habouzit (MadCoder Date: Sun, 17 Apr 2005 15:09:47 +0000 (+0000) Subject: platal rework to include xnet X-Git-Tag: xorg/old~216 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b52e0d57d124d27cdef168d82aaff9b4d3cc6bdb;p=platal.git platal rework to include xnet * creation of include/platal/ that holds all the ste idepenant code. lots of it comes from include/xorg/ * some buggy skins are now better * begin to work on xnet, but the current state is broken, this is only a "save me before the HDD crash" commit git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-546 --- diff --git a/htdocs.net/css/asso.css b/htdocs.net/css/asso.css deleted file mode 100644 index 8c1384f..0000000 --- a/htdocs.net/css/asso.css +++ /dev/null @@ -1,149 +0,0 @@ -BODY { - background-color: #F2E9D0; - margin-left: 0; - margin-top: 0; - color: #505050; - font-family: "Bitstream vera sans","Verdana",sans-serif; - font-size: 10pt; - border-top: 1px; -} - -table { font-size: 10pt; font-family: "Bitstream vera sans","Verdana",sans-serif; } -input,textarea,tt,pre { font-size: 10pt; } - -img { vertical-align: middle; } - -A:link { - color: #5C81AA; -} -A:visited { - color: #5C81AA; -} - -A.s:link { - text-decoration: none ; - color: #9F81AD; -} -A.s:visited { - text-decoration: none ; - color: #9F81AD; -} - -TABLE.tableprincipale { - width: 765px; - border: 0px; - margin: 0px; - padding: 0px; -} - -table.menu { width: 150px; } - -th.menu { - padding: 0.5em 0em 0.6em 0em; - font-size: 95%; - text-align: left; - font-family: "Arial",sans-serif; - vertical-align: middle; - text-align: center; - font-weight: bold; - background: url('images/barre.png') bottom left no-repeat; -} - -TD.menu { - padding: 0.2em 0em 0.2em 0em; - font-size: 95%; - text-align: left; - font-family: "Arial",sans-serif; - vertical-align: middle; -} - -TD.infos { - height: 30px; - text-align: center; - font-family: "Bitstream Vera Sans","Arial",sans-serif; - color: #505050; -} - -TD.pres { - background-repeat: no-repeat; - background-image: url("images/oval.png"); - background-position: center center; - height: 50px; - text-align: center; - width: 210px; -} -TD.presautres { - background-repeat: no-repeat; - background-image: url("images/oval.png"); - background-position: top center; - font-size: 90%; - height: 50px; - text-align: center; - width: 200px; -} - -TD.pres2 { - background-repeat: no-repeat; - background-image: url("images/oval2.png"); - height: 50px; - text-align: center; - width: 202px; -} - -TD.choix1 { - height: 30px; - background-color: #D0C198; - font-size: 100%; - color: #5C81AA; -} -DIV.choix1 { - text-align: center; -} -TD.choix1actif { - height: 30px; - vertical-align: middle; - text-decoration: none; -} - -TD.choix2 { - height: 20px; - background-color: #D0C198; - font-size: 80%; -} -TD.choix2actif { - height: 20px; - background-color: #5C81AA; - color:#D0C198; -} -DIV.choix2 { - text-align: center; -} - -TD.liens-puce { - width: 15px; - vertical-align: center; - padding-left: 0.25em; -} - -TD.liens { - vertical-align: center; - padding-left: 0.5em; - text-align: left; -} - -td.tdliens { - padding: 0.4em 0em 0.4em 0em; -} - -P.descr { - text-align: justify; - font-size: 90%; - font-weight: bold; - padding-left: 7px; - padding-right: 7px; -} -UL.descr { - text-align: justify; - font-size: 80%; - font-weight: bold; -} diff --git a/htdocs.net/css/xnet.css b/htdocs.net/css/xnet.css new file mode 100644 index 0000000..76c6c60 --- /dev/null +++ b/htdocs.net/css/xnet.css @@ -0,0 +1,216 @@ +/*************************************************************************** + * Copyright (C) 2003-2004 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 * + ***************************************************************************/ + +body { + background-color: #F2E9D0; + margin-left: 0; + margin-top: 0; + color: #505050; + font-family: "Bitstream vera sans","Verdana",sans-serif; + font-size: 10pt; + border-top: 1px; +} + +table { + font-size: 10pt; + font-family: "Bitstream vera sans","Verdana",sans-serif; +} + +input,textarea,select,option,tt,pre { + font-size: 10pt; +} + +a img { + border: none; +} + +/*************************************************************************** + * DEBUG + ***************************************************************************/ + +#dev { + width: 100%; + text-align: center; + padding: 1px; + + font-size: 10pt; + font-weight: bold; +} + +#db-trace div.hide { display: none; } +#db-trace:hover div.hide { display: block } +#db-trace h1 { margin: 0px; } + +/*************************************************************************** + * LAYOUT + ***************************************************************************/ + +table#layout { + width: 765px; + margin-left: auto; + margin-right: auto; +} + +td#credits { + text-align: center; + font-size: 90%; + font-weight: bold; +} + +td#search { + text-align: right; +} + +img { vertical-align: middle; } + +a:link { + color: #5C81AA; +} +a:visited { + color: #5C81AA; +} + +a.s:link { + text-decoration: none ; + color: #9F81AD; +} +a.s:visited { + text-decoration: none ; + color: #9F81AD; +} + +table.tableprincipale { + width: 765px; + border: 0px; + margin: 0px; + padding: 0px; +} + +table.menu { width: 150px; } + +th.menu { + padding: 0.5em 0em 0.6em 0em; + font-size: 95%; + text-align: left; + font-family: "Arial",sans-serif; + vertical-align: middle; + text-align: center; + font-weight: bold; + background: url('images/barre.png') bottom left no-repeat; +} + +td.menu { + padding: 0.2em 0em 0.2em 0em; + font-size: 95%; + text-align: left; + font-family: "Arial",sans-serif; + vertical-align: middle; +} + +td.infos { + height: 30px; + text-align: center; + font-family: "Bitstream Vera Sans","Arial",sans-serif; + color: #505050; +} + +td.pres { + background-repeat: no-repeat; + background-image: url("images/oval.png"); + background-position: center center; + height: 50px; + text-align: center; + width: 210px; +} +td.presautres { + background-repeat: no-repeat; + background-image: url("images/oval.png"); + background-position: top center; + font-size: 90%; + height: 50px; + text-align: center; + width: 200px; +} + +td.pres2 { + background-repeat: no-repeat; + background-image: url("images/oval2.png"); + height: 50px; + text-align: center; + width: 202px; +} + +td.choix1 { + height: 30px; + background-color: #D0C198; + font-size: 100%; + color: #5C81AA; +} +DIV.choix1 { + text-align: center; +} +td.choix1actif { + height: 30px; + vertical-align: middle; + text-decoration: none; +} + +td.choix2 { + height: 20px; + background-color: #D0C198; + font-size: 80%; +} +td.choix2actif { + height: 20px; + background-color: #5C81AA; + color:#D0C198; +} +DIV.choix2 { + text-align: center; +} + +td.liens-puce { + width: 15px; + vertical-align: center; + padding-left: 0.25em; +} + +td.liens { + vertical-align: center; + padding-left: 0.5em; + text-align: left; +} + +td.tdliens { + padding: 0.4em 0em 0.4em 0em; +} + +P.descr { + text-align: justify; + font-size: 90%; + font-weight: bold; + padding-left: 7px; + padding-right: 7px; +} +ul.descr { + text-align: justify; + font-size: 80%; + font-weight: bold; +} diff --git a/htdocs/TESTS/xorg_env.php b/htdocs/TESTS/xorg_env.php index 0060161..5387cc7 100644 --- a/htdocs/TESTS/xorg_env.php +++ b/htdocs/TESTS/xorg_env.php @@ -1,6 +1,6 @@ core->locale); +setlocale(LC_TIME, $globals->core->locale); +setlocale(LC_CTYPE, $globals->core->locale); + +// }}} +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker: +?> diff --git a/include/xorg/database.inc.php b/include/platal/database.inc.php similarity index 100% rename from include/xorg/database.inc.php rename to include/platal/database.inc.php diff --git a/include/xorg/env.inc.php b/include/platal/env.inc.php similarity index 92% rename from include/xorg/env.inc.php rename to include/platal/env.inc.php index 26ae14e..3d7b664 100644 --- a/include/xorg/env.inc.php +++ b/include/platal/env.inc.php @@ -340,5 +340,28 @@ class Cookie // }}} +function fix_gpc_magic(&$item, $key) { + if (is_array($item)) { + array_walk($item, 'fix_gpc_magic'); + } else { + $item = stripslashes($item); + } +} + +function unfix_gpc_magic(&$item, $key) { + if (is_array($item)) { + array_walk($item, 'fix_gpc_magic'); + } else { + $item = addslashes($item); + } +} + +if (ini_get("magic_quotes_gpc")) { + array_walk($_GET, 'fix_gpc_magic'); + array_walk($_POST, 'fix_gpc_magic'); + array_walk($_COOKIE, 'fix_gpc_magic'); + array_walk($_REQUEST, 'fix_gpc_magic'); +} + // vim:set et sw=4 sts=4 sws=4 foldmethod=marker: ?> diff --git a/include/xorg/errors.inc.php b/include/platal/errors.inc.php similarity index 100% rename from include/xorg/errors.inc.php rename to include/platal/errors.inc.php diff --git a/include/xorg/iterator.inc.php b/include/platal/iterator.inc.php similarity index 100% rename from include/xorg/iterator.inc.php rename to include/platal/iterator.inc.php diff --git a/include/platal/page.inc.php b/include/platal/page.inc.php new file mode 100644 index 0000000..16732ba --- /dev/null +++ b/include/platal/page.inc.php @@ -0,0 +1,235 @@ +template_dir = $globals->spoolroot."/templates/"; + $this->compile_dir = $globals->spoolroot."/templates_c/"; + array_unshift($this->plugins_dir, $globals->spoolroot."/plugins/"); + $this->config_dir = $globals->spoolroot."/configs/"; + + $this->compile_check = !empty($globals->debug); + + if ($type == SKINNED) { + $this->register_modifier('escape_html', 'escape_html'); + $this->default_modifiers[] = '@escape_html'; + } + + $this->_page_type = $type; + $this->_tpl = $tpl; + $this->_errors = new XOrgErrors; + + $this->DiogenesCorePage(); + $this->register_prefilter('at_to_globals'); + $this->register_prefilter('trimwhitespace'); + $this->addJsLink('javascript/xorg.js'); + + $this->doAuth(); + } + + // }}} + // {{{ function changeTpl() + + function changeTpl($tpl, $type=SKINNED) + { + $this->_tpl = $tpl; + $this->_page_type = $type; + if ($type == SKINNED) { + $this->register_modifier('escape_html', 'escape_html'); + $this->default_modifiers = Array('@escape_html'); + } + + $this->_page_type = $type; + $this->assign('xorg_tpl', $tpl); + } + + // }}} + // {{{ function _run() + + function _run($skin) + { + global $globals, $TIME_BEGIN; + $this->assign("xorg_error", $this->_errors); + + if ($this->_page_type == NO_SKIN) { + $this->display($this->_tpl); + exit; + } + + $this->assign('menu', $globals->menu->menu()); + + if ($globals->debug) { + + if ($globals->debug & 1) { + $this->assign('db_trace', $globals->db->trace_format($this, 'database-debug.tpl')); + } + + $this->assign('validate', urlencode($globals->baseurl.'/valid.html')); + $result = $this->fetch($skin); + $ttime = sprintf('Temps total: %.02fs
', microtime_float() - $TIME_BEGIN); + $replc = "VALIDATION HTML INACTIVE
"; + + if ($globals->debug & 2) { + + $fd = fopen($this->compile_dir."/valid.html","w"); + fwrite($fd, $result); + fclose($fd); + + exec($globals->spoolroot."/bin/devel/xhtml.validate.pl ".$this->compile_dir."/valid.html", $val); + foreach ($val as $h) { + if (preg_match("/^X-W3C-Validator-Errors: (\d+)$/", $h, $m)) { + $replc = 'HTML OK
'; + if ($m[1]) { + $replc = "{$m[1]} ERREUR(S) !!!
"; + } + break; + } + } + } + + echo str_replace("@HOOK@", $ttime.$replc, $result); + exit; + } + + $this->display($skin); + exit; + } + + // }}} + // {{{ function run() + + function run() + { + die ("implement me"); + } + + // }}} + // {{{ function nb_errs() + + function nb_errs() + { + return count($this->_errors->errs); + } + + // }}} + // {{{ function trig() + + function trig($msg) + { + $this->_errors->trig($msg); + } + + // }}} + // {{{ function trig() + + function trig_run($msg) + { + $this->_errors->trig($msg); + $this->run(); + } + + // }}} + // {{{ function fail() + + function fail($msg) + { + $this->_errors->fail($msg); + } + + // }}} + // {{{ function kill() + + function kill($msg) + { + $this->fail($msg); + $this->run(); + } + + // }}} + // {{{ function doAuth() + + function doAuth() { } + + // }}} + // {{{ function loadModule() + + function loadModule($modname) + { + require_once("$modname.inc.php"); + } + + // }}} + // {{{ function addJsLink + + function addJsLink($path) + { + $this->append('xorg_js', $path); + } + + // }}} + // {{{ function addCssLink + + function addCssLink($path) + { + $this->append('xorg_css', $path); + } + + // }}} + // {{{ function gassign + + function gassign($varname) + { + global $$varname; + $this->assign($varname, $$varname); + } + + // }}} +} + +// }}} + +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker: +?> diff --git a/include/xorg/smarty.plugins.inc.php b/include/platal/smarty.plugins.inc.php similarity index 100% rename from include/xorg/smarty.plugins.inc.php rename to include/platal/smarty.plugins.inc.php diff --git a/include/xorg/xml-rpc.inc.php b/include/platal/xml-rpc.inc.php similarity index 100% rename from include/xorg/xml-rpc.inc.php rename to include/platal/xml-rpc.inc.php diff --git a/include/xml-rpc-client.inc.php b/include/xml-rpc-client.inc.php index 0b13485..891646d 100644 --- a/include/xml-rpc-client.inc.php +++ b/include/xml-rpc-client.inc.php @@ -19,7 +19,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -require_once('xorg/xml-rpc.inc.php'); +require_once('platal/xml-rpc.inc.php'); /* taken from : http://fr2.php.net/xml-rpc * Author mboeren@php.net diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php new file mode 100644 index 0000000..5e37f76 --- /dev/null +++ b/include/xnet/page.inc.php @@ -0,0 +1,49 @@ +PlatalPage($tpl, $type); + } + + // }}} + // {{{ function run() + + function run() + { + $this->_run('xnet/skin.tpl'); + } + + // }}} +} + +// }}} + +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker: +?> diff --git a/include/xorg.globals.inc.php.in b/include/xorg.globals.inc.php.in index 8a71162..cde232b 100644 --- a/include/xorg.globals.inc.php.in +++ b/include/xorg.globals.inc.php.in @@ -21,8 +21,8 @@ require_once('diogenes/diogenes.core.globals.inc.php'); require_once('diogenes/diogenes.database.inc.php'); -require_once('xorg/iterator.inc.php'); -require_once('xorg/database.inc.php'); +require_once('platal/iterator.inc.php'); +require_once('platal/database.inc.php'); // {{{ class CoreConfig diff --git a/include/xorg.inc.php b/include/xorg.inc.php index a154039..6375c82 100644 --- a/include/xorg.inc.php +++ b/include/xorg.inc.php @@ -19,67 +19,12 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -function microtime_float() -{ - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); -} -$TIME_BEGIN = microtime_float(); - -// {{{ defines - -$i=0; -define("AUTH_PUBLIC", $i++); -define("AUTH_COOKIE", $i++); -define("AUTH_MDP", $i++); - -define("PERMS_EXT", "ext"); -define("PERMS_USER", "user"); -define("PERMS_ADMIN", "admin"); - -define('SKINNED', 0); -define('NO_SKIN', 1); - -// }}} -// {{{ globals + session init - -require_once('xorg/env.inc.php'); +require_once('platal.inc.php'); require_once('xorg.globals.inc.php'); require_once('xorg/session.inc.php'); XorgGlobals::init(); XorgSession::init(); -setlocale(LC_MESSAGES, $globals->core->locale); -setlocale(LC_TIME, $globals->core->locale); -setlocale(LC_CTYPE, $globals->core->locale); - -// }}} -// {{{ fix magic quotes - -function fix_gpc_magic(&$item, $key) { - if (is_array($item)) { - array_walk($item, 'fix_gpc_magic'); - } else { - $item = stripslashes($item); - } -} - -function unfix_gpc_magic(&$item, $key) { - if (is_array($item)) { - array_walk($item, 'fix_gpc_magic'); - } else { - $item = addslashes($item); - } -} - -if (ini_get("magic_quotes_gpc")) { - array_walk($_GET, 'fix_gpc_magic'); - array_walk($_POST, 'fix_gpc_magic'); - array_walk($_COOKIE, 'fix_gpc_magic'); - array_walk($_REQUEST, 'fix_gpc_magic'); -} - -// }}} // {{{ function _new_page() function _new_page($type, $tpl_name, $min_auth, $admin=false) diff --git a/include/xorg/page.inc.php b/include/xorg/page.inc.php index cd4909a..014ec4b 100644 --- a/include/xorg/page.inc.php +++ b/include/xorg/page.inc.php @@ -19,79 +19,17 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -require_once('diogenes/diogenes.core.page.inc.php'); -require_once('xorg/errors.inc.php'); -require_once('xorg/smarty.plugins.inc.php'); +require_once('platal/page.inc.php'); // {{{ class XorgPage -/** - * This class is the Core template compiler - * - * @category XOrgCore - * @package XOrgCore - * @author Jeremy Lainé - * @access public - * @see DiogenesCorePage - */ -class XorgPage extends DiogenesCorePage +class XorgPage extends PlatalPage { - // {{{ properties - - var $_page_type; - var $_tpl; - var $_errors; - - // defaults - var $caching = false; - var $config_overwrite = false; - var $use_sub_dirs = false; - - // }}} // {{{ function XorgPage() function XorgPage($tpl, $type=SKINNED) { - global $globals; - - $this->template_dir = $globals->spoolroot."/templates/"; - $this->compile_dir = $globals->spoolroot."/templates_c/"; - array_unshift($this->plugins_dir, $globals->spoolroot."/plugins/"); - $this->config_dir = $globals->spoolroot."/configs/"; - - $this->compile_check = !empty($globals->debug); - - if ($type == SKINNED) { - $this->register_modifier('escape_html', 'escape_html'); - $this->default_modifiers[] = '@escape_html'; - } - - $this->_page_type = $type; - $this->_tpl = $tpl; - $this->_errors = new XOrgErrors; - - $this->DiogenesCorePage(); - $this->register_prefilter('at_to_globals'); - $this->register_prefilter('trimwhitespace'); - $this->addJsLink('javascript/xorg.js'); - - $this->doAuth(); - } - - // }}} - // {{{ function changeTpl() - - function changeTpl($tpl, $type=SKINNED) - { - $this->_tpl = $tpl; - $this->_page_type = $type; - if ($type == SKINNED) { - $this->register_modifier('escape_html', 'escape_html'); - $this->default_modifiers = Array('@escape_html'); - } - - $this->_page_type = $type; - $this->assign('xorg_tpl', $tpl); + $this->PlatalPage($tpl, $type); } // }}} @@ -99,132 +37,7 @@ class XorgPage extends DiogenesCorePage function run() { - global $globals, $TIME_BEGIN; - $this->assign("xorg_error", $this->_errors); - - if ($this->_page_type == NO_SKIN) { - $this->display($this->_tpl); - exit; - } - - $this->assign('menu', $globals->menu->menu()); - - if ($globals->debug) { - - if ($globals->debug & 1) { - $this->assign('db_trace', $globals->db->trace_format($this, 'database-debug.tpl')); - } - - $this->assign('validate', urlencode($globals->baseurl.'/valid.html')); - $result = $this->fetch('skin/'.Session::get('skin')); - $ttime = sprintf('Temps total: %.02fs
', microtime_float() - $TIME_BEGIN); - $replc = "VALIDATION HTML INACTIVE
"; - - if ($globals->debug & 2) { - - $fd = fopen($this->compile_dir."/valid.html","w"); - fwrite($fd, $result); - fclose($fd); - - exec($globals->spoolroot."/bin/devel/xhtml.validate.pl ".$this->compile_dir."/valid.html", $val); - foreach ($val as $h) { - if (preg_match("/^X-W3C-Validator-Errors: (\d+)$/", $h, $m)) { - $replc = 'HTML OK
'; - if ($m[1]) { - $replc = "{$m[1]} ERREUR(S) !!!
"; - } - break; - } - } - } - - echo str_replace("@HOOK@", $ttime.$replc, $result); - exit; - } - - $this->display('skin/'.Session::get('skin')); - exit; - } - - // }}} - // {{{ function nb_errs() - - function nb_errs() - { - return count($this->_errors->errs); - } - - // }}} - // {{{ function trig() - - function trig($msg) - { - $this->_errors->trig($msg); - } - - // }}} - // {{{ function trig() - - function trig_run($msg) - { - $this->_errors->trig($msg); - $this->run(); - } - - // }}} - // {{{ function fail() - - function fail($msg) - { - $this->_errors->fail($msg); - } - - // }}} - // {{{ function kill() - - function kill($msg) - { - $this->fail($msg); - $this->run(); - } - - // }}} - // {{{ function doAuth() - - function doAuth() { } - - // }}} - // {{{ function loadModule() - - function loadModule($modname) - { - require_once("$modname.inc.php"); - } - - // }}} - // {{{ function addJsLink - - function addJsLink($path) - { - $this->append('xorg_js', $path); - } - - // }}} - // {{{ function addCssLink - - function addCssLink($path) - { - $this->append('xorg_css', $path); - } - - // }}} - // {{{ function gassign - - function gassign($varname) - { - global $$varname; - $this->assign($varname, $$varname); + $this->_run('skin/'.Session::get('skin')); } // }}} diff --git a/templates/skin/common.content.tpl b/templates/skin/common.content.tpl index acc2292..848a8fc 100644 --- a/templates/skin/common.content.tpl +++ b/templates/skin/common.content.tpl @@ -39,6 +39,6 @@ Nous conseillons tr
{$err|smarty:nodefaults}
{/foreach} -{if !$xorg_error->failure}{include file=$xorg_tpl}{/if} +{if !$xorg_error->failure && $xorg_tpl}{include file=$xorg_tpl}{/if} {* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl index 79d4e95..0bbe150 100644 --- a/templates/skin/common.header.tpl +++ b/templates/skin/common.header.tpl @@ -24,10 +24,10 @@ - - - - + + + + diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl index feb71c2..b38b80a 100644 --- a/templates/skin/default.tpl +++ b/templates/skin/default.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl index c35f845..50713c5 100644 --- a/templates/skin/espace.tpl +++ b/templates/skin/espace.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl index b4f40c1..d4a6def 100644 --- a/templates/skin/humlinux.tpl +++ b/templates/skin/humlinux.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl index 8b02aa9..5eb72a8 100644 --- a/templates/skin/linux.tpl +++ b/templates/skin/linux.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl index cecf488..03b4769 100644 --- a/templates/skin/liteskin.tpl +++ b/templates/skin/liteskin.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl index 02bebf0..42384c7 100644 --- a/templates/skin/nbviolet.tpl +++ b/templates/skin/nbviolet.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl index fba2b8c..b781cda 100644 --- a/templates/skin/newxorg.tpl +++ b/templates/skin/newxorg.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl index c12002f..d4ab2bc 100644 --- a/templates/skin/oldtimes.tpl +++ b/templates/skin/oldtimes.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl index 68f2b1c..6978cf4 100644 --- a/templates/skin/openweb.tpl +++ b/templates/skin/openweb.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl index a546ba4..b0057b2 100644 --- a/templates/skin/sharky.tpl +++ b/templates/skin/sharky.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl index 191ae87..7972f57 100644 --- a/templates/skin/spectral.tpl +++ b/templates/skin/spectral.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl index 704e416..6b6a26c 100644 --- a/templates/skin/trapped.tpl +++ b/templates/skin/trapped.tpl @@ -17,7 +17,6 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************} - diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl new file mode 100644 index 0000000..952734e --- /dev/null +++ b/templates/xnet/skin.tpl @@ -0,0 +1,117 @@ +{*************************************************************************** + * Copyright (C) 2003-2004 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 * + ***************************************************************************} + + + + + + + + Les associations polytechniciennes + + + + + + + + + + + + + {foreach from=$xorg_css item=css} + + {/foreach} + {foreach from=$xorg_js item=js} + + {/foreach} + + + {include file=skin/common.bandeau.head.tpl} + + + {include file=skin/common.devel.tpl} + {include file=skin/common.bandeau.tpl} + +{assign var=type value=plan} + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Logo Assos + + Logo {$type} + + {$type} +
+ {include file="skin/common.content.tpl"} +
----------
+IF LOGGED PRINT LIST OF ASSOCES OR TODO : IF NOT LOGGED PRINT LOGIN +
----------
+ page d'accueil - + liste des associations - + services proposés - + à propos de ce site - + polytechnique.org - + {mailto address="contact@polytechnique.org" text="nous contacter" encode="javascript"} +
+ © Copyright 2000-2004 Association Polytechnique.org +
+ + +{* vim:set et sw=2 sts=2 sws=2: *}