mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Fix responsive
This commit is contained in:
parent
26e8496c46
commit
6cb0374784
|
|
@ -330,7 +330,8 @@ if ($mode == 'desc') {
|
|||
|
||||
$textexternal = '';
|
||||
if ($objMod->isCoreOrExternalModule() == 'external') {
|
||||
$textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $dirofmodule);
|
||||
$tmpdirofmoduletoshow = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $dirofmodule);
|
||||
$textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $tmpdirofmoduletoshow);
|
||||
|
||||
global $dolibarr_allow_download_external_modules;
|
||||
if (!empty($dolibarr_allow_download_external_modules) && preg_match('/\/custom\//', $dirofmodule)) {
|
||||
|
|
|
|||
|
|
@ -540,7 +540,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
|
|||
$moreforfilter .= img_picto($langs->trans("Filter"), 'filter', 'class="paddingright opacityhigh hideonsmartphone"').'<input type="text" id="search_keyword" name="search_keyword" class="maxwidth125" value="'.dol_escape_htmltag($search_keyword).'" placeholder="'.dol_escape_htmltag($langs->trans('Keyword')).'">';
|
||||
$moreforfilter .= '</div>';
|
||||
$moreforfilter .= '<div class="divsearchfield paddingtop">';
|
||||
$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1);
|
||||
$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1);
|
||||
$moreforfilter .= '</div>';
|
||||
if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
|
||||
$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
|
||||
|
|
@ -563,7 +563,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
|
|||
$moreforfilter .= ' ';
|
||||
$moreforfilter .= '<div class="divsearchfield">';
|
||||
$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
|
||||
if ($search_keyword || $search_status || $search_nature || $search_version) {
|
||||
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" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1612,7 +1612,7 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0
|
|||
/**
|
||||
* Show tabs of a record
|
||||
*
|
||||
* @param array $links Array of tabs
|
||||
* @param array $links Array of tabs. Note that label into $links[$i][1] must be already HTML escaped.
|
||||
* @param string $active Active tab name
|
||||
* @param string $title Title
|
||||
* @param int $notab -1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
|
||||
|
|
@ -1697,8 +1697,8 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
|
|||
}
|
||||
|
||||
if ($i < $limittoshow || $isactive) {
|
||||
// Add a new entry
|
||||
$out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';
|
||||
// Output entry with a visible tab
|
||||
$out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : dol_escape_htmltag($links[$i][2])).' -->';
|
||||
|
||||
if (isset($links[$i][2]) && $links[$i][2] == 'image') {
|
||||
if (!empty($links[$i][0])) {
|
||||
|
|
@ -1710,7 +1710,8 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
|
|||
//print "x $i $active ".$links[$i][2]." z";
|
||||
$out .= '<div class="tab tab'.($isactive?'active':'unactive').'" style="margin: 0 !important">';
|
||||
if (!empty($links[$i][0])) {
|
||||
$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
|
||||
$titletoshow = preg_replace('/<.*$/', '', $links[$i][1]);
|
||||
$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'" title="'.dol_escape_htmltag($titletoshow).'">';
|
||||
}
|
||||
$out .= $links[$i][1];
|
||||
if (!empty($links[$i][0])) {
|
||||
|
|
@ -1722,7 +1723,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
|
|||
|
||||
$out .= '</div>';
|
||||
} else {
|
||||
// The popup with the other tabs
|
||||
// Add entry into the combo popup with the other tabs
|
||||
if (!$popuptab) {
|
||||
$popuptab = 1;
|
||||
$outmore .= '<div class="popuptabset wordwrap">'; // The css used to hide/show popup
|
||||
|
|
@ -1759,7 +1760,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
|
|||
$tabsname = str_replace("@", "", $picto);
|
||||
}
|
||||
$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
|
||||
$out .= '<a href="#" class="tab moretab inline-block tabunactive"><span class="hideonsmartphone">'.$langs->trans("More").'</span>... ('.$nbintab.')</a>'; // Do not use "reposition" class in the "More".
|
||||
$out .= '<div class="tab"><a href="#" class="tab moretab inline-block tabunactive"><span class="hideonsmartphone">'.$langs->trans("More").'</span>... ('.$nbintab.')</a></div>'; // Do not use "reposition" class in the "More".
|
||||
$out .= '<div id="moretabsList'.$tabsname.'" style="width: '.$widthofpopup.'px; position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
|
||||
$out .= $outmore;
|
||||
$out .= '</div>';
|
||||
|
|
|
|||
|
|
@ -1664,6 +1664,13 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
|
|||
height: 40px !important;
|
||||
}
|
||||
|
||||
div.tabs div.tab a.tab {
|
||||
max-width: 200px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.quatrevingtpercent, .inputsearch {
|
||||
width: 95%;
|
||||
}
|
||||
|
|
@ -3274,7 +3281,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
|
|||
}
|
||||
|
||||
.tabactive, a.tab#active {
|
||||
color: var(--colortextbacktab); !important;
|
||||
color: var(--colortextbacktab) !important;
|
||||
background: var(--colorbacktabcard1) !important;
|
||||
margin: 0 0.2em 0 0.2em !important;
|
||||
|
||||
|
|
@ -3286,7 +3293,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
|
|||
border-right: 1px solid transparent;
|
||||
border-left: 1px solid transparent;
|
||||
border-top: 1px solid transparent;
|
||||
border-bottom: 0px !important;*/
|
||||
border-bottom: 0px !important;
|
||||
}
|
||||
a.tab:hover
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1712,6 +1712,13 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
|
|||
width: 95%;
|
||||
}
|
||||
|
||||
div.tabs div.tab a.tab {
|
||||
max-width: 200px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
select {
|
||||
padding-top: 4px;
|
||||
padding-bottom: 5px;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user