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

Enable smartphone menu template only if level 2

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-29 11:08:52 +00:00
parent 203d7586d1
commit c948a09a6c
7 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/index.php
View File

@ -46,8 +46,8 @@ if (! isset($_GET["mainmenu"])) $_GET["mainmenu"]="home";
* View * View
*/ */
// Smartphone (for dev only) // Smartphone
if ($conf->global->MAIN_FEATURES_LEVEL == 2 && class_exists('Smartphone')) if (class_exists('Smartphone'))
{ {
// Template directory // Template directory
$smartphone->getTemplateDir(); $smartphone->getTemplateDir();

10
htdocs/main.inc.php
View File

@ -267,8 +267,8 @@ if (sizeof($conf->need_smarty) > 0)
} }
} }
// Init Smartphone // Init Smartphone (for dev only)
if (isset($conf->browser->phone)) if ($conf->global->MAIN_FEATURES_LEVEL == 2 && isset($conf->browser->phone))
{ {
include_once(DOL_DOCUMENT_ROOT."/core/class/smartphone.class.php"); include_once(DOL_DOCUMENT_ROOT."/core/class/smartphone.class.php");
@ -663,22 +663,18 @@ if (! empty($_GET["theme"]))
if (empty($user->societe_id)) // If internal user or not defined if (empty($user->societe_id)) // If internal user or not defined
{ {
$conf->top_menu=$conf->global->MAIN_MENU_BARRETOP; $conf->top_menu=$conf->global->MAIN_MENU_BARRETOP;
//$conf->left_menu=$conf->global->MAIN_MENU_BARRELEFT;
$conf->smart_menu=$conf->global->MAIN_MENU_SMARTPHONE; $conf->smart_menu=$conf->global->MAIN_MENU_SMARTPHONE;
// For backward compatibility // For backward compatibility
if ($conf->top_menu == 'eldy.php') $conf->top_menu='eldy_backoffice.php'; if ($conf->top_menu == 'eldy.php') $conf->top_menu='eldy_backoffice.php';
//if ($conf->left_menu == 'eldy.php') $conf->left_menu='eldy_backoffice.php';
if ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_backoffice.php'; if ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_backoffice.php';
//if ($conf->left_menu == 'rodolphe.php') $conf->left_menu='eldy_backoffice.php';
} }
else // If external user else // If external user
{ {
$conf->top_menu=$conf->global->MAIN_MENUFRONT_BARRETOP; $conf->top_menu=$conf->global->MAIN_MENUFRONT_BARRETOP;
//$conf->left_menu=$conf->global->MAIN_MENUFRONT_BARRELEFT;
$conf->smart_menu=$conf->global->MAIN_MENUFRONT_SMARTPHONE; $conf->smart_menu=$conf->global->MAIN_MENUFRONT_SMARTPHONE;
// For backward compatibility // For backward compatibility
if ($conf->top_menu == 'eldy.php') $conf->top_menu='eldy_frontoffice.php';
if ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_frontoffice.php'; if ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_frontoffice.php';
//if ($conf->left_menu == 'rodolphe.php') $conf->left_menu='eldy_frontoffice.php';
} }
if (! defined('NOLOGIN')) if (! defined('NOLOGIN'))

4
htdocs/master.inc.php
View File

@ -194,7 +194,7 @@ define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix);
// Detection browser // Detection browser
if (isset($_SERVER["HTTP_USER_AGENT"])) if (isset($_SERVER["HTTP_USER_AGENT"]))
{ {
// If phone/smartphone, we set osname. // If phone/smartphone, we set phone os name.
if (preg_match('/android/i',$_SERVER["HTTP_USER_AGENT"])) $conf->browser->phone='android'; if (preg_match('/android/i',$_SERVER["HTTP_USER_AGENT"])) $conf->browser->phone='android';
elseif (preg_match('/blackberry/i',$_SERVER["HTTP_USER_AGENT"])) $conf->browser->phone='blackberry'; elseif (preg_match('/blackberry/i',$_SERVER["HTTP_USER_AGENT"])) $conf->browser->phone='blackberry';
elseif (preg_match('/iphone/i',$_SERVER["HTTP_USER_AGENT"])) $conf->browser->phone='iphone'; elseif (preg_match('/iphone/i',$_SERVER["HTTP_USER_AGENT"])) $conf->browser->phone='iphone';
@ -282,7 +282,7 @@ if (! defined('NOREQUIREDB'))
// Add real path in session name // Add real path in session name
$realpath=''; $realpath='';
if ( preg_match('/^([^.]+)\/htdocs\//i', realpath($_SERVER["SCRIPT_FILENAME"]), $regs)) $realpath = isset($regs[1])?$regs[1]:''; if ( preg_match('/^([^.]+)\/htdocs\//i', realpath($_SERVER["SCRIPT_FILENAME"]), $regs)) $realpath = isset($regs[1])?$regs[1]:'';
$entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].$realpath); $entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].$realpath);
if (! empty($_COOKIE[$entityCookieName]) && ! empty($conf->file->cookie_cryptkey)) // Just for view specific login page if (! empty($_COOKIE[$entityCookieName]) && ! empty($conf->file->cookie_cryptkey)) // Just for view specific login page
{ {

4
htdocs/theme/auguria/style.css.php
View File

@ -36,7 +36,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
require_once("../../master.inc.php"); require_once("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
// Define css type // Define css type
@ -464,7 +464,7 @@ img.printer {
/* ============================================================================== */ /* ============================================================================== */
<?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print') <?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print')
|| (! empty($conf->browser->phone) && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?> || (! empty($conf->browser->phone) && class_exists('Smartphone') && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
.vmenu { .vmenu {
display: none; display: none;
} }

4
htdocs/theme/eldy/style.css.php
View File

@ -36,7 +36,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
require_once("../../master.inc.php"); require_once("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
// Define css type // Define css type
@ -482,7 +482,7 @@ img.printer {
/* ============================================================================== */ /* ============================================================================== */
<?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print') <?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print')
|| (! empty($conf->browser->phone) && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?> || (! empty($conf->browser->phone) && class_exists('Smartphone') && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
.vmenu { .vmenu {
display: none; display: none;
} }

4
htdocs/theme/freelug/style.css.php
View File

@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
require_once("../../master.inc.php"); require_once("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
// Define css type // Define css type
@ -395,7 +395,7 @@ img.printer
/* ============================================================================== */ /* ============================================================================== */
<?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print') <?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print')
|| (! empty($conf->browser->phone) && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?> || (! empty($conf->browser->phone) && class_exists('Smartphone') && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
.vmenu { .vmenu {
display: none; display: none;
} }

4
htdocs/theme/yellow/style.css.php
View File

@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
require_once("../../master.inc.php"); require_once("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
// Define css type // Define css type
@ -375,7 +375,7 @@ img.printer
/* ============================================================================== */ /* ============================================================================== */
<?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print') <?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print')
|| (! empty($conf->browser->phone) && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?> || (! empty($conf->browser->phone) && class_exists('Smartphone') && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
.vmenu { .vmenu {
display: none; display: none;
} }