From a3ee9fb267bbf0f639d711287a25dd31f0ab0fea Mon Sep 17 00:00:00 2001 From: dj3c1t Date: Sun, 16 Dec 2012 21:30:48 +0100 Subject: [PATCH] mise a jour pour mtweb.0.6.0 --- app/mods/pages/admin.php | 11 ++++++--- app/mods/pages/view.php | 2 +- mw_pages.php | 4 ++-- out/default/css/actions/pages_admin.css | 1 + out/{dist => default}/css/actions/pages_view.css | 0 out/{dist => default}/functions.php | 0 out/{dist => default}/js/actions/pages_admin.js | 0 out/{dist => default}/layouts/pages.xml | 0 out/{dist => default}/page.php | 2 +- out/{dist => default}/views/pages/admin/add.php | 8 +++---- out/{dist => default}/views/pages/admin/edit.php | 8 +++---- out/{dist => default}/views/pages/admin/list.php | 30 ++++++++++-------------- out/{dist => default}/views/pages/colonne.php | 0 out/{dist => default}/views/pages/view/index.php | 0 out/{dist => default}/views/pages/view/page.php | 8 +++---- out/dist/css/actions/pages_admin.css | 1 - 16 files changed, 38 insertions(+), 37 deletions(-) create mode 100644 out/default/css/actions/pages_admin.css rename out/{dist => default}/css/actions/pages_view.css (100%) rename out/{dist => default}/functions.php (100%) rename out/{dist => default}/js/actions/pages_admin.js (100%) rename out/{dist => default}/layouts/pages.xml (100%) rename out/{dist => default}/page.php (91%) rename out/{dist => default}/views/pages/admin/add.php (66%) rename out/{dist => default}/views/pages/admin/edit.php (64%) rename out/{dist => default}/views/pages/admin/list.php (55%) rename out/{dist => default}/views/pages/colonne.php (100%) rename out/{dist => default}/views/pages/view/index.php (100%) rename out/{dist => default}/views/pages/view/page.php (56%) delete mode 100644 out/dist/css/actions/pages_admin.css diff --git a/app/mods/pages/admin.php b/app/mods/pages/admin.php index 3498dca..551d9c8 100644 --- a/app/mods/pages/admin.php +++ b/app/mods/pages/admin.php @@ -43,8 +43,8 @@ $_page["title"] = isset($_POST["title"]) ? $_POST["title"] : ($page["title"] ? $page["title"] : null); $_page["content"] = isset($_POST["content"]) ? $_POST["content"] : ($page["content"] ? $page["content"] : null); $_page["user"] = $user["id"]; - $_page["enabled"] = isset($_POST["enabled"]) ? $_POST["enabled"] : ($page["enabled"] ? $page["enabled"] : 1); - $_page["position"] = isset($_POST["position"]) ? $_POST["position"] : ($page["position"] ? $page["position"] : 0); + $_page["enabled"] = isset($_POST["enabled"]) ? $_POST["enabled"] : (isset($page["enabled"]) ? $page["enabled"] : 1); + $_page["position"] = isset($_POST["position"]) ? $_POST["position"] : (isset($page["position"]) ? $page["position"] : 0); } } else $env->message("impossible de lire les informations de l'utilisateur"); @@ -53,9 +53,13 @@ function add(&$env){ $data = $env->data(); + $_SESSION["upload_dir"] = $env->path("web").($env->path("web") ? "" : "/").$env->path("content")."uploads"; if(($arbo = $data->pages_arbo()) !== false){ $env->set_out("arbo", $arbo); - $page = array(); + $page = array( + "title" => "", + "content" => "" + ); if($_POST){ $page = $this->validate_POST_page($env); if(!$env->messages()){ @@ -75,6 +79,7 @@ function edit(&$env){ $data = $env->data(); + $_SESSION["upload_dir"] = $env->path("web").($env->path("web") ? "" : "/").$env->path("content")."uploads"; if($page = $data->page($_GET[$env->param("id")])){ if(($arbo = $data->pages_arbo()) !== false){ $env->set_out("arbo", $arbo); diff --git a/app/mods/pages/view.php b/app/mods/pages/view.php index cb94a99..e5604da 100644 --- a/app/mods/pages/view.php +++ b/app/mods/pages/view.php @@ -7,7 +7,7 @@ function page(&$env){ $data = $env->data(); - if(($arbo = $data->pages_arbo(array("enabled" => 1))) !== false){ + if(($arbo = $data->pages_arbo(array("enabled" => 1, "order_by" => "position", "order" => "ASC"))) !== false){ $env->set_out("arbo", $arbo); if(($page = $data->page($_GET[$env->param("id")])) && $page["enabled"]){ $env->set_out("page", $page); diff --git a/mw_pages.php b/mw_pages.php index bb6d9b6..0e99cd4 100644 --- a/mw_pages.php +++ b/mw_pages.php @@ -2,11 +2,11 @@ class mw_pages extends mw_plugin{ - function title($env){ + function title(){ return "Pages"; } - function description($env){ + function description(){ return "Pour ajouter des pages, avec un éditeur dans l'administration du site"; } diff --git a/out/default/css/actions/pages_admin.css b/out/default/css/actions/pages_admin.css new file mode 100644 index 0000000..064036c --- /dev/null +++ b/out/default/css/actions/pages_admin.css @@ -0,0 +1 @@ +@import url("../../../../../../out/default/css/actions/admin.css"); diff --git a/out/dist/css/actions/pages_view.css b/out/default/css/actions/pages_view.css similarity index 100% rename from out/dist/css/actions/pages_view.css rename to out/default/css/actions/pages_view.css diff --git a/out/dist/functions.php b/out/default/functions.php similarity index 100% rename from out/dist/functions.php rename to out/default/functions.php diff --git a/out/dist/js/actions/pages_admin.js b/out/default/js/actions/pages_admin.js similarity index 100% rename from out/dist/js/actions/pages_admin.js rename to out/default/js/actions/pages_admin.js diff --git a/out/dist/layouts/pages.xml b/out/default/layouts/pages.xml similarity index 100% rename from out/dist/layouts/pages.xml rename to out/default/layouts/pages.xml diff --git a/out/dist/page.php b/out/default/page.php similarity index 91% rename from out/dist/page.php rename to out/default/page.php index cfb4e37..2a3201d 100644 --- a/out/dist/page.php +++ b/out/default/page.php @@ -28,7 +28,7 @@ -
out_config("colonne") ? "" : " class=\"no_colonne\"" ?>> +
out_config("colonne") ? "" : " class=\"no_colonne\""; ?>> out_file("views/messages.php"); ?> Nouvelle page -
" method="post"> +" method="post">

  • Titre : - " /> + " />

  • @@ -23,7 +23,7 @@

  • - +
  • diff --git a/out/dist/views/pages/admin/edit.php b/out/default/views/pages/admin/edit.php similarity index 64% rename from out/dist/views/pages/admin/edit.php rename to out/default/views/pages/admin/edit.php index 3b3abc7..a5f5e2f 100644 --- a/out/dist/views/pages/admin/edit.php +++ b/out/default/views/pages/admin/edit.php @@ -3,15 +3,15 @@

    Modifier une page

    - $this->out["page"]["id"])) ?>" method="post"> + $this->out["page"]["id"])); ?>" method="post">

    • Titre : - " /> + " />

    • @@ -23,7 +23,7 @@

    • - +
    • diff --git a/out/dist/views/pages/admin/list.php b/out/default/views/pages/admin/list.php similarity index 55% rename from out/dist/views/pages/admin/list.php rename to out/default/views/pages/admin/list.php index a48ef7f..89c5bfb 100644 --- a/out/dist/views/pages/admin/list.php +++ b/out/default/views/pages/admin/list.php @@ -1,15 +1,15 @@

      Pages

      -" method="post"> +" method="post">
      • Page d'accueil du site
        • @@ -23,7 +23,7 @@
      • Page parente
        • @@ -31,13 +31,9 @@ out["pages"]["total"]) : ?> -out["pages"]["total"] > $this->config("max_list")) : ?> - out_file("views/navig.php"); ?> - - -" method="post"> +" method="post"> @@ -48,19 +44,19 @@ out["pages"]["list"] as $id_page => $page) : ?> - - - - + + + + diff --git a/out/dist/views/pages/colonne.php b/out/default/views/pages/colonne.php similarity index 100% rename from out/dist/views/pages/colonne.php rename to out/default/views/pages/colonne.php diff --git a/out/dist/views/pages/view/index.php b/out/default/views/pages/view/index.php similarity index 100% rename from out/dist/views/pages/view/index.php rename to out/default/views/pages/view/index.php diff --git a/out/dist/views/pages/view/page.php b/out/default/views/pages/view/page.php similarity index 56% rename from out/dist/views/pages/view/page.php rename to out/default/views/pages/view/page.php index f6413ef..3fd77b3 100644 --- a/out/dist/views/pages/view/page.php +++ b/out/default/views/pages/view/page.php @@ -3,22 +3,22 @@ 0) : ?> » - $page["id"])) ?>"> + $page["id"])); ?>"> 0) : ?> » - out["page"]["title"] ?> + out["page"]["title"]; ?> out["pages"]["list"]) : ?>
        - out["page"]["content"] ?> + out["page"]["content"]; ?>
        diff --git a/out/dist/css/actions/pages_admin.css b/out/dist/css/actions/pages_admin.css deleted file mode 100644 index cb9a939..0000000 --- a/out/dist/css/actions/pages_admin.css +++ /dev/null @@ -1 +0,0 @@ -@import url("../../../../../../out/dist/css/actions/admin.css"); -- 2.1.4
        titre
        " /> />" /> /> - $id_page)) ?>" + $id_page)); ?>" class="admin_link" - title="modifier cette page">" /> + title="modifier cette page">" /> - $id_page)) ?>" + $id_page)); ?>" class="admin_link" - title="supprimer cette page">" + title="supprimer cette page">" onclick="return confirm('Supprimer cette page ?')"/>