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

Look and feel v14

Browse Source
This commit is contained in:
Laurent Destailleur
2021-03-26 17:58:00 +01:00
parent 4a22c8e87e
commit 84ec032cc0
10 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/api/admin/index.php
View File

@@ -139,21 +139,24 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
// Show message // Show message
$message = ''; $message = '';
$url = $urlwithroot.'/api/index.php/login?login=<strong>auserlogin</strong>&password=<strong>thepassword</strong>[&reset=1]'; //$url = $urlwithroot.'/api/index.php/login?login=<strong>auserlogin</strong>&password=<strong>thepassword</strong>[&reset=1]';
$url = $urlwithroot.'/api/index.php/login?login=auserlogin&password=thepassword[&reset=1]';
$message .= '<span class="opacitymedium">'.$langs->trans("UrlToGetKeyToUseAPIs").':</span><br>'; $message .= '<span class="opacitymedium">'.$langs->trans("UrlToGetKeyToUseAPIs").':</span><br>';
$message .= '<div class="urllink">'.img_picto('', 'globe').' '.$url.'</div>'; $message .= '<div class="urllink soixantepercent">'.img_picto('', 'globe').' <input type="text" class="quatrevingtpercent" id="urltogettoken" value="'.$url.'"></div>';
print $message; print $message;
print ajax_autoselect("urltogettoken");
print '<br>'; print '<br>';
print '<br>'; print '<br>';
// Explorer // Explorer
print '<u>'.$langs->trans("ApiExporerIs").':</u><br>'; print '<span class="opacitymedium">'.$langs->trans("ApiExporerIs").':</span><br>';
if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/explorer')) { if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/explorer')) {
$url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer'; $url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
print '<div class="urllink">'.img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a></div><br>\n"; print '<div class="urllink soixantepercent">'.img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a></div><br>\n";
print '<div class="opacitymediumxxx"><br><u>'.$langs->trans("SwaggerDescriptionFile").':</u><br>'; print '<div class="opacitymediumxxx"><br><span class="opacitymedium">'.$langs->trans("SwaggerDescriptionFile").':</span><br>';
$urlswagger = DOL_MAIN_URL_ROOT.'/api/index.php/explorer/swagger.json?DOLAPIKEY=youruserapikey'; $urlswagger = DOL_MAIN_URL_ROOT.'/api/index.php/explorer/swagger.json?DOLAPIKEY=youruserapikey';
print '<div class="urllink">'.img_picto('', 'globe').' <a href="'.$urlswagger.'" target="_blank">'.$urlswagger."</a></div><br>\n"; //$urlswaggerreal = DOL_MAIN_URL_ROOT.'/api/index.php/explorer/swagger.json?DOLAPIKEY='.$user->api_key;
print '<div class="urllink soixantepercent">'.img_picto('', 'globe').' <a href="'.$urlswagger.'" target="_blank">'.$urlswagger."</a></div><br>\n";
print '</div>'; print '</div>';
} else { } else {
$langs->load("errors"); $langs->load("errors");

2
htdocs/core/ajax/selectsearchbox.php
View File

@@ -81,7 +81,7 @@ if (((!empty($conf->product->enabled) && $user->rights->produit->lire) || (!empt
$arrayresult['searchintoproduct'] = array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'text'=>img_picto('', 'object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : '')); $arrayresult['searchintoproduct'] = array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'text'=>img_picto('', 'object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
// search on lot/serial numbers // search on lot/serial numbers
if ( ! empty($conf->productbatch->enabled) ) { if ( ! empty($conf->productbatch->enabled) ) {
$arrayresult['searchintobatch'] = array('position'=>32, 'shortcut'=>'B', 'img'=>'object_plot', 'label'=>$langs->trans("SearchIntoBatch", $search_boxvalue), 'text'=>img_picto('', 'object_lot').' '.$langs->trans("SearchIntoBatch", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/stock/productlot_list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : '')); $arrayresult['searchintobatch'] = array('position'=>32, 'shortcut'=>'B', 'img'=>'object_lot', 'label'=>$langs->trans("SearchIntoBatch", $search_boxvalue), 'text'=>img_picto('', 'object_lot').' '.$langs->trans("SearchIntoBatch", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/stock/productlot_list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
} }
} }

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

@@ -7721,16 +7721,17 @@ class Form
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td class="left">'; print '<td class="left">';
print '<input type="radio" name="idtolinkto" value='.$objp->rowid.'>'; print '<input type="radio" name="idtolinkto" id="'.$key.'_'.$objp->rowid.'" value="'.$objp->rowid.'">';
print '</td>'; print '</td>';
print '<td class="center">'.$objp->ref.'</td>'; print '<td class="center"><label for="'.$key.'_'.$objp->rowid.'">'.$objp->ref.'</label></td>';
print '<td>'.$objp->ref_client.'</td>'; print '<td>'.$objp->ref_client.'</td>';
print '<td class="right">'; print '<td class="right">';
if ($possiblelink['label'] == 'LinkToContract') { if ($possiblelink['label'] == 'LinkToContract') {
$form = new Form($this->db); $form = new Form($this->db);
print $form->textwithpicto('', $langs->trans("InformationOnLinkToContract")).' '; print $form->textwithpicto('', $langs->trans("InformationOnLinkToContract")).' ';
} }
print price($objp->total_ht).'</td>'; print '<span class="amount">'.price($objp->total_ht).'</span>';
print '</td>';
print '<td>'.$objp->name.'</td>'; print '<td>'.$objp->name.'</td>';
print '</tr>'; print '</tr>';
$i++; $i++;
@@ -7760,7 +7761,7 @@ class Form
<dl class="dropdown" id="linktoobjectname"> <dl class="dropdown" id="linktoobjectname">
'; ';
if (!empty($conf->use_javascript_ajax)) { if (!empty($conf->use_javascript_ajax)) {
$linktoelem .= '<dt><a href="#linktoobjectname">'.$langs->trans("LinkTo").'...</a></dt>'; $linktoelem .= '<dt><a href="#linktoobjectname"><span class="fas fa-link paddingrightonly"></span>'.$langs->trans("LinkTo").'...</a></dt>';
} }
$linktoelem .= '<dd> $linktoelem .= '<dd>
<div class="multiselectlinkto"> <div class="multiselectlinkto">

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

@@ -8821,8 +8821,8 @@ function showDirectDownloadLink($object)
$url = $object->getLastMainDocLink($object->element); $url = $object->getLastMainDocLink($object->element);
if ($url) { if ($url) {
$out .= img_picto($langs->trans("PublicDownloadLinkdesc"), 'globe').' '.$langs->trans("DirectDownloadLink").'<br>'; $out .= img_picto($langs->trans("PublicDownloadLinkdesc"), 'globe').' <span class="opacitymedium">'.$langs->trans("DirectDownloadLink").'</span><br>';
$out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">'; $out .= '<div class="urllink"><input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'"></div>';
$out .= ajax_autoselect("directdownloadlink", 0); $out .= ajax_autoselect("directdownloadlink", 0);
} }
return $out; return $out;

4
htdocs/core/lib/payments.lib.php
View File

@@ -171,9 +171,9 @@ function showOnlinePaymentUrl($type, $ref)
$servicename = $langs->transnoentitiesnoconv('Online'); $servicename = $langs->transnoentitiesnoconv('Online');
$out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>'; $out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'</span><br>';
$url = getOnlinePaymentUrl(0, $type, $ref); $url = getOnlinePaymentUrl(0, $type, $ref);
$out .= '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">'; $out .= '<div class="urllink"><input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'"></div>';
$out .= ajax_autoselect("onlinepaymenturl", 0); $out .= ajax_autoselect("onlinepaymenturl", 0);
return $out; return $out;
} }

8
htdocs/core/lib/signature.lib.php
View File

@@ -33,9 +33,15 @@ function showOnlineSignatureUrl($type, $ref)
$servicename = 'Online'; $servicename = 'Online';
$out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlineSignature", $servicename).'<br>'; $out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlineSignature", $servicename).'</span><br>';
$url = getOnlineSignatureUrl(0, $type, $ref); $url = getOnlineSignatureUrl(0, $type, $ref);
$out .= '<div class="urllink">';
if ($url == $langs->trans("FeatureOnlineSignDisabled")) {
$out .= $url;
} else {
$out .= '<input type="text" id="onlinesignatureurl" class="quatrevingtpercent" value="'.$url.'">'; $out .= '<input type="text" id="onlinesignatureurl" class="quatrevingtpercent" value="'.$url.'">';
}
$out .= '</div>';
$out .= ajax_autoselect("onlinesignatureurl", 0); $out .= ajax_autoselect("onlinesignatureurl", 0);
return $out; return $out;
} }

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

@@ -364,7 +364,7 @@ td.rightborder {
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
} }
td.amount { td.amount, span.amount, div.amount {
color: #006666; color: #006666;
} }
td.actionbuttons a { td.actionbuttons a {
@@ -768,13 +768,13 @@ textarea.centpercent {
overflow-y: auto; overflow-y: auto;
} }
div.urllink { div.urllink {
padding: 10px; padding: 5px;
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;
//border: 1px solid #ccc; /* border: 1px solid #ccc; */
border-radius: 5px; border-radius: 5px;
width: fit-content; /* width: fit-content; */
background-color: #eee; background-color: #f0f0f8;
opacity: 0.8; opacity: 0.8;
} }
div.urllink, div.urllink a { div.urllink, div.urllink a {

2
htdocs/theme/eldy/main_menu_fa_icons.inc.php
View File

@@ -169,7 +169,7 @@ div.mainmenu.generic4::before {
.fa-play { .fa-play {
color: #444; color: #444;
} }
.fa-unlink { .fa-link, .fa-unlink {
color: #555; color: #555;
} }

2
htdocs/theme/md/main_menu_fa_icons.inc.php
View File

@@ -150,7 +150,7 @@ div.mainmenu.generic4::before {
.fa-play { .fa-play {
color: #444; color: #444;
} }
.fa-unlink { .fa-link, .fa-unlink {
color: #555; color: #555;
} }

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

@@ -555,7 +555,7 @@ td.rightborder {
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
} }
td.amount { td.amount, span.amount, div.amount {
color: #006666; color: #006666;
} }
td.actionbuttons a { td.actionbuttons a {
@@ -896,6 +896,19 @@ textarea.centpercent {
max-width: 100%; max-width: 100%;
overflow-y: auto; overflow-y: auto;
} }
div.urllink {
padding: 5px;
margin-top: 5px;
margin-bottom: 5px;
/* border: 1px solid #ccc; */
border-radius: 5px;
/* width: fit-content; */
background-color: #e0e0e8;
opacity: 0.8;
}
div.urllink, div.urllink a {
color: #339 !important;
}
.fa-info-circle { .fa-info-circle {
padding-<?php echo $left; ?>: 3px; padding-<?php echo $left; ?>: 3px;
@@ -1628,6 +1641,7 @@ td.showDragHandle {
min-height: 100%; min-height: 100%;
position: relative; position: relative;
width: 213px; width: 213px;
padding-top: 20px;
} }
#id-right { /* This must stay id-right and not be replaced with echo $right */ #id-right { /* This must stay id-right and not be replaced with echo $right */
width: 100%; width: 100%;
@@ -1740,6 +1754,7 @@ body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block
} }
<?php } ?> <?php } ?>
/* For smartphone (testmenuhider is on) */ /* For smartphone (testmenuhider is on) */
<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> <?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
#id-container { #id-container {
@@ -1803,6 +1818,7 @@ div.login_block {
z-index: 91; z-index: 91;
background: rgb(<?php echo $colorbackvmenu1; ?>); background: rgb(<?php echo $colorbackvmenu1; ?>);
border-right: 1px solid rgba(0,0,0,0.3); border-right: 1px solid rgba(0,0,0,0.3);
padding-top: 20px;
<?php <?php
if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
top: 50px ! important; top: 50px ! important;
@@ -2619,7 +2635,7 @@ div.login_block {
vertical-align: middle; vertical-align: middle;
background: rgb(<?php echo $colorbackvmenu1; ?>); background: rgb(<?php echo $colorbackvmenu1; ?>);
width: 228px; width: 228px;
height: 45px; height: 70px;
<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?> <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
display: none; display: none;
<?php } ?> <?php } ?>
@@ -2640,13 +2656,13 @@ div.login a:hover {
text-decoration:underline; text-decoration:underline;
} }
div.login_block_user, div.login_block_other { clear: both; } div.login_block_user, div.login_block_other { clear: both; }
div.login_block_other { padding-top: 3px; } div.login_block_other { padding-top: 15px; }
.topnav div.login_block_user { .topnav div.login_block_user {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
line-height: <?php echo $disableimages ? '25' : '50'; ?>px; line-height: <?php echo $disableimages ? '25' : '70'; ?>px;
height: <?php echo $disableimages ? '25' : '50'; ?>px; height: <?php echo $disableimages ? '25' : '70'; ?>px;
} }
.topnav div.login_block_other { .topnav div.login_block_other {
display: inline-block; display: inline-block;
@@ -2768,6 +2784,7 @@ div.vmenu, td.vmenu {
#menu_contenu_logo { padding-right: 4px; } #menu_contenu_logo { padding-right: 4px; }
.companylogo { padding-top: 4px; } .companylogo { padding-top: 4px; }
.searchform { padding-top: 10px; } .searchform { padding-top: 10px; }
.searchform .bordertransp { border: 0; }
a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu { white-space: nowrap; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; } a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu { white-space: nowrap; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; }
font.vmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; white-space: nowrap; } font.vmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; white-space: nowrap; }