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

Responsive and css

Browse Source
This commit is contained in:
Laurent Destailleur
2018-01-12 01:10:03 +01:00
parent 5e7b814966
commit 95d2a9f88d
6 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/index.php
View File

@@ -80,8 +80,8 @@ print img_picto('','puce').' '.$langs->trans("SetupDescription3", DOL_URL_ROOT.'
if (! empty($setupcompanynotcomplete)) if (! empty($setupcompanynotcomplete))
{ {
$langs->load("errors"); $langs->load("errors");
$warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete")); $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"), 'style="padding-right: 6px;"');
print '<br><div class="warning"><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete)?'':'&action=edit').'">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a></div>'; print '<br><div class="warning"><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete)?'':'&action=edit').'">'.$warnpicto.$langs->trans("WarningMandatorySetupNotComplete").'</a></div>';
} }
print '<br>'; print '<br>';
print '<br>'; print '<br>';
@@ -92,8 +92,8 @@ print img_picto('','puce').' '.$langs->trans("SetupDescription4", DOL_URL_ROOT.'
if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) // If only user module enabled if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) // If only user module enabled
{ {
$langs->load("errors"); $langs->load("errors");
$warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete")); $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"), 'style="padding-right: 6px;"');
print '<br><div class="warning"><a href="'.DOL_URL_ROOT.'/admin/modules.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a></div>'; print '<br><div class="warning"><a href="'.DOL_URL_ROOT.'/admin/modules.php?mainmenu=home">'.$warnpicto.$langs->trans("WarningMandatorySetupNotComplete").'</a></div>';
} }
print '<br>'; print '<br>';
print '<br>'; print '<br>';

6
htdocs/compta/paiement/class/paiement.class.php
View File

@@ -1149,10 +1149,10 @@ class Paiement extends CommonObject
$billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him
if (!empty($billsarray)) if (!empty($billsarray))
{ {
$supplier_invoice = new FactureFournisseur($this->db); $invoice = new Facture($this->db);
if ($supplier_invoice->fetch($billsarray[0]) > 0) if ($invoice->fetch($billsarray[0]) > 0)
{ {
$force_thirdparty_id = $supplier_invoice->fk_soc; $force_thirdparty_id = $invoice->fk_soc;
} }
} }
} }

2
htdocs/compta/stats/cabyuser.php
View File

@@ -28,6 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$langs->load("accountancy");
$socid = GETPOST('socid','int'); $socid = GETPOST('socid','int');
// Security check // Security check

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

@@ -3096,7 +3096,7 @@ function img_info($titlealt = 'default')
* Show warning logo * Show warning logo
* *
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param string $moreatt Add more attribute on img tag (For example 'style="float: right"'). If 1 * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"'). If 1, add float: right. Can't be "class" attribute.
* @return string Return img tag * @return string Return img tag
*/ */
function img_warning($titlealt = 'default', $moreatt = '') function img_warning($titlealt = 'default', $moreatt = '')

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

@@ -3125,15 +3125,29 @@ div.ok {
color: #114466; color: #114466;
} }
/* Info admin */
div.info {
border-<?php print $left; ?>: solid 5px #87cfd2;
padding-top: 8px;
padding-left: 10px;
padding-right: 4px;
padding-bottom: 8px;
margin: 0.5em 0em 0.5em 0em;
background: #eff8fc;
}
/* Warning message */ /* Warning message */
div.warning { div.warning {
color: #302020; border-<?php print $left; ?>: solid 5px #f2cf87;
padding: 0.3em 0.3em 0.3em 0.3em; padding-top: 8px;
padding-left: 10px;
padding-right: 4px;
padding-bottom: 8px;
margin: 0.5em 0em 0.5em 0em; margin: 0.5em 0em 0.5em 0em;
border: 2px solid #805000; background: #fcf8e3;
-webkit-border-radius: 4px; }
border-radius: 4px; div.warning a, div.info a, div.error a {
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); color: rgb(<?php echo $colortext; ?>);
} }
/* Error message */ /* Error message */
@@ -3141,19 +3155,6 @@ div.error {
background: #EFCFCF; background: #EFCFCF;
} }
/* Info admin */
div.info {
color: #fff;
padding: 0.4em 0.4em 0.4em 0.4em;
margin: 0.5em 0em 0.5em 0em;
-webkit-border-radius: 4px;
border-radius: 4px;
background: #798080;
}
div.warning a, div.info a, div.error a {
color: rgb(<?php echo $colortext; ?>);
}
/* /*
* Liens Payes/Non payes * Liens Payes/Non payes
@@ -4947,7 +4948,7 @@ div.tabsElem a.tab {
/* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */ /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
/* rule to reduce top menu - 1st reduction */ /* rule to reduce top menu - 1st reduction */
@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.9, 0) + 24; ?>px) /* reduction 1 */ @media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 24; ?>px) /* reduction 1 */
{ {
div.tmenucenter { div.tmenucenter {
width: <?php echo round($fontsize * 4); ?>px; /* size of viewport */ width: <?php echo round($fontsize * 4); ?>px; /* size of viewport */

41
htdocs/theme/md/style.css.php
View File

@@ -3181,17 +3181,29 @@ div.ok {
color: #114466; color: #114466;
} }
/* Info admin */
div.info {
border-<?php print $left; ?>: solid 5px #87cfd2;
padding-top: 8px;
padding-left: 10px;
padding-right: 4px;
padding-bottom: 8px;
margin: 0.5em 0em 0.5em 0em;
background: #eff8fc;
}
/* Warning message */ /* Warning message */
div.warning { div.warning {
color: #302020; border-<?php print $left; ?>: solid 5px #f2cf87;
padding: 0.3em 0.3em 0.3em 0.3em; padding-top: 8px;
padding-left: 10px;
padding-right: 4px;
padding-bottom: 8px;
margin: 0.5em 0em 0.5em 0em; margin: 0.5em 0em 0.5em 0em;
/* border: 1px solid #e0d0b0; */ background: #fcf8e3;
border: 2px solid #805000 }
-webkit-border-radius: 3px; div.warning a, div.info a, div.error a {
border-radius: 3px; color: rgb(<?php echo $colortext; ?>);
/* background: #EFDF9A; */
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
} }
/* Error message */ /* Error message */
@@ -3205,19 +3217,6 @@ div.error {
background: #EFCFCF; background: #EFCFCF;
} }
/* Info admin */
div.info {
color: #fff;
padding: 0.4em 0.4em 0.4em 0.4em;
margin: 0.5em 0em 0.5em 0em;
-webkit-border-radius: 4px;
border-radius: 4px;
background: #989;
}
div.warning a, div.info a, div.error a {
color: rgb(<?php echo $colortext; ?>);
}
/* /*
* Liens Payes/Non payes * Liens Payes/Non payes