mise a jour pour mtweb.0.8.1

diff --git a/app/mods/admin/actions_logs.php b/app/mods/config/actions_logs.php
similarity index 93%
rename from app/mods/admin/actions_logs.php
rename to app/mods/config/actions_logs.php
index bdf25c1..e23b26b 100644 (file)
--- a/app/mods/admin/actions_logs.php
+++ b/app/mods/config/actions_logs.php
@@ -1,9 +1,9 @@
 <?php
 
-  class mw_admin_actions_logs extends mw_mod{
+  class mw_config_actions_logs extends mw_mod{
 
     function index(&$env){
-      $env->run("admin/actions_logs/historique");
+      $env->run("config/actions_logs/historique");
     }
 
     function historique(&$env){
@@ -39,7 +39,7 @@
         return;
       }
       $env->redirect(
-        $env->url("admin/actions_logs/historique"),
+        $env->url("config/actions_logs/historique"),
         "l'historique a été vidé"
       );
     }
@@ -60,7 +60,7 @@
           return;
         }
         $env->redirect(
-          $env->url("admin/actions_logs/config"),
+          $env->url("config/actions_logs/config"),
           "la configuration a été mise à jour"
         );
       }
@@ -92,7 +92,7 @@
           }
         }
         $env->redirect(
-          $env->url("admin/actions_logs/logs_actions"),
+          $env->url("config/actions_logs/logs_actions"),
           "Les informations ont été enregistrées"
         );
       }
@@ -130,7 +130,7 @@
         if(!$env->messages()){
           if($data->add_logs_actions($log_action)){
             $env->redirect(
-              $env->url("admin/actions_logs/logs_actions"),
+              $env->url("config/actions_logs/logs_actions"),
               "L'action a été ajoutée dans la liste"
             );
           }
@@ -155,7 +155,7 @@
         return;
       }
       $env->redirect(
-        $env->url("admin/actions_logs/logs_actions"),
+        $env->url("config/actions_logs/logs_actions"),
         "l'action a été retirée de la liste"
       );
     }
@@ -167,7 +167,7 @@
         return;
       }
       $env->redirect(
-        $env->url("admin/actions_logs/logs_actions"),
+        $env->url("config/actions_logs/logs_actions"),
         "la liste a été vidée"
       );
     }

diff --git a/app/out/default/css/actions/admin_actions_logs.css b/app/out/default/css/actions/config_actions_logs.css
similarity index 100%
rename from app/out/default/css/actions/admin_actions_logs.css
rename to app/out/default/css/actions/config_actions_logs.css

diff --git a/app/out/default/js/actions/admin_actions_logs.js b/app/out/default/js/actions/config_actions_logs.js
similarity index 100%
rename from app/out/default/js/actions/admin_actions_logs.js
rename to app/out/default/js/actions/config_actions_logs.js

diff --git a/app/out/default/layouts/admin.xml b/app/out/default/layouts/admin.xml
deleted file mode 100644 (file)
index 78027d6..0000000
--- a/app/out/default/layouts/admin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layout>
-
-  <admin page="admin.php">
-    <actions_logs>
-      <historique content="views/admin/actions_logs/historique.php" />
-      <config content="views/admin/actions_logs/config.php" />
-      <logs_actions content="views/admin/actions_logs/logs_actions.php" />
-      <add_log_action content="views/admin/actions_logs/edit_log_action.php" />
-    </actions_logs>
-  </admin>
-
-</layout>
\ No newline at end of file

diff --git a/app/out/default/layouts/config.xml b/app/out/default/layouts/config.xml
new file mode 100644 (file)
index 0000000..df6bb3f
--- /dev/null
+++ b/app/out/default/layouts/config.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layout>
+
+  <config page="config.php">
+    <actions_logs>
+      <historique content="views/config/actions_logs/historique.php" />
+      <config content="views/config/actions_logs/config.php" />
+      <logs_actions content="views/config/actions_logs/logs_actions.php" />
+      <add_log_action content="views/config/actions_logs/edit_log_action.php" />
+    </actions_logs>
+  </config>
+
+</layout>
\ No newline at end of file

diff --git a/app/out/default/views/admin/actions_logs/config.php b/app/out/default/views/config/actions_logs/config.php
similarity index 84%
rename from app/out/default/views/admin/actions_logs/config.php
rename to app/out/default/views/config/actions_logs/config.php
index c984edd..3a13454 100644 (file)
--- a/app/out/default/views/admin/actions_logs/config.php
+++ b/app/out/default/views/config/actions_logs/config.php
@@ -1,6 +1,6 @@
 <h2>Configuration des logs</h2>
 
-<form name="config_form" action="<?php echo $this->url("admin/actions_logs/config"); ?>" method="post">
+<form name="config_form" action="<?php echo $this->url("config/actions_logs/config"); ?>" method="post">
 
   <fieldset>
     <ul>
@@ -14,9 +14,9 @@
         <label for="default_log">Pour chaque action</label>
         <div class="form_input">
           <input class="default_log_input" type="radio" name="default_log" id="default_log" value="0" <?php echo $this->out["actions_logs_config"]["default_log"] ? "" : "checked"; ?>/>
-          Ne pas enregistrer, sauf si l'action est dans <a href="<?php echo $this->url("admin/actions_logs/logs_actions"); ?>"><strong>la liste</strong></a>.<br />
+          Ne pas enregistrer, sauf si l'action est dans <a href="<?php echo $this->url("config/actions_logs/logs_actions"); ?>"><strong>la liste</strong></a>.<br />
           <input class="default_log_input" type="radio" name="default_log" id="default_log" value="1" <?php echo $this->out["actions_logs_config"]["default_log"] ? "checked" : ""; ?>/>
-          Enregistrer, sauf si l'action est dans <a href="<?php echo $this->url("admin/actions_logs/logs_actions"); ?>"><strong>la liste</strong></a>.
+          Enregistrer, sauf si l'action est dans <a href="<?php echo $this->url("config/actions_logs/logs_actions"); ?>"><strong>la liste</strong></a>.
           <div id="default_log_params" <?php echo $this->out["actions_logs_config"]["default_log"] ? "" : "style=\"display: none\""; ?>>
             <input type="checkbox" name="default_log_get" <?php echo $this->out["actions_logs_config"]["default_log_get"] ? "checked" : ""; ?>/> Enregistrer les paramètres GET<br />
             <input type="checkbox" name="default_log_post" <?php echo $this->out["actions_logs_config"]["default_log_post"] ? "checked" : ""; ?>/> Enregistrer les paramètres POST

diff --git a/app/out/default/views/admin/actions_logs/edit_log_action.php b/app/out/default/views/config/actions_logs/edit_log_action.php
similarity index 83%
rename from app/out/default/views/admin/actions_logs/edit_log_action.php
rename to app/out/default/views/config/actions_logs/edit_log_action.php
index ab2da8a..6f6a95a 100644 (file)
--- a/app/out/default/views/admin/actions_logs/edit_log_action.php
+++ b/app/out/default/views/config/actions_logs/edit_log_action.php
@@ -1,10 +1,10 @@
 <h2>Ajouter une action dans la liste</h2>
 
 <ul class="buttons">
-  <li><a href="<?php echo $this->url("admin/actions_logs/logs_actions"); ?>">Retour &agrave; la liste des actions</a></li>
+  <li><a href="<?php echo $this->url("config/actions_logs/logs_actions"); ?>">Retour &agrave; la liste des actions</a></li>
 </ul>
 
-<form name="log_action_form" action="<?php echo $this->url("admin/actions_logs/add_log_action"); ?>" method="post">
+<form name="log_action_form" action="<?php echo $this->url("config/actions_logs/add_log_action"); ?>" method="post">
   <fieldset>
     <ul>
       <li>

diff --git a/app/out/default/views/admin/actions_logs/historique.php b/app/out/default/views/config/actions_logs/historique.php
similarity index 96%
rename from app/out/default/views/admin/actions_logs/historique.php
rename to app/out/default/views/config/actions_logs/historique.php
index 54a7391..d6a5bf0 100644 (file)
--- a/app/out/default/views/admin/actions_logs/historique.php
+++ b/app/out/default/views/config/actions_logs/historique.php
@@ -1,7 +1,7 @@
 <h2>Historique des actions</h2>
 
 <ul class="buttons">
-  <li><a href="<?php echo $this->url("admin/actions_logs/del_historique"); ?>"
+  <li><a href="<?php echo $this->url("config/actions_logs/del_historique"); ?>"
        class="del"
        onclick="return confirm('Vider l hitorique ?')">Vider l'historique <img src="<?php echo $this->out_url("icons/del.gif"); ?>"/></a></li>
 </ul>

diff --git a/app/out/default/views/admin/actions_logs/logs_actions.php b/app/out/default/views/config/actions_logs/logs_actions.php
similarity index 75%
rename from app/out/default/views/admin/actions_logs/logs_actions.php
rename to app/out/default/views/config/actions_logs/logs_actions.php
index cdd18b3..434209c 100644 (file)
--- a/app/out/default/views/admin/actions_logs/logs_actions.php
+++ b/app/out/default/views/config/actions_logs/logs_actions.php
@@ -1,27 +1,27 @@
 <h2>Liste des actions</h2>
 
 <ul class="buttons">
-  <li><a class="add" href="<?php echo $this->url("admin/actions_logs/add_log_action"); ?>">Ajouter une action dans la liste</a></li>
-  <li><a href="<?php echo $this->url("admin/actions_logs/del_logs_actions"); ?>"
+  <li><a class="add" href="<?php echo $this->url("config/actions_logs/add_log_action"); ?>">Ajouter une action dans la liste</a></li>
+  <li><a href="<?php echo $this->url("config/actions_logs/del_logs_actions"); ?>"
        class="del"
        onclick="return confirm('Vider la liste ?')">Vider la liste <img src="<?php echo $this->out_url("icons/del.gif"); ?>"/></a></li>
 </ul>
 
 <p>
-  <a href="<?php echo $this->url("admin/actions_logs/config"); ?>"><strong>Configuration actuelle</strong></a> :
-  <strong>
-    <?php if($this->out["actions_logs_config"]["default_log"]) : ?>
-    enregistrer par défaut
-    <?php else : ?>
-    ne pas enregistrer par défaut
-    <?php endif; ?>
-  </strong>
-  (sauf si dans la liste)
+  <a href="<?php echo $this->url("config/actions_logs/config"); ?>"><strong>Configuration actuelle</strong></a> :
+</p>
+<p>
+  <?php if($this->out["actions_logs_config"]["default_log"]) : ?>
+  enregistrer un historique pour chaque action,
+  <?php else : ?>
+  n'enregistrer un historique pour aucune action,
+  <?php endif; ?>
+  sauf si l'action est dans cette liste.
 </p>
 
 <?php if($this->out["logs_actions"]["list"]) : ?>
 
-<form name="logs_actions_form" action="<?php echo $this->url("admin/actions_logs/logs_actions"); ?>" method="post">
+<form name="logs_actions_form" action="<?php echo $this->url("config/actions_logs/logs_actions"); ?>" method="post">
 
   <fieldset>
     <table class="admin" id="logs_actions" <?php echo $this->out["logs_actions"] ? "" : "style=\"display: none\""; ?>>
@@ -53,7 +53,7 @@
         </td>
         <?php endif; ?>
         <td align="center">
-          <a href="<?php echo $this->url("admin/actions_logs/del_log_action", array("id" => $log_action["id"])); ?>"
+          <a href="<?php echo $this->url("config/actions_logs/del_log_action", array("id" => $log_action["id"])); ?>"
              class="admin_link del_action"
              id="del_action_<?php echo $log_action["id"]; ?>"
              title="Enlever cette action de la liste"><img src="<?php echo $this->out_url("icons/del.gif"); ?>"/></a>

diff --git a/mw_actions_logs.php b/mw_actions_logs.php
index 337866d..a5496fb 100644 (file)
--- a/mw_actions_logs.php
+++ b/mw_actions_logs.php
@@ -11,10 +11,9 @@
     }
 
     function init($env){
-      $env->set_link("admin/actions_logs", $env->url("admin/actions_logs/historique"), "Actions logs", 50);
-      $env->set_link("admin/actions_logs/historique", $env->url("admin/actions_logs/historique"), "Historique des actions", 10);
-      $env->set_link("admin/actions_logs/config", $env->url("admin/actions_logs/config"), "Configuration des logs", 20);
-      $env->set_link("admin/actions_logs/logs_actions", $env->url("admin/actions_logs/logs_actions"), "Liste des actions", 30);
+      $env->set_link("config/actions_logs", $env->url("config/actions_logs/historique"), "Historique des actions", 50);
+      $env->set_link("config/actions_logs/config", $env->url("config/actions_logs/config"), "Configuration des logs", 20);
+      $env->set_link("config/actions_logs/logs_actions", $env->url("config/actions_logs/logs_actions"), "Liste des actions", 30);
       return true;
     }