From d083f500e283a6abfcbac69d85ca8bd9892d7742 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Mon, 18 Sep 2006 20:06:05 +0000 Subject: [PATCH] merges git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@859 839d8a87-29fc-0310-9880-83ba4fa771e5 --- classes/Page.php | 1 + templates/skin/common.bug.tpl | 2 +- templates/skin/default.tpl | 2 +- templates/skin/espace.tpl | 2 +- templates/skin/humlinux.tpl | 2 +- templates/skin/keynote.tpl | 2 +- templates/skin/linux.tpl | 2 +- templates/skin/liteskin.tpl | 2 +- templates/skin/nbviolet.tpl | 2 +- templates/skin/newxorg.tpl | 2 +- templates/skin/oldtimes.tpl | 2 +- templates/skin/openweb.tpl | 2 +- templates/skin/sharky.tpl | 2 +- templates/skin/spectral.tpl | 2 +- templates/skin/trapped.tpl | 2 +- templates/xnet/skin.tpl | 2 +- 16 files changed, 16 insertions(+), 15 deletions(-) diff --git a/classes/Page.php b/classes/Page.php index 01a52c3..63add7e 100644 --- a/classes/Page.php +++ b/classes/Page.php @@ -79,6 +79,7 @@ class PlatalPage extends Smarty $this->assign("xorg_errors", $this->_errors); $this->assign("xorg_failure", $this->_failure); + $this->assign('globals', $globals); switch ($this->_page_type) { case NO_SKIN: diff --git a/templates/skin/common.bug.tpl b/templates/skin/common.bug.tpl index a06085f..07442ab 100644 --- a/templates/skin/common.bug.tpl +++ b/templates/skin/common.bug.tpl @@ -25,7 +25,7 @@ ** Explique ici le problème ou l'amélioration proposée ** -Page : {#globals.baseurl#}/?{$smarty.server.QUERY_STRING} +Page : {$globals->baseurl}/?{$smarty.server.QUERY_STRING} Navigateur : {$smarty.server.HTTP_USER_AGENT} Skin : {$smarty.session.skin} Signalé par {$smarty.session.forlife} diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl index fdd2a2c..27b4280 100644 --- a/templates/skin/default.tpl +++ b/templates/skin/default.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl index e2bc244..0d6519f 100644 --- a/templates/skin/espace.tpl +++ b/templates/skin/espace.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl index 4d6dd02..f15b8a4 100644 --- a/templates/skin/humlinux.tpl +++ b/templates/skin/humlinux.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} diff --git a/templates/skin/keynote.tpl b/templates/skin/keynote.tpl index c769cba..e333e67 100644 --- a/templates/skin/keynote.tpl +++ b/templates/skin/keynote.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl index f204771..18b92a5 100644 --- a/templates/skin/linux.tpl +++ b/templates/skin/linux.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl index f1955f3..e6b0b64 100644 --- a/templates/skin/liteskin.tpl +++ b/templates/skin/liteskin.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl index 16a5ec4..e6c5394 100644 --- a/templates/skin/nbviolet.tpl +++ b/templates/skin/nbviolet.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl index 934e090..ffc73bb 100644 --- a/templates/skin/newxorg.tpl +++ b/templates/skin/newxorg.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl index d873622..60c47ea 100644 --- a/templates/skin/oldtimes.tpl +++ b/templates/skin/oldtimes.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl index e4ef50f..a2f4e21 100644 --- a/templates/skin/openweb.tpl +++ b/templates/skin/openweb.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl index aa524b3..4b7a5f1 100644 --- a/templates/skin/sharky.tpl +++ b/templates/skin/sharky.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl index 60b8fda..48931ec 100644 --- a/templates/skin/spectral.tpl +++ b/templates/skin/spectral.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl index 2b5beaa..a09f088 100644 --- a/templates/skin/trapped.tpl +++ b/templates/skin/trapped.tpl @@ -23,7 +23,7 @@ - + {include file=skin/common.header.tpl} diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl index 1467bbe..34a8d5a 100644 --- a/templates/xnet/skin.tpl +++ b/templates/xnet/skin.tpl @@ -23,7 +23,7 @@ - + Les associations polytechniciennes -- 2.1.4