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

Merge pull request #2123 from frederic34/patch-12

Browse Source 
Update card.php
This commit is contained in:
Laurent Destailleur 2014-12-03 12:20:00 +01:00
commit 3a476d0daf
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/html.form.class.php
View File

@ -2978,12 +2978,13 @@ class Form
// Show JQuery confirm box. Note that global var $useglobalvars is used inside this template // Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
$formconfirm.= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">'; $formconfirm.= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
if (! empty($more)) { if (! empty($more)) {
$formconfirm.= '<p>'.$more.'</p>'; $formconfirm.= '<div>'.$more.'</div>';
} }
$formconfirm.= img_help('','').' '.$question; $formconfirm.= img_help('','').' '.$question;
$formconfirm.= '</div>'; $formconfirm.= '</div>'."\n";
$formconfirm.= '<script type="text/javascript">'; $formconfirm.= "\n<!-- begin ajax form_confirm page=".$page." -->\n";
$formconfirm.= '<script type="text/javascript">'."\n";
$formconfirm.=' $formconfirm.='
$(function() { $(function() {
$( "#'.$dialogconfirm.'" ).dialog({ $( "#'.$dialogconfirm.'" ).dialog({
@ -3050,13 +3051,14 @@ class Form
} }
}); });
</script>'; </script>';
$formconfirm.= "<!-- end ajax form_confirm -->\n";
} }
else else
{ {
$formconfirm.= "\n<!-- begin form_confirm page=".$page." -->\n"; $formconfirm.= "\n<!-- begin form_confirm page=".$page." -->\n";
$formconfirm.= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n"; $formconfirm.= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
$formconfirm.= '<input type="hidden" name="action" value="'.$action.'">'; $formconfirm.= '<input type="hidden" name="action" value="'.$action.'">'."\n";
$formconfirm.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n"; $formconfirm.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
$formconfirm.= '<table width="100%" class="valid">'."\n"; $formconfirm.= '<table width="100%" class="valid">'."\n";

4
htdocs/product/card.php
View File

@ -1547,7 +1547,9 @@ else
} }
// Note // Note
print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'</td></tr>'; print '<!-- show Note --> '."\n";
print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'</td></tr>'."\n";
print '<!-- End show Note --> '."\n";
print "</table>\n"; print "</table>\n";