Skip to content

Commit

Permalink
Clean css
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Jun 10, 2016
1 parent 74e59a1 commit aed2c5c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion htdocs/core/class/html.form.class.php
Expand Up @@ -5948,7 +5948,7 @@ function showFilterAndCheckAddButtons($addcheckuncheckall=0, $cssclass='checkfor
{
console.log("We uncheck all");
$(".'.$cssclass.'").prop(\'checked\', false);
}';
}'."\n";
if ($calljsfunction) $out.='if (typeof initCheckForSelect == \'function\') { initCheckForSelect(); } else { console.log("No function initCheckForSelect found. Call won\'t done."); }';
$out.=' });
});
Expand Down
8 changes: 4 additions & 4 deletions htdocs/core/class/html.formmail.class.php
Expand Up @@ -715,9 +715,11 @@ function get_form($addfileaction='addfile',$removefileaction='removefile')
$out.= "</td></tr>\n";
}

$out.= '</table>'."\n";

if ($this->withform == 1 || $this->withform == -1)
{
$out.= '<tr><td align="center" colspan="2"><div class="center">';
$out.= '<br><div class="center">';
$out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
// Add a javascript test to avoid to forget to submit file before sending email
if ($this->withfile == 2 && $conf->use_javascript_ajax)
Expand All @@ -730,11 +732,9 @@ function get_form($addfileaction='addfile',$removefileaction='removefile')
$out.= ' &nbsp; &nbsp; ';
$out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
}
$out.= '</div></td></tr>'."\n";
$out.= '</div>'."\n";
}

$out.= '</table>'."\n";

if ($this->withform == 1) $out.= '</form>'."\n";

// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
Expand Down

0 comments on commit aed2c5c

Please sign in to comment.