From a8c58dd397a1a7097f3d1efdf3e6b51173ebe93f Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Wed, 26 Oct 2011 14:42:03 +0000
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20design?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/scripts/criteres/entreprise.phtml |  18 ++-
 .../views/default/scripts/header.phtml        |  19 ++-
 .../views/default/scripts/index/index.phtml   |   5 +-
 application/views/default/scripts/main.phtml  |   2 +-
 .../views/default/scripts/user/login.phtml    |   2 +-
 public/themes/default/images/bg-home-tile.jpg | Bin 0 -> 660 bytes
 .../images/menu/bg_primaryNav_left.gif        | Bin 0 -> 1447 bytes
 .../images/menu/bg_primaryNav_right.gif       | Bin 0 -> 207 bytes
 .../images/menu/bg_secondaryNav_left.gif      | Bin 0 -> 495 bytes
 .../images/menu/bg_secondaryNav_right.gif     | Bin 0 -> 112 bytes
 public/themes/default/styles/main.css         | 109 +++++++++++++++++-
 11 files changed, 139 insertions(+), 16 deletions(-)
 create mode 100644 public/themes/default/images/bg-home-tile.jpg
 create mode 100644 public/themes/default/images/menu/bg_primaryNav_left.gif
 create mode 100644 public/themes/default/images/menu/bg_primaryNav_right.gif
 create mode 100644 public/themes/default/images/menu/bg_secondaryNav_left.gif
 create mode 100644 public/themes/default/images/menu/bg_secondaryNav_right.gif

diff --git a/application/views/default/scripts/criteres/entreprise.phtml b/application/views/default/scripts/criteres/entreprise.phtml
index b21af107..5322e574 100644
--- a/application/views/default/scripts/criteres/entreprise.phtml
+++ b/application/views/default/scripts/criteres/entreprise.phtml
@@ -1,5 +1,15 @@
-<p>Etablissements : Tous / Seulement les actifs / Seulement les inactifs </p>
-<p>Type Etablissements : Tous / Uniquement les sièges / Uniquement les secondaires</p>
-<p>Entreprises appartenant à un groupe français</p>
-<p>Entreprise appartenant à un groupe étranger</p>
+<p>
+<label>Etablissements :</label>
+<select name="Entreprise[Etablissements]">
+<option value="">Tous</option>
+<option value="">Actifs</option>
+<option value="">Inactifs</option>
+</select>
+</p>
+<p><label>Type d'établissements</label>
+<select name="Entreprise[Etablissements]">
+<option value="">Tous</option>
+<option value="">Uniquement les sièges</option>
+<option value="">Uniquement les secondaires</option>
+</select>
 <p>Téléphone renseigné / non renseigné</p>
\ No newline at end of file
diff --git a/application/views/default/scripts/header.phtml b/application/views/default/scripts/header.phtml
index f0d5226a..e1758478 100644
--- a/application/views/default/scripts/header.phtml
+++ b/application/views/default/scripts/header.phtml
@@ -1,3 +1,18 @@
-<h1>Odea</h1>
+<div id="primaryNavigation" class="clearfix">
+<ul>
+<li><a href="<?=$this->url(array('controller'=>'index', 'action'=>'index'), null, true)?>">Accueil</a></li>
+<li><a href="<?=$this->url(array('controller'=>'index', 'action'=>'index'), null, true)?>">Tableau de bord</a></li>
+<li><a href="<?=$this->url(array('controller'=>'index', 'action'=>'index'), null, true)?>">Aide</a></li>
+<li><a href="<?=$this->url(array('controller'=>'index', 'action'=>'index'), null, true)?>">A propos de</a></li>
+</ul>
+</div>
+
+<div id="logo">
+<h1>Odea</h1>
+</div>
+
+<div id="message">
+Message d'information
+</div>
+
 
-<a href="<?=$this->url(array('controller'=>'index', 'action'=>'index'), null, true)?>">Accueil</a>
diff --git a/application/views/default/scripts/index/index.phtml b/application/views/default/scripts/index/index.phtml
index 398b431f..b5055521 100644
--- a/application/views/default/scripts/index/index.phtml
+++ b/application/views/default/scripts/index/index.phtml
@@ -14,16 +14,17 @@
 </div>
 
 <div id="result">
-TEST
+Résultat
 </div>
 
 
 <script>
 $(function() {
 	$( "#tabs" ).tabs({
+		cache: true,
 		ajaxOptions: {
 			error: function( xhr, status, index, anchor ) {
-				$( anchor.hash ).html("Erreur lors du chargement...Contactez le support.");
+				$( anchor.hash ).html("Erreur lors du chargement...");
 			}
 		}
 	});
diff --git a/application/views/default/scripts/main.phtml b/application/views/default/scripts/main.phtml
index f6b1bede..e9c17de2 100644
--- a/application/views/default/scripts/main.phtml
+++ b/application/views/default/scripts/main.phtml
@@ -9,7 +9,7 @@
 </head>
 <body>
 <div id="global">
- <div id="header">
+ <div id="header" class="clearfix">
  <?php echo $this->render('header.phtml') ?>
  </div>
  <div id="content" class="clearfix">
diff --git a/application/views/default/scripts/user/login.phtml b/application/views/default/scripts/user/login.phtml
index b9d92ec7..12642945 100644
--- a/application/views/default/scripts/user/login.phtml
+++ b/application/views/default/scripts/user/login.phtml
@@ -6,7 +6,7 @@
   <link rel="shortcut icon" type="image/x-icon" href="<?='http://'.$_SERVER['SERVER_NAME']?>/favicon.ico" />
 </head>
 <body>
-<h2>CONNEXION EXTRANET</h2>
+<h2>CONNEXION ODEA</h2>
 <?=$this->message?>
 <?=$this->form?>
 </body>
diff --git a/public/themes/default/images/bg-home-tile.jpg b/public/themes/default/images/bg-home-tile.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0ce1a9cc5a8de432784ef12e37461a8a127a4a52
GIT binary patch
literal 660
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5H)B*^gp9Rr_ZN`6u*L&^c5
z2;=|T3@r?d!~-S-V1@&zb|ywfpezu>C5UDGKfoZ!!N|%W!ptbhz$D1XEXer(2tzH<
z*~~zQ1Q^-aSy;Ikf#Qrvq6`d7EUat-j6n6Q99#$uj2{9QGK&f-CSDYI5-M)!IPqan
z(j?(2Q%$b03Ig@BGP5F?!YH`#VUQw|$cMy<Ns~nX-(uha+QB5qEXZKb@Uh_SoCXvN
zv2(8d46i))?jPHqv(Mii+7|z?I_SC9dyBjG58UsoyQ7`l`qq2S>OGIk>zV5;e;2In
z6W^+LGqU>t&@3apjJU7=8My3@m$uD+e%LD3d-isYzY)(`-!u1b=)Y!fCwb|)d7j{}
zO_mF54=i5Z@iqL%UUi_lm}hSf*@uM~++3A&<-+AnJ!j0aW}8ZtsU>a>xw+!<Mzi+T
z%Ct+FnOAzWPn%6PdF3YhbhhWLQnlXJ<4w9(S}qyv_~5#$vrSx%V|$=s)s4(KHqyMt
z?ahhH3O;Pjxfp8ev0OviB-B5^i|wpv@D-uv9pAp(yvM$M*|`t4d(Fz5r%%%AJHf0H
TDm#JAW0kdn5K5rf|Gx<UlhUx1

literal 0
HcmV?d00001

diff --git a/public/themes/default/images/menu/bg_primaryNav_left.gif b/public/themes/default/images/menu/bg_primaryNav_left.gif
new file mode 100644
index 0000000000000000000000000000000000000000..06f07df47a198b25876ff534cf0cb0f5cde211c3
GIT binary patch
literal 1447
zcmZ?wbhEHb+`wYQ@STByUs6R%(~6T<P)6IDk&%gwo1aTSoKHeYQQuxrLV<;igOQ1u
zTS$tPgIm$SK~dL+jf-DK-B?l2PD)u{$-t3;fk9Hk5=f4M(GVDlA)xq^1?+4c5DCf?
z3>^O%{s(Sw*s$PWGl#HN%!v&P54Q^_d(H9KxaerNgmKoL6B`#F?^kf{lJVTM<m6<H
z;8igvH!VFq-5~kY5siXnXJ=a!zq)gB^YZia9h$jhy|%2lxY)z?n$M{%D=#k(SnM^|
zYwN13t0Ojli&?dG_4V}$hr49Gx2?IkIm5EZ_w=^4x3?EOJ~h{S`@73q%RaxldwTo&
z`}-T1)sJfL*zoXhhp=|snIAe2k4;eap69c3)6>)Z^2ztk?A-kP`~qk9t2(>3yu7?3
zcy-*_2_~<vZ%95p&o_GA>svdDU*9{sd;7WD`<l7s{r2oAY(CJh9e-}m&d;Y#&i9`0
zw|7_RmW%7N@1NVd`}_Qx`@8?k`|sORIg9!H>iF~f_Wu6x?(ymQ{_*C2e*O6T`hNdU
zyZ`?g*fbWz{o~De(8!^-BD9gq?8Sp-fnP@wT13J!9=0m^c06p8DSM&lBvq&Js6$0f
zBB@hj*@{Iq>g!%S>Nd!`p44M<Ekn7`_}+@geKz~1CHFh9X{OY_<js6C(PP%P<Vike
zFH>T??KGcG38@lIof?t0@@ax=-pi-c6XHr!XQWKaT;`cPZ{@RDIbl=MW)~dORCmlj
zm-&2d;<e7_^J@H7rq6F+vwAYWNh~X)w?%H%i$$tJ3XTjtZdxm+aJd*9STZBcY6&Bg
z0>jE>3);Mt8CX>w9AKE=wd&O>C8h!f7ABvT4-BkZu4TPmyW`oa*X#Ctd-Zz#0XFS7
z8;*!&zu9;~ZS|W?XUtx|*?hrG`|Xx1VcBoD-bh>hcH5n@*KfB!Xw%l)$S~!!12gxZ
z#qV~#+4lO~?hnVb-|zWyE&Ki6AJ105-}mR+>-YN^*mXV}U=h#xaF9cN&4)ug=5Ib6
V7I4@3ctj*T=i^a{*U|zE)&Ts&ZrlI>

literal 0
HcmV?d00001

diff --git a/public/themes/default/images/menu/bg_primaryNav_right.gif b/public/themes/default/images/menu/bg_primaryNav_right.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e4b4d53d0949502663b04551fa348d640aa71c91
GIT binary patch
literal 207
zcmZ?wbhEHbWM?p9IKsfdFR3D>X~oGaD5Gu7$jHRT&Cewu&L^RysBbSQp}@k%!N|nS
zEhNRt!L4ZEpr~uZ#>FqAZmg(hC#9^fWZ=laz#yq%2_$g=#h)x-DIE|AvXg<;XMt*0
zi0Pzfk@K#tTDDmFu!i>a^}gGGpM8B`PJx&TU*R#8qMz1gQ~j6a-&!rU^jflmlLfC*
eS0IC;K?D=C`yz$~Hfl^K7y}|rBpPZs7_0%dxhoX_

literal 0
HcmV?d00001

diff --git a/public/themes/default/images/menu/bg_secondaryNav_left.gif b/public/themes/default/images/menu/bg_secondaryNav_left.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2691ab66942a2c3d4a478d01038f43653f280695
GIT binary patch
literal 495
zcmV<L0TBL2Nk%w1VXy=u0J8u9C_`Tl86*^Fp*>}hG;5tGLS8ppgA{0>J!Fp}IZ+yD
zpfzlrLT#K6XQ2Q900000A^8LV00000EC2ui0I&oi000F4FeJmOy*TU5yZ>M)j$~<`
zXsWJk>%MR-&vb3yc&_h!@BhG{aEJmd6pf^E$!t2G(5Q4uty-_xtai)odcWYXcuX#v
z&*-#z&2GEj@VI<VuiNk3fdJ3%`~QG}f`f#GhKGoWii?bmj$;gul9QB`mY0~Bnwy-R
zo}Y!0prfRvrl+W>s;jK6u8^;>va__cwzs&sx|yQ8zQ4f1!o$SH#+1Fs%FE2n&d<=%
zvB}ca*4NnC+S}Y$)ZO6W;^XAy=9=H<>g(+7?(gta>GAaS_V@Vty7T(|{{H|23LM05
zpuvL(6DnNjq#(nG5F<*Q*v%ouix@L%+$hT;$B!VKLy8=U$Ro*<C{wCj3C1MLmoQ_>
z9O-hV&6_xL2CS*Gr_Y~2!|@DCw5ZXe!G<DT%CxCdQc9mnol3Q;p{Q1~YTe2;4c4w;
z!-^gI<SW^;XwynHtG2D%w>jCuolCc_NV#_N>fO5#FW<j_1KUGzK(OJ%hyxZNuqUzO
l$B@?r05E`v<;$2eYu?Pcv**vCLyI0wy0q!js9i(=06Th(3S0mH

literal 0
HcmV?d00001

diff --git a/public/themes/default/images/menu/bg_secondaryNav_right.gif b/public/themes/default/images/menu/bg_secondaryNav_right.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e3944e4d1845ead2ab7e608a826ec725f2285204
GIT binary patch
literal 112
zcmZ?wbhEHbWM)ue*v!D7;T+E|sUniG&^C3VN%mX~r#SQIW|52qwkiEemVr_k3rut7
zI_1vcPhZFY28usfz_bpC1ew9WB70%U0<nywEyv29$8q$<YtDMIa+%I6Gj=6`qYNy9
G4AuaO6dw2h

literal 0
HcmV?d00001

diff --git a/public/themes/default/styles/main.css b/public/themes/default/styles/main.css
index c240ce53..2e0c92a8 100644
--- a/public/themes/default/styles/main.css
+++ b/public/themes/default/styles/main.css
@@ -1,4 +1,11 @@
-body { font:0.8em/100% Arial,Helvetica,sans-serif;}
+body {
+    background: url("/themes/default/images/bg-home-tile.jpg") repeat-x scroll 50% 0 #39414A;
+    color: #FFFFFF;
+    font: 62.5% "Trebuchet MS",Verdana,Helvetica,Arial,sans-serif !important;
+    margin: 0;
+    padding: 0;
+}
+
 
 ul, ul li {
 	margin: 0 5px;
@@ -11,15 +18,103 @@ ul, ul li {
 	margin-right: auto;
 	margin-left: auto;
 }
-#header {}
+
+#header {
+	height: 156px;
+    padding: 0 40px;
+    position: relative;
+}
+
+#header #message {
+	background: #ffffff;
+    color: #000000;
+    clear: right;
+    float: right;
+    margin-top: 34px;
+    font-size: 1.2em;
+    line-height: 25px;
+    margin-bottom: 2px;
+    padding: 0 1em;
+    min-width:300px;
+}
+
+#header h1 {
+    border: 0 none;
+    bottom: 15px;
+    color: #DDDDDD;
+    font-size: 2em;
+    font-weight: normal;
+    left: 60px;
+    line-height: 1;
+    padding: 0;
+    position: absolute;
+    text-transform: uppercase;
+}
+
+
 #header h1 {
 	font-size:18px; 
 	margin:10px 5px;
 }
 
+#logo {
+	border: 0 none !important;
+    display: block;
+    position: absolute;
+    top: 80px;	
+}
+
+
+#primaryNavigation {
+    background: url("/themes/default/images/menu/bg_primaryNav_left.gif") no-repeat scroll left bottom #192839;
+    float: right;
+}
+
+#primaryNavigation ul {
+    background: url("/themes/default/images/menu/bg_primaryNav_right.gif") no-repeat scroll right bottom transparent;
+    float: left;
+    margin: 0;
+    padding: 0 0.8em 2px;
+}
+
+#primaryNavigation li {
+    background: none repeat scroll 0 0 transparent;
+    float: left;
+    list-style: none outside none;
+    margin: 0;
+    padding: 0;
+}
+
+#primaryNavigation li a {
+    color: #D0D0D0;
+    float: left;
+    font-size: 1.2em;
+    line-height: 25px;
+    margin-bottom: 2px;
+    padding: 0 1em;
+    text-decoration: none;
+}
+
+#primaryNavigation li.jq-ui, #primaryNavigation li.jq-blog {
+    border-right: 1px solid #0F1924;
+}
+
+#primaryNavigation li.jq-current a, #primaryNavigation li.jq-current a:hover {
+    background: none repeat scroll 0 0 #192839;
+    border-bottom: 2px solid #176092;
+    color: #D0D0D0;
+    cursor: default;
+    margin-bottom: 0;
+}
+
+#primaryNavigation li a:hover {
+    border-bottom: 2px solid #4082AE;
+    color: #FFFFFF;
+    margin-bottom: 0;
+}
+
 #content {
-	margin:10px 5px;
-	border:1px solid #000000;
+	margin:0;
 }
 
 #content h1 {font-size:16px; text-decoration:underline;}
@@ -60,15 +155,17 @@ h3 {
 
 #tabs {
 	float:left;
-	margin: 2px;	
+	margin: 2px;
+	width:700px;
 }
 
 #result {
+	background: #ffffff;
+	color: #000000;
 	float:left;
 	width:250px;
 	margin:2px;
 	padding:2px;
-	border:1px solid #000000;	
 }
 
 .clearfix:after {