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

Debug v23

Browse Source
This commit is contained in:
Laurent Destailleur
2025-11-23 16:15:59 +01:00
parent aac48b7f01
commit 53e926371b
7 changed files with 70 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/admin/modules.php
View File

@@ -724,9 +724,6 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$deschelp .= '<br>';
}
}
//if ($mode == 'marketplace') {
// $deschelp = '<div class="info hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br></div><br>\n";
//}
if ($mode == 'deploy') {
$deschelp = '<div class="info hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br></div><br>\n";
}
@@ -801,7 +798,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button small nomarginleft" value="'.dolPrintHTMLForAttribute($langs->trans("Refresh")).'">';
if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) {
$moreforfilter .= ' ';
$moreforfilter .= '<input type="submit" name="buttonreset" class="buttonreset noborderbottom nomargintop nomarginbottom" value="'.dolPrintHTMLForAttribute($langs->trans("Reset")).'">';
$moreforfilter .= '<input type="submit" name="buttonreset" class="buttonreset noborderall nomargintop nomarginbottom" value="'.dolPrintHTMLForAttribute($langs->trans("Reset")).'">';
}
$moreforfilter .= '</div>';
$moreforfilter .= '</div>';
@@ -1421,7 +1418,7 @@ if ($mode == 'marketplace') {
<div id="listing-content" class="div-table-responsive" <?php if (empty($categories_tree)) { ?>style="width:100%;"<?php } ?>>
<table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
<tbody id="listOfModules">
<?php //echo $remotestore->get_products($nbmaxtoshow); ?>
<!-- $product_list is $remotestore->getProducts($options) done previously -->
<?php print $products_list; ?>
</tbody>
</table>

18
htdocs/admin/remotestore/class/externalModules.class.php
View File

@@ -366,6 +366,22 @@ class ExternalModules
$this->numberTotalOfProducts = 0;
// Special case of category goodies
if ($this->categorie == 87) {
$html = '<div class="shop-container">
<div class="shop-image">
<a href="https://merch.dolibarr.org/" target="_blank">
<img src="https://www.dolistore.com/medias/image/marketplace/img/goodies-shop.jpg" width="50%" alt="DoliStore Merch and Gifts" />
<div class="shop-overlay">
<button target="new" class="shop-button">'.$langs->trans("GoodiesButtonTitle").' <i class="icon-chevron-right"></i></button>
</div>
</a>
</div>
</div>';
return $html;
}
// Fetch the products from Dolistore source
$dolistoreProducts = array();
@@ -638,7 +654,7 @@ class ExternalModules
$this->numberOfProducts = count($this->products);
return $html ;
return $html;
}
/**

35
htdocs/admin/remotestore/css/store.css
View File

@@ -195,17 +195,48 @@ textarea.row4{
h2.appTitle small{
font-weight: normal;
}
/*
tr.NotCompatible{
opacity: 0.5;
opacity: 1;
}
tr.NotCompatible:hover{
opacity: 0.7;
opacity: 0.9;
}
*/
span.details{
font-size: 1em;
margin-left: 10px;
vertical-align: super;
}
.storedesc {
opacity: 0.5;
}
.shop-container {
border-top: none;
overflow: hidden;
text-align: center;
background-color: #fff;
box-shadow: 0 8px 20px rgba(0, 0, 0, .1);
transition: transform .3s;
transform: scale(1);
}
.shop-button {
position: absolute;
top: 20%;
left: 50%;
padding: 10px 20px;
border: none;
border-radius: 8px;
text-transform: uppercase;
font-size: 16px;
color: #fff;
background-color: #ff5f57;
box-shadow: 0 5px 15px rgba(255, 95, 87, .3);
transition: background-color .3s, transform .3s;
transform: translate(-50%, -50%);
cursor: pointer;
}
@media only screen and (min-width: 1150px) {

1
htdocs/langs/en_US/admin.lang
View File

@@ -2757,3 +2757,4 @@ GlobalParameters=Global parameters
SpecificParameters=Specific parameters
YouAreUsingTheAdvancedPermissionsMode=You are using the advanced permission mode. Granularity of permissions is higher. Go to Home - Setup - Security to go back to the simple mode.
YouAreUsingTheSimplePermissionsMode=You are using the simple permission mode. Go to Home - Setup - Security to switch to advanced mode if you need more granularity on permissions.
GoodiesButtonTitle=Visit Our Merch & Gifts Store

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

@@ -4441,6 +4441,9 @@ td.border, div.tagtable div div.border {
.borderbottom {
border-bottom: 1px solid var(--colortopbordertitle1);
}
.noborderall {
border: none !important;
}
table.noborder {
background: var(--colorbacktabcard1);

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

@@ -4481,6 +4481,9 @@ td.border, div.tagtable div div.border {
.borderbottom {
border-bottom: 1px solid var(--colortopbordertitle1);
}
.noborderall {
border: none !important;
}
.fichehalfright table.noborder {
margin: 0px 0px 0px 0px;