diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 33b98d56f48..c2c2ef9a452 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * + * * This template needs: * $object */ @@ -47,77 +47,77 @@ $userstatic=new User($db);
-
-
trans("Source"); ?>
-
trans("Company"); ?>
-
trans("Contacts"); ?>
-
trans("ContactType"); ?>
-
 
-
 
+ +
trans("Source"); ?>
+
trans("Company"); ?>
+
trans("Contacts"); ?>
+
trans("ContactType"); ?>
+
 
+
 
-
action="id; ?>" method="POST"> + " /> -
trans("Users"); ?>
-
global->MAIN_INFO_SOCIETE_NOM; ?>
-
select_dolusers($user->id, 'userid', 0, (! empty($userAlreadySelected)?$userAlreadySelected:null), 0, null, null, 0, 56); ?>
-
selectTypeContact($object, '', 'type','internal'); ?>
-
 
-
">
+
trans("Users"); ?>
+
global->MAIN_INFO_SOCIETE_NOM; ?>
+
select_dolusers($user->id, 'userid', 0, (! empty($userAlreadySelected)?$userAlreadySelected:null), 0, null, null, 0, 56); ?>
+
selectTypeContact($object, '', 'type','internal'); ?>
+
 
+
">
-
action="id; ?>" method="POST"> + " /> -
trans("ThirdPartyContacts"); ?>
+
trans("ThirdPartyContacts"); ?>
use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) { ?> -
+
'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); print $form->select_company($object->socid,'socid','',1,0,0,$events); ?>
-
+
select_contacts($object->socid, '', 'contactid'); ?>
-
+
socid; ?> selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany'); ?>
-
+
select_contacts($selectedCompany, '', 'contactid'); ?>
-
+
selectTypeContact($object, '', 'type','external'); ?>
-
 
-
+
 
+
">
-
-
trans("Source"); ?>
-
trans("Company"); ?>
-
trans("Contacts"); ?>
-
trans("ContactType"); ?>
-
trans("Status"); ?>
-
 
+ +
trans("Source"); ?>
+
trans("Company"); ?>
+
trans("Contacts"); ?>
+
trans("ContactType"); ?>
+
trans("Status"); ?>
+
 
@@ -132,12 +132,12 @@ $userstatic=new User($db); $var = !$var; ?> -
> -
+ "> +
trans("User"); ?> trans("ThirdPartyContact"); ?>
-
+
0) { @@ -154,7 +154,7 @@ $userstatic=new User($db); } ?>
-
+
-
-
+
+ -
+
 "> diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index 7229c0cda9d..fb8274e5524 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -44,48 +44,68 @@ This page is a sample of page using tables. To make test with

-Example 0 : Table with div and table with table containg a select that should be overflowed and truncated
-
- -
-
- - + +
+ +
+ + +Example 0b: Table with div+form+div containg a select that should be overflowed and truncated
+
+ +
+ +
+
+ +
+ +
+Example 0c: Table with table+tr+td containg a select that should be overflowed and truncated
+
+Example 0a : Table with div+div+div containg a select that should be overflowed and truncated
+
+
+
-
+ + + +
+ + + +

-Example 1 : Table using tags: div.tagtable+form+div or div.tagtable+div.tagtr+div.tagtd
+Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd
use_javascript_ajax) && $object->statut == 0) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; ?> - - -
-
-
line3
-
dfsdf
-
ffdsfsd
-
aaaa
+
+
line3
+
dfsdf
+
ffdsfsd
+
aaaa
-
line4
-
dfsdf
-
-
bbbb
+
line4
+
dfsdf
+
+
bbbb
-
line5
-
dfsdf
-
-
bbbb
+
line5
+
dfsdf
+
+
bbbb