From b8303bdd5f9cec21d919f6423779a8c417e9f952 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 29 Dec 2012 23:40:16 +0100 Subject: [PATCH 1/3] Fix: CSS --- htdocs/ecm/index.php | 2 +- htdocs/theme/eldy/style.css.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 304e9718637..3d15615cb21 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -412,7 +412,7 @@ else $classviewhide='visible'; // Start container of all panels ?>
-
+
background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; @@ -1009,7 +1009,9 @@ td.photo { box-shadow: 4px 4px 4px #EEE; padding: 0 4px 0 4px !important; +} +.toolbar { height: 34px !important; } From 3fb60304db6f9f7e6a137727547afff2db64dafc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Dec 2012 12:02:54 +0100 Subject: [PATCH 2/3] Fix: Css for ecm module --- htdocs/theme/amarok/style.css.php | 39 +++++++++++++++++++------- htdocs/theme/auguria/style.css.php | 4 +-- htdocs/theme/bureau2crea/style.css.php | 2 +- htdocs/theme/cameleo/style.css.php | 4 +-- 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 749e7a7f4d6..40585daf1da 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -95,7 +95,7 @@ body { color:#232323; font-size:px; font-family:; - + trans("DIRECTION").";\n"; ?> } @@ -215,19 +215,19 @@ form#login img#img_logo { 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); } - + form#login input { padding:6px; font-size:120%; } - + form#login label, form#login td b { vertical-align:middle; line-height:40px; color:rgba(0,0,0,.4); text-shadow:1px 1px 1px rgba(255,255,255,.6); } - + form#login table.login_table { margin:10px 0px; border:none; @@ -277,7 +277,7 @@ table.login_table .button:hover { color-stop(0, rgba(0,0,0,.3)) ); } - + table.login_table .vmenu { color:rgba(0,0,0,.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:hover {color:rgba(255,255,255,.2);} - + div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */ color:#ffffff; font-weight:bold; @@ -508,6 +508,25 @@ div.vmenu { /* Toolbar for ECM or Filemanager */ /* ============================================================================== */ + +.largebutton { + background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + background-image: linear-gradient(bottom, rgb() 15%, rgb() 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 {} .toolbarbutton {} @@ -598,26 +617,26 @@ a.tabTitle img { -webkit-border-top-left-radius:6px; -webkit-border-top-right-radius:6px; } - + .tab#active { color:#232323; font-weight:bold; background-color:#ffffff; border-bottom:solid 1px #ffffff; } - + .tab:hover {color:#333333;} /* ============================================================================== */ /* Styles de positionnement des zones */ /* ============================================================================== */ - + div.fiche { margin-: browser->phone) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?'20':'24'; ?>px; margin-: browser->phone)?'12':'6'; ?>px; } - + div.fichecenter { width: 100%; clear: both; /* This is to have div fichecenter that are true rectangles */ diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index cac0c269e51..75004e8f6ca 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -755,7 +755,8 @@ a.toolbarbutton { background: #FFFFFF;*/ } img.toolbarbutton { - height: 28px; + margin-top: 2px; + height: 28px; } /* ============================================================================== */ @@ -919,7 +920,6 @@ img.toolbarbutton { } .ecm-layout-resizer { /* all 'resizer-bars' */ - background: #EEE; border: 1px solid #BBB; border-width: 0; } diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 5543e69791c..12de15a702d 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -835,6 +835,7 @@ a.toolbarbutton { background: #FFFFFF;*/ } img.toolbarbutton { + margin-top: 2px; height: 28px; } @@ -994,7 +995,6 @@ img.toolbarbutton { } .ecm-layout-resizer { /* all 'resizer-bars' */ - background: #EEE; border: 1px solid #BBB; border-width: 0; } diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 06811782e6b..14f3cb102b3 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -870,7 +870,8 @@ a.toolbarbutton { background: #FFFFFF;*/ } img.toolbarbutton { - height: 28px; + margin-top: 2px; + height: 28px; } @@ -1029,7 +1030,6 @@ img.toolbarbutton { } .ecm-layout-resizer { /* all 'resizer-bars' */ - background: #EEE; border: 1px solid #BBB; border-width: 0; } From ca2b3f11b166f395e11af74d825989737920e925 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Dec 2012 12:24:53 +0100 Subject: [PATCH 3/3] Fix: Several fix in trigger names --- htdocs/commande/class/commande.class.php | 2 +- htdocs/contrat/class/contrat.class.php | 4 ++-- htdocs/user/class/usergroup.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 07050f41a01..c0fdce4b5c1 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -426,7 +426,7 @@ class Commande extends CommonOrder // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $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; } // Fin appel triggers } diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 19e0130cf29..81f89ea1715 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1112,7 +1112,7 @@ class Contrat extends CommonObject // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $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; } // Fin appel triggers @@ -1940,7 +1940,7 @@ class ContratLigne // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $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; } // Fin appel triggers } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index d5170955162..9ed9c8eb4bf 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -532,7 +532,7 @@ class UserGroup extends CommonObject // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $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; } // Fin appel triggers