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

Fix warning when javascript disabled

Browse Source
This commit is contained in:
Laurent Destailleur 2016-02-03 03:10:58 +01:00
parent f4d04b8f26
commit 19300a2d82
3 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/admin/barcode.php
View File

@ -78,6 +78,11 @@ else if ($action == 'update')
$res = dolibarr_set_const($db, "GENBARCODE_BARCODETYPE_THIRDPARTY", $coder_id,'chaine',0,'',$conf->entity); $res = dolibarr_set_const($db, "GENBARCODE_BARCODETYPE_THIRDPARTY", $coder_id,'chaine',0,'',$conf->entity);
} }
} }
else if ($action == 'updateengine')
{
// TODO Update engines.
}
// define constants for models generator that need parameters // define constants for models generator that need parameters
if ($action == 'setModuleOptions') if ($action == 'setModuleOptions')
@ -190,6 +195,10 @@ $var=true;
print '<br>'; print '<br>';
print load_fiche_titre($langs->trans("BarcodeEncodeModule"),'',''); print load_fiche_titre($langs->trans("BarcodeEncodeModule"),'','');
print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"updateengine\">";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Name").'</td>'; print '<td>'.$langs->trans("Name").'</td>';
@ -282,11 +291,18 @@ if ($resql)
} }
print "</table>\n"; print "</table>\n";
if (empty($conf->use_javascript_ajax))
{
// TODO Implement code behind action updateengine
//print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
}
print '</form>';
print "<br>"; print "<br>";
/* /*
* Autres options * Other options
*
*/ */
print load_fiche_titre($langs->trans("OtherOptions"),'',''); print load_fiche_titre($langs->trans("OtherOptions"),'','');

33
htdocs/core/lib/functions.lib.php
View File

@ -5109,21 +5109,24 @@ function printCommonFooter($zone='private')
if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n"; if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
print "\n"; print "\n";
print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() {'."\n"; if (! empty($conf->use_javascript_ajax))
{
print '<!-- If page_y set, we set scollbar with it -->'."\n"; print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() {'."\n";
print "page_y=getParameterByName('page_y', 0);";
print "if (page_y > 0) $('html, body').scrollTop(page_y);"; print '<!-- If page_y set, we set scollbar with it -->'."\n";
print "page_y=getParameterByName('page_y', 0);";
print '<!-- Set handler to add page_y param on some a href links -->'."\n"; print "if (page_y > 0) $('html, body').scrollTop(page_y);";
print 'jQuery(".reposition").click(function() {
var page_y = $(document).scrollTop(); print '<!-- Set handler to add page_y param on some a href links -->'."\n";
/* alert(page_y); */ print 'jQuery(".reposition").click(function() {
this.href=this.href+\'&page_y=\'+page_y; var page_y = $(document).scrollTop();
});'."\n"; /* alert(page_y); */
print '});'."\n"; this.href=this.href+\'&page_y=\'+page_y;
});'."\n";
print '</script>'."\n"; print '});'."\n";
print '</script>'."\n";
}
// Google Analytics (need Google module) // Google Analytics (need Google module)
if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID)) if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))

15
htdocs/main.inc.php
View File

@ -1941,12 +1941,15 @@ if (! function_exists("llxFooter"))
if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent; if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
// Wrapper to show tooltips // Wrapper to show tooltips
print "\n<!-- JS CODE TO ENABLE tipTip on all object with class classfortooltip -->\n"; if ($conf->use_javascript_ajax)
print '<script type="text/javascript"> {
jQuery(document).ready(function () { print "\n<!-- JS CODE TO ENABLE tipTip on all object with class classfortooltip -->\n";
jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(600,'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50}); print '<script type="text/javascript">
}); jQuery(document).ready(function () {
</script>' . "\n"; jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(600,'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
});
</script>' . "\n";
}
// A div for the address popup // A div for the address popup
print "\n<!-- A div to allow dialog popup -->\n"; print "\n<!-- A div to allow dialog popup -->\n";