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

Enhancement in smartphone menu management

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-19 17:21:29 +00:00
parent 7faf3f5a37
commit 289005ba40
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/index.php
View File

@ -34,11 +34,17 @@ require_once(DOL_DOCUMENT_ROOT."/boxes.php");
if (! isset($_GET["mainmenu"])) $_GET["mainmenu"]="home"; if (! isset($_GET["mainmenu"])) $_GET["mainmenu"]="home";
/* /*
* Actions * Actions
*/ */
// No actions // Check if company name is defined (first install)
if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM))
{
header("Location: ".DOL_URL_ROOT."/admin/company.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
exit;
}
@ -46,20 +52,12 @@ if (! isset($_GET["mainmenu"])) $_GET["mainmenu"]="home";
* View * View
*/ */
// Check if company name is defined (first install)
if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM))
{
header("Location: ".DOL_URL_ROOT."/admin/company.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
exit;
}
// If smartphone mode, we do no show main page, we show only menu // If smartphone mode, we do no show main page, we show only menu
if (preg_match('/^smartphone/',$conf->smart_menu) && isset($conf->browser->phone)) if (preg_match('/^smartphone/',$conf->smart_menu) && isset($conf->browser->phone))
{ {
$limitmenuto=GETPOST('limitmenuto')?GETPOST('limitmenuto'):0; $limitmenuto=GETPOST('limitmenuto')?GETPOST('limitmenuto'):0;
$limitmenuto=1; // A virer $limitmenuto=1; // A virer
// Load the smartphone menu manager // Load the smartphone menu manager
$result=@include_once(DOL_DOCUMENT_ROOT ."/includes/menus/smartphone/".$conf->smart_menu); $result=@include_once(DOL_DOCUMENT_ROOT ."/includes/menus/smartphone/".$conf->smart_menu);
if (! $result) // If failed to include, we try with standard if (! $result) // If failed to include, we try with standard

9
htdocs/theme/phones/smartphone/theme/default/default.css.php
View File

@ -43,6 +43,10 @@ else header('Cache-Control: no-cache');
?> ?>
.landscape, .landscape .ui-page {
min-height: 300px;
}
#dol-homeheader { height: 40px; font-size: 16px; } #dol-homeheader { height: 40px; font-size: 16px; }
@ -72,7 +76,7 @@ padding-bottom: 0px;
} }
.ui-li .ui-btn-inner { .ui-li .ui-btn-inner {
padding: 0.3em 5px 0.3em 5px; padding: 0.4em 5px 0.4em 5px;
} }
input.ui-input-text, textarea.ui-input-text { input.ui-input-text, textarea.ui-input-text {
@ -85,12 +89,13 @@ input.ui-input-text, textarea.ui-input-text {
.ui-body-c { .ui-body-c {
background: #FFFFFF; background: #FFFFFF;
text-shadow: none;
} }
.loginform { .loginform {
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
padding: 10px; padding: 5px;
} }