mutualise la partie qui affiche la date et le nb d'inscrits dans les skins + formulai...

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@313 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 13329ae..4df9c06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@ New :
     * Profile :
         - See fiche send to AX.                                             -Car
 
+    * Skin :
+        - Common file for header above title.                               -Car
+        - Add a quick search form in this common header.                    -Car
+
     * Xnet :
         - Use wiki from Xnet.                                               -Car
         - Use wiki for group pages.                                         -Car

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index fec37e1..929e846 100644 (file)
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  Copyright (C) 2003-2006 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -545,6 +545,11 @@ div.adresse {
     vertical-align: top;
 }
 
+#quick_search {
+    color: gray;
+    text-align: right;
+}
+
 div#content {
     padding: 1em;
     margin: 0em;

diff --git a/templates/skin/common.title.header.tpl b/templates/skin/common.title.header.tpl
new file mode 100644 (file)
index 0000000..9423df8
--- /dev/null
+++ b/templates/skin/common.title.header.tpl
@@ -0,0 +1,41 @@
+{**************************************************************************}\r
+{*                                                                        *}\r
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}\r
+{*  http://opensource.polytechnique.org/                                  *}\r
+{*                                                                        *}\r
+{*  This program is free software; you can redistribute it and/or modify  *}\r
+{*  it under the terms of the GNU General Public License as published by  *}\r
+{*  the Free Software Foundation; either version 2 of the License, or     *}\r
+{*  (at your option) any later version.                                   *}\r
+{*                                                                        *}\r
+{*  This program is distributed in the hope that it will be useful,       *}\r
+{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}\r
+{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}\r
+{*  GNU General Public License for more details.                          *}\r
+{*                                                                        *}\r
+{*  You should have received a copy of the GNU General Public License     *}\r
+{*  along with this program; if not, write to the Free Software           *}\r
+{*  Foundation, Inc.,                                                     *}\r
+{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}\r
+{*                                                                        *}\r
+{**************************************************************************}\r
+          <table>\r
+            <tr>\r
+              <td class="date-heure">\r
+                <script type="text/javascript">\r
+                  <!--\r
+                  document.write(getNow());\r
+                  //-->\r
+                </script>\r
+              </td>\r
+              <td class="inscrits">\r
+                {insert name="getNbIns"} polytechniciens sur le web\r
+                <form action="{rel}/search.php" method="get">\r
+                    <div>\r
+                        <input type="text" size="30" name="quick" id="quick_search" value="{$smarty.request.quick|default:"recherche dans l'annuaire"}" onfocus="this.select()"/>                        \r
+                    </div>\r
+                </form>\r
+                {insert name="getNbNotifs"}\r
+              </td>\r
+            </tr>\r
+          </table>\r

diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl
index 1ed8664..b41a0a3 100644 (file)
--- a/templates/skin/default.tpl
+++ b/templates/skin/default.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -57,21 +57,7 @@
         </td>
         <td id="body-top">
           <a href="{rel}/login.php"><img src="{rel}/images/sk_default_ban.jpg" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
           <a href="{rel}/login.php"><img src="{rel}/images/sk_default_lesX.gif" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>

diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl
index a947781..89f7dfd 100644 (file)
--- a/templates/skin/espace.tpl
+++ b/templates/skin/espace.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -59,21 +59,7 @@
         </td>
         <td id="body-top">
           <a href="{"login.php"|url}"><img src="{"images/sk_espace_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
           <a href="{"login.php"|url}"><img src="{"images/sk_espace_lesX.gif"|url}" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>

diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl
index 286dff0..d447670 100644 (file)
--- a/templates/skin/humlinux.tpl
+++ b/templates/skin/humlinux.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -59,21 +59,7 @@
         </td>
         <td id="body-top">
           <a href="{"login.php"|url}"><img src="{"images/sk_humlinux_lesX.gif"|url}" alt="[LES X SUR LE WEB]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl
index 01f0dfe..69a2017 100644 (file)
--- a/templates/skin/linux.tpl
+++ b/templates/skin/linux.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -59,21 +59,7 @@
         </td>
         <td id="body-top">
           <a href="{"login.php"|url}"><img src="{"images/sk_linux_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
           <a href="{"login.php"|url}"><img src="{"images/sk_linux_lesX.jpg"|url}" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>

diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl
index a8c8ed2..d7172bd 100644 (file)
--- a/templates/skin/liteskin.tpl
+++ b/templates/skin/liteskin.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -59,21 +59,7 @@
         </td>
         <td id="body-top">
           <a href="{"login.php"|url}"><img src="{"images/sk_liteskin_titre.png"|url}" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl
index bcca45b..6dd1c17 100644 (file)
--- a/templates/skin/nbviolet.tpl
+++ b/templates/skin/nbviolet.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -59,21 +59,7 @@
         </td>
         <td id="body-top">
           <a href="{"login.php"|url}"><img src="{"images/sk_nbviolet_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
           <a href="{"login.php"|url}"><img src="{"images/sk_nbviolet_lesX.gif"|url}" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>

diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl
index fe375e2..bbb60f6 100644 (file)
--- a/templates/skin/newxorg.tpl
+++ b/templates/skin/newxorg.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -59,21 +59,7 @@
         </td>
         <td id="body-top">
           <a href="{"login.php"|url}"><img src="{"images/sk_newxorg_ban.png"|url}" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl
index 8aff1b0..60d2eba 100644 (file)
--- a/templates/skin/oldtimes.tpl
+++ b/templates/skin/oldtimes.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -59,21 +59,7 @@
         </td>
         <td id="body-top">
           <a href="{"login.php"|url}"><img src="{"images/sk_oldtimes_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
           <a href="{"login.php"|url}"><img src="{"images/sk_oldtimes_lesX.gif"|url}" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>

diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl
index 8aaf7ad..10e9f79 100644 (file)
--- a/templates/skin/openweb.tpl
+++ b/templates/skin/openweb.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -58,21 +58,7 @@
         </td>
         <td id="body-top">
           <a href="{rel}/login.php"><img src="{rel}/images/sk_default_ban.jpg" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl
index 92f7489..dbf56aa 100644 (file)
--- a/templates/skin/sharky.tpl
+++ b/templates/skin/sharky.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -59,21 +59,7 @@
         </td>
         <td id="body-top">
           <a href="{"login.php"|url}"><img src="{"images/sk_sharky_ban.png"|url}" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl
index d47d5d0..dcff345 100644 (file)
--- a/templates/skin/spectral.tpl
+++ b/templates/skin/spectral.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -59,21 +59,7 @@
         </td>
         <td id="body-top">
           <a href="{"login.php"|url}"><img src="{"images/sk_spectral_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
           <a href="{"login.php"|url}"><img src="{"images/sk_spectral_lesX.jpg"|url}" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>

diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl
index 40956f6..c57daca 100644 (file)
--- a/templates/skin/trapped.tpl
+++ b/templates/skin/trapped.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -59,21 +59,7 @@
         </td>
         <td id="body-top">
           <a href="{"login.php"|url}"><img src="{"images/sk_trapped_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
-          <table>
-            <tr>
-              <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
-              </td>
-              <td class="inscrits">
-                {insert name="getNbIns"} polytechniciens sur le web<br />
-                {insert name="getNbNotifs"}
-              </td>
-            </tr>
-          </table>
+          {include file="skin/common.title.header.tpl"}
           <a href="{"login.php"|url}"><img src="{"images/sk_trapped_lesX.gif"|url}" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>