no more head hacks
authorPierre Habouzit (MadCoder <pierre.habouzit@m4x.org>
Sat, 8 Jan 2005 14:43:43 +0000 (14:43 +0000)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 26 Jun 2008 21:27:18 +0000 (23:27 +0200)
 * XOrgPage::addJsLink to add javascript links
 * XOrgPage::addCssLink to add css links

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-247

32 files changed:
ChangeLog
htdocs/admin/newsletter_edit.php
htdocs/banana/index.php
htdocs/css/lists.archives.css [moved from templates/listes/archives.head.tpl with 70% similarity]
htdocs/css/profil.css [moved from templates/banana/index.head.tpl with 62% similarity]
htdocs/javascript/do_challenge_response_logged.js [moved from templates/password_prompt_logged.head.tpl with 70% similarity]
htdocs/javascript/motdepassemd5.js [moved from templates/motdepassemd5.head.tpl with 77% similarity]
htdocs/listes/archives.php
htdocs/motdepassemd5.php
htdocs/newsletter/show.php
htdocs/newsletter/submit.php
htdocs/profil.php
include/xorg.inc.php
include/xorg/page.inc.php
include/xorg/session.inc.php
install.d/platal/files
templates/newsletter/head.tpl [deleted file]
templates/password_prompt.head.tpl [deleted file]
templates/profil.head.tpl [deleted file]
templates/skin/common.header.tpl
templates/skin/default.tpl
templates/skin/espace.tpl
templates/skin/humlinux.tpl
templates/skin/linux.tpl
templates/skin/liteskin.tpl
templates/skin/nbviolet.tpl
templates/skin/newxorg.tpl
templates/skin/oldtimes.tpl
templates/skin/openweb.tpl
templates/skin/sharky.tpl
templates/skin/spectral.tpl
templates/skin/trapped.tpl

index 935ff9d..0b94c15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ New :
                - Drop cache algorithm (was complex for no gain).                                       -MC
                - Enhancements wrt COOKIE.                                                                                      -MC
                - More homogenous date formating (use %x / %X everywhere).                      -MC
+               - No more .head.tpl. (thanks to JM for the tip).                                        -MC
 
        * Contacts :
                - Brand new PDF of the contact list (using FPDF).                                       -MC
index 9ba916f..3e5cc7e 100644 (file)
@@ -20,7 +20,8 @@
  ***************************************************************************/
 
 require_once("xorg.inc.php");
-new_admin_page('admin/newsletter_edit.tpl', 'newsletter/head.tpl');
+new_admin_page('admin/newsletter_edit.tpl');
+$page->addCssLink('css/nl.css');
 require_once("newsletter.inc.php");
 
 $nid = Get::get('nid', 'last');
index bf0433d..af59d9a 100644 (file)
@@ -8,7 +8,8 @@
 ********************************************************************************/
 
 require_once('xorg.inc.php');
-new_skinned_page('banana/index.tpl', AUTH_COOKIE, 'banana/index.head.tpl');
+new_skinned_page('banana/index.tpl', AUTH_COOKIE);
+$page->addCssLink('banana/css/style.css');
 require_once('banana.inc.php');
 
 $res = PlatalBanana::run();
similarity index 70%
rename from templates/listes/archives.head.tpl
rename to htdocs/css/lists.archives.css
index 3470f46..0039827 100644 (file)
@@ -1,4 +1,4 @@
-{***************************************************************************
+/***************************************************************************
  *  Copyright (C) 2003-2004 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  along with this program; if not, write to the Free Software            *
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************}
+ ***************************************************************************/
 
-{literal}
-<style type="text/css">
-  table.bicol+table.bicol { margin: 1ex; }
-  table.bicol td.right { white-space: nowrap; }
-  table.bicol td.subj { white-space: nowrap; }
-  table.bicol tr:hover td { background: yellow; }
-  table.bicol tr.pair:hover td { background: inherit; }
-  table.bicol tr.impair:hover td { background: inherit; }
-  table.bicol img { margin: 1ex; }
-  td.subj a { overflow: hidden; display: block; }
-  td.subj strong { overflow: hidden; display: block; }
+table.bicol+table.bicol { margin: 1ex; }
+table.bicol td.right { white-space: nowrap; }
+table.bicol td.subj { white-space: nowrap; }
+table.bicol tr:hover td { background: yellow; }
+table.bicol tr.pair:hover td { background: inherit; }
+table.bicol tr.impair:hover td { background: inherit; }
+table.bicol img { margin: 1ex; }
+td.subj a { overflow: hidden; display: block; }
+td.subj strong { overflow: hidden; display: block; }
 
-  .quote {
+.quote {
     font-style: italic;
     margin: 0em 0.3em;
     padding-left: 0.3em;
     color: green;
     border-left: green solid 2px;
-  }
-  .quote .quote {
+}
+.quote .quote {
     color: #95b;
     border-left: #95b solid 2px;
-  }
-  .quote .quote .quote {
+}
+.quote .quote .quote {
     color: #888;
     border-left: #888 solid 2px;
-  }
-</style>
-{/literal}
-
-{* vim:set et sw=2 sts=2 sws=2: *}
+}
similarity index 62%
rename from templates/banana/index.head.tpl
rename to htdocs/css/profil.css
index 1dbee56..5c85de9 100644 (file)
@@ -1,4 +1,4 @@
-{***************************************************************************
+/***************************************************************************
  *  Copyright (C) 2003-2004 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  along with this program; if not, write to the Free Software            *
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************}
+ ***************************************************************************/
 
-<link rel="stylesheet" type="text/css" href="css/style.css" media="screen" />
-
-{* vim:set et sw=2 sts=2 sws=2: *}
+div.blocunite {margin: 1em 0em 2em 0em;}
+div.blocunite_tab {margin: 0em 0em 2em 0em;}
+div.erreur {background-color: #FF3300; padding-left=0.5em; margin: 2px;}
+table.bicol td.cold,td.col {padding-right: 0.5em;}
+table.bicol td.colm {}
+table.bicol td.colg,td.col {padding-left: 0.5em;}
+table.bicol td.dcolm, td.dcolg, td.dcold {padding-bottom: 0.5em;}
+table.bicol td.dcolg {padding-left: 0.5em;}
+table.bicol td.dcold {padding-right: 0.5em;}
+table.bicol td.pflags {}
+table.bicol td.flags {padding-top: 0.5em;}
+table.bicol tr.top {vertical-align: top;}
+table.bicol span.titre {font-weight: bold;}
+table.bicol span.comm {font-size: smaller;}
+table.bicol span.nom {}
+table.bicol span.valeur {font-weight: bold;}
+table.bicol span.lien {font-size: smaller;}
@@ -1,4 +1,4 @@
-{***************************************************************************
+/***************************************************************************
  *  Copyright (C) 2003-2004 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  along with this program; if not, write to the Free Software            *
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************}
+ ***************************************************************************/
 
+function readCookie(name)
+{
+    var nameEQ = name + "=";
+    var ca = document.cookie.split(';');
+    for(var i=0;i < ca.length;i++)
+    {
+        var c = ca[i];
+        while (c.charAt(0)==' ') c = c.substring(1,c.length);
+        if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+    }
+    return null;
+}
 
-    <script src="{"javascript/md5.js"|url}" type="text/javascript"></script>
-    <script type="text/javascript">//<![CDATA[
-      function doChallengeResponse() {ldelim}
-        str = "{$smarty.cookies.ORGuid}:" +
+
+function doChallengeResponse() {
+    str = readCookie('ORGuid') + ":" +
         MD5(document.forms.login.password.value) + ":" +
         document.forms.loginsub.challenge.value;
 
-        document.forms.loginsub.response.value = MD5(str);
-        document.forms.login.password.value = "";
-        document.forms.loginsub.submit();
-      {rdelim}
-      //]]>
-    </script>
-
-{* vim:set et sw=2 sts=2 sws=2: *}
+    document.forms.loginsub.response.value = MD5(str);
+    document.forms.login.password.value = "";
+    document.forms.loginsub.submit();
+}
similarity index 77%
rename from templates/motdepassemd5.head.tpl
rename to htdocs/javascript/motdepassemd5.js
index 6c54c2c..8474f8c 100644 (file)
@@ -1,4 +1,4 @@
-{***************************************************************************
+/***************************************************************************
  *  Copyright (C) 2003-2004 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  along with this program; if not, write to the Free Software            *
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************}
+ ***************************************************************************/
 
-
-<script type="text/javascript" src="{"javascript/md5.js"|url}"></script>
-{literal}
-<script type="text/javascript">
-//<![CDATA[
-  function EnCryptedResponse() {
+function EnCryptedResponse() {
     pw1 = document.forms.changepass.nouveau.value;
     pw2 = document.forms.changepass.nouveau2.value;
     if (pw1 != pw2) {
-      alert ("\nErreur : les deux champs ne sont pas identiques !")
-      return false;
-      exit;
+        alert ("\nErreur : les deux champs ne sont pas identiques !")
+            return false;
+        exit;
     }
     if (pw1.length < 6) {
-      alert ("\nErreur : le nouveau mot de passe doit faire au moins 6 caractères !")
-      return false;
-      exit;
+        alert ("\nErreur : le nouveau mot de passe doit faire au moins 6 caractères !")
+            return false;
+        exit;
     }
     str = MD5(document.forms.changepass.nouveau.value);
     document.forms.changepass2.response2.value = str;
     alert ("Le mot de passe que tu as rentré va être chiffré avant de nous parvenir par Internet ! Ainsi il ne circulera pas en clair.");
     document.forms.changepass2.submit();
     return true;
-  }
-//]]>
-</script>
-{/literal}
-
-{* vim:set et sw=2 sts=2 sws=2: *}
+}
index 555d9c5..89b1aa7 100644 (file)
@@ -23,7 +23,8 @@ require_once("xorg.inc.php");
 if (!Env::has('liste')) header('Location: index.php');
 $liste = strtolower(Env::get('liste'));
 
-new_skinned_page('listes/archives.tpl', AUTH_COOKIE, 'listes/archives.head.tpl');
+new_skinned_page('listes/archives.tpl', AUTH_COOKIE);
+$page->addCssLink('css/lists.archives.css');
 require_once('lists.inc.php');
 
 $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'));
index ce034ac..23be59f 100644 (file)
@@ -37,6 +37,8 @@ if (Env::has('response2'))  {
     $page->run();
 }
 
-new_skinned_page('motdepassemd5.tpl', AUTH_MDP, 'motdepassemd5.head.tpl');
+new_skinned_page('motdepassemd5.tpl', AUTH_MDP);
+$page->addJsLink('javascript/md5.js');
+$page->addJsLink('javascript/motdepassemd5.js');
 $page->run();
 ?>
index bbee019..18cba2a 100644 (file)
@@ -20,7 +20,8 @@
  ***************************************************************************/
 
 require_once("xorg.inc.php");
-new_skinned_page('newsletter/show.tpl', AUTH_COOKIE, 'newsletter/head.tpl');
+new_skinned_page('newsletter/show.tpl', AUTH_COOKIE);
+$page->addCssLink('css/nl.css');
 require_once("newsletter.inc.php");
 
 $nid = Get::get('nid', 'last');
index 509436a..a311482 100644 (file)
@@ -20,7 +20,8 @@
  ***************************************************************************/
 
 require_once("xorg.inc.php");
-new_skinned_page('newsletter/submit.tpl', AUTH_COOKIE, 'newsletter/head.tpl');
+new_skinned_page('newsletter/submit.tpl', AUTH_COOKIE);
+$page->addCssLink('css/nl.css');
 require_once("newsletter.inc.php");
 
 if (Post::has('see')) {
index b84d20f..8a4d0f4 100644 (file)
@@ -20,7 +20,8 @@
  ***************************************************************************/
 
 require_once("xorg.inc.php");
-new_skinned_page('profil.tpl',AUTH_MDP, 'profil.head.tpl');
+new_skinned_page('profil.tpl',AUTH_MDP);
+$page->addCssLink('css/profil.css');
 
 require_once('tabs.inc.php');
 require_once('profil.func.inc.php');
index 0d78f58..5245c0e 100644 (file)
@@ -73,7 +73,7 @@ if (ini_get("magic_quotes_gpc")) {
 // }}}
 // {{{ function _new_page()
 
-function _new_page($type, $tpl_name, $tpl_head, $min_auth, $admin=false)
+function _new_page($type, $tpl_name, $min_auth, $admin=false)
 {
     global $page,$globals;
     require_once("xorg/page.inc.php");
@@ -92,25 +92,24 @@ function _new_page($type, $tpl_name, $tpl_head, $min_auth, $admin=false)
             $page = new XorgAuth($tpl_name, $type);
     }
 
-    $page->assign('xorg_head', $tpl_head);
     $page->assign('xorg_tpl', $tpl_name);
 }
 
 // }}}
 // {{{ function new_skinned_page()
 
-function new_skinned_page($tpl_name, $min_auth, $tpl_head="")
+function new_skinned_page($tpl_name, $min_auth)
 {
-    _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth);
+    _new_page(SKINNED, $tpl_name, $min_auth);
 }
 
 // }}}
 // {{{ function new_simple_page()
 
-function new_simple_page($tpl_name, $min_auth, $tpl_head="")
+function new_simple_page($tpl_name, $min_auth)
 {
     global $page,$globals;
-    _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth);
+    _new_page(SKINNED, $tpl_name, $min_auth);
     $page->assign('simple', true);
 }
 
@@ -125,9 +124,9 @@ function new_nonhtml_page($tpl_name, $min_auth)
 // }}}
 // {{{ function new_admin_page()
 
-function new_admin_page($tpl_name, $tpl_head="")
+function new_admin_page($tpl_name)
 {
-    _new_page(SKINNED, $tpl_name, $tpl_head, AUTH_MDP, true);
+    _new_page(SKINNED, $tpl_name, AUTH_MDP, true);
 }
 
 // }}}
index 0d53255..38927ff 100644 (file)
@@ -72,6 +72,7 @@ class XorgPage extends DiogenesCorePage
 
         $this->DiogenesCorePage();
         $this->register_prefilter('at_to_globals');
+        $this->addJsLink('javascript/xorg.js');
 
         $this->doAuth();
     }
@@ -98,12 +99,12 @@ class XorgPage extends DiogenesCorePage
     function run()
     {
         global $globals, $TIME_BEGIN;
-        $this->assign_by_ref("xorg_error", $this->_errors);
+        $this->assign("xorg_error", $this->_errors);
         
         if ($this->_page_type == NO_SKIN) {
             $this->display($this->_tpl);
         } else {
-            $this->assign_by_ref('menu', $globals->menu->menu());
+            $this->assign('menu', $globals->menu->menu());
             if ($globals->debug) {
                 $this->assign('db_trace', $globals->db->trace_format($this, 'database-debug.tpl'));
                 $this->assign('validate', urlencode($globals->baseurl.'/valid.html'));
@@ -191,6 +192,22 @@ class XorgPage extends DiogenesCorePage
     }
 
     // }}}
+    // {{{ function addJsLink
+
+    function addJsLink($path)
+    {
+        $this->append('xorg_js', $path);
+    }
+
+    // }}}
+    // {{{ function addCssLink
+
+    function addCssLink($path)
+    {
+        $this->append('xorg_css', $path);
+    }
+
+    // }}}
 }
 
 // }}}
index dee75da..ebe935f 100644 (file)
@@ -147,16 +147,15 @@ class XorgSession extends DiogenesCoreSession
      */
     function doLogin(&$page, $new_name=false)
     {
+        $page->addJsLink('javascript/md5.js');
        if (logged() and !$new_name) {
            $page->changeTpl('password_prompt_logged.tpl');
-           $page->caching = false;
-           $page->assign("xorg_head", "password_prompt_logged.head.tpl");
+            $page->addJsLink('javascript/do_challenge_response_logged.js');
            $page->assign("xorg_tpl", "password_prompt_logged.tpl");
            $page->run();
        } else {
            $page->changeTpl('password_prompt.tpl');
-           $page->caching = false;
-           $page->assign("xorg_head", "password_prompt.head.tpl");
+            $page->addJsLink('javascript/do_challenge_response.js');
            $page->assign("xorg_tpl", "password_prompt.tpl");
            $page->run();
        }
index fd0077f..c9baa83 100644 (file)
@@ -299,11 +299,8 @@ templates/cookie_on.tpl
 templates/deconnexion.tpl
 templates/index.tpl
 templates/logger-view.tpl
-templates/motdepassemd5.head.tpl
 templates/motdepassemd5.success.tpl
 templates/motdepassemd5.tpl
-templates/password_prompt.head.tpl
-templates/password_prompt_logged.head.tpl
 templates/password_prompt_logged.tpl
 templates/password_prompt.tpl
 templates/preferences.tpl
diff --git a/templates/newsletter/head.tpl b/templates/newsletter/head.tpl
deleted file mode 100644 (file)
index 3b2ccac..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-{***************************************************************************
- *  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                *
- ***************************************************************************}
-
-<link rel="stylesheet" type="text/css" href="{"css/nl.css"|url}" media="screen,print" />
-
-{* vim:set et sw=2 sts=2 sws=2: *}
diff --git a/templates/password_prompt.head.tpl b/templates/password_prompt.head.tpl
deleted file mode 100644 (file)
index 09df2ca..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-{***************************************************************************
- *  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                *
- ***************************************************************************}
-<script src="{rel}/javascript/md5.js" type="text/javascript"></script>
-<script src="{rel}/javascript/do_challenge_response.js" type="text/javascript"></script>
-
-{* vim:set et sw=2 sts=2 sws=2: *}
diff --git a/templates/profil.head.tpl b/templates/profil.head.tpl
deleted file mode 100644 (file)
index 55c2588..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-{***************************************************************************
- *  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                *
- ***************************************************************************}
-
-
-{literal}
-<style type="text/css">
-  <!--
-  div.blocunite {margin: 1em 0em 2em 0em;}
-  div.blocunite_tab {margin: 0em 0em 2em 0em;}
-  div.erreur {background-color: #FF3300; padding-left=0.5em; margin: 2px;}
-  table.bicol td.cold,td.col {padding-right: 0.5em;}
-  table.bicol td.colm {}
-  table.bicol td.colg,td.col {padding-left: 0.5em;}
-  table.bicol td.dcolm, td.dcolg, td.dcold {padding-bottom: 0.5em;}
-  table.bicol td.dcolg {padding-left: 0.5em;}
-  table.bicol td.dcold {padding-right: 0.5em;}
-  table.bicol td.pflags {}
-  table.bicol td.flags {padding-top: 0.5em;}
-  table.bicol tr.top {vertical-align: top;}
-  table.bicol span.titre {font-weight: bold;}
-  table.bicol span.comm {font-size: smaller;}
-  table.bicol span.nom {}
-  table.bicol span.valeur {font-weight: bold;}
-  table.bicol span.lien {font-size: smaller;}
-  -->
-</style>
-{/literal}
-
-{* vim:set et sw=2 sts=2 sws=2: *}
index a867e87..1130dc1 100644 (file)
     <link rel="bookmark" href="http://www.polytechnique.org/"       title="| Polytechnique.org" />
     <link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />
 
-    <title>
-      {if $xorg_title}
-            {$xorg_title}
-            {else}
-      Anciens eleves Polytechnique, annuaire email, Alumni
-      {/if}
-    </title>
-    <script type="text/javascript" src="{"javascript/xorg.js"|url}"></script>
+    {foreach from=$xorg_css item=css}
+    <link rel="stylesheet" type="text/css" href="{rel}/{$css}" />
+    {/foreach}
+    {foreach from=$xorg_js item=js}
+    <script type="text/javascript" src="{rel}/{$js}"></script>
+    {/foreach}
+
+    <title>{$xorg_title|default:"Anciens eleves Polytechnique, annuaire email, Alumni"}</title>
 
 {* vim:set et sw=2 sts=2 sws=2: *}
index 06e8b35..feb71c2 100644 (file)
 <!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>
-    {include file=skin/common.header.tpl}
     <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
+    {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -36,8 +33,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>
index 4e03ed1..c35f845 100644 (file)
 <!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>
+    <link rel="stylesheet" type="text/css" href="{rel}/css/default.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="{rel}/css/espace.css" media="screen" />
     {include file=skin/common.header.tpl}
-    <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
-    <link rel="stylesheet" type="text/css" href="{"css/espace.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -37,8 +34,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>
index bbef65a..b4f40c1 100644 (file)
 <!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>
+    <link rel="stylesheet" type="text/css" href="{rel}/css/default.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="{rel}/css/humlinux.css" media="screen" />
     {include file=skin/common.header.tpl}
-    <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
-    <link rel="stylesheet" type="text/css" href="{"css/humlinux.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -37,8 +34,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>
index 1687bfb..8b02aa9 100644 (file)
 <!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>
+    <link rel="stylesheet" type="text/css" href="{rel}/css/default.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="{rel}/css/linux.css" media="screen" />
     {include file=skin/common.header.tpl}
-    <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
-    <link rel="stylesheet" type="text/css" href="{"css/linux.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -37,8 +34,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>
index f8e40e7..cecf488 100644 (file)
 <!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>
-    {include file=skin/common.header.tpl}
     <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
     <link rel="stylesheet" type="text/css" href="{"css/liteskin.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
+    {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -37,8 +34,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>
index fd4c75f..02bebf0 100644 (file)
 <!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>
-    {include file=skin/common.header.tpl}
     <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
     <link rel="stylesheet" type="text/css" href="{"css/nbviolet.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
+    {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -37,8 +34,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>
index e5e7faf..fba2b8c 100644 (file)
 <!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>
-    {include file=skin/common.header.tpl}
     <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
     <link rel="stylesheet" type="text/css" href="{"css/newxorg.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
+    {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -37,8 +34,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>
index c4862cd..c12002f 100644 (file)
 <!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>
-    {include file=skin/common.header.tpl}
     <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
     <link rel="stylesheet" type="text/css" href="{"css/oldtimes.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
+    {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -37,8 +34,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>
index 3c657e7..68f2b1c 100644 (file)
 <!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>
-    {include file=skin/common.header.tpl}
     <link rel="stylesheet" type="text/css" href="{rel}/css/openweb.css" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
+    {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -36,8 +33,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{rel}/exit.php">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{rel}/exit.php">exit</a>]
         </td>
       </tr>
     </table>
index 2b18b8e..a546ba4 100644 (file)
 <!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>
-    {include file=skin/common.header.tpl}
     <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
     <link rel="stylesheet" type="text/css" href="{"css/sharky.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
+    {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -37,8 +34,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>
index c6313b4..191ae87 100644 (file)
 <!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>
-    {include file=skin/common.header.tpl}
     <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
     <link rel="stylesheet" type="text/css" href="{"css/spectral.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
+    {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -37,8 +34,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>
index ed19129..704e416 100644 (file)
 <!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>
-    {include file=skin/common.header.tpl}
     <link rel="stylesheet" type="text/css" href="{"css/default.css"|url}" media="screen" />
     <link rel="stylesheet" type="text/css" href="{"css/trapped.css"|url}" media="screen" />
-    {if $xorg_head}
-    {include file=$xorg_head}
-    {/if}
+    {include file=skin/common.header.tpl}
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body onload='pa_onload()'>
@@ -37,8 +34,8 @@
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
-                    {$smarty.session.suid} ({$smarty.session.forlife})
-                    [<a href="{"exit.php"|url}">exit</a>]
+          {$smarty.session.suid} ({$smarty.session.forlife})
+          [<a href="{"exit.php"|url}">exit</a>]
         </td>
       </tr>
     </table>