Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Look adn feel v21

Browse Source
This commit is contained in:
Laurent Destailleur 2024-10-17 22:20:39 +02:00
parent a41a162e2b
commit 622a296d0e
10 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/blockedlog/admin/blockedlog_list.php
View File

@ -333,7 +333,7 @@ if (GETPOST('withtab', 'alpha')) {
print dol_get_fiche_head($head, 'fingerprints', '', -1);
}
print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("FingerprintsDesc")."<br></span>\n";
print '<div class="opacitymedium hideonsmartphone justify">'.$langs->trans("FingerprintsDesc")."<br></div>\n";
print '<br>';

16
htdocs/comm/action/class/cactioncomm.class.php
View File

@ -162,6 +162,8 @@ class CActionComm
global $langs, $conf, $user;
$langs->load("commercial");
$actionstatic = new ActionComm($this->db);
$rep_id = array();
$rep_code = array();
$rep_all = array();
@ -294,17 +296,25 @@ class CActionComm
}
$label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label));
/*
$actionstatic->type_color = $obj->type_color;
$actionstatic->type_picto = $obj->type_picto;
$actionstatic->type = $obj->type;
$picto = $actionstatic->getTypePicto();
$label = $picto.$label;
*/
if (($onlyautoornot == -1 || $onlyautoornot == -2) && getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
// Add a group of elements
if ($typecalendar == 'system' || $typecalendar == 'user') {
$label = '&nbsp;&nbsp; '.$label;
$TSystem['id'][-99] = $langs->trans("ActionAC_MANUAL");
$TSystem['code']['AC_NON_AUTO'] = '-- '.$langs->trans("ActionAC_MANUAL");
$TSystem['code']['AC_NON_AUTO'] = '<small>-- '.$langs->trans("ActionAC_MANUAL").'</small>';
}
if ($typecalendar == 'systemauto') {
$label = '&nbsp;&nbsp; '.$label;
$TSystemAuto['id'][-98] = $langs->trans("ActionAC_AUTO");
$TSystemAuto['code']['AC_ALL_AUTO'] = '-- '.$langs->trans("ActionAC_AUTO");
$TSystemAuto['code']['AC_ALL_AUTO'] = '<small>-- '.$langs->trans("ActionAC_AUTO").'</small>';
}
if ($typecalendar == 'module') {
@ -314,7 +324,7 @@ class CActionComm
$idforallfornewmodule--;
}
$TModule['id'][-1 * $idforallfornewmodule] = $langs->trans("ActionAC_ALL_".strtoupper($module));
$TModule['code']['AC_ALL_'.strtoupper($module)] = '-- '.$langs->trans("Module").' '.ucfirst($module);
$TModule['code']['AC_ALL_'.strtoupper($module)] = '<small>-- '.$langs->trans("Module").' '.ucfirst($module).'</small>';
}
}
// Add element

17
htdocs/comm/action/index.php
View File

@ -1726,11 +1726,11 @@ if (empty($mode) || $mode == 'show_month') { // View by month
print '</div>';
print '<div class="div-table-responsive-no-min sectioncalendarbyday maxscreenheightless300">';
echo '<table class="tagtable centpercent noborder nocellnopadd cal_pannel cal_month noborderbottom" style="margin-bottom: 5px !important;">';
echo '<table class="tagtable centpercent noborder nocellnopadd cal_pannel cal_month" style="margin-bottom: 10px !important;">';
echo ' <tr class="tagtr liste_titre">';
echo ' <td class="tagtd center bold uppercase">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n";
echo " </td>\n";
echo " </tr>\n";
/*
echo ' <div class="tagtr">';
@ -1741,13 +1741,12 @@ if (empty($mode) || $mode == 'show_month') { // View by month
echo " </div>\n";
*/
echo '</table>';
print '</div>';
print '<tr><td>';
/* WIP View per hour */
$useviewhour = 0;
if ($useviewhour) {
print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
$maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file
@ -1787,13 +1786,19 @@ if (empty($mode) || $mode == 'show_month') { // View by month
print '</div>';
} else {
print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0, $bookcalcalendars);
print '</div>';
}
print '</td></tr>';
echo '</table>';
print '</div>';
}
print "\n".'</form>';

2
htdocs/comm/action/list.php
View File

@ -761,6 +761,8 @@ print '<div class="liste_titre liste_titre_bydiv centpercent">';
print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, '', $filtert, '', $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid, $search_categ_cus);
print '</div>';
$moreforfilter = 1;
print '<div class="div-table-responsive">';
print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

8
htdocs/core/class/html.formactions.class.php
View File

@ -383,13 +383,6 @@ class FormActions
// Suggest a list with manual events or all auto events
$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot, '', 0); // If we use param 'all' instead of 'code', there is no group by include in answer but the key 'type' of answer array contains the key for the group by.
/* Removed. The empty line must now be managed with param showempty
if (empty($multiselect)) {
// Add empty line at start only if no multiselect
array_unshift($arraylist, '&nbsp;');
}
*/
//asort($arraylist);
if ($selected == 'manual') {
$selected = 'AC_OTH';
@ -411,6 +404,7 @@ class FormActions
if (strpos($key, 'AC_ALL_') !== false && strpos($key, 'AC_ALL_AUTO') === false) {
$disabled = 'disabled';
}
$newarraylist[$key] = array('id' => $key, 'label' => $value, 'disabled' => $disabled);
}

6
htdocs/core/class/html.formfile.class.php
View File

@ -176,7 +176,9 @@ class FormFile
$out .= ' ';
if ($sectionid) { // Show overwrite if exists for ECM module only
$langs->load('link');
$out .= '<span class="nowraponsmartphone"><input style="margin-right: 2px;" type="checkbox" id="overwritefile" name="overwritefile" value="1"><label for="overwritefile">'.$langs->trans("OverwriteIfExists").'</label></span>';
$out .= '<span class="nowraponsmartphone"><input style="margin-right: 2px;" type="checkbox" id="overwritefile" name="overwritefile" value="1">';
$out .= '<label for="overwritefile" class="opacitylow paddingright">'.$langs->trans("OverwriteIfExists").'</label>';
$out .= '</span>';
}
$out .= '<input type="submit" class="button small reposition" name="sendit" value="'.$langs->trans("Upload").'"';
$out .= (!getDolGlobalString('MAIN_UPLOAD_DOC') || empty($perm) ? ' disabled' : '');
@ -192,7 +194,7 @@ class FormFile
$menudolibarrsetupmax = $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Security");
$langs->load('other');
$out .= ' ';
$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetupAt", $menudolibarrsetupmax, $max, $maxphptoshowparam, $maxphptoshow), 1);
$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetupAt", $menudolibarrsetupmax, $max, $maxphptoshowparam, $maxphptoshow), 1, 0, '1', 'classfortooltip');
}
} else {
$out .= ' ('.$langs->trans("UploadDisabled").')';

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

@ -97,7 +97,7 @@ function print_actions_filter(
$multiselect = (getDolGlobalString('AGENDA_USE_EVENT_TYPE'));
}
print img_picto($langs->trans("ActionType"), 'square', 'class="pictofixedwidth inline-block" style="color: #ddd;"');
print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? -1 : 1), 0, $multiselect, 0, 'minwidth200 maxwidth250 widthcentpercentminusx', 1);
print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? -1 : 1), 0, $multiselect, 0, 'minwidth150 maxwidth200 widthcentpercentminusx', 1);
print '</div>';
if ($canedit) {

2
htdocs/hrm/index.php
View File

@ -166,7 +166,7 @@ if (isModEnabled('holiday')) {
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder nohover centpercent">';
print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
print '<tr class="oddeven">';
print '<tr class="oddeven nohover">';
print '<td>';
$out = '';

10
htdocs/theme/eldy/global.inc.php
View File

@ -4257,10 +4257,14 @@ table.nointerlines tr:not(:last-child) td {
/* Experimental code to manage rounding */
<?php $borderradius = getDolGlobalInt('THEME_ELDY_BORDER_RADIUS', 6); ?>
<?php $borderradius = getDolGlobalInt('THEME_ELDY_BORDER_RADIUS', 5); ?>
table.noborder:not(.cal_month) {
border-radius: <?php echo $borderradius; ?>px;
}
table.noborder.cal_month {
border-bottom-left-radius: <?php echo $borderradius; ?>px;
border-bottom-right-radius: <?php echo $borderradius; ?>px;
}
table.liste:not(.listwithfilterbefore) {
border-top-left-radius: <?php echo $borderradius; ?>px;
border-top-right-radius: <?php echo $borderradius; ?>px;
@ -5959,14 +5963,14 @@ table.cal_month td { padding-left: 1px !important; padding-right: 1px !important
.cal_other_month_right { border-right: solid 1px #C0C0C0; }
.cal_other_month { /* opacity: 0.6; */ background: #FAFAFA; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_past_month { /* opacity: 0.6; */ background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px !important; }
.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_today { background: #FDFDF0; border-left: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_today_peruser { background: #FDFDF0; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_today_peruser_peruserleft { background: #FDFDF0; border-left: solid 2px #6C7C7B; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_past { }
.cal_peruser { padding-top: 0 !important; padding-bottom: 0 !important; padding-<?php print $left; ?>: 1px !important; padding-<?php print $right; ?>: 1px !important; }
.cal_impair { ackground: linear-gradient(bottom, var(--colorbacklinepair2) 85%, var(--colorbacklinepair2) 100%); }
.cal_impair { background: linear-gradient(bottom, var(--colorbacklinepair2) 85%, var(--colorbacklinepair2) 100%); }
.cal_today_peruser_impair { background: #F8F8F0; }
.peruser_busy { }
.peruser_notbusy { opacity: 0.5; }

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

@ -166,7 +166,7 @@ $dol_no_mouse_hover = $conf->dol_no_mouse_hover;
//$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
//var_dump($user->conf->THEME_ELDY_RGB);
$useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->THEME_ELDY_USEBOLDTITLE : 0);
$useboldtitle = getDolGlobalInt('THEME_ELDY_USEBOLDTITLE');
$borderwidth = 2;
$userborderontable = getDolGlobalInt('THEME_ELDY_USEBORDERONTABLE');