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

Fix: Some lib missing when jmobile enabled.

Browse Source
This commit is contained in:
Laurent Destailleur 2013-05-10 12:48:11 +02:00
parent ce6e1dc2a6
commit 9b30f116f1
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/categories/fiche.php
View File

@ -211,7 +211,7 @@ if ($user->rights->categorie->creer)
// Ref // Ref
print '<tr>'; print '<tr>';
print '<td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" name="label" size="25" value="'.$label.'">'; print '<td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="flat" name="label" size="25" value="'.$label.'">';
print'</td></tr>'; print'</td></tr>';
// Description // Description

24
htdocs/core/class/html.formother.class.php
View File

@ -1004,11 +1004,13 @@ class FormOther
} }
} }
$emptybox->box_id='A'; if (empty($conf->browser->phone))
$emptybox->info_box_head=array(); {
$emptybox->info_box_contents=array(); $emptybox->box_id='A';
$emptybox->showBox(array(),array()); $emptybox->info_box_head=array();
$emptybox->info_box_contents=array();
$emptybox->showBox(array(),array());
}
print "</div>\n"; print "</div>\n";
print "<!-- End box container -->\n"; print "<!-- End box container -->\n";
@ -1033,11 +1035,13 @@ class FormOther
} }
} }
$emptybox->box_id='B'; if (empty($conf->browser->phone))
$emptybox->info_box_head=array(); {
$emptybox->info_box_contents=array(); $emptybox->box_id='B';
$emptybox->showBox(array(),array()); $emptybox->info_box_head=array();
$emptybox->info_box_contents=array();
$emptybox->showBox(array(),array());
}
print "</div>\n"; print "</div>\n";
print "<!-- End box container -->\n"; print "<!-- End box container -->\n";

8
htdocs/main.inc.php
View File

@ -984,7 +984,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || ! empty($conf->dol_use_jmobile)) if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || ! empty($conf->dol_use_jmobile))
{ {
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css" />'."\n"; print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css" />'."\n";
} //$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jquerytreeview/jquery.treeview.css" />'."\n";
}
} }
print '<!-- Includes CSS for Dolibarr theme -->'."\n"; print '<!-- Includes CSS for Dolibarr theme -->'."\n";
@ -1148,6 +1151,9 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0)) if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0))
{ {
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js"></script>'."\n";
//$arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jquerytreeview/jquery.treeview.js"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js"></script>'."\n";
} }
} }