Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Look and feel v21

Browse Source
This commit is contained in:
Laurent Destailleur
2024-10-01 03:41:55 +02:00
parent 0cb9fbc39a
commit f57b4f26b4
5 changed files with 64 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/admin/system/about.php
View File

@@ -58,27 +58,30 @@ llxHeader('', '', '', '', 0, 0, '', '', '', 'mod-admin page-system_about');
print load_fiche_titre($langs->trans("ExternalResources"), '', 'title_setup');
print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png', 'height="120"').'</div>';
print '<div class="fichecenter"><div class="fichehalfleft">';
print '<div class="divsection wordwrap">';
print '<div class="float paddingright">'.img_picto_common('', 'dolibarr_box.png', 'height="100"').'</div>';
print $langs->trans("DolibarrLicense").' : ';
print '<ul><li>';
print '<a href="https://www.gnu.org/copyleft/gpl.html">GNU-GPL v3+</a></li>';
print '</li></ul>';
print'</div>';
//print "<br>\n";
print '<div class="divsection wordwrap">';
print $langs->trans("Developpers").':';
print '<ul>';
print '<li>'.$langs->trans("SourcesRepository").': <a href="https://www.github.com/Dolibarr/dolibarr" target="_blank" rel="noopener noreferrer external">https://www.github.com/Dolibarr/dolibarr</a></li>';
print '<li>'.$langs->trans("SeeWikiForAllTeam").': <a href="https://wiki.dolibarr.org/index.php/Dolibarr_Project" target="_blank" rel="noopener noreferrer external">https://wiki.dolibarr.org/index.php/Dolibarr_Project</a></li>';
print '</ul>';
print '</div>';
//print "<br>\n";
print '<div class="divsection wordwrap">';
print $langs->trans("OtherInformations").':';
print '<ul>';
@@ -121,25 +124,29 @@ print '<li>';
print '<a target="_blank" href="https://wiki.dolibarr.org/" rel="noopener noreferrer external">'.$langs->trans("OfficialWiki").'</a>';
print '</li>';
print '</ul>';
print '</div>';
print '<div class="divsection wordwrap">';
print $langs->trans("Demo").':';
print '<ul>';
print '<li>';
print '<a target="_blank" href="https://www.dolibarr.org/onlinedemo/" rel="noopener noreferrer external">'.$langs->trans("OfficialDemo").'</a>';
print '</li>';
print '</ul>';
print '</div>';
print '<div class="divsection wordwrap">';
print $langs->trans("ModulesMarketPlaces").':';
print '<ul>';
print '<li>';
print '<a target="_blank" href="https://www.dolistore.com" rel="noopener noreferrer external">'.$langs->trans("OfficialMarketPlace").'</a>';
print '</li>';
print '</ul>';
print '</div>';
print '</div><div class="fichehalfright">';
print '<div class="divsection wordwrap">';
print $langs->trans("HelpCenter").':';
print '<ul>';
print '<li>';
@@ -147,8 +154,9 @@ print '<li>';
print '<a target="_blank" rel="noopener noreferrer external" href="'.DOL_URL_ROOT.'/support/index.php" data-ajax="false">'.$langs->trans("HelpCenter").'</a>';
print '</li>';
print '</ul>';
print '</div>';
print '<div class="divsection wordwrap">';
print $langs->trans("Foundation").':';
print '<ul>';
@@ -161,17 +169,19 @@ if (preg_match('/^es_/i', $langs->getDefaultLang())) {
}
print '<li><a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$langs->trans("SubscribeToFoundation").'</a></li>';
print '</ul>';
print '</div>';
print '<div class="divsection wordwrap">';
print $langs->trans("SocialNetworks").':';
print '<ul>';
print '<li><a href="https://facebook.com/dolibarr" target="_blank" rel="noopener noreferrer external">FaceBook</a></li>';
print '<li><a href="https://twitter.com/dolibarr" target="_blank" rel="noopener noreferrer external">Twitter</a></li>';
print '<li><a href="https://wiki.dolibarr.org/index.php?title=Social_Networksr" target="_blank" rel="noopener noreferrer external">See wiki</a></li>';
print '</ul>';
print '</div>';
print '<div class="divsection wordwrap">';
print $langs->trans("OtherResources").':';
print '<ul>';
@@ -191,6 +201,7 @@ print '<a target="_blank" rel="noopener noreferrer external" href="'.$url.'">'.$
print '</li>';
print '</ul>';
print '</div>';
print '</div>';
print '</div>';

5
htdocs/core/class/html.form.class.php
View File

@@ -1125,6 +1125,7 @@ class Form
}
}
$out .= '</select>';
$out .= ajax_combobox($htmlname);
if ($conf->use_javascript_ajax && empty($disableautocomplete)) {
$out .= ajax_multiautocompleter('location_incoterms', array(), DOL_URL_ROOT . '/core/ajax/locationincoterms.php') . "\n";
@@ -8893,7 +8894,7 @@ class Form
cache: true
},
language: select2arrayoflanguage,
containerCssClass: \':all:\', /* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
containerCssClass: \':all:\', /* Line to add class from the original SELECT propagated to the new <span class="select2-selection...> tag */
placeholder: "' . dol_escape_js($placeholder) . '",
escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
minimumInputLength: ' . ((int) $minimumInputLength) . ',
@@ -8983,7 +8984,7 @@ class Form
$(".' . $htmlname . '").select2({
data: data,
language: select2arrayoflanguage,
containerCssClass: \':all:\', /* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
containerCssClass: \':all:\', /* Line to add class from the original SELECT propagated to the new <span class="select2-selection...> tag */
placeholder: "' . dol_escape_js($placeholder) . '",
escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
minimumInputLength: ' . $minimumInputLength . ',

2
htdocs/main.inc.php
View File

@@ -3362,7 +3362,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
//$textsearch = $langs->trans("Search");
$textsearch = '<span class="fa fa-search paddingright pictofixedwidth"></span>'.$langs->trans("Search");
$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (!getDolGlobalString('MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY') ? 1 : 0), 'vmenusearchselectcombo', 1, $textsearch, 1, $stringforfirstkey.' s');
$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (getDolGlobalString('MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY') ? 0 : 1), 'vmenusearchselectcombo', 1, $textsearch, 1, $stringforfirstkey.' s');
} else {
if (is_array($arrayresult)) {
// @phan-suppress-next-line PhanEmptyForeach // array is really empty in else case.

12
htdocs/societe/card.php
View File

@@ -1692,7 +1692,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
}
print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
print '<td>';
print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOSTINT("no_email") : getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS')), 1, false, (getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2));
print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOSTINT("no_email") : getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS')), 1, false, (getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 ? 1 : 0), 1);
print '</td>';
}
print '</tr>';
@@ -1856,9 +1856,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
print '<td colspan="3"><input type="text" name="capital" id="capital" class="maxwidth100" value="'.$object->capital.'"> ';
if (isModEnabled("multicurrency")) {
print '<span class="hideonsmartphone">'.$langs->trans("Currency".$object->multicurrency_code).'</span></td></tr>';
print '<span class="hideonsmartphone">';
//print $langs->trans("Currency".$object->multicurrency_code);
print $langs->getCurrencySymbol($object->multicurrency_code);
print '</span></td></tr>';
} else {
print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
print '<span class="hideonsmartphone">';
print $langs->getCurrencySymbol($conf->currency);
//print $langs->trans("Currency".$conf->currency);
print '</span></td></tr>';
}
if (getDolGlobalInt('MAIN_MULTILANGS')) {
print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";

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

@@ -3499,7 +3499,7 @@ div.vmenu, td.vmenu {
.vmenu {
width: <?php echo $leftmenuwidth; ?>px;
margin-left: 6px;
margin-left: 8px;
<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
display: none;
<?php } ?>
@@ -3593,10 +3593,23 @@ div.blockvmenusearchphone
{
margin: 0 0 8px 2px;
}
.vmenu div.blockvmenusearch
{
padding-bottom: 13px;
.vmenu div.blockvmenusearch {
margin-top: 5px;
margin-bottom: 15px;
}
/*
.vmenu div.blockvmenusearch {
border: 1px solid #888;
padding-top: 8px;
padding-bottom: 8px;
padding-left: 0;
padding-right: 0;
border-radius: 6px;
box-sizing: border-box;
margin-left: 3px;
margin-left: 3px;
}
*/
.vmenu div.blockvmenuend
{
padding-bottom: 5px;
@@ -5446,7 +5459,11 @@ div#card-errors {
border: 1px solid #e0e0e0;
border-radius: 6px;
}
.ui-dialog {
padding-left: 10px;
padding-right: 10px;
padding-top: 10px;
}
/* ============================================================================== */
/* For content of image preview */
@@ -6910,7 +6927,7 @@ input.select2-input {
.select2-dropdown {
/*background-color: var(--colorbackvmenu1);
border: 1px solid var(--colorbackvmenu1); */
box-shadow: 1px 2px 10px var(--colorbackvmenu1);
box-shadow: 1px 2px 10px #8884;
background-color: var(--colorbackbody);
color: var(--colortext);
}
@@ -7078,9 +7095,14 @@ span#select2-boxbookmark-container {
cursor: text;
overflow: hidden;
}
ul.select2-results__options li {
font-size: 0.95em;
.select2-results__option {
padding: 8px;
}
span.select2-dropdown--below {
margin-top: -1px;
}
span.select2-dropdown--above {
margin-bottom: -1px;
}
.parentonrightofpage {