Look: Increase tab size. Reduce size of css. Removed a non pretty line.

This commit is contained in:
Laurent Destailleur 2012-03-19 18:54:12 +01:00
parent 3383d314c9
commit b583e71552
2 changed files with 29 additions and 99 deletions

View File

@ -42,15 +42,15 @@ $userstatic=new User($db);
<td><?php echo $langs->trans("ContactType"); ?></td> <td><?php echo $langs->trans("ContactType"); ?></td>
<td colspan="3">&nbsp;</td> <td colspan="3">&nbsp;</td>
</tr> </tr>
<?php $var=false; ?> <?php $var=false; ?>
<form action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST"> <form action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
<input type="hidden" name="id" value="<?php echo $object->id; ?>" /> <input type="hidden" name="id" value="<?php echo $object->id; ?>" />
<input type="hidden" name="action" value="addcontact" /> <input type="hidden" name="action" value="addcontact" />
<input type="hidden" name="source" value="internal" /> <input type="hidden" name="source" value="internal" />
<tr <?php echo $bc[$var]; ?>> <tr <?php echo $bc[$var]; ?>>
<td nowrap="nowrap"><?php echo img_object('','user').' '.$langs->trans("Users"); ?></td> <td nowrap="nowrap"><?php echo img_object('','user').' '.$langs->trans("Users"); ?></td>
<td><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></td> <td><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></td>
@ -59,7 +59,7 @@ $userstatic=new User($db);
<td align="right" colspan="3" ><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></td> <td align="right" colspan="3" ><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></td>
</tr> </tr>
</form> </form>
<form action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST"> <form action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
<input type="hidden" name="id" value="<?php echo $object->id; ?>" /> <input type="hidden" name="id" value="<?php echo $object->id; ?>" />
@ -67,12 +67,12 @@ $userstatic=new User($db);
<input type="hidden" name="source" value="internal" /> <input type="hidden" name="source" value="internal" />
<?php $var=!$var; ?> <?php $var=!$var; ?>
<tr <?php echo $bc[$var]; ?>> <tr <?php echo $bc[$var]; ?>>
<td nowrap="nowrap"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></td> <td nowrap="nowrap"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></td>
<?php if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT) { ?> <?php if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT) { ?>
<td> <td>
<?php <?php
$events=array(); $events=array();
$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); $events[]=array('method' => '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); print $form->select_company($object->socid,'socid','',1,0,0,$events);
@ -98,10 +98,7 @@ $userstatic=new User($db);
</td> </td>
</tr> </tr>
</form> </form>
<tr>
<td colspan="7">&nbsp;</td>
</tr>
<?php } ?> <?php } ?>
<tr class="liste_titre"> <tr class="liste_titre">
@ -114,17 +111,17 @@ $userstatic=new User($db);
</tr> </tr>
<?php $var=true; ?> <?php $var=true; ?>
<?php <?php
foreach(array('internal','external') as $source) { foreach(array('internal','external') as $source) {
$tab = $object->liste_contact(-1,$source); $tab = $object->liste_contact(-1,$source);
$num=count($tab); $num=count($tab);
$i = 0; $i = 0;
while ($i < $num) { while ($i < $num) {
$var = !$var; $var = !$var;
?> ?>
<tr <?php echo $bc[$var]; ?> valign="top"> <tr <?php echo $bc[$var]; ?> valign="top">
<td align="left"> <td align="left">
<?php if ($tab[$i]['source']=='internal') echo $langs->trans("User"); ?> <?php if ($tab[$i]['source']=='internal') echo $langs->trans("User"); ?>
@ -148,7 +145,7 @@ $userstatic=new User($db);
?> ?>
</td> </td>
<td> <td>
<?php <?php
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
$userstatic->id=$tab[$i]['id']; $userstatic->id=$tab[$i]['id'];
@ -177,9 +174,9 @@ $userstatic=new User($db);
<?php } ?> <?php } ?>
</td> </td>
</tr> </tr>
<?php $i++; ?> <?php $i++; ?>
<?php } } ?> <?php } } ?>
</table> </table>
<!-- END PHP TEMPLATE CONTACTS --> <!-- END PHP TEMPLATE CONTACTS -->

View File

@ -1067,7 +1067,7 @@ background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 15
div.tabs { div.tabs {
top: 20px; top: 20px;
margin: 1px 0px 0px 0px; margin: 1px 0px 2px 0px;
padding: 0px 6px 0px 0px; padding: 0px 6px 0px 0px;
text-align: <?php print $left; ?>; text-align: <?php print $left; ?>;
} }
@ -1086,7 +1086,6 @@ div.tabBar {
border-bottom: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC;
border-left: 1px solid #D0D0D0; border-left: 1px solid #D0D0D0;
border-top: 1px solid #D8D8D8; border-top: 1px solid #D8D8D8;
/* background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/eldy/img/tab_background.png',1) ?>) repeat-x; */
/* DYN */ /* DYN */
background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%);
@ -1112,16 +1111,15 @@ a.tabTitle {
color: white; color: white;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
font-weight: normal; font-weight: normal;
padding: 0px 6px; padding: 0px 6px 2px 6px;
margin: 0px 6px; margin: 0px 6px;
text-decoration: none; text-decoration: none;
white-space: nowrap; white-space: nowrap;
} }
a.tab:link { a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
background: #dee7ec;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
padding: 0px 6px; padding: 2px 6px 2px 6px;
margin: 0em 0.2em; margin: 0em 0.2em;
text-decoration: none; text-decoration: none;
white-space: nowrap; white-space: nowrap;
@ -1133,85 +1131,20 @@ a.tab:link {
border-<?php print $left; ?>: 1px solid #D8D8D8; border-<?php print $left; ?>: 1px solid #D8D8D8;
border-top: 1px solid #D8D8D8; border-top: 1px solid #D8D8D8;
/* DYN */ /* DYN */
background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
} }
a.tab:visited {
background: #dee7ec;
font-family: <?php print $fontlist ?>;
padding: 0px 6px;
margin: 0em 0.2em;
text-decoration: none;
white-space: nowrap;
-moz-border-radius:6px 6px 0px 0px;
-webkit-border-radius:6px 6px 0px 0px;
border-radius:6px 6px 0px 0px;
border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8;
border-top: 1px solid #D8D8D8;
/* DYN */
background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
}
a.tab#active { a.tab#active {
background: white; border-bottom: 1px solid rgb(<?php echo $colorbacktabactive; ?>) !important;
font-family: <?php print $fontlist ?>; background-color: rgb(<?php echo $colorbacktabactive; ?>) !important;
padding: 0px 6px; background-image: none !important;
margin: 0em 0.2em;
text-decoration: none;
-moz-border-radius:6px 6px 0px 0px;
-webkit-border-radius:6px 6px 0px 0px;
border-radius:6px 6px 0px 0px;
border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8;
border-top: 1px solid #D8D8D8;
/* border-bottom: 1px solid white; */
/* DYN */
/*background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
*/
border-bottom: 1px solid rgb(<?php echo $colorbacktabactive; ?>);
background-color: rgb(<?php echo $colorbacktabactive; ?>);
} }
a.tab:hover { a.tab:link, a.tab:visited, a.tab:hover, a.tab#active
background: white;
font-family: <?php print $fontlist ?>;
padding: 0px 6px;
margin: 0em 0.2em;
text-decoration: none;
-moz-border-radius:6px 6px 0px 0px;
-webkit-border-radius:6px 6px 0px 0px;
border-radius:6px 6px 0px 0px;
border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8;
border-top: 1px solid #D8D8D8;
/* DYN */
background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
}
a.tab:link, a.tab:visited, a.tab#active, a.tab:hover
{ {
color: #<?php echo $colortextmain; ?>; color: #<?php echo $colortextmain; ?>;
} }
@ -1311,9 +1244,9 @@ span.butAction, span.butActionDelete {
} }
#undertopmenu { #undertopmenu {
/* background-image: url("<?php echo dol_buildpath($path.'/theme/eldy/img/gradient.gif',1) ?>"); */ /* background-image: url("<?php echo dol_buildpath($path.'/theme/eldy/img/gradient.gif',1) ?>"); */
background-repeat: repeat-x; background-repeat: repeat-x;
margin-top: 8px; margin-top: 12px;
} }