Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Var not initialized

Browse Source 
Fix: Pb of duplicate run of javascript with jmobile
This commit is contained in:
Laurent Destailleur
2013-06-01 23:45:03 +02:00
parent c6411477d7
commit 8348596aea
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/get_menudiv.php
View File

@@ -48,9 +48,10 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
$title=$langs->trans("Menu");
// URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
$head='<!-- Menu -->'."\n";
$arrayofjs=array();
$arrayofcss=array();
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
print '<body>'."\n";

11
htdocs/core/search_page.php
View File

@@ -45,12 +45,18 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
* View
*/
$title=$langs->trans("Search");
// URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
$head='<!-- Quick access -->'."\n";
$arrayofjs=array();
$arrayofcss=array();
top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
print '<body style="margin: 30px; height: 100%;">'."\n";
print '<body>'."\n";
print '<div>';
//print '<br>';
$nbofsearch=0;
@@ -112,6 +118,7 @@ print '</div>'."\n";
print '</div>';
print "<!-- End SearchForm -->\n";
print '</div>';
print '</body></html>'."\n";
$db->close();

3
htdocs/main.inc.php
View File

@@ -1685,6 +1685,7 @@ function main_area($title='')
print "\n";
if (! empty($conf->dol_use_jmobile)) print '<div data-role="page">';
print '<div class="fiche"> <!-- begin div class="fiche" -->'."\n";
if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
}
@@ -1804,7 +1805,7 @@ if (! function_exists("llxFooter"))
print "\n\n";
print '</div> <!-- end div class="fiche" -->'."\n";
if (! empty($conf->dol_use_jmobile)) print '</div>'; // end data-role="page"
//XXX print "\n".'</td></tr></table> <!-- end right area -->'."\n";
if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print '</div></div> <!-- end main layout -->'."\n";