Merge
This commit is contained in:
commit
00020322ce
@ -29,7 +29,7 @@ if(isset($tabStyles) && count($tabStyles)>0){
|
||||
if( ENVIRONNEMENT == 'DEV' || $sortie=='pdf' ||
|
||||
$compressoff || isBuggyIe() ){
|
||||
foreach($group['list'] as $style){
|
||||
echo '<link rel="stylesheet" type="text/css" media="all" href="./css/'.$style.'" />';
|
||||
echo '<link rel="stylesheet" type="text/css" media="all" href="css/'.$style.'" />';
|
||||
echo "\n";
|
||||
}
|
||||
}else{
|
||||
@ -49,11 +49,11 @@ if(isset($tabScripts) && count($tabScripts)>0){
|
||||
if(in_array('all', $group['pages']) || in_array($page, $group['pages'])){
|
||||
if( ENVIRONNEMENT == 'DEV' || $compressoff || isBuggyIe()){
|
||||
foreach($group['list'] as $script){
|
||||
echo '<script type="text/javascript" src="./js/'.$script.'"></script>';
|
||||
echo '<script type="text/javascript" src="js/'.$script.'"></script>';
|
||||
echo "\n";
|
||||
}
|
||||
}else{
|
||||
echo '<script type="text/javascript" src="./servescripts.php?q='.$name.'.js"></script>';
|
||||
echo '<script type="text/javascript" src="servescripts.php?q='.$name.'.js"></script>';
|
||||
echo "\n";
|
||||
}
|
||||
}
|
||||
|
@ -17,6 +17,7 @@ require_once 'siren.php';
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr" dir="ltr">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />
|
||||
<base href="<?=EXTRANET_URL?>" />
|
||||
<title>Extranet Scores & Décisions - <?=$title?></title>
|
||||
<?php require_once 'includeheader.php'; ?>
|
||||
</head>
|
||||
|
@ -1,16 +1,16 @@
|
||||
<?php
|
||||
if ( hasModeEdition() ){
|
||||
|
||||
require_once 'partenaires/classMTva.php';
|
||||
require_once 'common/dates.php';
|
||||
require_once 'saisie/constantes.php';
|
||||
require_once 'saisie/saisie_logo.php';
|
||||
|
||||
$tabInfo = $_SESSION['tabInfo'];
|
||||
|
||||
$message = '';
|
||||
|
||||
//Sauvegarde du formulaire
|
||||
if ( isset($_REQUEST['submit']) && $_REQUEST['submit']=='Sauver' ) {
|
||||
require_once 'saisie/saisie_logo.php';
|
||||
|
||||
require_once 'saisie/saisie_save.php';
|
||||
saisie_logo($siren);
|
||||
$message = saisie_save($siret, $idEntreprise, $tabInfo);
|
||||
@ -61,6 +61,3 @@ if ($etab['Siege']==0){
|
||||
require_once 'saisie/saisie_form.php';
|
||||
?>
|
||||
</div>
|
||||
<?php
|
||||
} //Fin control mode edition
|
||||
?>
|
Loading…
x
Reference in New Issue
Block a user