more simplifications

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

diff --git a/classes/LoggerView.php b/classes/LoggerView.php
index 59f8d90..b0d1967 100644 (file)
--- a/classes/LoggerView.php
+++ b/classes/LoggerView.php
@@ -39,7 +39,7 @@ class LoggerView {
         global $globals;
 
         // give a 'no filter' option
-        $days[0] = __("all");
+        $months[0] = "----";
 
         if ($year && $month) {
             $day_max = Array(-1, 31, checkdate(2, 29, $year) ? 29 : 28 , 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
@@ -82,7 +82,7 @@ class LoggerView {
         global $globals;
 
         // give a 'no filter' option
-        $months[0] = __("all");
+        $months[0] = "----";
 
         if ($year) {
             $res = XDB::query("SELECT YEAR (MAX(start)), YEAR (MIN(start)),
@@ -137,7 +137,7 @@ class LoggerView {
         global $globals;
 
         // give a 'no filter' option
-        $years[0] = __("all");
+        $years[0] = "----";
 
         // retrieve available years
         $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM {$globals->table_log_sessions}");
@@ -286,22 +286,14 @@ class LoggerView {
                 $res = XDB::iterator($select);
 
                 $sessions = array();
-                $odd = false;
                 while ($mysess = $res->next()) {
                     $mysess['username'] = $this->_getUsername($mysess['auth'], $mysess['uid']);
                     // pretty label for auth method
                     $mysess['lauth'] = $auths[$mysess['auth']];
                     // summary of events
                     $mysess['events'] = array();
-                    // actions
-                    $mysess['actions'] = array(
-                        array(__("view session"), "admin/logger?logsess={$mysess['id']}"),
-                        array(__("user's log"), "admin/logger?logauth={$mysess['auth']}&loguser={$mysess['username']}")
-                        );
 
-                    $mysess['class'] = $odd ? "odd" : "even";
                     $sessions[$mysess['id']] = $mysess;
-                    $odd = !$odd;
                 }
                 array_reverse($sessions);
 
@@ -318,27 +310,10 @@ class LoggerView {
                 }
                 $page->assign_by_ref('sessions', $sessions);
             } else {
-                $page->assign('msg_nofilters', __("Please select a year and/or a user."));
+                $page->assign('msg_nofilters', "Sélectionner une annuée et/ou un utilisateur");
             }
         }
 
-        // translations
-        $page->assign('msg_session_properties', __("session properties"));
-        $page->assign('msg_user', __("user"));
-        $page->assign('msg_host', __("host"));
-        $page->assign('msg_browser', __("browser"));
-        $page->assign('msg_date', __("date"));
-        $page->assign('msg_action', __("action"));
-        $page->assign('msg_data', __("data"));
-        $page->assign('msg_filter_by', __("filter by"));
-        $page->assign('msg_start', __("start"));
-        $page->assign('msg_summary', __("summary"));
-        $page->assign('msg_actions', __("actions"));
-        $page->assign('msg_year', __("year"));
-        $page->assign('msg_month', __("month"));
-        $page->assign('msg_day', __("day"));
-        $page->assign('msg_submit', __("Submit"));
-
         // if requested, assign the content to be displayed
         if (!empty($outputvar)) {
             $page->assign($outputvar, $page->fetch($template));

diff --git a/classes/Page.php b/classes/Page.php
index 1f45385..1b76701 100644 (file)
--- a/classes/Page.php
+++ b/classes/Page.php
@@ -62,22 +62,6 @@ class PlatalPage extends Smarty
     }
 
     // }}}
-    // {{{ function fakeDiogenes()
-
-    function fakeDiogenes()
-    {
-        require_once 'diogenes/diogenes.core.page.inc.php';
-        $this->register_function("extval","diogenes_func_extval");
-        $this->register_function("flags","diogenes_func_flags");
-        $this->register_function("a","diogenes_func_a");
-        $this->register_function("checkbox","diogenes_func_checkbox");
-        $this->register_function("diff","diogenes_func_diff");
-        $this->register_function("menu_item","diogenes_func_menu_item");
-        $this->register_function("tag","diogenes_func_tag");
-        $this->register_function("toolbar","diogenes_func_toolbar");
-    }
-
-    // }}}
     // {{{ function changeTpl()
 
     function changeTpl($tpl, $type = SKINNED)

diff --git a/modules/admin.php b/modules/admin.php
index 3259b9d..d905cc5 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -103,7 +103,6 @@ class AdminModule extends PLModule
         $logview = new LoggerView;
         $logview->run($page);
 
-        $page->fakeDiogenes();
         $page->assign('xorg_title','Polytechnique.org - Administration - Logs des sessions');
     }
 

diff --git a/templates/logger-view.tpl b/templates/logger-view.tpl
index f20a2d3..34a40b5 100644 (file)
--- a/templates/logger-view.tpl
+++ b/templates/logger-view.tpl
@@ -26,19 +26,19 @@
 
 <table class="bicol">
 <tr>
-  <th colspan="2">{$msg_session_properties}</th>
+  <th colspan="2">Propriétés de la session</th>
 </tr>
 <tr class="impair">
-  <td class="titre">{$msg_user}</td>
+  <td class="titre">utilisateur</td>
   <td>{$session.username} {if $session.suer}(suid by {$session.suer}){/if}
   [<a href="{$platal->ns}admin/logger?logauth={$session.auth}&amp;loguser={$session.username}">user's log</a>]</td>
 </tr>
 <tr class="pair">
-  <td class="titre">{$msg_host}</td>
+  <td class="titre">Hôte</td>
   <td><em>{$session.host}</em> <tt>IP: {$session.ip}</tt></td>
 </tr>
 <tr class="impair">
-  <td class="titre">{$msg_browser}</td>
+  <td class="titre">Navigateur</td>
   <td>{$session.browser}</td>
 </tr>
 </table>
@@ -47,9 +47,9 @@
 
 <table class="bicol">
 <tr>
-  <th>{$msg_date}</th>
-  <th>{$msg_action}</th>
-  <th>{$msg_data}</th>
+  <th>date</th>
+  <th>action</th>
+  <th>donnée</th>
 </tr>
 {foreach from=$events item=myevent}
 <tr class="{cycle values="impair,pair"}">
@@ -65,31 +65,28 @@
 <form method="post" action="{$platal->ns}admin/logger">
 <table class="bicol">
 <tr>
-  <th colspan="2">{$msg_filter_by}</th>
-</tr>
-<tr>
   <td><strong>{$msg_date}</strong></td>
   <td>
-    {$msg_year}
+    Année
     <select name="year" onchange="this.form.submit()">
       {html_options options=$years selected=$year}
     </select>
-    &nbsp;{$msg_month}
+    &nbsp;Mois
     <select name="month" onchange="this.form.submit()">
       {html_options options=$months selected=$month}
     </select>
-    &nbsp;{$msg_day}
+    &nbsp;Jour
     <select name="day" onchange="this.form.submit()">
       {html_options options=$days selected=$day}
     </select>
   </td>
 </tr>
 <tr>
-  <td><strong>{$msg_user}</strong></td>
+  <td><strong>Utilisateur</strong></td>
   <td>
     <input type="text" name="loguser" value="{$loguser}" />
     {html_options name="logauth" options=$auths selected=$logauth}
-    <input type="submit" value="{$msg_submit}" />
+    <input type="submit" />
   </td>
 </tr>
 </table>
@@ -100,10 +97,10 @@
 
 <table class="bicol" style="font-size: 90%">
   <tr>
-    <th>{$msg_start}</th>
-    <th>{$msg_user}</th>
-    <th>{$msg_summary}</th>
-    <th>{$msg_actions}</th>
+    <th>début</th>
+    <th>utilisateur</th>
+    <th>résumé</th>
+    <th>actions</th>
   </tr>
 {foreach from=$sessions item=mysess}
   <tr class="{cycle values="impair,pair"}">
@@ -113,9 +110,8 @@
       {foreach from=$mysess.events item=myevent}{$myevent}<br />{/foreach}
     </td>
     <td class="action">
-{foreach from=$mysess.actions item=myaction}
-      {a lnk=$myaction}
-{/foreach}
+      <a href="admin/logger?logsess={$mysess.id}">session</a>
+      <a href="admin/logger?logauth={$mysess.auth}&amp;loguser={$mysess.username}">user's log</a>
     </td>
   </tr>
   {/foreach}