Look: Uniformize css

This commit is contained in:
Laurent Destailleur 2011-11-14 18:37:04 +01:00
parent 5dc660af46
commit 0308ed1088
5 changed files with 27 additions and 20 deletions

View File

@ -2913,7 +2913,8 @@ else
$delallowed=$user->rights->facture->supprimer; $delallowed=$user->rights->facture->supprimer;
print '<br>'; print '<br>';
$somethingshown=$formfile->show_documents('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang,$hookmanager); print $formfile->showdocuments('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang,$hookmanager);
$somethingshown=$formfile->numoffiles;
/* /*
* Linked object block * Linked object block

View File

@ -134,7 +134,7 @@ class FormActions
$total = 0; $var=true; $total = 0; $var=true;
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr '.$bc[$var].'><td>'.$langs->trans('Ref').'</td><td>'.$langs->trans('Date').'</td><td>'.$langs->trans('Action').'</td><td>'.$langs->trans('By').'</td></tr>'; print '<tr class="liste_titre"><th class="liste_titre">'.$langs->trans('Ref').'</th><th class="liste_titre">'.$langs->trans('Date').'</th><th class="liste_titre">'.$langs->trans('Action').'</th><th class="liste_titre">'.$langs->trans('By').'</th></tr>';
print "\n"; print "\n";
foreach($actioncomm->actions as $action) foreach($actioncomm->actions as $action)

View File

@ -369,12 +369,12 @@ class FormFile
$out.= '<div class="titre">'.$titletoshow.'</div>'; $out.= '<div class="titre">'.$titletoshow.'</div>';
$out.= '<table class="border formdoc" summary="listofdocumentstable" width="100%">'; $out.= '<table class="border formdoc" summary="listofdocumentstable" width="100%">';
$out.= '<tr '.$bc[$var].'>'; $out.= '<tr class="liste_titre">';
// Model // Model
if (! empty($modellist)) if (! empty($modellist))
{ {
$out.= '<td align="center" class="formdoc">'; $out.= '<th align="center" class="formdoc liste_titre">';
$out.= $langs->trans('Model').' '; $out.= $langs->trans('Model').' ';
if (is_array($modellist) && count($modellist) == 1) // If there is only one element if (is_array($modellist) && count($modellist) == 1) // If there is only one element
{ {
@ -382,17 +382,17 @@ class FormFile
$modelselected=$arraykeys[0]; $modelselected=$arraykeys[0];
} }
$out.= $form->selectarray('model',$modellist,$modelselected,$showempty,0,0); $out.= $form->selectarray('model',$modellist,$modelselected,$showempty,0,0);
$out.= '</td>'; $out.= '</th>';
} }
else else
{ {
$out.= '<td align="left" class="formdoc">'; $out.= '<th align="left" class="formdoc liste_titre">';
$out.= $langs->trans("Files"); $out.= $langs->trans("Files");
$out.= '</td>'; $out.= '</th>';
} }
// Language code (if multilang) // Language code (if multilang)
$out.= '<td align="center" class="formdoc">'; $out.= '<th align="center" class="formdoc liste_titre">';
if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang) if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang)
{ {
include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php');
@ -404,10 +404,10 @@ class FormFile
{ {
$out.= '&nbsp;'; $out.= '&nbsp;';
} }
$out.= '</td>'; $out.= '</th>';
// Button // Button
$out.= '<td align="center" colspan="'.($delallowed?'2':'1').'" class="formdocbutton">'; $out.= '<th align="center" colspan="'.($delallowed?'2':'1').'" class="formdocbutton liste_titre">';
$out.= '<input class="button" id="'.$forname.'_generatebutton"'; $out.= '<input class="button" id="'.$forname.'_generatebutton"';
$out.= ' type="submit" value="'.$buttonlabel.'"'; $out.= ' type="submit" value="'.$buttonlabel.'"';
if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $out.= ' disabled="disabled"'; if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $out.= ' disabled="disabled"';
@ -417,7 +417,7 @@ class FormFile
$langs->load("errors"); $langs->load("errors");
$out.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated")); $out.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
} }
$out.= '</td>'; $out.= '</th>';
$out.= '</tr>'; $out.= '</tr>';

View File

@ -91,7 +91,6 @@ a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; fo
input:focus, textarea:focus, button:focus, select:focus { input:focus, textarea:focus, button:focus, select:focus {
box-shadow: 0 0 4px #8091BF; box-shadow: 0 0 4px #8091BF;
} }
input, input.flat, textarea, textarea.flat, form.flat select, select.flat { input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
@ -133,6 +132,9 @@ textarea:disabled {
.button:hover { .button:hover {
background: #dee7ec; background: #dee7ec;
} }
.button:disabled {
background: #ddd;
}
.buttonajax { .buttonajax {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
border: 0px; border: 0px;
@ -155,6 +157,14 @@ div.float
{ {
float:<?php print $left; ?>; float:<?php print $left; ?>;
} }
th .button {
-moz-box-shadow: none !important;
-webkit-box-shadow: none !important;
box-shadow: none !important;
-moz-border-radius:0px !important;
-webkit-border-radius:0px !important;
border-radius:0px !important;
}
/* ============================================================================== */ /* ============================================================================== */
/* Styles to hide objects */ /* Styles to hide objects */
@ -954,10 +964,6 @@ a.tabTitle {
margin: 0px 6px; margin: 0px 6px;
text-decoration: none; text-decoration: none;
white-space: nowrap; white-space: nowrap;
border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8;
border-top: 1px solid #D8D8D8;
} }
a.tab:link { a.tab:link {

View File

@ -1318,8 +1318,8 @@ else
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
print '<input type="hidden" name="action" value="addgroup" />'; print '<input type="hidden" name="action" value="addgroup" />';
print '<table class="noborder" width="100%">'."\n"; print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre"><td class="liste_titre" width="25%">'.$langs->trans("GroupsToAdd").'</td>'."\n"; print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("GroupsToAdd").'</th>'."\n";
print '<td>'; print '<th>';
print $form->select_dolgroups('','group',1,$exclude,0,'','',$fuser->entity); print $form->select_dolgroups('','group',1,$exclude,0,'','',$fuser->entity);
print ' &nbsp; '; print ' &nbsp; ';
// Multicompany // Multicompany
@ -1341,7 +1341,7 @@ else
print '<input type="hidden" name="entity" value="'.$conf->entity.'" />'; print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
} }
print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />'; print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
print '</td></tr>'."\n"; print '</th></tr>'."\n";
print '</table></form>'."\n"; print '</table></form>'."\n";
print '<br>'; print '<br>';
@ -1516,7 +1516,7 @@ else
print "</td></tr>\n"; print "</td></tr>\n";
// Administrator // Administrator
print "<tr>".'<td valign="top">'.$langs->trans("Administrator").'</td>'; print '<tr><td valign="top">'.$langs->trans("Administrator").'</td>';
if ($fuser->societe_id > 0) if ($fuser->societe_id > 0)
{ {
print '<td>'; print '<td>';