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

Several css enhancements

Browse Source
This commit is contained in:
Laurent Destailleur 2016-04-22 11:11:08 +02:00
parent d735f5dc70
commit 78d18185e4
8 changed files with 61 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/adherents/type.php
View File

@ -153,6 +153,7 @@ if ($action == 'delete' && $user->rights->adherent->configurer)
exit; exit;
} }
/* /*
* View * View
*/ */
@ -236,7 +237,7 @@ if ($action == 'create')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tbody>'; print '<tbody>';
print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40"></td></tr>'; print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40"></td></tr>';
print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>'; print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
print $form->selectyesno("cotisation",1,1); print $form->selectyesno("cotisation",1,1);
@ -247,7 +248,7 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>'; print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
print '<textarea name="comment" wrap="soft" cols="60" rows="3"></textarea></td></tr>'; print '<textarea name="comment" wrap="soft" class="centpercent" rows="3"></textarea></td></tr>';
print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>'; print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@ -645,7 +646,7 @@ if ($rowid > 0)
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>'; print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
print '<textarea name="comment" wrap="soft" cols="90" rows="3">'.$object->note.'</textarea></td></tr>'; print '<textarea name="comment" wrap="soft" class="centpercent" rows="3">'.$object->note.'</textarea></td></tr>';
print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>'; print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

2
htdocs/categories/index.php
View File

@ -79,7 +79,7 @@ print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("Search").'</td>'; print '<td colspan="3">'.$langs->trans("Search").'</td>';
print '</tr>'; print '</tr>';
print '<tr '.$bc[0].'><td>'; print '<tr '.$bc[0].'><td>';
print $langs->trans("Name").':</td><td><input class="flat" type="text" size="20" name="catname" value="' . $catname . '"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>'; print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="' . $catname . '"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
/* /*
// faire une rech dans une sous categorie uniquement // faire une rech dans une sous categorie uniquement
print '<tr '.$bc[0].'><td>'; print '<tr '.$bc[0].'><td>';

2
htdocs/comm/action/peruser.php
View File

@ -564,7 +564,7 @@ echo '</form>';
//print "begin_d=".$begin_d." end_d=".$end_d; //print "begin_d=".$begin_d." end_d=".$end_d;
echo '<table width="100%" class="nocellnopadd cal_month">'; echo '<table width="100%" class="noborder nocellnopadd cal_month">';
echo '<tr class="liste_titre">'; echo '<tr class="liste_titre">';
echo '<td></td>'; echo '<td></td>';

8
htdocs/core/modules/mailings/contacts3.modules.php
View File

@ -225,6 +225,8 @@ class mailing_contacts3 extends MailingTargets
if ($resql) if ($resql)
{ {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
if ($num)
{
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
@ -233,6 +235,12 @@ class mailing_contacts3 extends MailingTargets
$i++; $i++;
} }
} }
else
{
$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
}
}
else dol_print_error($this->db);
$s.='</select>'; $s.='</select>';
return $s; return $s;

9
htdocs/core/modules/mailings/contacts4.modules.php
View File

@ -222,9 +222,10 @@ class mailing_contacts4 extends MailingTargets
$s=''; $s='';
$s.='<select name="filter" class="flat">'; $s.='<select name="filter" class="flat">';
$s.='<option value="all"></option>'; $s.='<option value="all"></option>';
if ($resql)
{
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
if ($num)
{
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
@ -233,6 +234,10 @@ class mailing_contacts4 extends MailingTargets
$i++; $i++;
} }
} }
else
{
$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
}
$s.='</select>'; $s.='</select>';
return $s; return $s;
} }

1
htdocs/langs/en_US/website.lang
View File

@ -11,3 +11,4 @@ EditPageContent=Edit Content
Website=Web site Website=Web site
AddPage=Add page AddPage=Add page
Page=Page Page=Page
PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.

43
htdocs/theme/eldy/style.css.php
View File

@ -81,7 +81,8 @@ $dol_use_jmobile=$conf->dol_use_jmobile;
// Colors // Colors
$colorbackhmenu1='120,130,170'; // topmenu $colorbackhmenu1='120,130,170'; // topmenu
$colorbackvmenu1='255,255,255'; // vmenu $colorbackvmenu1='255,255,255'; // vmenu
$colorbacktitle1='230,230,230'; // title of array $colortopbordertitle1='40,40,40'; // top border of title
$colorbacktitle1='230,230,230'; // title of tables,list
$colorbacktabcard1='255,255,255'; // card $colorbacktabcard1='255,255,255'; // card
$colorbacktabactive='234,234,234'; $colorbacktabactive='234,234,234';
$colorbacklineimpair1='255,255,255'; // line impair $colorbacklineimpair1='255,255,255'; // line impair
@ -345,7 +346,7 @@ input:-moz-placeholder { color:#ccc; }
<?php if (! empty($dol_use_jmobile)) { ?> <?php if (! empty($dol_use_jmobile)) { ?>
legend { margin-bottom: 8px; } legend { margin-bottom: 8px; }
<?php } ?> <?php } ?>
fieldset { border: 1px solid #AAAAAA !important; box-shadow: 2px 2px 3px #DDD; } fieldset { border: 1px solid #AAAAAA !important; }
.button, input[name="sbmtConnexion"] { .button, input[name="sbmtConnexion"] {
@ -1720,11 +1721,11 @@ div.tabBar {
background: rgb(<?php echo $colorbacktabcard1; ?>); background: rgb(<?php echo $colorbacktabcard1; ?>);
<?php if (empty($dol_optimize_smallscreen)) { ?> /*<?php if (empty($dol_optimize_smallscreen)) { ?>
-moz-box-shadow: 3px 3px 4px #DDD; -moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD;
<?php } ?> <?php } ?>*/
} }
div.popuptabset { div.popuptabset {
padding: 6px; padding: 6px;
@ -2177,17 +2178,17 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-spacing: 0px; border-spacing: 0px;
border-top-width: 1px; border-top-width: 1px;
border-top-color: #BBB; border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid; border-top-style: solid;
border-right-width: 1px; /* border-right-width: 1px;
border-right-color: #BBB; border-right-color: #BBB;
border-right-style: solid; border-right-style: solid;
border-left-width: 1px; border-left-width: 1px;
border-left-color: #BBB; border-left-color: #BBB;
border-left-style: solid; border-left-style: solid;
*/
border-bottom-width: 1px; border-bottom-width: 1px;
border-bottom-color: #BBB; border-bottom-color: #BBB;
border-bottom-style: solid; border-bottom-style: solid;
@ -2538,6 +2539,10 @@ div.liste_titre {
border-top-style: solid; border-top-style: solid;
} }
div.liste_titre_bydiv { div.liste_titre_bydiv {
border-top-width: 1px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
border-collapse: collapse; border-collapse: collapse;
display: table; display: table;
padding: 2px 0px 2px 0; padding: 2px 0px 2px 0;
@ -2555,13 +2560,13 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list
color: #000 !important;*/ color: #000 !important;*/
/* TO MATCH ELDY */ /* TO MATCH ELDY */
background: rgb(<?php echo $colorbacktitle1; ?>); /*background: rgb(<?php echo $colorbacktitle1; ?>);*/
<?php if ($usegradient) { ?> <?php if ($usegradient) { ?>
background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.3) 100%);
background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.3) 100%);
background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.3) 100%);
background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.3) 100%);
background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.3) 100%);
<?php } ?> <?php } ?>
font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>; font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
@ -2707,13 +2712,13 @@ tr.box_titre {
color: #000 !important;*/ color: #000 !important;*/
/* TO MATCH ELDY */ /* TO MATCH ELDY */
background: rgb(<?php echo $colorbacktitle1; ?>); /* background: rgb(<?php echo $colorbacktitle1; ?>); */
<?php if ($usegradient) { ?> <?php if ($usegradient) { ?>
background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.3) 100%);
background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.3) 100%);
background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.3) 100%);
background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.3) 100%);
background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.3) 100%);
<?php } ?> <?php } ?>
color: rgb(<?php echo $colortexttitle; ?>); color: rgb(<?php echo $colortexttitle; ?>);

3
htdocs/websites/index.php
View File

@ -334,7 +334,8 @@ print '</form>';
if ($action == 'preview') if ($action == 'preview')
{ {
print '<div class="center">Preview TO DO</center>'; print '<br><br><div class="center">'.$langs->trans("PreviewOfSiteNotYetAvailable", $website).'</center><br><br><br>';
print '<div class="center"><div class="logo_setup"></div></div>';
} }