From 0844ad10b9cfb0540ce45dcab703315a9fa3d3f3 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Thu, 9 Jul 2009 10:19:52 +0000
Subject: [PATCH] =?UTF-8?q?Appel=20des=20fichiers=20includecss=20et=20incl?=
 =?UTF-8?q?udejs=20pour=20la=20g=C3=A9n=C3=A9ration=20des=20styles=20et=20?=
 =?UTF-8?q?javascripts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 www/includecss.php | 21 ++++++++++++
 www/includejs.php  | 24 +++++++++++++
 www/pages/main.php | 85 +++++++++++++---------------------------------
 3 files changed, 69 insertions(+), 61 deletions(-)
 create mode 100644 www/includecss.php
 create mode 100644 www/includejs.php
diff --git a/www/includecss.php b/www/includecss.php
new file mode 100644
index 000000000..5e7979539
--- /dev/null
+++ b/www/includecss.php
@@ -0,0 +1,21 @@
+<?php
+//Inclusion des css en fonction de la variable page
+?>
+<link rel="stylesheet" type="text/css" href="./css/infogreffe_base.css" />
+<link rel="stylesheet" type="text/css" href="./css/infogreffe.css" />
+<link rel="stylesheet" type="text/css" href="./css/main.css" />
+<link rel="stylesheet" type="text/css" href="./css/menu.css" />
+<link rel="stylesheet" type="text/css" href="./css/jquery.autocomplete.css" />
+<?php
+if($page=='international_recherche' || $page=='international_identite' || $page=='international_identitec'){
+?>
+<link rel="stylesheet" type="text/css" href="./css/international.css" />
+<?php
+}
+if($page=='saisie'){
+?>
+<link rel="stylesheet" type="text/css" href="./css/jquery.autocomplete2.css" />
+<link rel="stylesheet" href="./css/saisie.css" type="text/css" />
+<link rel="stylesheet" href="./css/thickbox.css" type="text/css" />
+<?php
+}
\ No newline at end of file
diff --git a/www/includejs.php b/www/includejs.php
new file mode 100644
index 000000000..4ae980460
--- /dev/null
+++ b/www/includejs.php
@@ -0,0 +1,24 @@
+<?php
+//Inclusion des js en fonction de la variable page
+?>
+<script type="text/javascript" src="./js/jquery.js"></script>
+<script type="text/javascript" src="./js/jquery.bgiframe.min.js"></script>
+<script type="text/javascript" src="./js/jquery.autocomplete.js"></script>
+<?php
+/*
+<script type="text/javascript" src="./js/jquery.dimensions.js"></script>
+<script type="text/javascript" src="./js/jquery.easing.js"></script>
+<script type="text/javascript" src="./js/jquery-ui.js"></script>
+*/
+?>
+<script type="text/javascript" src="./js/dropDownOverlapping.js"></script>
+<script type="text/javascript" src="./js/menu.js"></script>
+<script type="text/javascript" src="./js/scripts.js"></script>
+<?php
+//Ajout script ajax pour la saisie
+if($page=='saisie'){
+?>
+<script type="text/javascript" src="./js/saisieajax.js"></script>
+<?php
+}
+?>
\ No newline at end of file
diff --git a/www/pages/main.php b/www/pages/main.php
index 9f5193119..b5ec93dc8 100644
--- a/www/pages/main.php
+++ b/www/pages/main.php
@@ -3,74 +3,37 @@ if (!$_SESSION['connected'])	die('Erreur 11000 : Not connected');
 
 //Affectation de valeur par défaut pour arriver sur la page de recherche
 if (!isset($page2)){
+	$title='Recherche';
 	$page2='recherche.php';
 	$vueRecherche = 'ent';
 }
 
-require_once(realpath(dirname(__FILE__).'/../../includes/siren.php'));
+require_once 'siren.php';
 ?>
 <html>
 <head>
 <title>Extranet Scores &amp; D&eacute;cisions - <?=$title?></title>
-<link rel="stylesheet" type="text/css" href="./css/infogreffe_base.css" />
-<link rel="stylesheet" type="text/css" href="./css/infogreffe.css" />
-<link rel="stylesheet" type="text/css" href="./css/main.css" />
-<link rel="stylesheet" type="text/css" href="./css/menu.css" />
-<link rel="stylesheet" type="text/css" href="./css/jquery.autocomplete.css" />
-<?php 
-if($page=='international_recherche' || $page=='international_identite' || $page=='international_identitec'){
-?>
-<link rel="stylesheet" type="text/css" href="./css/international.css" />
 <?php
-}
-
-if($sortie!='prt'){
-?>
-<script type="text/javascript" src="./js/jquery.js"></script>
-<script type="text/javascript" src="./js/jquery.bgiframe.min.js"></script>
-<script type="text/javascript" src="./js/jquery.autocomplete.js"></script>
-
-<?php
-/* 
-<script type="text/javascript" src="./js/jquery.dimensions.js"></script>
-<script type="text/javascript" src="./js/jquery.easing.js"></script>
-<script type="text/javascript" src="./js/jquery-ui.js"></script>
-*/
-?>
-<script type="text/javascript" src="./js/dropDownOverlapping.js"></script>
-<script type="text/javascript" src="./js/menu.js"></script>
-<script type="text/javascript" src="./js/scripts.js"></script>
-
-<?php
-	//Ajout script ajax pour la saisie
-if($page2=='saisie.php'){
-?>
-<script type="text/javascript" src="./js/saisieajax.js"></script>
-<link rel="stylesheet" type="text/css" href="./css/jquery.autocomplete2.css" />
-<link rel="stylesheet" href="./css/saisie.css" type="text/css" />
-<link rel="stylesheet" href="./css/thickbox.css" type="text/css" />				
-<?php
-	}
-}
+require_once 'includecss.php';
+if($sortie!='prt') require_once 'includejs.php';
 ?>
 </head>
-<?php 
-if ($sortie!='prt')
-{
+<?php
+if ($sortie!='prt') {
 ?>
 <body onResize="JSFX_FloatTopDiv()">
-<?php	
-} elseif ($sortie=='prt') { 
+<?php
+} elseif ($sortie=='prt') {
 ?>
 <body onLoad="window.print();window.close();">
-<?php	
-} 
+<?php
+}
 ?>
 <center>
 <table border="0" width="800" height="600">
 <tr>
-<?php 
-if ($sortie<>'pdf' && $sortie<>'prt') { 
+<?php
+if ($sortie<>'pdf' && $sortie<>'prt') {
 ?>
 	<td width="220" valign="top"><!--<img src="./img/logo_menu.png" width="200" height="65" />-->&nbsp;</td>
 	<td width="580">
@@ -82,8 +45,8 @@ if ($sortie<>'pdf' && $sortie<>'prt') {
 			</tr>
 		</table>
 	</td>
-<?php 
-} else { 
+<?php
+} else {
 ?>
 <td width="800">
 	<table id="MainPage" cellSpacing="0" border="0" cellPadding="0" align="left" height="100%">
@@ -98,30 +61,30 @@ if ($sortie<>'pdf' && $sortie<>'prt') {
 </tr>
 </table><br/>
 <font size="1" face="Arial, Helvetica, sans-serif">
-&copy; 2006-<?=date('Y')?> Scores &amp; D&eacute;cisions SAS - 
+&copy; 2006-<?=date('Y')?> Scores &amp; D&eacute;cisions SAS -
 Tous droits r&eacute;serv&eacute;s - <a href="<?=SITEINST_URL2?>mentions.php" target="_blank">Mentions l&eacute;gales</a>
-<? 
+<?
 if ($sortie!='prt') {
 	if ($page=='recherche'){
 		if ($_REQUEST['vue']=='list' ) $_SERVER['REQUEST_URI'] = str_replace('vue=list', 'vue=list_pre', $_SERVER['REQUEST_URI']);
-	}	
-	
+	}
+
 	$printUrl = $_SERVER['REQUEST_URI'];
 	if ($page=='bilans' && isset($_REQUEST['type']) && $_REQUEST['type']!=''){
 		$printUrl.= '&type='.$_REQUEST['type'];
 	}
-?> 
+?>
 - <a href="<?=$printUrl;?>&sortie=prt" target="_blank"><img src="./img/icone_print.png"/></a>
-<?php 
-} 
+<?php
+}
 ?>
 
 </font>
 </center>
-<?php 
-if ($sortie!='pdf' && $sortie!='prt') { 
+<?php
+if ($sortie!='pdf' && $sortie!='prt') {
 	require_once('menu.php');
-} 
+}
 ?>
 </body>
 </html>
\ No newline at end of file
