Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into 3.3

Browse Source
This commit is contained in:
Marcos García
2012-12-30 12:37:48 +01:00
parent 10fff57b51 ca2b3f11b1
commit c3a75307b0
9 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/class/commande.class.php
View File

@@ -426,7 +426,7 @@ class Commande extends CommonOrder
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $interface=new Interfaces($this->db);
$result=$interface->run_triggers('BILL_REOPEN',$this,$user,$langs,$conf); $result=$interface->run_triggers('ORDER_REOPEN',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
} }

4
htdocs/contrat/class/contrat.class.php
View File

@@ -1112,7 +1112,7 @@ class Contrat extends CommonObject
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $interface=new Interfaces($this->db);
$result=$interface->run_triggers('CONTRACTLINE_DELETE',$this,$user,$langs,$conf); $result=$interface->run_triggers('CONTRACT_LINE_DELETE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
@@ -1940,7 +1940,7 @@ class ContratLigne
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $interface=new Interfaces($this->db);
$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); $result=$interface->run_triggers('CONTRACT_LINE_MODIFY',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
} }

2
htdocs/ecm/index.php
View File

@@ -412,7 +412,7 @@ else $classviewhide='visible';
// Start container of all panels // Start container of all panels
?> ?>
<div id="containerlayout"> <!-- begin div id="containerlayout" --> <div id="containerlayout"> <!-- begin div id="containerlayout" -->
<div id="ecm-layout-north" class="toolbar"> <div id="ecm-layout-north" class="toolbar largebutton">
<?php <?php
// Start top panel, toolbar // Start top panel, toolbar

39
htdocs/theme/amarok/style.css.php
View File

@@ -95,7 +95,7 @@ body {
color:#232323; color:#232323;
font-size:<?php print $fontsize ?>px; font-size:<?php print $fontsize ?>px;
font-family:<?php print $fontlist ?>; font-family:<?php print $fontlist ?>;
<?php print 'direction:'.$langs->trans("DIRECTION").";\n"; ?> <?php print 'direction:'.$langs->trans("DIRECTION").";\n"; ?>
} }
@@ -215,19 +215,19 @@ form#login img#img_logo {
border-bottom:solid 1px rgba(0,0,0,.3); border-bottom:solid 1px rgba(0,0,0,.3);
box-shadow:1px 1px 6px rgba(0,0,0,.3) inset , 0 0 1px rgba(255,255,255,.6); box-shadow:1px 1px 6px rgba(0,0,0,.3) inset , 0 0 1px rgba(255,255,255,.6);
} }
form#login input { form#login input {
padding:6px; padding:6px;
font-size:120%; font-size:120%;
} }
form#login label, form#login td b { form#login label, form#login td b {
vertical-align:middle; vertical-align:middle;
line-height:40px; line-height:40px;
color:rgba(0,0,0,.4); color:rgba(0,0,0,.4);
text-shadow:1px 1px 1px rgba(255,255,255,.6); text-shadow:1px 1px 1px rgba(255,255,255,.6);
} }
form#login table.login_table { form#login table.login_table {
margin:10px 0px; margin:10px 0px;
border:none; border:none;
@@ -277,7 +277,7 @@ table.login_table .button:hover {
color-stop(0, rgba(0,0,0,.3)) color-stop(0, rgba(0,0,0,.3))
); );
} }
table.login_table .vmenu { table.login_table .vmenu {
color:rgba(0,0,0,.6); color:rgba(0,0,0,.6);
text-shadow:1px 1px 1px rgba(255,255,255,.6); text-shadow:1px 1px 1px rgba(255,255,255,.6);
@@ -370,7 +370,7 @@ div.tmenu li {
div.tmenu li a {color:#cccccc;} div.tmenu li a {color:#cccccc;}
div.tmenu li a:hover {color:rgba(255,255,255,.2);} div.tmenu li a:hover {color:rgba(255,255,255,.2);}
div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */ div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */
color:#ffffff; color:#ffffff;
font-weight:bold; font-weight:bold;
@@ -508,6 +508,25 @@ div.vmenu {
/* Toolbar for ECM or Filemanager */ /* Toolbar for ECM or Filemanager */
/* ============================================================================== */ /* ============================================================================== */
.largebutton {
background-image: -o-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
background-image: -moz-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
background-image: -webkit-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
background-image: -ms-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
background-image: linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
border: 1px solid #CCC !important;
-moz-border-radius: 5px 5px 5px 5px !important;
-webkit-border-radius: 5px 5px 5px 5px !important;
border-radius: 5px 5px 5px 5px !important;
-moz-box-shadow: 4px 4px 4px #EEE;
-webkit-box-shadow: 4px 4px 4px #EEE;
box-shadow: 4px 4px 4px #EEE;
padding: 0 4px 0 4px !important;
}
.toolbar {} .toolbar {}
.toolbarbutton {} .toolbarbutton {}
@@ -598,26 +617,26 @@ a.tabTitle img {
-webkit-border-top-left-radius:6px; -webkit-border-top-left-radius:6px;
-webkit-border-top-right-radius:6px; -webkit-border-top-right-radius:6px;
} }
.tab#active { .tab#active {
color:#232323; color:#232323;
font-weight:bold; font-weight:bold;
background-color:#ffffff; background-color:#ffffff;
border-bottom:solid 1px #ffffff; border-bottom:solid 1px #ffffff;
} }
.tab:hover {color:#333333;} .tab:hover {color:#333333;}
/* ============================================================================== */ /* ============================================================================== */
/* Styles de positionnement des zones */ /* Styles de positionnement des zones */
/* ============================================================================== */ /* ============================================================================== */
div.fiche { div.fiche {
margin-<?php print $left; ?>: <?php print (empty($conf->browser->phone) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'20':'24'; ?>px; margin-<?php print $left; ?>: <?php print (empty($conf->browser->phone) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'20':'24'; ?>px;
margin-<?php print $right; ?>: <?php print empty($conf->browser->phone)?'12':'6'; ?>px; margin-<?php print $right; ?>: <?php print empty($conf->browser->phone)?'12':'6'; ?>px;
} }
div.fichecenter { div.fichecenter {
width: 100%; width: 100%;
clear: both; /* This is to have div fichecenter that are true rectangles */ clear: both; /* This is to have div fichecenter that are true rectangles */

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

@@ -755,7 +755,8 @@ a.toolbarbutton {
background: #FFFFFF;*/ background: #FFFFFF;*/
} }
img.toolbarbutton { img.toolbarbutton {
height: 28px; margin-top: 2px;
height: 28px;
} }
/* ============================================================================== */ /* ============================================================================== */
@@ -919,7 +920,6 @@ img.toolbarbutton {
} }
.ecm-layout-resizer { /* all 'resizer-bars' */ .ecm-layout-resizer { /* all 'resizer-bars' */
background: #EEE;
border: 1px solid #BBB; border: 1px solid #BBB;
border-width: 0; border-width: 0;
} }

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

@@ -835,6 +835,7 @@ a.toolbarbutton {
background: #FFFFFF;*/ background: #FFFFFF;*/
} }
img.toolbarbutton { img.toolbarbutton {
margin-top: 2px;
height: 28px; height: 28px;
} }
@@ -994,7 +995,6 @@ img.toolbarbutton {
} }
.ecm-layout-resizer { /* all 'resizer-bars' */ .ecm-layout-resizer { /* all 'resizer-bars' */
background: #EEE;
border: 1px solid #BBB; border: 1px solid #BBB;
border-width: 0; border-width: 0;
} }

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

@@ -870,7 +870,8 @@ a.toolbarbutton {
background: #FFFFFF;*/ background: #FFFFFF;*/
} }
img.toolbarbutton { img.toolbarbutton {
height: 28px; margin-top: 2px;
height: 28px;
} }
@@ -1029,7 +1030,6 @@ img.toolbarbutton {
} }
.ecm-layout-resizer { /* all 'resizer-bars' */ .ecm-layout-resizer { /* all 'resizer-bars' */
background: #EEE;
border: 1px solid #BBB; border: 1px solid #BBB;
border-width: 0; border-width: 0;
} }

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

@@ -988,7 +988,7 @@ td.photo {
/* Toolbar for ECM or Filemanager */ /* Toolbar for ECM or Filemanager */
/* ============================================================================== */ /* ============================================================================== */
.toolbar { .largebutton {
<?php if ($usecss3) { ?> <?php if ($usecss3) { ?>
background-image: -o-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important; background-image: -o-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
background-image: -moz-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important; background-image: -moz-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
@@ -1009,7 +1009,9 @@ td.photo {
box-shadow: 4px 4px 4px #EEE; box-shadow: 4px 4px 4px #EEE;
padding: 0 4px 0 4px !important; padding: 0 4px 0 4px !important;
}
.toolbar {
height: 34px !important; height: 34px !important;
} }

2
htdocs/user/class/usergroup.class.php
View File

@@ -532,7 +532,7 @@ class UserGroup extends CommonObject
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $interface=new Interfaces($this->db);
$result=$interface->run_triggers('USER_DELETE',$this,$user,$langs,$conf); $result=$interface->run_triggers('GROUP_DELETE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers