quelques modifications sur le template default

diff --git a/mw/app/out/default/css/actions/config_plugins.css b/mw/app/out/default/css/actions/config_plugins.css
index e5cba25..95c1c6c 100644 (file)
--- a/mw/app/out/default/css/actions/config_plugins.css
+++ b/mw/app/out/default/css/actions/config_plugins.css
@@ -27,7 +27,6 @@ li.plugin h3{
 li.plugin h3 span{
   float: right;
   font-size: 0.7em;
-  margin: 0.3em 0 0 0;
 }
 
 li.plugin ul.plugin_links{

diff --git a/mw/app/out/default/css/style.css b/mw/app/out/default/css/style.css
index a3a5e21..8d87b8b 100644 (file)
--- a/mw/app/out/default/css/style.css
+++ b/mw/app/out/default/css/style.css
@@ -21,13 +21,13 @@ body{
 #colonne{
   float: left;
   width: 220px;
-  padding: 10px;
+  padding: 0 10px 10px 10px;
 }
 
 #center{
   float: left;
   width: 540px;
-  padding: 10px;
+  padding: 0 10px 10px 10px;
 }
 
 #center.no_colonne{
@@ -43,19 +43,39 @@ body{
   font-size: 0;
 }
 
+#main{
+  background-color: #ffffff;
+  padding: 1em 0;
+}
+
 /* --------------------------------------------- HEADER */
 
+#main_header{
+  border-bottom: solid 1px #d5d5d5;
+}
+
 #main_header .content{
-  border-bottom: solid 1px #e9e9e9;
   padding: 10px 0 3px 0;
+  min-height: 11em;
+  position: relative;
 }
 
 #main_header .content h1{
-  padding-bottom: 0;
+}
+#main_header .content h1 a{
+}
+#main_header .content h1 span{
+}
+
+#menu_top{
+  position: absolute;
+  bottom: 5px;
+  right: 30px;
 }
 
 #menu_top ul{
   float: right;
+  margin-top: 179px;
   padding-bottom: 0;
 }
 
@@ -69,21 +89,20 @@ body{
   list-style-type: none;
   float: left;
   position: relative;
-  padding: 2px 5px 0 0;
+  padding: 2px 1em 0 0;
 }
 
 #menu_top ul li a{
   display: block;
-  padding: 5px 10px 5px 10px;
+  padding: 0.4em 1em;
   white-space : nowrap;
-  border: solid 1px #e9e9e9;
+  border: solid 1px #d5d5d5;
   background-color: #ffffff;
   border-radius: 2px;
 }
-
 #menu_top ul li a:hover{
   color: #000066;
-  background-color: #f7f7f7;
+  background-color: #f5f5f5;
 }
 
 #menu_top ul li .menu{
@@ -121,11 +140,17 @@ body{
   background-repeat: no-repeat;
 }
 
+#main_header .menu_user{
+  position: absolute;
+  top: 4em;
+  left: 30px;
+}
+
 /* --------------------------------------------- CONTENUS */
 
 body{
   color: #333333;
-  font: normal 12px Verdana, Helvetica, Arial, sans-serif;
+  font: normal 0.9em Verdana, Helvetica, Arial, sans-serif;
 }
 
 a{
@@ -138,7 +163,7 @@ a img{
 }
 
 a:hover{
-  color: #c0c0c0;
+  color: #777777;
 }
 
 h1{
@@ -146,11 +171,14 @@ h1{
 }
 
 h2{
-  font-size: 1.8em;
+  font-size: 1.4em;
+  padding-top: 1em;
+  border-bottom: solid 1px #d5d5d5;
 }
 
 h3{
-  font-size: 1.6em;
+  font-size: 1.4em;
+  margin-top: 1em;
 }
 
 h4{
@@ -166,7 +194,7 @@ h6{
 }
 
 h1, h2, h3, h4, h5, h6, p, ul{
-  padding: 0 0 0.5em 0;
+  margin: 0 0 0.5em 0;
 }
 
 strong{
@@ -198,7 +226,7 @@ nav.sous_pages ul ul{
 nav.sous_pages ul li{
   margin: 1px 0;
   padding: 0;
-  border-bottom: solid 1px #e5e5e5;
+  border-bottom: solid 1px #d5d5d5;
 }
 
 #colonne .menu ul li a,
@@ -206,13 +234,13 @@ nav.sous_pages ul li a{
   display: block;
   line-height: 2em;
   padding: 0 1em;
-  background-color: #f5f5f5;
+  background-color: #f1f1f1;
 }
 
 #colonne .menu ul li a:hover,
 nav.sous_pages ul li a:hover{
   color: #000066;
-  background-color: #f1f1f1;
+  background-color: #e9e9e9;
 }
 
 /* --------------------------------------------- FORMULAIRES */
@@ -222,10 +250,10 @@ fieldset{
 }
 
 fieldset legend{
-  font-size: 1.4em;
+  font-size: 1.2em;
   display: block;
   width: 100%;
-  border-bottom: solid 1px #f3f3f3;
+  border-bottom: solid 1px #d5d5d5;
 }
 
 form ul li{
@@ -257,14 +285,22 @@ form ul li .form_input span.info{
   color: #666666;
 }
 
-textarea, input[type=text], input[type=password]{
+textarea, input[type=text], input[type=password], input[type=file]{
   border: solid 1px #c0c0c0;
   padding: 3px;
+  background-color: #ffffff;
+  color: #333333;
+}
+
+textarea.tinymce{
+  width: 100%;
+  height: 300px;
 }
 
 select{
   border: solid 1px #c0c0c0;
   background-color: #ffffff;
+  color: #333333;
   padding: 3px 10px;;
 }
 
@@ -276,26 +312,27 @@ form ul li .form_single_button{
   text-align: left;
   padding-left: 150px;
 }
-
-form ul li .form_buttons input[type=submit],
-form ul li .form_single_button input[type=submit]{
+input[type=submit]{
+  background-color: #e9e9e9;
+  cursor: pointer;
   border: solid 1px #c0c0c0;
-  background-color: #ffffff;
-  padding: 3px 10px;
 }
 
-form ul li .form_buttons input[type=submit]:hover{
-  cursor: pointer;
+input[type=submit]:hover{
   background-color: #f5f5f5;
 }
 
+form ul li .form_buttons input[type=submit],
+form ul li .form_single_button input[type=submit]{
+  padding: 3px 10px;
+}
+
 /* --------------------------------------------- ADMIN */
 
 ul.buttons{
   margin: 10px 0 20px 0;
   text-align: right;
   padding-bottom: 10px;
-  border-bottom: dashed 1px #e5e5e5;
 }
 
 ul.buttons li{
@@ -304,14 +341,17 @@ ul.buttons li{
 
 ul.buttons li a{
   padding: 3px 7px 3px 7px;
-  border: solid 1px #d1d1d1;
+  border: solid 1px #d5d5d5;
+}
+ul.buttons li a:hover{
+  color: #000066;
+  background-color: #f5f5f5;
 }
 
 ul.buttons li a.add{
   background-image: url("../icons/add.gif");
   background-repeat: no-repeat;
-  background-position: 3px 6px;
-  border: solid 1px #d1d1d1;
+  background-position: 3px 8px;
   padding: 3px 7px 3px 18px;
 }
 
@@ -319,7 +359,6 @@ ul.filters{
   margin: 10px 0 20px 0;
   text-align: right;
   padding-bottom: 10px;
-  border-bottom: dashed 1px #e5e5e5;
 }
 
 ul.filters li{
@@ -337,7 +376,7 @@ table.admin{
 }
 
 table.admin tr.hl:hover{
-  background-color: #f9f9f9;
+  background-color: #f5f5f5;
 }
 
 table.admin tr th{
@@ -397,8 +436,10 @@ form ul.actions li label{
   border: solid 1px #c0c0c0;
 }
 
+.redirect_message{
+  padding: 50px 100px 50px 100px;  
+}
 .redirect_message div{
-  margin: 50px 100px 50px 100px;
   padding: 20px;
   border: solid 1px #c0c0c0;
 }
@@ -414,9 +455,9 @@ form ul.actions li label{
 
 /* --------------------------------------------- FOOTER */
 
-#main_footer .content{
-  border-top: solid 1px #e9e9e9;
-  padding-bottom: 20px;
+#main_footer{
+  border-top: solid 1px #d5d5d5;
+  padding-bottom: 60px;
 }
 
 #main_footer .content ul{
@@ -431,8 +472,8 @@ form ul.actions li label{
 
 #main_footer .content ul li{
   float: left;
-  padding: 0 5px;
-  border-left: solid 1px #c0c0c0;
+  padding: 0 1em;
+  border-left: solid 1px #666666;
   margin-top: 5px;
 }
 

diff --git a/mw/app/out/default/css/tinymce.css b/mw/app/out/default/css/tinymce.css
new file mode 100644 (file)
index 0000000..f34b922
--- /dev/null
+++ b/mw/app/out/default/css/tinymce.css
@@ -0,0 +1,9 @@
+body{
+  background-color: #ffffff;
+  color: #333333;
+  font: normal 0.9em Verdana, Helvetica, Arial, sans-serif;
+}
+
+p{
+  text-align: justify;
+}
\ No newline at end of file

diff --git a/mw/app/out/default/views/config/index.php b/mw/app/out/default/views/config/index.php
index 568cb00..2a743d6 100644 (file)
--- a/mw/app/out/default/views/config/index.php
+++ b/mw/app/out/default/views/config/index.php
@@ -3,7 +3,6 @@
 <form name="config_form" action="<?php echo $this->url("config"); ?>" method="post">
 
   <fieldset>
-    <legend>Configuration générale</legend>
     <ul>
       <li>
         <label for="site_name">nom du site</label>

diff --git a/mw/app/out/default/views/footer.php b/mw/app/out/default/views/footer.php
index 012622c..29a3d20 100644 (file)
--- a/mw/app/out/default/views/footer.php
+++ b/mw/app/out/default/views/footer.php
@@ -2,21 +2,6 @@
 <?php if($this->config("contact_form") && $this->action_allowed("forms/contact")) : ?>
   <li><a href="<?php echo $this->url("forms/contact"); ?>">contact</a></li>
 <?php endif; ?>
-<?php if(!($user = $this->user())) : ?>
-  <li><a href="<?php echo $this->url("users/identification"); ?>">s'identifier</a></li>
-<?php else : ?>
-  <li>Bienvenue <strong><?php echo $user["login"]; ?></strong></li>
-  <?php if($this->action_allowed("users/infos")) : ?>
-  <li><a href="<?php echo $this->url("users/infos"); ?>">compte</a></li>
-  <?php endif; ?>
-<?php if($this->action_allowed("admin")) : ?>
-  <li><a href="<?php echo $this->url("admin"); ?>">admin</a></li>
-<?php endif; ?>
-<?php if($this->action_allowed("config")) : ?>
-  <li><a href="<?php echo $this->url("config"); ?>">config</a></li>
-<?php endif; ?>
-  <li><a href="<?php echo $this->url("users/identification/logout"); ?>">deconnexion</a></li>
-<?php endif; ?>
 <?php if($this->out_config("mtweb_footer_link")) : ?>
   <li><a href="http://mtweb.dj3c1t.com/">mtweb</a></li>
 <?php endif; ?>

diff --git a/mw/app/out/default/views/header.php b/mw/app/out/default/views/header.php
index 6b13fe7..63b33e7 100644 (file)
--- a/mw/app/out/default/views/header.php
+++ b/mw/app/out/default/views/header.php
@@ -4,4 +4,6 @@
 </nav>
 <?php endif; ?>
 
-<h1><a href="<?php echo $this->url(); ?>"><?php echo $this->config("site_name"); ?></a></h1>
+<h1><a href="<?php echo $this->url(); ?>"><span><?php echo $this->config("site_name"); ?></span></a></h1>
+
+<?php require $this->out_file("views/menu_user.php"); ?>
\ No newline at end of file

diff --git a/mw/app/out/default/views/menu_user.php b/mw/app/out/default/views/menu_user.php
new file mode 100644 (file)
index 0000000..d6e42d9
--- /dev/null
+++ b/mw/app/out/default/views/menu_user.php
@@ -0,0 +1,20 @@
+<ul class="menu_user">
+<?php if(!($user = $this->user())) : ?>
+  <li><a href="<?php echo $this->url("users/identification"); ?>">s'identifier</a></li>
+<?php else : ?>
+  <li>Bienvenue <strong><?php echo $user["login"]; ?></strong></li>
+  <?php if($this->action_allowed("users/infos")) : ?>
+  <li><a href="<?php echo $this->url("users/infos"); ?>">compte</a></li>
+  <?php endif; ?>
+<?php if($this->action_allowed("admin")) : ?>
+  <li><a href="<?php echo $this->url("admin"); ?>">admin</a></li>
+<?php endif; ?>
+<?php if($this->action_allowed("config")) : ?>
+  <li><a href="<?php echo $this->url("config"); ?>">config</a></li>
+<?php endif; ?>
+  <li><a href="<?php echo $this->url("users/identification/logout"); ?>">deconnexion</a></li>
+<?php endif; ?>
+<?php if($this->out_config("mtweb_footer_link")) : ?>
+  <li><a href="http://mtweb.dj3c1t.com/">mtweb</a></li>
+<?php endif; ?>
+</ul>