Minor fixes in css
This commit is contained in:
parent
04063a62a8
commit
348e004da6
@ -1,10 +1,19 @@
|
|||||||
|
|
||||||
To test upgrade of a lib with composer:
|
* To list packages
|
||||||
|
|
||||||
composer update --no-dev --no-autoloader --dry-run ccampbell/chromephp
|
composer show -i
|
||||||
|
|
||||||
To upgrade a lib with composer:
|
* To test upgrade of a lib with composer:
|
||||||
|
|
||||||
|
Remove entry in composer.lock
|
||||||
|
Edit composer.json to change version to "x.y.z"
|
||||||
|
composer -v update --root-reqs --no-dev --no-autoloader --dry-run ccampbell/chromephp
|
||||||
|
|
||||||
|
* To upgrade a lib with composer:
|
||||||
|
|
||||||
|
Remove entry in composer.lock
|
||||||
|
Edit composer.json to change version to "x.y.z"
|
||||||
|
composer -v update --root-reqs --no-dev --no-autoloader ccampbell/chromephp
|
||||||
|
|
||||||
composer update --no-dev --no-autoloader ccampbell/chromephp
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -27,7 +27,7 @@
|
|||||||
"php": ">=5.3.0",
|
"php": ">=5.3.0",
|
||||||
"ext-curl": "*",
|
"ext-curl": "*",
|
||||||
"ccampbell/chromephp": "4.1.0",
|
"ccampbell/chromephp": "4.1.0",
|
||||||
"ckeditor/ckeditor": "dev-full/stable",
|
"ckeditor/ckeditor": "4.5.9",
|
||||||
"mike42/escpos-php": "1.2.1",
|
"mike42/escpos-php": "1.2.1",
|
||||||
"mobiledetect/mobiledetectlib": "2.8.17",
|
"mobiledetect/mobiledetectlib": "2.8.17",
|
||||||
"phpoffice/phpexcel": "1.8.1",
|
"phpoffice/phpexcel": "1.8.1",
|
||||||
|
|||||||
1406
composer.lock
generated
1406
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1632,7 +1632,7 @@ activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is miss
|
|||||||
CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
|
CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
|
||||||
LandingPage=Landing page
|
LandingPage=Landing page
|
||||||
SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
|
SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
|
||||||
ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
|
ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
|
||||||
UserHasNoPermissions=This user has no permission defined
|
UserHasNoPermissions=This user has no permission defined
|
||||||
TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
|
TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
|
||||||
##### Resource ####
|
##### Resource ####
|
||||||
|
|||||||
@ -656,6 +656,13 @@ div.myavailability {
|
|||||||
/* Force values for small screen 570 */
|
/* Force values for small screen 570 */
|
||||||
@media only screen and (max-width: 570px)
|
@media only screen and (max-width: 570px)
|
||||||
{
|
{
|
||||||
|
.tdoverflowonsmartphone {
|
||||||
|
max-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
div.titre {
|
div.titre {
|
||||||
line-height: 2em;
|
line-height: 2em;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -660,6 +660,13 @@ div.myavailability {
|
|||||||
/* Force values for small screen 570 */
|
/* Force values for small screen 570 */
|
||||||
@media only screen and (max-width: 570px)
|
@media only screen and (max-width: 570px)
|
||||||
{
|
{
|
||||||
|
.tdoverflowonsmartphone {
|
||||||
|
max-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
div.titre {
|
div.titre {
|
||||||
line-height: 2em;
|
line-height: 2em;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -329,7 +329,7 @@ if ($result)
|
|||||||
{
|
{
|
||||||
// On affiche ligne pour modifier droits
|
// On affiche ligne pour modifier droits
|
||||||
print '<tr '. $bc[$var].'>';
|
print '<tr '. $bc[$var].'>';
|
||||||
print '<td class="maxwidthonsmartphone tdoverflow">'.img_object('',$picto).' '.$objMod->getName();
|
print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('',$picto).' '.$objMod->getName();
|
||||||
print '<a name="'.$objMod->getName().'"></a></td>';
|
print '<a name="'.$objMod->getName().'"></a></td>';
|
||||||
print '<td align="center" class="nowrap">';
|
print '<td align="center" class="nowrap">';
|
||||||
print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$object->id.'&action=addrights&entity='.$entity.'&module='.$obj->module.'">'.$langs->trans("All")."</a>";
|
print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$object->id.'&action=addrights&entity='.$entity.'&module='.$obj->module.'">'.$langs->trans("All")."</a>";
|
||||||
@ -344,7 +344,7 @@ if ($result)
|
|||||||
print '<tr '. $bc[$var].'>';
|
print '<tr '. $bc[$var].'>';
|
||||||
|
|
||||||
// Picto and label of permission
|
// Picto and label of permission
|
||||||
print '<td class="maxwidthonsmartphone tdoverflow">'.img_object('',$picto).' '.$objMod->getName().'</td>';
|
print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('',$picto).' '.$objMod->getName().'</td>';
|
||||||
|
|
||||||
// Permission and tick
|
// Permission and tick
|
||||||
if (! empty($object->admin) && ! empty($objMod->rights_admin_allowed)) // Permission own because admin
|
if (! empty($object->admin) && ! empty($objMod->rights_admin_allowed)) // Permission own because admin
|
||||||
|
|||||||
@ -632,7 +632,7 @@ if (count($object->records) > 0)
|
|||||||
if ($website && $action == 'preview')
|
if ($website && $action == 'preview')
|
||||||
{
|
{
|
||||||
$disabled='';
|
$disabled='';
|
||||||
if (empty($user->rights->websites->create)) $disabled=' disabled="disabled"';
|
if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
|
||||||
|
|
||||||
print ' ';
|
print ' ';
|
||||||
|
|
||||||
@ -735,7 +735,7 @@ if (count($object->records) > 0)
|
|||||||
if ($action == 'preview')
|
if ($action == 'preview')
|
||||||
{
|
{
|
||||||
$disabled='';
|
$disabled='';
|
||||||
if (empty($user->rights->websites->create)) $disabled=' disabled="disabled"';
|
if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
|
||||||
|
|
||||||
if ($pageid > 0)
|
if ($pageid > 0)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user