lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor enhancement

Browse Source
This commit is contained in:
Laurent Destailleur 2015-05-22 00:46:53 +02:00
parent fb923c0c2b
commit 6108dfad55
4 changed files with 141 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/ihm.php
View File

@ -283,7 +283,7 @@ if ($action == 'edit') // Edit
{ {
// Show bugtrack link // Show bugtrack link
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ShowBugTrackLink").'</td><td>'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK',$conf->global->MAIN_BUGTRACK_ENABLELINK,1); print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK',$conf->global->MAIN_BUGTRACK_ENABLELINK,1);
print '</td>'; print '</td>';
print '<td width="20">&nbsp;</td>'; print '<td width="20">&nbsp;</td>';
@ -469,7 +469,7 @@ else // Show
{ {
// Show bugtrack link // Show bugtrack link
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'"><td width="35%">'.$langs->trans("ShowBugTrackLink").'</td><td>'; print '<tr '.$bc[$var].'"><td width="35%">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
print yn($conf->global->MAIN_BUGTRACK_ENABLELINK)."</td>"; print yn($conf->global->MAIN_BUGTRACK_ENABLELINK)."</td>";
print '<td width="20">&nbsp;</td>'; print '<td width="20">&nbsp;</td>';
print "</tr>"; print "</tr>";

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

@ -946,7 +946,7 @@ DoNotSuggestPaymentMode=Do not suggest
NoActiveBankAccountDefined=No active bank account defined NoActiveBankAccountDefined=No active bank account defined
OwnerOfBankAccount=Owner of bank account %s OwnerOfBankAccount=Owner of bank account %s
BankModuleNotActive=Bank accounts module not enabled BankModuleNotActive=Bank accounts module not enabled
ShowBugTrackLink=Show link "Report a bug" ShowBugTrackLink=Show link "<strong>%s</strong>"
ShowWorkBoard=Show "workbench" on homepage ShowWorkBoard=Show "workbench" on homepage
Alerts=Alerts Alerts=Alerts
Delays=Delays Delays=Delays

14
htdocs/product/composition/card.php
View File

@ -326,6 +326,8 @@ if ($id > 0 || ! empty($ref))
$class='pair'; $class='pair';
if (count($prods_arbo))
{
foreach($prods_arbo as $value) foreach($prods_arbo as $value)
{ {
$productstatic->id=$value['id']; $productstatic->id=$value['id'];
@ -402,6 +404,7 @@ if ($id > 0 || ! empty($ref))
print '</tr>'."\n"; print '</tr>'."\n";
} }
} }
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td class="liste_total"></td>'; print '<td class="liste_total"></td>';
print '<td class="liste_total"></td>'; print '<td class="liste_total"></td>';
@ -426,6 +429,17 @@ if ($id > 0 || ! empty($ref))
} }
print '</td>'; print '</td>';
print '</tr>'."\n"; print '</tr>'."\n";
}
else
{
$colspan=6;
if (! empty($conf->stock->enabled)) $colspan++;
print '<tr>';
print '<td colspan="'.$colspan.'">'.$langs->trans("None").'</td>';
print '</tr>';
}
print '</table>'; print '</table>';
/*if($user->rights->produit->creer || $user->rights->service->creer) { /*if($user->rights->produit->creer || $user->rights->service->creer) {

62
htdocs/theme/eldy/style.css.php
View File

@ -1037,8 +1037,8 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
border-right: 1px solid #BBB; border-right: 1px solid #BBB;
border-bottom: 1px solid #BBB; border-bottom: 1px solid #BBB;
border-top: 1px solid #BBB; border-top: 1px solid #BBB;
border-radius: 5px; border-radius: 4px;
-moz-border-radius: 5px; -moz-border-radius: 4px;
-moz-box-shadow: 3px 3px 4px #DDD; -moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD;
@ -1061,8 +1061,8 @@ div.blockvmenusearch
border-right: 1px solid #CCC; border-right: 1px solid #CCC;
border-bottom: 1px solid #CCC; border-bottom: 1px solid #CCC;
border-top: 1px solid #CCC; border-top: 1px solid #CCC;
border-radius: 5px; border-radius: 4px;
-moz-border-radius: 5px; -moz-border-radius: 4px;
-moz-box-shadow: 3px 3px 4px #DDD; -moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD;
@ -1142,9 +1142,9 @@ td.photo {
background-repeat: repeat-x !important; background-repeat: repeat-x !important;
border: 1px solid #CCC !important; border: 1px solid #CCC !important;
-moz-border-radius: 5px 5px 5px 5px !important; -moz-border-radius: 4px 4px 4px 4px !important;
-webkit-border-radius: 5px 5px 5px 5px !important; -webkit-border-radius: 4px 4px 4px 4px !important;
border-radius: 5px 5px 5px 5px !important; border-radius: 4px 4px 4px 4px !important;
-moz-box-shadow: 2px 2px 4px #DDD; -moz-box-shadow: 2px 2px 4px #DDD;
-webkit-box-shadow: 2px 2px 4px #DDD; -webkit-box-shadow: 2px 2px 4px #DDD;
box-shadow: 2px 2px 4px #DDD; box-shadow: 2px 2px 4px #DDD;
@ -1377,9 +1377,9 @@ div.tabBar {
padding-right: <?php echo ($dol_optimize_smallscreen?'4':'14'); ?>px; padding-right: <?php echo ($dol_optimize_smallscreen?'4':'14'); ?>px;
padding-bottom: <?php echo ($dol_optimize_smallscreen?'4':'12'); ?>px; padding-bottom: <?php echo ($dol_optimize_smallscreen?'4':'12'); ?>px;
margin: 0px 0px 14px 0px; margin: 0px 0px 14px 0px;
-moz-border-radius:6px; -moz-border-radius:4px;
-webkit-border-radius: 6px; -webkit-border-radius: 4px;
border-radius: 6px; border-radius: 4px;
border-right: 1px solid #AAA; border-right: 1px solid #AAA;
border-bottom: 1px solid #AAA; border-bottom: 1px solid #AAA;
border-left: 1px solid #AAA; border-left: 1px solid #AAA;
@ -1434,6 +1434,13 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
border-top: 1px solid #CCC; border-top: 1px solid #CCC;
*/ */
border-right: 1px solid transparent;
border-left: 1px solid transparent;
border-top: 1px solid transparent;
-moz-border-radius:4px 4px 0 0;
-webkit-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
background-image: none !important; background-image: none !important;
} }
@ -1447,6 +1454,9 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
border-right: 1px solid #AAA !important; border-right: 1px solid #AAA !important;
border-left: 1px solid #AAA !important; border-left: 1px solid #AAA !important;
border-top: 1px solid #BBB !important; border-top: 1px solid #BBB !important;
-moz-border-radius:4px 4px 0 0;
-webkit-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
} }
a.tab:hover a.tab:hover
{ {
@ -1475,9 +1485,9 @@ span.tabspan {
margin: 0em 0.2em; margin: 0em 0.2em;
text-decoration: none; text-decoration: none;
white-space: nowrap; white-space: nowrap;
-moz-border-radius:6px 6px 0px 0px; -moz-border-radius:4px 4px 0px 0px;
-webkit-border-radius:6px 6px 0px 0px; -webkit-border-radius:4px 4px 0px 0px;
border-radius:6px 6px 0px 0px; border-radius:4px 4px 0px 0px;
border-<?php print $right; ?>: 1px solid #555555; border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8; border-<?php print $left; ?>: 1px solid #D8D8D8;
@ -2220,7 +2230,7 @@ div.tabBar .noborder {
margin-bottom: 8px !important;*/ margin-bottom: 8px !important;*/
border: 1px solid #AAA; border: 1px solid #AAA;
text-align: center; text-align: center;
border-radius: 5px; border-radius: 4px;
} }
.boxtable { .boxtable {
@ -2317,9 +2327,9 @@ div.warning {
padding: 0.3em 0.3em 0.3em 0.3em; padding: 0.3em 0.3em 0.3em 0.3em;
margin: 0.5em 0em 0.5em 0em; margin: 0.5em 0em 0.5em 0em;
border: 1px solid #e0d0b0; border: 1px solid #e0d0b0;
-moz-border-radius:6px; -moz-border-radius: 4px;
-webkit-border-radius: 6px; -webkit-border-radius: 4px;
border-radius: 6px; border-radius: 4px;
background: #EFDF9A; background: #EFDF9A;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
} }
@ -2329,9 +2339,9 @@ div.error {
padding: 0.3em 0.3em 0.3em 0.3em; padding: 0.3em 0.3em 0.3em 0.3em;
margin: 0.5em 0em 0.5em 0em; margin: 0.5em 0em 0.5em 0em;
border: 1px solid #DC9CAB; border: 1px solid #DC9CAB;
-moz-border-radius:6px; -moz-border-radius: 4px;
-webkit-border-radius: 6px; -webkit-border-radius: 4px;
border-radius: 6px; border-radius: 4px;
background: #EFCFCF; background: #EFCFCF;
} }
@ -2341,9 +2351,9 @@ div.info {
padding: 0.4em 0.4em 0.4em 0.4em; padding: 0.4em 0.4em 0.4em 0.4em;
margin: 0.5em 0em 0.5em 0em; margin: 0.5em 0em 0.5em 0em;
border: 1px solid #DFBF9A; border: 1px solid #DFBF9A;
-moz-border-radius:6px; -moz-border-radius: 4px;
-webkit-border-radius: 6px; -webkit-border-radius: 4px;
border-radius:6px; border-radius: 4px;
background: #EFCFAA; background: #EFCFAA;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
} }
@ -2506,9 +2516,9 @@ table.valid {
z-index: 3000; z-index: 3000;
background-color: #FFF; background-color: #FFF;
opacity: 1; opacity: 1;
-moz-border-radius:6px; -moz-border-radius: 4px;
-webkit-border-radius: 6px; -webkit-border-radius: 4px;
border-radius: 6px; border-radius: 4px;
} }
#tiptip_content { #tiptip_content {
background-color: rgb(255,255,255); background-color: rgb(255,255,255);