projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a3eb011)
merges
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 18 Sep 2006 20:06:05 +0000 (20:06 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 18 Sep 2006 20:06:05 +0000 (20:06 +0000)
git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@859 839d8a87-29fc-0310-9880-83ba4fa771e5

16 files changed:
classes/Page.php patch | blob | blame | history
templates/skin/common.bug.tpl patch | blob | blame | history
templates/skin/default.tpl patch | blob | blame | history
templates/skin/espace.tpl patch | blob | blame | history
templates/skin/humlinux.tpl patch | blob | blame | history
templates/skin/keynote.tpl patch | blob | blame | history
templates/skin/linux.tpl patch | blob | blame | history
templates/skin/liteskin.tpl patch | blob | blame | history
templates/skin/nbviolet.tpl patch | blob | blame | history
templates/skin/newxorg.tpl patch | blob | blame | history
templates/skin/oldtimes.tpl patch | blob | blame | history
templates/skin/openweb.tpl patch | blob | blame | history
templates/skin/sharky.tpl patch | blob | blame | history
templates/skin/spectral.tpl patch | blob | blame | history
templates/skin/trapped.tpl patch | blob | blame | history
templates/xnet/skin.tpl patch | blob | blame | history

diff --git a/classes/Page.php b/classes/Page.php
index 01a52c3..63add7e 100644 (file)
--- 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 (file)
--- a/templates/skin/common.bug.tpl
+++ b/templates/skin/common.bug.tpl
@@ -25,7 +25,7 @@
 \r
 ** Explique ici le problème ou l'amélioration proposée **\r
                \r
-Page : {#globals.baseurl#}/?{$smarty.server.QUERY_STRING}\r
+Page : {$globals->baseurl}/?{$smarty.server.QUERY_STRING}\r
 Navigateur : {$smarty.server.HTTP_USER_AGENT}\r
 Skin : {$smarty.session.skin} \r
 Signalé par {$smarty.session.forlife}</textarea>\r
diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl
index fdd2a2c..27b4280 100644 (file)
--- a/templates/skin/default.tpl
+++ b/templates/skin/default.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     {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 (file)
--- a/templates/skin/espace.tpl
+++ b/templates/skin/espace.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="css/espace.css" media="screen" />
     {include file=skin/common.header.tpl}
diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl
index 4d6dd02..f15b8a4 100644 (file)
--- a/templates/skin/humlinux.tpl
+++ b/templates/skin/humlinux.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="css/humlinux.css" media="screen" />
     {include file=skin/common.header.tpl}
diff --git a/templates/skin/keynote.tpl b/templates/skin/keynote.tpl
index c769cba..e333e67 100644 (file)
--- a/templates/skin/keynote.tpl
+++ b/templates/skin/keynote.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/keynote.css" media="screen" />
     {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 (file)
--- a/templates/skin/linux.tpl
+++ b/templates/skin/linux.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="css/linux.css" media="screen" />
     {include file=skin/common.header.tpl}
diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl
index f1955f3..e6b0b64 100644 (file)
--- a/templates/skin/liteskin.tpl
+++ b/templates/skin/liteskin.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="css/liteskin.css" media="screen" />
     {include file=skin/common.header.tpl}
diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl
index 16a5ec4..e6c5394 100644 (file)
--- a/templates/skin/nbviolet.tpl
+++ b/templates/skin/nbviolet.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="css/nbviolet.css" media="screen" />
     {include file=skin/common.header.tpl}
diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl
index 934e090..ffc73bb 100644 (file)
--- a/templates/skin/newxorg.tpl
+++ b/templates/skin/newxorg.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="css/newxorg.css" media="screen" />
     {include file=skin/common.header.tpl}
diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl
index d873622..60c47ea 100644 (file)
--- a/templates/skin/oldtimes.tpl
+++ b/templates/skin/oldtimes.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="css/oldtimes.css" media="screen" />
     {include file=skin/common.header.tpl}
diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl
index e4ef50f..a2f4e21 100644 (file)
--- a/templates/skin/openweb.tpl
+++ b/templates/skin/openweb.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/openweb.css" media="screen" />
     {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 (file)
--- a/templates/skin/sharky.tpl
+++ b/templates/skin/sharky.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="css/sharky.css" media="screen" />
     {include file=skin/common.header.tpl}
diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl
index 60b8fda..48931ec 100644 (file)
--- a/templates/skin/spectral.tpl
+++ b/templates/skin/spectral.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="css/spectral.css" media="screen" />
     {include file=skin/common.header.tpl}
diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl
index 2b5beaa..a09f088 100644 (file)
--- a/templates/skin/trapped.tpl
+++ b/templates/skin/trapped.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <link rel="stylesheet" type="text/css" href="css/default.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="css/trapped.css" media="screen" />
     {include file=skin/common.header.tpl}
diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 1467bbe..34a8d5a 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}/" />
+    <base href="{$globals->baseurl}/" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 
     <title>Les associations polytechniciennes</title>
plat/al