diff --git a/www/css/international.css b/www/css/international.css index 51ba5b627..a5abaf246 100644 --- a/www/css/international.css +++ b/www/css/international.css @@ -27,8 +27,4 @@ #international div.submit p.required-note{margin-top:1em;} #international div.submit p.required-note span{color:#4B911C;_color:#666;font-size:170%;vertical-align:top;} -#center { background: #ffffff; width:580px; padding:5px; } -#center h1 { margin:5px; padding:5px; background: #606060; color:#ffffff; font: 600 1.4em arial, verdana, sans-serif; } -#center h2 { margin:5px; padding:5px; background: #00008c; color:#ffffff; font: bold 1.2em arial, verdana, sans-serif; } - diff --git a/www/css/main.css b/www/css/main.css index 021d23310..77a1c49af 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -1,6 +1,8 @@ body { background-color: #BEBEBE; - font-family: Arial + font-family: Arial; + margin: 0; /* pour éviter les marges */ + text-align: center; /* pour corriger le bug de centrage IE */ } img { @@ -219,13 +221,26 @@ table.table-classic tr.last td.titre { background-color: #2b2b8b; } -#center {background: #ffffff; width:570px; padding:5px; } +/* Nouveau style */ +#container { + position: relative; /* on positionne le conteneur */ + width:800px; + margin:0 auto; + text-align:left; +} + +#left {margin:0; padding:0;} +#content {margin:0; padding:0;} + +#MainPage {float:left; margin:0; padding:0; } +#center {float:left; width:580px; padding:0; margin:0 0 0 10px; background: #ffffff; } #center h1 {margin:5px; padding:5px; background:#606060; color:#ffffff; font:600 1.4em Arial, Verdana, Sans-serif; letter-spacing:1px; line-height:1.2em;} #center h2 {clear:both; margin:5px; padding:5px; background:#00008c; color:#ffffff; font:bold 1.2em Arial, Verdana, Sans-serif; } +#footer { clear:both; width:100%; margin:20px 0; } +#footer p { width:80%; margin:0 auto; font:0.6em Arial, Helvetica, sans-serif; } + .logout h4 {font-size: 16px;} .logout h5 {font-size: 14px;} #formR-submit {border:none;} - - diff --git a/www/css/menu2.css b/www/css/menu2.css index e2b4a6ecb..652e56fb6 100644 --- a/www/css/menu2.css +++ b/www/css/menu2.css @@ -1,4 +1,4 @@ -#floatMenu {font:12px Arial, Sans-serif; position:absolute; top:0px; left:10%; margin-left:50px; width:200px; } +#floatMenu {float:left; font:12px Arial, Sans-serif; width:200px; margin:0;} #floatMenu #logo img {width:200px; height:65px; } #floatMenu #icones {text-align:center; margin-top:5px;} .ui-accordion .ui-accordion-header {position:relative; margin:0; height:25px; font-size:12px; line-height:25px; cursor:pointer; background:#00a0c6 url(/img/menu/title.gif);} diff --git a/www/includecss.php b/www/includecss.php index 304018956..500c64c00 100644 --- a/www/includecss.php +++ b/www/includecss.php @@ -2,7 +2,7 @@ //Inclusion des css en fonction de la variable page $tabStyles = array( 'styles' => array( - 'list' => array('infogreffe_base.css', 'infogreffe.css', 'main.css', 'menu2.css', 'jquery.autocomplete.css', 'feed_menu_ie.css', 'feed_menu.css'), + 'list' => array( 'infogreffe_base.css', 'infogreffe.css', 'main.css', 'menu2.css', 'jquery.autocomplete.css', 'feed_menu_ie.css', 'feed_menu.css'), 'pages' => array('all'), ), 'styles_saisie' => array( diff --git a/www/js/scripts2.js b/www/js/scripts2.js index 04107c3f5..c94b15aa9 100644 --- a/www/js/scripts2.js +++ b/www/js/scripts2.js @@ -15,18 +15,9 @@ $(document).ready(function(){ }); //Auto Scroll - //var menuYloc = null; - var menuYloc = parseInt($("#floatMenu").css("top").substring(0,$("#floatMenu").css("top").indexOf("px"))); $(window).scroll(function() { - offset = menuYloc+$(document).scrollTop()+"px"; - $("#floatMenu").animate({top:offset},{duration:250,queue:false}); - }); - - var reference = parseInt($("#MainPage").css("left").substring(0,$("#MainPage").css("left").indexOf("px"))); - $(window).resize(function(){ - offset = parseInt($("#MainPage").css("left").substring(0,$("#MainPage").css("left").indexOf("px")))-reference; - offset = parseInt($("#floatMenu").css("left").substring(0,$("#floatMenu").css("left").indexOf("px")))+offset+"px"; - $("#floatMenu").animate({left:offset},{duration:250,queue:false}); + var offset = $(document).scrollTop(); + $("#floatMenu").css('margin-top',offset); }); }); diff --git a/www/pages/main.php b/www/pages/main.php index f0748075b..961e43448 100644 --- a/www/pages/main.php +++ b/www/pages/main.php @@ -1,8 +1,8 @@ Extranet Scores & Décisions - +onLoad="window.print();window.close();"> + +
+
+ + + +
- - - - -
- - - - - - - - - -
  - - - - -
- -
-
- - - - -
- -
-

- +
+ +
+ + + + - - - +
+ +
+
\ No newline at end of file diff --git a/www/pages/menu2.php b/www/pages/menu2.php index 908662626..567687a47 100644 --- a/www/pages/menu2.php +++ b/www/pages/menu2.php @@ -7,22 +7,44 @@
  • Rechercher une entreprise
  • Rechercher par dirigeant
  • Recherche internationale
  • - +
  • Dernière recherche
  • - +
  • Dernière recherche
  • -0) { ?> +0) { ?>
  • Centrale IparI ©
  • - +
  • Centrale IparI ©
  • - +

    IDENTITÉ

    diff --git a/www/pages/options_surv.php b/www/pages/options_surv.php index 8d86af141..60563af65 100644 --- a/www/pages/options_surv.php +++ b/www/pages/options_surv.php @@ -62,9 +62,6 @@ require_once 'surveillance/surveillance_tri.php'; $listTrier = $fonctionTri($listSurveillance); ?>