diff --git a/htdocs/index.php b/htdocs/index.php index e2b4032e41c..68a0b738373 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -34,11 +34,17 @@ require_once(DOL_DOCUMENT_ROOT."/boxes.php"); if (! isset($_GET["mainmenu"])) $_GET["mainmenu"]="home"; + /* * 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 */ -// 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 (preg_match('/^smartphone/',$conf->smart_menu) && isset($conf->browser->phone)) { $limitmenuto=GETPOST('limitmenuto')?GETPOST('limitmenuto'):0; $limitmenuto=1; // A virer - + // Load the smartphone menu manager $result=@include_once(DOL_DOCUMENT_ROOT ."/includes/menus/smartphone/".$conf->smart_menu); if (! $result) // If failed to include, we try with standard diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index 8bcd6f25e3f..035b941cf71 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -43,6 +43,10 @@ else header('Cache-Control: no-cache'); ?> +.landscape, .landscape .ui-page { + min-height: 300px; +} + #dol-homeheader { height: 40px; font-size: 16px; } @@ -72,7 +76,7 @@ padding-bottom: 0px; } .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 { @@ -85,12 +89,13 @@ input.ui-input-text, textarea.ui-input-text { .ui-body-c { background: #FFFFFF; + text-shadow: none; } .loginform { margin-left: 10px; margin-right: 10px; - padding: 10px; + padding: 5px; }