diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php index 818a38c28df..cf5a52cf9c6 100644 --- a/htdocs/bookmarks/card.php +++ b/htdocs/bookmarks/card.php @@ -159,7 +159,7 @@ if ($action == 'create') print ''.$langs->trans("BookmarkTitle").''.$langs->trans("SetHereATitleForLink").''; - print ''.$langs->trans("UrlOrLink").''.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").''; + print ''.$langs->trans("UrlOrLink").''.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").''; print ''.$langs->trans("BehaviourOnClick").''; $liste=array(0=>$langs->trans("ReplaceWindow"),1=>$langs->trans("OpenANewWindow")); @@ -219,9 +219,11 @@ if ($id > 0 && ! preg_match('/^add/i',$action)) $linkback = ''.$langs->trans("BackToList").''; - dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', '', 0); + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', '', 0); - print '
'; + print '
'; + + print '
'; print ''; print '
'; @@ -297,6 +299,8 @@ if ($id > 0 && ! preg_match('/^add/i',$action)) print '
'; + print '
'; + dol_fiche_end(); if ($action == 'edit') diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index b1a37c67b31..99e4a6c0871 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2414,7 +2414,6 @@ if ($action == 'create') print ''; } - print "
\n"; //Select mail models is same action as presend if (GETPOST('modelselected')) $action = 'presend'; diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index c97124ed35b..212fa465266 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -164,7 +164,7 @@ if ($id > 0 || ! empty($ref)) print ''; - print '
'; + //print '
'; include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0c19d216164..62b2fb274c8 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -780,7 +780,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename=' * @param array $links Array of tabs. Currently initialized by calling a function xxx_admin_prepare_head * @param string $active Active tab name (document', 'info', 'ldap', ....) * @param string $title Title - * @param int $notab 0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required. + * @param int $notab -1 or 0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required. * @param string $picto Add a picto on tab title * @param int $pictoisfullpath If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto. * @return void @@ -796,7 +796,7 @@ function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto * @param array $links Array of tabs * @param string $active Active tab name * @param string $title Title - * @param int $notab 0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required. + * @param int $notab -1 or 0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required. * @param string $picto Add a picto on tab title * @param int $pictoisfullpath If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto. * @return string @@ -926,7 +926,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi $out.="\n"; - if (! $notab) $out.="\n".'
'."\n"; + if (! $notab || $notab == -1) $out.="\n".'
'."\n"; $parameters=array('tabname' => $active, 'out' => $out); $reshook=$hookmanager->executeHooks('printTabsHead',$parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead" @@ -941,7 +941,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi /** * Show tab footer of a card * - * @param int $notab 0=Add tab footer, 1=no tab footer + * @param int $notab -1 or 0=Add tab footer, 1=no tab footer * @return void */ function dol_fiche_end($notab=0) @@ -952,12 +952,12 @@ function dol_fiche_end($notab=0) /** * Return tab footer of a card * - * @param int $notab 0=Add tab footer, 1=no tab footer + * @param int $notab -1 or 0=Add tab footer, 1=no tab footer * @return string */ function dol_get_fiche_end($notab=0) { - if (! $notab) return "\n
\n"; + if (! $notab || $notab == -1) return "\n
\n"; else return ''; } diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 474a037d23f..74c02440a9f 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1506,7 +1506,7 @@ else if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print ''; - dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company'); + dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company'); print ''; @@ -1921,7 +1921,7 @@ else $head = societe_prepare_head($object); - dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company'); + dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company'); // Confirm delete third party if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))) diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index e02a512f327..8ec24860e14 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1773,7 +1773,6 @@ if ($action == 'create') print ''; } - print "
\n"; if ($action != 'presend') { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 17e77025da8..a665002e30a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1878,20 +1878,21 @@ div.tabBar { color: #; padding-top: 16px; padding-left: 0px; padding-right: 0px; - padding-bottom: 14px; - margin: 0px 0px 14px 0px; + padding-bottom: 2px; + margin: 0px 0px 16px 0px; border-top: 1px solid #BBB; - border-bottom: 1px solid #AAA; + /* border-bottom: 1px solid #AAA; */ width: auto; - background: rgb(); - - /* - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; - */ } +div.tabBarWithBottom { + padding-bottom: 18px; + border-bottom: 1px solid #aaa; +} +div.tabBar table.tableforservicepart2:last-child { + border-bottom: 1px solid #aaa; +} + div.popuptabset { padding: 6px; background: #fff; @@ -1904,7 +1905,7 @@ div.popuptab { padding-right: 5px; } div.tabsAction { - margin: 20px 0em 10px 0em; + margin: 20px 0em 25px 0em; padding: 0em 0em; text-align: right; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 4470cbed751..913a269b0f2 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1883,30 +1883,28 @@ div.tabBar { padding-top: px; padding-left: px; padding-right: px; - padding-bottom: px; - margin: 0px 0px 14px 0px; + padding-bottom: px; + margin: 0px 0px 16px 0px; -moz-border-radius:3px; -webkit-border-radius: 3px; border-radius: 3px; border-right: 1px solid #BBB; - border-bottom: 1px solid #BBB; + /* border-bottom: 1px solid #BBB; */ border-left: 1px solid #BBB; border-top: 1px solid #CCC; width: auto; - background: rgb(); - - /* - - -moz-box-shadow: 3px 3px 4px #f4f4f4; - -webkit-box-shadow: 3px 3px 4px #f4f4f4; - box-shadow: 3px 3px 4px #f4f4f4; - - */ +} +div.tabBarWithBottom { + padding-bottom: 18px; + border-bottom: 1px solid #aaa; +} +div.tabBar table.tableforservicepart2:last-child { + border-bottom: 1px solid #aaa; } div.tabsAction { - margin: 20px 0em 10px 0em; + margin: 20px 0em 25px 0em; padding: 0em 0em; text-align: right; }