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

Theme cleaner

Browse Source
This commit is contained in:
Laurent Destailleur
2016-09-10 16:09:01 +02:00
parent 4955e8d3de
commit f8dbc1aa9f
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/functions.lib.php
View File

@@ -959,18 +959,18 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
$morehtmlright.=ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); $morehtmlright.=ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
} else { } else {
$morehtmlright.=$object->getLibStatut(2,0); $morehtmlright.=$object->getLibStatut(5,0);
} }
$morehtmlright.='   '; $morehtmlright.='   ';
//$morehtmlright.=$langs->trans("Status").' ('.$langs->trans("Buy").') '; //$morehtmlright.=$langs->trans("Status").' ('.$langs->trans("Buy").') ';
if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
$morehtmlright.=ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); $morehtmlright.=ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
} else { } else {
$morehtmlright.=$object->getLibStatut(2,1); $morehtmlright.=$object->getLibStatut(5,1);
} }
} }
else { else {
$morehtmlright.=$object->getLibStatut(2); $morehtmlright.=$object->getLibStatut(5);
} }
if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>'; // For thirdparty if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>'; // For thirdparty
if (! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>'; // For product if (! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>'; // For product

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

@@ -871,6 +871,11 @@ div.nopadding {
padding-left: 2px; padding-left: 2px;
padding-right: 2px; padding-right: 2px;
} }
.pictostatus {
width: 15px;
vertical-align: middle;
margin-top: -3px
}
.pictowarning, .pictopreview { .pictowarning, .pictopreview {
padding-<?php echo $left; ?>: 3px; padding-<?php echo $left; ?>: 3px;
} }
@@ -902,8 +907,8 @@ div.divphotoref {
} }
div.statusref { div.statusref {
float: right; float: right;
padding-right: 12px; padding-left: 12px;
margin-top: 6px; margin-top: 8px;
margin-bottom: 10px; margin-bottom: 10px;
clear: both; clear: both;
} }
@@ -1870,17 +1875,18 @@ div.tabsElem {
div.tabBar { div.tabBar {
color: #<?php echo $colortextbacktab; ?>; color: #<?php echo $colortextbacktab; ?>;
padding-top: 16px; padding-top: 16px;
padding-left: 18px; padding-left: 0px; padding-right: 0px;
padding-right: 18px; /*padding-left: 18px;
padding-right: 18px;*/
padding-bottom: 14px; padding-bottom: 14px;
margin: 0px 0px 14px 0px; margin: 0px 0px 14px 0px;
-moz-border-radius:4px; /*-moz-border-radius:4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
border-right: 1px solid #AAA; border-right: 1px solid #AAA;
border-bottom: 1px solid #AAA; border-left: 1px solid #AAA; */
border-left: 1px solid #AAA;
border-top: 1px solid #BBB; border-top: 1px solid #BBB;
border-bottom: 1px solid #AAA;
width: auto; width: auto;
background: rgb(<?php echo $colorbacktabcard1; ?>); background: rgb(<?php echo $colorbacktabcard1; ?>);
@@ -2456,18 +2462,18 @@ div.pagination li.pagination a,
div.pagination li.pagination span { div.pagination li.pagination span {
<?php if (empty($conf->dol_use_jmobile)) { ?> <?php if (empty($conf->dol_use_jmobile)) { ?>
padding: 6px 12px; padding: 6px 12px;
border-color: #ccc;
margin-left: -1px; margin-left: -1px;
line-height: 1.42857143; line-height: 1.42857143;
color: #000; color: #000;
text-decoration: none; text-decoration: none;
/*
border-color: #ccc;
background-color: #f5f5f5; background-color: #f5f5f5;
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);*/
background-repeat: repeat-x; background-repeat: repeat-x;
<?php } ?> <?php } ?>
} }
@@ -2515,7 +2521,7 @@ div.pagination li.noborder a:hover {
div.pagination li a, div.pagination li a,
div.pagination li span { div.pagination li span {
background-color: #fff; background-color: #fff;
border: 1px solid #ddd; /* border: 1px solid #ddd; */
} }
div.pagination li:first-child a, div.pagination li:first-child a,
div.pagination li:first-child span { div.pagination li:first-child span {

16
htdocs/user/class/user.class.php
View File

@@ -2112,23 +2112,23 @@ class User extends CommonObject
} }
if ($mode == 2) if ($mode == 2)
{ {
if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"').' '.$langs->trans('Enabled');
if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled'); if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"').' '.$langs->trans('Disabled');
} }
if ($mode == 3) if ($mode == 3)
{ {
if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4'); if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"');
if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5'); if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"');
} }
if ($mode == 4) if ($mode == 4)
{ {
if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"').' '.$langs->trans('Enabled');
if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled'); if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"').' '.$langs->trans('Disabled');
} }
if ($mode == 5) if ($mode == 5)
{ {
if ($statut == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4'); if ($statut == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"');
if ($statut == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5'); if ($statut == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"');
} }
} }