Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Some fix in layouts

Browse Source
This commit is contained in:
Laurent Destailleur
2011-07-06 11:40:21 +00:00
parent c704383c48
commit baae17ab55
8 changed files with 4398 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
htdocs/ecm/index.php
View File

@@ -21,7 +21,7 @@
* \file htdocs/ecm/index.php * \file htdocs/ecm/index.php
* \ingroup ecm * \ingroup ecm
* \brief Main page for ECM section area * \brief Main page for ECM section area
* \version $Id$ * \version $Id: index.php,v 1.99 2011/07/06 11:40:21 eldy Exp $
* \author Laurent Destailleur * \author Laurent Destailleur
*/ */
@@ -298,27 +298,19 @@ if (GETPOST("action") == 'refreshmanual')
//print "xx".$_SESSION["dol_screenheight"]; //print "xx".$_SESSION["dol_screenheight"];
$maxheightwin=(isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500)?($_SESSION["dol_screenheight"]-166):660; $maxheightwin=(isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500)?($_SESSION["dol_screenheight"]-166):660;
$morehead="<style type=\"text/css\"> $morecss="
html, body { <!-- dol_screenheight=".$_SESSION["dol_screenheight"]." -->
width: 100%; <style type=\"text/css\">
height: 100%;
padding: 0;
margin: 0;
overflow: auto; /* when page gets too small */
}
#containerlayout { #containerlayout {
background: #999;
height: ".$maxheightwin."px; height: ".$maxheightwin."px;
margin: 0 auto; margin: 0 auto;
width: 100%; width: 100%;
min-width: 700px; min-width: 700px;
_width: 700px; /* min-width for IE6 */ _width: 700px; /* min-width for IE6 */
} }
.pane { </style>";
display: none; /* will appear when layout inits */ $morejs="
} <script type=\"text/javascript\">
</style>
<SCRIPT type=\"text/javascript\">
jQuery(document).ready(function () { jQuery(document).ready(function () {
jQuery('#containerlayout').layout({ jQuery('#containerlayout').layout({
name: \"ecmlayout\" name: \"ecmlayout\"
@@ -346,9 +338,10 @@ html, body {
, south__closable: false , south__closable: false
}); });
}); });
</SCRIPT>"; </script>";
llxHeader($morecss.$morejs,$langs->trans("ECM"),'','','','','','',0,0);
llxHeader($morehead,$langs->trans("ECM"),'','','','','','',0,0);
// Ajout rubriques automatiques // Ajout rubriques automatiques
$rowspan=0; $rowspan=0;
@@ -382,7 +375,7 @@ if (GETPOST('action') == 'delete')
if ($mesg) { print $mesg."<br>"; } if ($mesg) { print $mesg."<br>"; }
// Toolbar // Toolbar
$head = ecm_prepare_head_fm($fac); //$head = ecm_prepare_head_fm($fac);
//dol_fiche_head($head, 'file_manager', '', 1); //dol_fiche_head($head, 'file_manager', '', 1);
@@ -393,7 +386,7 @@ if ($conf->use_javascript_ajax)
{ {
?> ?>
<div id="containerlayout"> <!-- begin div id="containerlayout" --> <div id="containerlayout"> <!-- begin div id="containerlayout" -->
<div id="ecm-layout-north" class="pane toolbar"> <div id="ecm-layout-north" class="toolbar">
<?php <?php
} }
else else
@@ -433,7 +426,7 @@ if ($conf->use_javascript_ajax)
?> ?>
</div> </div>
<div id="ecm-layout-west" class="pane"> <div id="ecm-layout-west" class="hidden">
<?php <?php
} }
else else
@@ -795,7 +788,7 @@ if ($conf->use_javascript_ajax)
?> ?>
</div> </div>
<div id="ecm-layout-center" class="pane layout-with-no-border"> <div id="ecm-layout-center" class="hidden">
<div class="pane-in ecm-in-layout-center"> <div class="pane-in ecm-in-layout-center">
<?php <?php
@@ -878,10 +871,6 @@ if ($conf->use_javascript_ajax)
</div> </div>
</div> </div>
<!-- <div id="ecm-layout-east" class="pane"></div> -->
<!-- <div id="ecm-layout-south" class="pane"></div> -->
</div> <!-- end div id="containerlayout" --> </div> <!-- end div id="containerlayout" -->
@@ -898,5 +887,5 @@ else
// End of page // End of page
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date: 2011/07/06 11:40:21 $ - $Revision: 1.99 $');
?> ?>

4353
htdocs/includes/jquery/plugins/layout/jquery.layout-latest.js Normal file
View File

File diff suppressed because it is too large Load Diff

6
htdocs/theme/auguria/style.css.php
View File

@@ -21,7 +21,7 @@
/** /**
* \file htdocs/theme/auguria/style.css.php * \file htdocs/theme/auguria/style.css.php
* \brief Fichier de style CSS du theme auguria * \brief Fichier de style CSS du theme auguria
* \version $Id: style.css.php,v 1.86 2011/07/06 09:42:55 eldy Exp $ * \version $Id: style.css.php,v 1.87 2011/07/06 11:40:21 eldy Exp $
*/ */
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -672,6 +672,7 @@ td.photo {
.toolbar { .toolbar {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.jpg' ?>) !important; background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.jpg' ?>) !important;
background-repeat: repeat-x !important; background-repeat: repeat-x !important;
border: 1px solid #BBB !important;
} }
.toolbarbutton { .toolbarbutton {
@@ -688,17 +689,16 @@ td.photo {
/* Panes for ECM or Filemanager */ /* Panes for ECM or Filemanager */
/* ============================================================================== */ /* ============================================================================== */
/*
#containerlayout .layout-with-no-border { #containerlayout .layout-with-no-border {
border: 0 !important; border: 0 !important;
border-width: 0 !important; border-width: 0 !important;
} }
*/
#containerlayout .layout-padding { #containerlayout .layout-padding {
padding: 2px !important; padding: 2px !important;
} }
/* /*
* PANES and CONTENT-DIVs * PANES and CONTENT-DIVs
*/ */

12
htdocs/theme/bureau2crea/style.css.php
View File

@@ -23,7 +23,7 @@
/** /**
* \file htdocs/theme/bureau2crea/style.css.php * \file htdocs/theme/bureau2crea/style.css.php
* \brief Fichier de style CSS du theme bureau2crea * \brief Fichier de style CSS du theme bureau2crea
* \version $Id: style.css.php,v 1.37 2011/07/06 09:42:55 eldy Exp $ * \version $Id: style.css.php,v 1.38 2011/07/06 11:40:21 eldy Exp $
*/ */
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -788,6 +788,7 @@ td.photo {
.toolbar { .toolbar {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important; background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important;
background-repeat: repeat-x !important; background-repeat: repeat-x !important;
border: 1px solid #BBB !important;
} }
.toolbarbutton { .toolbarbutton {
@@ -804,6 +805,15 @@ td.photo {
/* Panes for ECM or Filemanager */ /* Panes for ECM or Filemanager */
/* ============================================================================== */ /* ============================================================================== */
#containerlayout .layout-with-no-border {
border: 0 !important;
border-width: 0 !important;
}
#containerlayout .layout-padding {
padding: 2px !important;
}
/* /*
* PANES and CONTENT-DIVs * PANES and CONTENT-DIVs
*/ */

7
htdocs/theme/cameleo/style.css.php
View File

@@ -23,7 +23,7 @@
/** /**
* \file htdocs/theme/eldy/style.css.php * \file htdocs/theme/eldy/style.css.php
* \brief Fichier de style CSS du theme Cameleo * \brief Fichier de style CSS du theme Cameleo
* \version $Id: style.css.php,v 1.5 2011/07/06 09:42:55 eldy Exp $ * \version $Id: style.css.php,v 1.6 2011/07/06 11:40:22 eldy Exp $
*/ */
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -809,6 +809,7 @@ td.photo {
.toolbar { .toolbar {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important; background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important;
background-repeat: repeat-x !important; background-repeat: repeat-x !important;
border: 1px solid #BBB !important;
} }
.toolbarbutton { .toolbarbutton {
@@ -937,13 +938,13 @@ td.photo {
padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */ padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */
} }
.ui-in-layout-center { .ecm-in-layout-center {
border-left: 0px !important; border-left: 0px !important;
border-right: 0px !important; border-right: 0px !important;
border-top: 0px !important; border-top: 0px !important;
} }
.ui-in-layout-south { .ecm-in-layout-south {
border-left: 0px !important; border-left: 0px !important;
border-right: 0px !important; border-right: 0px !important;
border-bottom: 0px !important; border-bottom: 0px !important;

7
htdocs/theme/eldy/style.css.php
View File

@@ -21,7 +21,7 @@
/** /**
* \file htdocs/theme/eldy/style.css.php * \file htdocs/theme/eldy/style.css.php
* \brief Fichier de style CSS du theme Eldy * \brief Fichier de style CSS du theme Eldy
* \version $Id: style.css.php,v 1.83 2011/07/06 10:22:56 eldy Exp $ * \version $Id: style.css.php,v 1.84 2011/07/06 11:40:22 eldy Exp $
*/ */
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -655,6 +655,7 @@ td.photo {
.toolbar { .toolbar {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.jpg' ?>) !important; background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.jpg' ?>) !important;
background-repeat: repeat-x !important; background-repeat: repeat-x !important;
border: 1px solid #BBB !important;
} }
.toolbarbutton { .toolbarbutton {
@@ -783,13 +784,13 @@ td.photo {
padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */ padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */
} }
.ui-in-layout-center { .ecm-in-layout-center {
border-left: 0px !important; border-left: 0px !important;
border-right: 0px !important; border-right: 0px !important;
border-top: 0px !important; border-top: 0px !important;
} }
.ui-in-layout-south { .ecm-in-layout-south {
border-left: 0px !important; border-left: 0px !important;
border-right: 0px !important; border-right: 0px !important;
border-bottom: 0px !important; border-bottom: 0px !important;

7
htdocs/theme/freelug/style.css.php
View File

@@ -20,7 +20,7 @@
/** /**
* \file htdocs/theme/freelug/style.css.php * \file htdocs/theme/freelug/style.css.php
* \brief Fichier de style CSS du theme Freelug * \brief Fichier de style CSS du theme Freelug
* \version $Id: style.css.php,v 1.40 2011/07/06 09:42:55 eldy Exp $ * \version $Id: style.css.php,v 1.41 2011/07/06 11:40:22 eldy Exp $
*/ */
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -531,6 +531,7 @@ td.photo {
.toolbar { .toolbar {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important; background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important;
background-repeat: repeat-x !important; background-repeat: repeat-x !important;
border: 1px solid #BBB !important;
} }
.toolbarbutton { .toolbarbutton {
@@ -658,13 +659,13 @@ td.photo {
padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */ padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */
} }
.ui-in-layout-center { .ecm-in-layout-center {
border-left: 0px !important; border-left: 0px !important;
border-right: 0px !important; border-right: 0px !important;
border-top: 0px !important; border-top: 0px !important;
} }
.ui-in-layout-south { .ecm-in-layout-south {
border-left: 0px !important; border-left: 0px !important;
border-right: 0px !important; border-right: 0px !important;
border-bottom: 0px !important; border-bottom: 0px !important;

7
htdocs/theme/yellow/style.css.php
View File

@@ -20,7 +20,7 @@
/** /**
* \file htdocs/theme/yellow/style.css.php * \file htdocs/theme/yellow/style.css.php
* \brief Fichier de style CSS du theme Yellow * \brief Fichier de style CSS du theme Yellow
* \version $Id: style.css.php,v 1.41 2011/07/06 09:42:55 eldy Exp $ * \version $Id: style.css.php,v 1.42 2011/07/06 11:40:21 eldy Exp $
*/ */
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -525,6 +525,7 @@ td.photo {
.toolbar { .toolbar {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important; background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important;
background-repeat: repeat-x !important; background-repeat: repeat-x !important;
border: 1px solid #BBB !important;
} }
.toolbarbutton { .toolbarbutton {
@@ -652,13 +653,13 @@ td.photo {
padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */ padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */
} }
.ui-in-layout-center { .ecm-in-layout-center {
border-left: 0px !important; border-left: 0px !important;
border-right: 0px !important; border-right: 0px !important;
border-top: 0px !important; border-top: 0px !important;
} }
.ui-in-layout-south { .ecm-in-layout-south {
border-left: 0px !important; border-left: 0px !important;
border-right: 0px !important; border-right: 0px !important;
border-bottom: 0px !important; border-bottom: 0px !important;