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

Better responsive for website toolbar

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-02 16:18:33 +02:00
parent 320e9bbeec
commit 34c4de3287
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3842,6 +3842,7 @@ tr.visible {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
background: #e6e6e6; background: #e6e6e6;
display: inline-block; display: inline-block;
padding: 4px 0 4px 0;
} }
.websitebar .buttonDelete, .websitebar .button { .websitebar .buttonDelete, .websitebar .button {
text-shadow: none; text-shadow: none;
@ -3853,10 +3854,10 @@ tr.visible {
line-height: normal; line-height: normal;
} }
.websiteselection { .websiteselection {
display: inline-block; /* display: inline-block; */
padding-left: 10px; padding-left: 10px;
vertical-align: middle; vertical-align: middle;
line-height: 28px; /* line-height: 28px; */
} }
.websitetools { .websitetools {
float: right; float: right;

44
htdocs/website/index.php
View File

@ -1953,18 +1953,18 @@ if (! GETPOST('hide_websitemenu'))
// ***** Part for web sites // ***** Part for web sites
print '<!-- Bar for website -->'; print '<!-- Bar for website -->';
print '<div class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">'; print '<span class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
print $langs->trans("Website").' : '; print $langs->trans("Website").' : ';
print '</div>'; print '</span>';
print '<div class="websiteselection hideonsmartphoneimp">'; print '<span class="websiteselection hideonsmartphoneimp">';
print ' <input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'" name="createsite">'; print ' <input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'" name="createsite">';
print '</div>'; print '</span>';
// List of website // List of website
print '<div class="websiteselection">'; print '<span class="websiteselection">';
$out=''; $out='';
$out.='<select name="website" class="minwidth100" id="website">'; $out.='<select name="website" class="minwidth100 maxwidth300" id="website">';
if (empty($object->records)) $out.='<option value="-1">&nbsp;</option>'; if (empty($object->records)) $out.='<option value="-1">&nbsp;</option>';
// Loop on each sites // Loop on each sites
$i=0; $i=0;
@ -2050,19 +2050,19 @@ if (! GETPOST('hide_websitemenu'))
print '<a href="'.$_SERVER["PHP_SEFL"].'?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_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
} }
print '</div>'; print '</span>';
// Toolbar for websites // Toolbar for websites
print '<div class="websitetools websiteselection">'; print '<span class="websitetools websiteselection">';
if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite') if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
{ {
$urlext=$virtualurl; $urlext=$virtualurl;
$urlint=$urlwithroot.'/public/website/index.php?website='.$websitekey; $urlint=$urlwithroot.'/public/website/index.php?website='.$websitekey;
print '<div class="websiteinputurl valignmiddle" id="websiteinputurl">'; print '<span class="websiteinputurl valignmiddle" id="websiteinputurl">';
$linktotestonwebserver = '<a href="'.($virtualurl?$virtualurl:'#').'" class="valignmiddle">'; $linktotestonwebserver = '<a href="'.($virtualurl?$virtualurl:'#').'" class="valignmiddle">';
$linktotestonwebserver.= $langs->trans("TestDeployOnWeb", $virtualurl).' '.img_picto('', 'object_globe'); $linktotestonwebserver.= $langs->trans("TestDeployOnWeb", $virtualurl).' '.img_picto('', 'object_globe');
$linktotestonwebserver.= '</a>'; $linktotestonwebserver.= '</a>';
@ -2096,8 +2096,8 @@ if (! GETPOST('hide_websitemenu'))
$htmltext.='<br>'; $htmltext.='<br>';
$htmltext.=$langs->trans("YouCanAlsoDeployToAnotherWHP"); $htmltext.=$langs->trans("YouCanAlsoDeployToAnotherWHP");
} }
print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 2, 'helpvirtualhost'); print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 3, 'helpvirtualhost');
print '</div>'; print '</span>';
} }
if (in_array($action, array('editcss','editmenu','file_manager','replacesite','replacesiteconfirm'))) if (in_array($action, array('editcss','editmenu','file_manager','replacesite','replacesiteconfirm')))
@ -2107,7 +2107,7 @@ if (! GETPOST('hide_websitemenu'))
if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">'; if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
} }
print '</div>'; print '</span>';
// Toolbar for pages // Toolbar for pages
@ -2119,15 +2119,15 @@ if (! GETPOST('hide_websitemenu'))
print '<!-- Bar for websitepage -->'; print '<!-- Bar for websitepage -->';
print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">'; print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">';
print '<div class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">'; print '<span class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
print $langs->trans("PageContainer").': '; print $langs->trans("PageContainer").': ';
print '</div>'; print '</span>';
print '<div class="websiteselection hideonsmartphoneimp">'; print '<span class="websiteselection hideonsmartphoneimp">';
print '<input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'" name="createcontainer">'; print '<input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'" name="createcontainer">';
print '</div>'; print '</span>';
print '<div class="websiteselection">'; print '<span class="websiteselection">';
if ($action != 'addcontainer') if ($action != 'addcontainer')
{ {
@ -2395,9 +2395,9 @@ if (! GETPOST('hide_websitemenu'))
} }
} }
print '</div>'; // end website selection print '</span>'; // end website selection
print '<div class="websitetools">'; print '<span class="websitetools">';
if (($pageid > 0 && $atleastonepage) && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')) if (($pageid > 0 && $atleastonepage) && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
{ {
@ -2437,9 +2437,9 @@ if (! GETPOST('hide_websitemenu'))
if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">'; if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
} }
print '</div>'; // end websitetools print '</span>'; // end websitetools
print '<div class="websitehelp">'; print '<span class="websitehelp">';
if (GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha')) if (GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha'))
{ {
$htmltext=$langs->transnoentitiesnoconv("YouCanEditHtmlSource").'<br>'; $htmltext=$langs->transnoentitiesnoconv("YouCanEditHtmlSource").'<br>';
@ -2453,7 +2453,7 @@ if (! GETPOST('hide_websitemenu'))
print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution'); print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
} }
} }
print '</div>'; // end websitehelp print '</span>'; // end websitehelp