From 2568b5c880943ea274ff3d573477b1ced8a37a1f Mon Sep 17 00:00:00 2001
From: dj3c1t <dj3c1t@free.fr>
Date: Sun, 23 Dec 2012 16:43:10 +0100
Subject: [PATCH] template default en HTML5

---
 app/out/default/css/actions/pages_admin.css |  4 +-
 app/out/default/css/actions/pages_view.css  | 98 +++++++++++++++++++++++++++--
 app/out/default/functions.php               |  5 ++
 app/out/default/page.php                    | 40 +++---------
 app/out/default/views/pages/admin/add.php   | 50 ++++++++-------
 app/out/default/views/pages/admin/edit.php  | 50 ++++++++-------
 app/out/default/views/pages/admin/list.php  | 36 ++++++-----
 app/out/default/views/pages/colonne.php     |  9 +--
 app/out/default/views/pages/view/page.php   | 46 +++++++-------
 mw_pages.php                                | 24 ++++---
 10 files changed, 222 insertions(+), 140 deletions(-)

diff --git a/app/out/default/css/actions/pages_admin.css b/app/out/default/css/actions/pages_admin.css
index 521689e..bc3395a 100644
--- a/app/out/default/css/actions/pages_admin.css
+++ b/app/out/default/css/actions/pages_admin.css
@@ -1 +1,3 @@
-@import url("../../../../../../../app/out/default/css/actions/admin.css");
+textarea.tinymce{
+  width: 100%;
+}
\ No newline at end of file
diff --git a/app/out/default/css/actions/pages_view.css b/app/out/default/css/actions/pages_view.css
index bf1b915..2bbaffc 100644
--- a/app/out/default/css/actions/pages_view.css
+++ b/app/out/default/css/actions/pages_view.css
@@ -1,29 +1,117 @@
-ul.pages_menu{
+/* ------------------------------------------------- ARIANE */
+
+.page_ariane{
+  border-bottom: dashed 1px #d5d5d5;
+}
+
+.page_ariane:after{
+  content: "";
+  display: table;
+  clear: both;
+}
+
+.page_ariane li{
+  float: left;
+  padding-right: 5px;
+  font-size: 0.8em;
+}
+
+.page_ariane li a{
+  padding-left: 5px;
+  font-size: 1.1em;
+}
+
+.page_ariane li:first-child a{
+  padding-left: 0px;
+}
+
+.page_ariane li:before{
+  content: ">";
+}
+
+.page_ariane li:first-child:before{
+  content: "";
+}
+
+/* ------------------------------------------------- SOUS PAGES */
+
+nav.sous_pages{
+  margin-bottom: 1em;
+}
+
+nav.sous_pages ul{
   list-style-type: none;
   margin: 5px 20px 5px 10px;
   padding: 0;
 }
 
-ul.pages_menu ul{
+nav.sous_pages ul ul{
   list-style-type: none;
   margin: 0 0 0 20px;
   padding: 0;
 }
 
-ul.pages_menu li{
+nav.sous_pages ul li{
   margin: 1px 0;
   padding: 0;
   border-bottom: solid 1px #e5e5e5;
 }
 
-ul.pages_menu li a{
+nav.sous_pages ul li a{
   display: block;
   line-height: 2em;
   padding: 0 1em;
   background-color: #f5f5f5;
 }
 
-ul.pages_menu li a:hover{
+nav.sous_pages ul li a:hover{
   color: #000066;
   background-color: #f1f1f1;
 }
+
+/* ------------------------------------------------- PAGE */
+
+article .page_content hr{
+  border: none;
+  border-top: dashed 1px #c0c0c0;
+}
+
+article .page_content pre{
+  margin: 5px;
+  border: solid 1px #e1e1e1;
+  background-color: #f6faff;
+  padding: 10px;
+  border-radius: 3px;
+  overflow: auto;
+}
+
+article .page_content ul li{
+  margin-left: 15px;
+}
+
+article .page_content h1{
+  font-size: 1.8em;
+}
+
+article .page_content h2{
+  font-size: 1.6em;
+  border-bottom: solid 1px #e5e5e5;
+  padding-bottom: 0;
+  margin: 1.2em 0;
+}
+
+article .page_content h3{
+  font-size: 1.4em;
+}
+
+article .page_content h4{
+  font-size: 1.2em;
+}
+
+article .page_content h5{
+  font-size: 1em;
+}
+
+article .page_content h6{
+  font-size: 1em;
+}
diff --git a/app/out/default/functions.php b/app/out/default/functions.php
index f96e4b8..17d24cc 100644
--- a/app/out/default/functions.php
+++ b/app/out/default/functions.php
@@ -1,5 +1,10 @@
 <?php
 
+  if($this->etat("mod") == "pages" && $this->etat("controller") == "admin"){
+    $this->add_js_file($this->path("mw_path")."libs/tiny_mce/tiny_mce.js");
+    $this->add_js_file($this->path("mw_path")."libs/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php");
+  }
+
   if(!function_exists("datetime2timestamp")) :
   function datetime2timestamp($string){
     list($date, $time) = explode(" ", $string);
diff --git a/app/out/default/page.php b/app/out/default/page.php
index 2a3201d..b748e2f 100644
--- a/app/out/default/page.php
+++ b/app/out/default/page.php
@@ -1,23 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<!doctype html>
+<html>
   <head>
-    <?php require $this->out_file("views/head.php"); ?>
+<?php require $this->out_file("views/head.php"); ?>
   </head>
   <body>
 
-    <div id="header">
+    <header id="main_header">
       <div class="content">
 <?php require $this->out_file("views/header.php"); ?>
      </div>
-    </div>
-
-    <div id="menu_top">
-      <div class="content">
-<?php if($this->out_config("navig_menu_top")) require $this->out_file("views/top_menu.php"); ?>
-      </div>
-    </div>
-
-    <div class="clear"><!-- --></div>
+    </header>
 
     <div id="main">
       <div class="content">
@@ -30,31 +22,17 @@
 
         <div id="center"<?php echo $this->out_config("colonne") ? "" : " class=\"no_colonne\""; ?>>
 <?php require $this->out_file("views/messages.php"); ?>
-<?php
-
-  if($this->out_file_exists($layout["content"])) :
-
-?>
-
-<?php
-
-  require $this->out_file($layout["content"]);
-  endif;
-
-?>
-
+<?php if($layout["content"] && $this->out_file_exists($layout["content"])) require $this->out_file($layout["content"]); ?>
         </div>
 
-        <div class="clear"><!-- --></div>
-
       </div>
     </div>
 
-    <div id="footer">
+    <footer id="main_footer">
       <div class="content">
 <?php require $this->out_file("views/footer.php"); ?>
      </div>
-    </div>
+    </footer>
 
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/out/default/views/pages/admin/add.php b/app/out/default/views/pages/admin/add.php
index 53e160c..75e3488 100644
--- a/app/out/default/views/pages/admin/add.php
+++ b/app/out/default/views/pages/admin/add.php
@@ -2,31 +2,35 @@
 
 <h2>Nouvelle page</h2>
 
-<ul class="admin">
+<ul class="buttons">
   <li><a href="<?php echo $this->url("pages/admin"); ?>">Retour &agrave; la liste des pages</a></li>
 </ul>
 
 <form name="page_form" action="<?php echo $this->url("pages/admin/add"); ?>" method="post">
-  <ul class="form">
-    <li>
-      <p>
-        Titre :
-        <input type="text" size="50" name="title" id="title" value="<?php echo $this->out["page"]["title"]; ?>" />
-      </p>
-    </li>
-    <li>
-      <p>
-        Page parente :
-        <select name="id_parent">
-          <?php echo pages_arbo_edit_select_options($this->out["arbo"], null, $this->out["page"]["id_parent"], "&nbsp;&nbsp;"); ?>
-        </select>
-      </p>
-    </li>
-    <li>
-      <textarea class="tinymce" cols="60" rows="10" name="content" id="content"><?php echo htmlspecialchars($this->out["page"]["content"]); ?></textarea>
-    </li>
-    <li class="buttons">
-      <input type="submit" value="Ajouter" />
-    </li>
-  </ul>
+  <fieldset>
+    <ul>
+      <li>
+        <label>Titre</label>
+        <div class="form_input">
+          <input type="text" size="50" name="title" id="title" value="<?php echo $this->out["page"]["title"]; ?>" />
+        </div>
+      </li>
+      <li>
+        <label>Page parente</label>
+        <div class="form_input">
+          <select name="id_parent">
+            <?php echo pages_arbo_edit_select_options($this->out["arbo"], null, $this->out["page"]["id_parent"], "&nbsp;&nbsp;"); ?>
+          </select>
+        </div>
+      </li>
+      <li>
+        <textarea class="tinymce" cols="60" rows="10" name="content" id="content"><?php echo htmlspecialchars($this->out["page"]["content"]); ?></textarea>
+      </li>
+      <li>
+        <div class="form_buttons">
+          <input type="submit" value="Ajouter" />
+        </div>
+      </li>
+    </ul>
+  </fieldset>
 </form>
\ No newline at end of file
diff --git a/app/out/default/views/pages/admin/edit.php b/app/out/default/views/pages/admin/edit.php
index a5f5e2f..accb84f 100644
--- a/app/out/default/views/pages/admin/edit.php
+++ b/app/out/default/views/pages/admin/edit.php
@@ -2,31 +2,35 @@
 
 <h2>Modifier une page</h2>
 
-<ul class="admin">
+<ul class="buttons">
   <li><a href="<?php echo $this->url("pages/admin"); ?>">Retour &agrave; la liste des pages</a></li>
 </ul>
 
 <form name="page_form" action="<?php echo $this->url("pages/admin/edit", array("id" => $this->out["page"]["id"])); ?>" method="post">
-  <ul class="form">
-    <li>
-      <p>
-        Titre :
-        <input type="text" size="50" name="title" id="title" value="<?php echo $this->out["page"]["title"]; ?>" />
-      </p>
-    </li>
-    <li>
-      <p>
-        Page parente :
-        <select name="id_parent">
-          <?php echo pages_arbo_edit_select_options($this->out["arbo"], $this->out["page"]["id"], $this->out["page"]["id_parent"], "&nbsp;&nbsp;"); ?>
-        </select>
-      </p>
-    </li>
-    <li>
-      <textarea class="tinymce" cols="60" rows="10" name="content" id="content"><?php echo htmlspecialchars($this->out["page"]["content"]); ?></textarea>
-    </li>
-    <li class="buttons">
-      <input type="submit" value="Enregistrer" />
-    </li>
-  </ul>
+  <fieldset>
+    <ul>
+      <li>
+        <label>Titre</label>
+        <div class="form_input">
+          <input type="text" size="50" name="title" id="title" value="<?php echo $this->out["page"]["title"]; ?>" />
+        </div>
+      </li>
+      <li>
+        <label>Page parente</label>
+        <div class="form_input">
+          <select name="id_parent">
+            <?php echo pages_arbo_edit_select_options($this->out["arbo"], $this->out["page"]["id"], $this->out["page"]["id_parent"], "&nbsp;&nbsp;"); ?>
+          </select>
+        </div>
+      </li>
+      <li>
+        <textarea class="tinymce" cols="60" rows="10" name="content" id="content"><?php echo htmlspecialchars($this->out["page"]["content"]); ?></textarea>
+      </li>
+      <li>
+        <div class="form_buttons">
+          <input type="submit" value="Enregistrer" />
+        </div>
+      </li>
+    </ul>
+  </fieldset>
 </form>
\ 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 89c5bfb..544e7cf 100644
--- a/app/out/default/views/pages/admin/list.php
+++ b/app/out/default/views/pages/admin/list.php
@@ -1,25 +1,27 @@
 <h2>Pages</h2>
 
-<ul class="admin">
-  <li><a class="add" href="<?php echo $this->url("pages/admin/add"); ?>">Nouvelle page</a></li>
-</ul>
-
 <form name="accueil_form" action="<?php echo $this->url("pages/admin/set_accueil"); ?>" method="post">
-<ul class="admin">
-  <li>Page d'accueil du site</li>
-  <li>
-    <select name="id">
-      <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>
-  </li>
-  <li class="buttons">
-    <input type="submit" value="Enregistrer" />
-  </li>
-</ul>
+  <fieldset>
+    <ul>
+      <li>
+        <label for="id">Page d'accueil du site</label>
+        <div class="form_input">
+          <select id="id" name="id">
+            <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>
+          <input type="submit" value="Enregistrer" />
+        </div>
+      </li>
+    </ul>
+  </fieldset>
 </form>
 
-<ul class="admin">
+<ul class="buttons">
+  <li><a class="add" href="<?php echo $this->url("pages/admin/add"); ?>">Nouvelle page</a></li>
+</ul>
+
+<ul class="filters">
   <li>Page parente</li>
   <li>
     <select onchange="document.location=this.options[this.selectedIndex].value;">
diff --git a/app/out/default/views/pages/colonne.php b/app/out/default/views/pages/colonne.php
index 4145c3e..70be0b0 100644
--- a/app/out/default/views/pages/colonne.php
+++ b/app/out/default/views/pages/colonne.php
@@ -1,10 +1,5 @@
-<?php
-
-  if($this->out["arbo"]) :
-  $current_page_id = isset($_GET[$this->param("id")]) ? $_GET[$this->param("id")] : null;
-
-?>
-<ul class="pages_menu">
+<?php if($this->out["arbo"]) : $current_page_id = isset($_GET[$this->param("id")]) ? $_GET[$this->param("id")] : null; ?>
+<ul class="menu">
 <?php echo pages_arbo_navig_lis($this, $this->out["arbo"], $this->out["ariane"]); ?>
 </ul>
 <?php endif; ?>
diff --git a/app/out/default/views/pages/view/page.php b/app/out/default/views/pages/view/page.php
index 3fd77b3..66a6c6b 100644
--- a/app/out/default/views/pages/view/page.php
+++ b/app/out/default/views/pages/view/page.php
@@ -1,24 +1,22 @@
-<h2>
-<?php $k = 0; foreach($this->out["ariane"] as $page) : if($k < count($this->out["ariane"]) - 1) : ?>
-  <?php if($k > 0) : ?>
-  &raquo;
-  <?php endif; ?>
-  <a href="<?php echo $this->url("pages/view/page", array("id" => $page["id"])); ?>"><?php echo $page["title"]; ?></a>
-<?php $k++; endif; endforeach; ?>
-  <?php if($k > 0) : ?>
-  &raquo;
-  <?php endif; ?>
-  <?php echo $this->out["page"]["title"]; ?>
-</h2>
-
-<?php if($this->out["pages"]["list"]) : ?>
-<ul class="pages_menu">
-<?php foreach($this->out["pages"]["list"] 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; ?>
-
-<div>
-  <?php echo $this->out["page"]["content"]; ?>
-</div>
+<article>
+  <header>
+    <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>
+    <h1><?php echo $this->out["page"]["title"]; ?></h1>
+    <?php if($this->out["pages"]["list"]) : ?>
+    <nav class="sous_pages">
+      <ul class="pages_menu">
+      <?php foreach($this->out["pages"]["list"] 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>
+    </nav>
+    <?php endif; ?>
+  </header>
+  <div class="page_content">
+    <?php echo $this->out["page"]["content"]; ?>
+  </div>
+</article>
diff --git a/mw_pages.php b/mw_pages.php
index 0e99cd4..c50660c 100644
--- a/mw_pages.php
+++ b/mw_pages.php
@@ -16,26 +16,32 @@
       $data = $env->data();
       if(
         (
-          $pages = $data->pages(
+          $arbo = $data->pages_arbo(
             array(
-              "id_parent" => "",
-              "enabled"   => 1,
-              "order_by"  => "position",
-              "order"     => "ASC"
+              "enabled" => 1,
+              "order_by" => "position",
+              "order" => "ASC"
             )
           )
         ) !== false
       ){
-        foreach($pages["list"] as $id_page => $page){
+        $this->_set_links($env, "menu_top", $arbo);
+      }
+      return true;
+    }
+
+    function _set_links($env, $parent, $arbo){
+      if($arbo["subs"]){
+        foreach($arbo["subs"] as $page){
           $env->set_link(
-            "menu_top/mw_page_".$id_page,
-            $env->url("pages/view/page", array("id" => $id_page)),
+            $parent."/mw_page_".$page["id"],
+            $env->url("pages/view/page", array("id" => $page["id"])),
             $page["title"],
             $page["position"]
           );
+          $this->_set_links($env, $parent."/mw_page_".$page["id"], $page);
         }
       }
-      return true;
     }
 
     function enable($env){
-- 
2.1.4