projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e74411f)
Some skin updates: fix SUID location
authorx2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Thu, 7 Dec 2006 18:27:01 +0000 (18:27 +0000)
committerx2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Thu, 7 Dec 2006 18:27:01 +0000 (18:27 +0000)
git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1255 839d8a87-29fc-0310-9880-83ba4fa771e5

14 files changed:
htdocs/css/default.css patch | blob | blame | history
htdocs/css/keynote.css patch | blob | blame | history
modules/platal.php 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/register.tpl patch | blob | blame | history
templates/skin/spectral.tpl patch | blob | blame | history
templates/skin/trapped.tpl patch | blob | blame | history

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index 47c2871..7dd3471 100644 (file)
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -472,11 +472,24 @@ div.adresse strong {
 #suid {
     color: red;
     background: #ffc0cb;
-    width: 100%;
+    width: auto;
     font-weight: bold;
+    text-align: center;
+}
+#suid a {
+    color: red;
+    background: inherit;
+    text-decoration: none;
+    display: block;
+}
+#suid:hover {
+    color: red;
+    background: #ffffcb;
+}
+#suid a:hover {
+    color: #ff7000;
+    background: inherit;
 }
-#suid td { padding: 2px; }
-#suid a { color: red; }
 
 #body {
     width: 740px;
diff --git a/htdocs/css/keynote.css b/htdocs/css/keynote.css
index 94caa22..23dbff2 100644 (file)
--- a/htdocs/css/keynote.css
+++ b/htdocs/css/keynote.css
@@ -494,12 +494,25 @@ div.adresse {
     background: #ffc0cb;
     width: auto;
     font-weight: bold;
+    text-align: center;
+}
+#suid a {
+    color: red;
+    background: inherit;
+    text-decoration: none;
+    display: block;
+}
+#suid:hover {
+    color: red;
+    background: #ffffcb;
+}
+#suid a:hover {
+    color: #ff7000;
+    background: inherit;
 }
-#suid td { padding: 2px; }
-#suid a { color: red; background: inherit; }
 
 #body {
-    width: 740px;
+    width: 800px;
     margin-left: auto;
     margin-right: auto;
 }
diff --git a/modules/platal.php b/modules/platal.php
index d8fa628..234b925 100644 (file)
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -349,7 +349,7 @@ Mail envoy
              LEFT JOIN auth_user_quick AS a ON s.id=a.skin
                  WHERE skin_tpl != '' AND ext != ''
               GROUP BY id ORDER BY s.date DESC";
-        $page->assign_by_ref('skins', XDB::iterator($sql));
+        $page->assign('skins', XDB::iterator($sql));
     }
 
     function handler_exit(&$page, $level = null)
diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl
index 8f2f63b..d9e7ad5 100644 (file)
--- a/templates/skin/default.tpl
+++ b/templates/skin/default.tpl
@@ -30,15 +30,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -49,8 +49,6 @@
 
   {else}
 
-    {include file=skin/common.bandeau.tpl}
-
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl
index dca26b5..9d0855d 100644 (file)
--- a/templates/skin/espace.tpl
+++ b/templates/skin/espace.tpl
@@ -31,16 +31,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
-
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -51,8 +50,6 @@
 
   {else}
 
-    {include file=skin/common.bandeau.tpl}
-
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl
index 3b1ebf0..95e6ce2 100644 (file)
--- a/templates/skin/humlinux.tpl
+++ b/templates/skin/humlinux.tpl
@@ -31,16 +31,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
-
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -51,8 +50,6 @@
 
   {else}
 
-    {include file=skin/common.bandeau.tpl}
-
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
diff --git a/templates/skin/keynote.tpl b/templates/skin/keynote.tpl
index 34964db..27461ff 100644 (file)
--- a/templates/skin/keynote.tpl
+++ b/templates/skin/keynote.tpl
@@ -30,15 +30,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -49,8 +49,6 @@
 
   {else}
 
-    {include file=skin/common.bandeau.tpl}
-
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl
index 79ba9ef..89288c3 100644 (file)
--- a/templates/skin/linux.tpl
+++ b/templates/skin/linux.tpl
@@ -31,16 +31,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
-
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -51,8 +50,6 @@
 
   {else}
 
-    {include file=skin/common.bandeau.tpl}
-
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl
index 750d55b..d6b039c 100644 (file)
--- a/templates/skin/liteskin.tpl
+++ b/templates/skin/liteskin.tpl
@@ -31,16 +31,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
-
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -51,8 +50,6 @@
 
   {else}
 
-    {include file=skin/common.bandeau.tpl}
-
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl
index 819f5a5..a31fce5 100644 (file)
--- a/templates/skin/nbviolet.tpl
+++ b/templates/skin/nbviolet.tpl
@@ -31,16 +31,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
-
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -51,8 +50,6 @@
 
   {else}
 
-    {include file=skin/common.bandeau.tpl}
-
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl
index 4bd64e9..b294fe9 100644 (file)
--- a/templates/skin/newxorg.tpl
+++ b/templates/skin/newxorg.tpl
@@ -31,16 +31,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
-
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -51,8 +50,6 @@
 
   {else}
 
-    {include file=skin/common.bandeau.tpl}
-
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
diff --git a/templates/skin/register.tpl b/templates/skin/register.tpl
index be664cb..6949952 100644 (file)
--- a/templates/skin/register.tpl
+++ b/templates/skin/register.tpl
@@ -30,15 +30,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -46,7 +46,6 @@
       {include file="skin/common.content.tpl"}
     </div>
   {else}
-    {include file=skin/common.bandeau.tpl}
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-top">
diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl
index 69c6a06..3ccf2e1 100644 (file)
--- a/templates/skin/spectral.tpl
+++ b/templates/skin/spectral.tpl
@@ -31,16 +31,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
-
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -51,8 +50,6 @@
 
   {else}
 
-    {include file=skin/common.bandeau.tpl}
-
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl
index 2c7fc62..777f558 100644 (file)
--- a/templates/skin/trapped.tpl
+++ b/templates/skin/trapped.tpl
@@ -31,16 +31,15 @@
   </head>
   <body>
     {include file=skin/common.devel.tpl}
-
+    {if !$simple}
+      {include file=skin/common.bandeau.tpl}
+    {/if}
     {if $smarty.session.suid}
-    <table id="suid" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-          {$smarty.session.suid} ({$smarty.session.forlife})
-          [<a href="exit">exit</a>]
-        </td>
-      </tr>
-    </table>
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.forlife} ({$smarty.session.perms})
+      </a>
+    </div>
     {/if}
 
   {if $simple}
@@ -51,8 +50,6 @@
 
   {else}
 
-    {include file=skin/common.bandeau.tpl}
-
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
plat/al