Skip to content

Commit

Permalink
Merge pull request #936 from marcosgdf/style
Browse files Browse the repository at this point in the history 
Style improvements in model document selector
  • Loading branch information
@eldy
eldy committed May 8, 2013
2 parents 88b5723 + 3d5cb4e commit 6660618
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 9 deletions.
3 changes: 2 additions & 1 deletion htdocs/admin/commande.php
View file
Expand Up @@ -367,7 +367,8 @@
print '<td>'.$langs->trans("Description").'</td>';
print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
print '<td align="center" width="38" colspan="2">'.$langs->trans("Infos").'</td>';
print '<td align="center" width="38">'.$langs->trans("Infos").'</td>';
print '<td align="center" width="38">'.$langs->trans("Preview").'</td>';
print "</tr>\n";

clearstatcache();
Expand Down
8 changes: 7 additions & 1 deletion htdocs/admin/expedition.php
View file
Expand Up @@ -362,6 +362,7 @@
print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
print '<td align="center" width="80" class="nowrap">'.$langs->trans("Infos").'</td>';
print '<td align="center" width="80" class="nowrap">'.$langs->trans("Preview").'</td>';
print "</tr>\n";

clearstatcache();
Expand Down Expand Up @@ -428,8 +429,13 @@
$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
print '<td align="center">';
print $form->textwithpicto('',$htmltooltip,-1,0);
print '</td>';

// Preview
$link='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"),'sending').'</a>';
print $form->textwithpicto(' &nbsp; &nbsp; '.$link,$htmltooltip,-1,0);
print '<td align="center">';
print $link;
print '</td>';

print '</tr>';
Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/facture.php
View file
Expand Up @@ -486,7 +486,8 @@
print '<td>'.$langs->trans("Description").'</td>';
print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
print '<td align="center" width="32" colspan="2">'.$langs->trans("Infos").'</td>';
print '<td align="center" width="32">'.$langs->trans("Infos").'</td>';
print '<td align="center" width="32">'.$langs->trans("Preview").'</td>';
print "</tr>\n";

clearstatcache();
Expand Down
8 changes: 7 additions & 1 deletion htdocs/admin/fichinter.php
View file
Expand Up @@ -346,6 +346,7 @@
print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
print '<td align="center" width="80">'.$langs->trans("Infos").'</td>';
print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
print "</tr>\n";

clearstatcache();
Expand Down Expand Up @@ -416,8 +417,13 @@
$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
print '<td align="center">';
print $form->textwithpicto('',$htmltooltip,-1,0);
print '</td>';

// Preview
$link='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'intervention').'</a>';
print $form->textwithpicto(' &nbsp; &nbsp; '.$link,$htmltooltip,-1,0);
print '<td align="center">';
print $link;
print '</td>';

print '</tr>';
Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/livraison.php
View file
Expand Up @@ -347,7 +347,8 @@
print '<td>'.$langs->trans("Description").'</td>';
print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
print '<td align="center" width="32" colspan="2">'.$langs->trans("Infos").'</td>';
print '<td align="center" width="32">'.$langs->trans("Infos").'</td>';
print '<td align="center" width="32">'.$langs->trans("Preview").'</td>';
print "</tr>\n";

clearstatcache();
Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/supplier_invoice.php
View file
Expand Up @@ -346,7 +346,8 @@
print '<td>'.$langs->trans("Description").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
print '<td align="center" width="40" colspan="2">'.$langs->trans("Info").'</td>';
print '<td align="center" width="40">'.$langs->trans("Info").'</td>';
print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
print '</tr>'."\n";

clearstatcache();
Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/supplier_order.php
View file
Expand Up @@ -344,7 +344,8 @@
print '<td>'.$langs->trans("Description").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
print '<td align="center" width="40" colspan="2">'.$langs->trans("Info").'</td>';
print '<td align="center" width="40">'.$langs->trans("Info").'</td>';
print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
print '</tr>'."\n";

clearstatcache();
Expand Down
9 changes: 7 additions & 2 deletions htdocs/societe/admin/societe.php
View file
Expand Up @@ -453,6 +453,7 @@
print '<td>'.$langs->trans("Description").'</td>';
print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
print '<td align="center" width="60">'.$langs->trans("Infos").'</td>';
print '<td align="center" width="60">'.$langs->trans("Preview").'</td>';
print "</tr>\n";

foreach ($dirsociete as $dirroot)
Expand Down Expand Up @@ -536,8 +537,12 @@
}
$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);

print '<td align="center" class="nowrap">';
print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';


// Preview
print '<td align="center" class="nowrap">';
if ($module->type == 'pdf')
{
Expand All @@ -547,7 +552,7 @@
{
$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
}
print $form->textwithpicto(' &nbsp; '.$linkspec,$htmltooltip,1,0);
print $linkspec;
print '</td>';

print "</tr>\n";
Expand Down

0 comments on commit 6660618

Please sign in to comment.