From 4f9b4a773a46e9dd78eed013cd58cb626c143d7d Mon Sep 17 00:00:00 2001
From: dj3c1t <dj3c1t@dj3c1t.net>
Date: Mon, 24 Dec 2012 22:41:56 +0100
Subject: [PATCH] correction notices et modifs css

---
 app/data/modules/xml/mw_data_pages.php     |  6 ++--
 app/out/default/css/actions/pages_view.css | 57 ++++++++++++++++++++++++------
 app/out/default/views/pages/admin/list.php |  4 +++
 app/out/default/views/pages/view/page.php  |  2 ++
 4 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/app/data/modules/xml/mw_data_pages.php b/app/data/modules/xml/mw_data_pages.php
index 9ea3f70..bde8ba1 100644
--- a/app/data/modules/xml/mw_data_pages.php
+++ b/app/data/modules/xml/mw_data_pages.php
@@ -4,7 +4,7 @@
 
     function page_ariane($id, $ariane = array()){
       if($page = $this->page($id)){
-        if($page["id_parent"]) $ariane = $this->page_ariane($page["id_parent"], $ariane);
+        if(isset($page["id_parent"]) && $page["id_parent"]) $ariane = $this->page_ariane($page["id_parent"], $ariane);
         $ariane[] = $page;
         return $ariane;
       }
@@ -38,7 +38,7 @@
             if(isset($id_parent)){
               $MATCH = (
                    ($id_parent && isset($v_rst["id_parent"]) && ($id_parent == $v_rst["id_parent"]))
-                || ($id_parent == "" && !$v_rst["id_parent"])
+                || ($id_parent == "" && (!isset($v_rst["id_parent"]) || !$v_rst["id_parent"]))
               );
             }
             if($MATCH){
@@ -120,7 +120,7 @@
 
     function set_page($id, $params, $RAZ = false){
       if($page = $this->page($id)){
-        $id_parent = isset($params["id_parent"]) ? $params["id_parent"] : ($RAZ ? null : $page["id_parent"]);
+        $id_parent = isset($params["id_parent"]) ? $params["id_parent"] : ($RAZ ? null : (isset($page["id_parent"]) ? $page["id_parent"] : null));
         $title = isset($params["title"]) ? $params["title"] : ($RAZ ? null : $page["title"]);
         $content = isset($params["content"]) ? $params["content"] : ($RAZ ? null : $page["content"]);
         $user = isset($params["user"]) ? $params["user"] : null;
diff --git a/app/out/default/css/actions/pages_view.css b/app/out/default/css/actions/pages_view.css
index 2bbaffc..3d540d2 100644
--- a/app/out/default/css/actions/pages_view.css
+++ b/app/out/default/css/actions/pages_view.css
@@ -13,7 +13,7 @@
 .page_ariane li{
   float: left;
   padding-right: 5px;
-  font-size: 0.8em;
+  font-size: 1em;
 }
 
 .page_ariane li a{
@@ -71,47 +71,82 @@ nav.sous_pages ul li a:hover{
 
 /* ------------------------------------------------- PAGE */
 
+article .page_content p{
+  padding-bottom: 1em;
+  line-height: 1.3em;
+  text-align: justify;
+}
+
 article .page_content hr{
   border: none;
   border-top: dashed 1px #c0c0c0;
 }
 
 article .page_content pre{
-  margin: 5px;
+  margin: 0 1em 1em 1em;
   border: solid 1px #e1e1e1;
   background-color: #f6faff;
-  padding: 10px;
+  padding: 1em;
   border-radius: 3px;
   overflow: auto;
+  font-family: monospace;
+}
+
+article .page_content ul{
+  list-style-type: disc;
+  margin: 0 1em 1em 1em;
+  padding: 0em;
 }
 
 article .page_content ul li{
-  margin-left: 15px;
+  margin-left: 2em;
+  line-height: 1.3em;
 }
 
-article .page_content h1{
+article h1{
   font-size: 1.8em;
+  font-weight: bold;
+  padding-top: 0.5em;
 }
 
-article .page_content h2{
+article h2{
   font-size: 1.6em;
+  font-weight: bold;
   border-bottom: solid 1px #e5e5e5;
   padding-bottom: 0;
-  margin: 1.2em 0;
+  margin: 0em 0 1em 0;
 }
 
-article .page_content h3{
+article h3{
   font-size: 1.4em;
+  font-weight: bold;
 }
 
-article .page_content h4{
+article h4{
   font-size: 1.2em;
+  font-weight: bold;
 }
 
-article .page_content h5{
+article h5{
   font-size: 1em;
+  font-weight: bold;
 }
 
-article .page_content h6{
+article h6{
   font-size: 1em;
 }
+
+article a#button{
+  display: inline-block;
+  text-align: center;
+  padding: 10px 20px;
+  margin: 20px;
+  color: #ffffff;
+  font-weight: bold;
+  background-color: #2b6626;
+  border-radius: 7px;
+}
+
+article a#button:hover{
+  background-color: #32772d;
+}
\ No newline at end of file
diff --git a/app/out/default/views/pages/admin/list.php b/app/out/default/views/pages/admin/list.php
index 544e7cf..4259512 100644
--- a/app/out/default/views/pages/admin/list.php
+++ b/app/out/default/views/pages/admin/list.php
@@ -10,6 +10,10 @@
             <option value=""<?php echo $this->config("start_action") ? "" : " selected=\"selected\""; ?>>Page par d&eacute;faut du site</option>
             <?php echo pages_arbo_start_select_options($this, $this->out["arbo"], $this->config("start_action"), $this->config("start_action_params"), "&nbsp;&nbsp;"); ?>
           </select>
+        </div>
+      </li>
+      <li>
+        <div class="form_single_button">
           <input type="submit" value="Enregistrer" />
         </div>
       </li>
diff --git a/app/out/default/views/pages/view/page.php b/app/out/default/views/pages/view/page.php
index 66a6c6b..17c3dbd 100644
--- a/app/out/default/views/pages/view/page.php
+++ b/app/out/default/views/pages/view/page.php
@@ -1,10 +1,12 @@
 <article>
   <header>
+    <?php if(count($this->out["ariane"]) > 1) : ?>
     <ul class="page_ariane">
       <?php foreach($this->out["ariane"] as $page) : ?>
       <li><a href="<?php echo $this->url("pages/view/page", array("id" => $page["id"])); ?>"><?php echo $page["title"]; ?></a></li>
       <?php endforeach; ?>
     </ul>
+    <?php endif; ?>
     <h1><?php echo $this->out["page"]["title"]; ?></h1>
     <?php if($this->out["pages"]["list"]) : ?>
     <nav class="sous_pages">
-- 
2.1.4