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

Fix css

Browse Source
This commit is contained in:
Laurent Destailleur 2021-09-07 17:26:31 +02:00
parent c3825e2394
commit 4e0ae972f1
7 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/lib/ajax.lib.php
View File

@ -624,9 +624,10 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
* @param string $text_on Text if on * @param string $text_on Text if on
* @param string $text_off Text if off * @param string $text_off Text if off
* @param array $input Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid')) * @param array $input Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
* @param string $morecss More CSS
* @return string html for button on/off * @return string html for button on/off
*/ */
function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input = array()) function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input = array(), $morecss = '')
{ {
global $langs; global $langs;
@ -697,8 +698,8 @@ function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input =
}); });
}); });
</script>'; </script>';
$out .= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').'">'.img_picto($langs->trans($text_off), 'switch_off').'</span>'; $out .= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').($morecss ? ' '.$morecss : '').'">'.img_picto($langs->trans($text_off), 'switch_off').'</span>';
$out .= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').'">'.img_picto($langs->trans($text_on), 'switch_on').'</span>'; $out .= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').($morecss ? ' '.$morecss : '').'">'.img_picto($langs->trans($text_on), 'switch_on').'</span>';
return $out; return $out;
} }

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

@ -1153,3 +1153,4 @@ ConfirmMassLeaveApprovalQuestion=Are you sure you want to approve the %s selecte
ConfirmMassLeaveApproval=Mass leave approval confirmation ConfirmMassLeaveApproval=Mass leave approval confirmation
RecordAproved=Record approved RecordAproved=Record approved
RecordsApproved=%s Record(s) approved RecordsApproved=%s Record(s) approved
Properties=Properties

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

@ -180,7 +180,7 @@ MessageSuccessfullyAdded=Ticket added
TicketMessageSuccessfullyAdded=Message successfully added TicketMessageSuccessfullyAdded=Message successfully added
TicketMessagesList=Message list TicketMessagesList=Message list
NoMsgForThisTicket=No message for this ticket NoMsgForThisTicket=No message for this ticket
Properties=Classification TicketProperties=Classification
LatestNewTickets=Latest %s newest tickets (not read) LatestNewTickets=Latest %s newest tickets (not read)
TicketSeverity=Severity TicketSeverity=Severity
ShowTicket=See ticket ShowTicket=See ticket

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

@ -4775,9 +4775,12 @@ span[phptag] {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
background: #e6e6e6; background: #e6e6e6;
display: inline-block; display: inline-block;
padding: 5px 0 5px 0; padding: 5px 5px 5px 5px;
z-index: 1000; z-index: 1000;
} }
.centpercent.websitebar {
width: calc(100% - 10px);
}
.websitebar .buttonDelete, .websitebar .button { .websitebar .buttonDelete, .websitebar .button {
text-shadow: none; text-shadow: none;
} }
@ -4785,13 +4788,13 @@ span[phptag] {
{ {
padding: 4px 5px 4px 5px !important; padding: 4px 5px 4px 5px !important;
margin: 2px 4px 2px 4px !important; margin: 2px 4px 2px 4px !important;
line-height: normal; /* line-height: normal; */
background: #f5f5f5 !important; background: #f5f5f5 !important;
border: 1px solid #ccc !important; border: 1px solid #ccc !important;
} }
.websiteselection { .websiteselection {
/* display: inline-block; */ /* display: inline-block; */
padding-left: 10px; padding-<?php echo $right; ?>: 10px;
vertical-align: middle; vertical-align: middle;
/* line-height: 28px; */ /* line-height: 28px; */
} }
@ -4811,6 +4814,9 @@ span[phptag] {
.websiteiframenoborder { .websiteiframenoborder {
border: 0px; border: 0px;
} }
span.websiteselection span.select2.select2-container.select2-container--default {
margin: 0 0 0 4px;
}
span.websitebuttonsitepreview, a.websitebuttonsitepreview { span.websitebuttonsitepreview, a.websitebuttonsitepreview {
vertical-align: middle; vertical-align: middle;
} }
@ -7067,6 +7073,12 @@ div.clipboardCPValue.hidewithsize {
#divbodywebsite { #divbodywebsite {
word-break: break-all; word-break: break-all;
} }
.websiteselectionsection {
border-left: unset;
boerder-right: unset;
padding-left: 5px;
}
} }
@media only screen and (max-width: 320px) @media only screen and (max-width: 320px)

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

@ -6874,6 +6874,16 @@ div.clipboardCPValue.hidewithsize {
input#addedfile { input#addedfile {
width: 95%; width: 95%;
} }
#divbodywebsite {
word-break: break-all;
}
.websiteselectionsection {
border-left: unset;
boerder-right: unset;
padding-left: 5px;
}
} }

2
htdocs/ticket/card.php
View File

@ -1129,7 +1129,7 @@ if ($action == 'create' || $action == 'presend') {
print '<table class="noborder tableforfield centpercent margintable">'; print '<table class="noborder tableforfield centpercent margintable">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'; print '<td>';
print $langs->trans('Properties'); print $langs->trans('TicketProperties');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
if (GETPOST('set', 'alpha') == 'properties' && $user->rights->ticket->write) { if (GETPOST('set', 'alpha') == 'properties' && $user->rights->ticket->write) {

16
htdocs/website/index.php
View File

@ -2599,7 +2599,7 @@ if (!GETPOST('hide_websitemenu')) {
print '<!-- Bar for website -->'; print '<!-- Bar for website -->';
if ($action != 'file_manager') { if ($action != 'file_manager') {
print '<span class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">'; print '<span class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
print $langs->trans("Website").' : '; print $langs->trans("Website").': ';
print '</span>'; print '</span>';
$urltocreatenewwebsite = $_SERVER["PHP_SELF"].'?action=createsite'; $urltocreatenewwebsite = $_SERVER["PHP_SELF"].'?action=createsite';
@ -2668,7 +2668,7 @@ if (!GETPOST('hide_websitemenu')) {
print ' &nbsp; '; print ' &nbsp; ';
//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">'; //print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcss" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans("EditCss")).'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcss" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans($conf->dol_optimize_smallscreen ? "Properties" : "EditCss")).'</a>';
$importlabel = $langs->trans("ImportSite"); $importlabel = $langs->trans("ImportSite");
$exportlabel = $langs->trans("ExportSite"); $exportlabel = $langs->trans("ExportSite");
@ -2693,13 +2693,9 @@ if (!GETPOST('hide_websitemenu')) {
// Regenerate all pages // Regenerate all pages
print '<a href="'.$_SERVER["PHP_SELF"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="fa fa-cogs"><span></a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="fa fa-cogs"><span></a>';
print ' &nbsp; ';
// Generate site map // Generate site map
print '<a href="'.$_SERVER["PHP_SELF"].'?action=confirmgeneratesitemaps&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("GenerateSitemaps")).'"><span class="fa fa-sitemap"><span></a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=confirmgeneratesitemaps&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("GenerateSitemaps")).'"><span class="fa fa-sitemap"><span></a>';
print ' &nbsp; ';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
} }
@ -2722,7 +2718,7 @@ if (!GETPOST('hide_websitemenu')) {
} }
print '<span class="websitetools websiteselection">'; print '<span class="websitetools">';
if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite') { if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite') {
$urlext = $virtualurl; $urlext = $virtualurl;
@ -2968,10 +2964,10 @@ if (!GETPOST('hide_websitemenu')) {
print ' &nbsp; '; print ' &nbsp; ';
//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">'; //print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editmeta" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans("EditPageMeta")).'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editmeta" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans($conf->dol_optimize_smallscreen ? "Properties" : "EditPageMeta")).'</a>';
//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditHTMLSource")).'" name="editsource">'; //print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditHTMLSource")).'" name="editsource">';
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editsource" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans("EditHTMLSource")).'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editsource" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans($conf->dol_optimize_smallscreen ? "HTML" : "EditHTMLSource")).'</a>';
print '<!-- button EditInLine and ShowSubcontainers -->'."\n"; print '<!-- button EditInLine and ShowSubcontainers -->'."\n";
print '<div class="websiteselectionsection inline-block">'; print '<div class="websiteselectionsection inline-block">';
@ -4360,7 +4356,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
} }
print '<a class="editfielda marginleftonly marginrightonly '.$disabled.'" href="'.$urltoedithtmlsource.'" title="'.$langs->trans("EditHTMLSource").'">'.img_picto($langs->trans("EditHTMLSource"), 'edit').'</a>'; print '<a class="editfielda marginleftonly marginrightonly '.$disabled.'" href="'.$urltoedithtmlsource.'" title="'.$langs->trans("EditHTMLSource").'">'.img_picto($langs->trans("EditHTMLSource"), 'edit').'</a>';
print '<span class="marginleftonly marginrightonly"></span>'.ajax_object_onoff($answerrecord, 'status', 'status', 'Enabled', 'Disabled'); print '<span class="marginleftonly marginrightonly"></span>'.ajax_object_onoff($answerrecord, 'status', 'status', 'Enabled', 'Disabled', array(), 'valignmiddle');
print '</td>'; print '</td>';