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

Fix: iphone template should not be linked with theme

Browse Source
This commit is contained in:
Regis Houssin 2009-12-28 10:21:43 +00:00
parent 4bab3bb2db
commit b45f186d1f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/lib/security.lib.php
View File

@ -361,6 +361,7 @@ function dol_loginfunction2($langs,$conf,$mysoc)
if (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone)) if (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone))
{ {
$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/templates/"; $smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/templates/";
$smarty->assign('theme', 'default');
} }
else else
{ {

2
htdocs/theme/phones/iphone/templates/login.tpl
View File

@ -33,7 +33,7 @@
<meta name="robots" content="noindex,nofollow" /> <meta name="robots" content="noindex,nofollow" />
<meta content="minimum-scale=1.0, width=device-width, maximum-scale=0.6667, user-scalable=no" name="viewport" /> <meta content="minimum-scale=1.0, width=device-width, maximum-scale=0.6667, user-scalable=no" name="viewport" />
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<link rel="stylesheet" href="{$dol_url_root}/theme/phones/iphone/theme/default/default.css.php" type="text/css" /> <link rel="stylesheet" href="{$dol_url_root}/theme/phones/iphone/theme/{$theme}/{$theme}.css.php" type="text/css" />
<script type="text/javascript" src="{$dol_url_root}/includes/iphone/iwebkit/Framework/javascript/function.js"></script> <script type="text/javascript" src="{$dol_url_root}/includes/iphone/iwebkit/Framework/javascript/function.js"></script>
</head> </head>